PATCH: [ 1220492 ] Improve backup-fail message to show actual filename

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 048eaf5..e909d78 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1881,7 +1881,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 está marcado somente-leitura.  Você gostaria de salvar suas alterações com um nome de diferente?"
     IDS_ERROR_FILE_WRITEABLE "Erro ao checar escrita no destino"
     IDS_ERROR_BACKUP        "Erro ao realizar cópia de segurança do arquivo"
-    IDS_BACKUP_FAILED_PROMPT "Não foi possível fazer a cópia de segurança do arquivo original.\nContinuar assim mesmo?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index dcc4f67..5f8aaa7 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1780,7 +1780,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 å read-only. Äà çàïèøè ëè read-only ôàéëà ? (Íå ùå ãî çàïèøà ñ íîâî èìå.)"
     IDS_ERROR_FILE_WRITEABLE "Ãðåøêà ïðè ïðîâåðêàòà çà ïèñàíå"
     IDS_ERROR_BACKUP        "Error backing up file"
-    IDS_BACKUP_FAILED_PROMPT "Íå ìîæå äà backup ïúðâîíà÷àëíèÿ ôàéë.\nÙå ïðîäúëæèòå ëè?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 9cec99b..7159abf 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1781,7 +1781,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "El fitxer %1 està marcat com a només de lectua. Voldríeu substituir el fitxer només de lectura? (No es tracta de desar amb un nom nou.)"
     IDS_ERROR_FILE_WRITEABLE "Hi ha hagut un error en comprovar si la destinació era modificable"
     IDS_ERROR_BACKUP        "Hi ha hagut un error en crear una còpia de seguretat del fitxer"
-    IDS_BACKUP_FAILED_PROMPT "No es pot desar una còpia de seguretat del fitxer original.\nVoleu continuar tot i així?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Hi ha hagut un error en desar el fitxer.\n%1\n%2\nVoleu:\n\t-desar-lo amb un nom diferent (premeu D'acord)\n\r-avortar l'operació actual (Premeu Cancel·lar)?"
     IDS_FILEPACK_FAILED_LEFT "El connector '%2' no pot tornar a empaquetar els vostres canvis al fitxer de l'esquerra altre cop cap a '%1'.\n\nEl fitxer original no es canviarà.\n\nVoleu desar la versió desempaquetada en un altre fitxer?"
     IDS_FILEPACK_FAILED_RIGHT "El connector '%2' no pot tornar a empaquetar els vostres canvis al fitxer de la dreta altre cop cap a '%1'.\n\nEl fitxer original no es canviarà.\n\nVoleu desar la versió desempaquetada en un altre fitxer?"

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 27f9d2e..0a59b65 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1751,7 +1751,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
     IDS_ERROR_FILE_WRITEABLE "´íÎó¼ì²éÄ¿±êдÈëÐÔ"
     IDS_ERROR_BACKUP        "´íÎ󱸷ÝÎļþ"
-    IDS_BACKUP_FAILED_PROMPT "ÎÞ·¨±¸·ÝԭʼµÄÎļþ¡£\nÎÞÂÛÈçºÎÒª¼ÌÐøÂð£¿"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 920b81c..b2b56b7 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1863,7 +1863,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 ¬O¼Ð°O¬°°ßŪ¡C §A­nÂмg°ßŪÀÉ®×¶Ü ¡H (¤£¥i¥H¥t¦s¬°·sÀɮצWºÙ¡C)"
     IDS_ERROR_FILE_WRITEABLE "¿ù»~Àˬd¥Ø¼Ð¼g¤J©Ê"
     IDS_ERROR_BACKUP        "¿ù»~³Æ¥÷ÀÉ®×"
-    IDS_BACKUP_FAILED_PROMPT "µLªk³Æ¥÷­ì©lªºÀɮסC\nµL½×¦p¦ó­nÄ~Äò¶Ü¡H"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Àx¦sÀÉ®×¥¢±Ñ¡C\n%1\n%2\n§A­n¥H¤@­Ó¤£¦P¦WºÙÀx¦sÀɮ׶ܡH"
     IDS_FILEPACK_FAILED_LEFT "¥~±¾ '%2' µLªk«Ê¥]§A¹ï¥ªÃäÀɮתºÅܧó¦^¨ì '%1'.\n\n­ì©lÀɮפ£·|Åܧó¡C\n\n§A­nÀx¦s¸Ñ«Ê¥]ª©¥»¬°¥t¤@Àɮ׶ܡH"
     IDS_FILEPACK_FAILED_RIGHT "¥~±¾ '%2' µLªk«Ê¥]§A¹ï¥kÃäÀɮתºÅܧó¦^¨ì '%1'.\n\n­ì©lÀɮפ£·|Åܧó¡C\n\n§A­nÀx¦s¸Ñ«Ê¥]ª©¥»¬°¥t¤@Àɮ׶ܡH"

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 547d758..1f449b3 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1878,7 +1878,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
     IDS_ERROR_FILE_WRITEABLE "Error checking destination writeability"
     IDS_ERROR_BACKUP        "Error backing up file"
-    IDS_BACKUP_FAILED_PROMPT "Nelze zálohovat puvodní soubor.\nPokracovat?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 50e9c95..30a65d5 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1763,7 +1763,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 er markeret som skrivebeskyttet. Vil du ignorerer skrivebeskyttelsen? (Nej for at gemme til et andet filnavn.)"
     IDS_ERROR_FILE_WRITEABLE "Fejl ender tjek af skrivebeskyttelsen på destinationen"
     IDS_ERROR_BACKUP        "Fejl under backup af filen"
-    IDS_BACKUP_FAILED_PROMPT "Kan ikke lave backup af den originale fil.\nVil du fortsætte alligevel?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' kan ikke pakke dine ændringer til den venstre fil tilbage til '%1'.\n\nDen originale fil vil ikke blive ændret.\n\nVil du gemme den udpakkede version under et andet filnavn?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' kan ikke pakke dine ændringer til den højre fil tilbage til '%1'.\n\nDen originale fil vil ikke blive ændret.\n\nVil du gemme den udpakkede version under et andet filnavn?"

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 6ec288e..48c70be 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1880,7 +1880,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand overschrijven? (Niet opslaan onder nieuwe naam.)"
     IDS_ERROR_FILE_WRITEABLE "Fout bij het controleren van de schrijfrechten van het doelbestand"
     IDS_ERROR_BACKUP        "Fout bij het maken van een veiligheidskopie"
-    IDS_BACKUP_FAILED_PROMPT "Kan geen veiligheidskopie maken van originele bestand. \nToch doorgaan?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Het opslaan van het bestand is mislukt.\n%1\n%2\nWilt u het bestand onder een andere naam opslaan?"
     IDS_FILEPACK_FAILED_LEFT "Plug-in '%2' kan de wijzigingen aan de linker kant niet opslaan in '%1'.\n\nHet originele bestand zal niet worden gewijzigd.\n\nWilt u de uitgepakte versie in een ander bestand opslaan?"
     IDS_FILEPACK_FAILED_RIGHT "Plug-in '%2' kan de wijzigingen aan de rechter kant niet opslaan in '%1'.\n\nHet originele bestand zal niet worden gewijzigd.\n\nWilt u de uitgepakte versie in een ander bestand opslaan?"

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 44a6e98..ef3899a 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1766,7 +1766,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT      "%1 est en lecture seule. Voulez-vous outrepasser ? (Choisissez Non pour enregistrer avec un nouveau nom.)"
     IDS_ERROR_FILE_WRITEABLE  "Erreur en vérifiant les droits en écriture de la destination"
     IDS_ERROR_BACKUP          "Erreur lors du backup du fichier"
-    IDS_BACKUP_FAILED_PROMPT  "Erreur lors du backup du fichier original.\nContinuer quand même ?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED       "Erreur lors de l'enregistrement.\n%1\n%2\nVoulez-vous:\n\t-utiliser un nom autre nom de fichier (Ok)\n\t-avorter l'opération en cours (Annuler)?"
     IDS_FILEPACK_FAILED_LEFT  "Le plugiciel '%2' ne peut compressé le fichier modifié de gauche dans '%1'.\n\nLe fichier original est conservé.\n\nVoulez-vous enregistrer la version décompressée sous un autre nom ?"
     IDS_FILEPACK_FAILED_RIGHT "Le plugiciel '%2' ne peut compressé le fichier modifié de droite dans '%1'.\n\nLe fichier original est conservé.\n\nVoulez-vous enregistrer la version décompressée sous un autre nom ?"

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 55561d0..72605c5 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1881,7 +1881,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 ist als Schreibgeschützt markiert. Möchten Sie die schreibgeschützte Datei überschreiben? (Nicht unter neuem Dateinamen speichern.)"
     IDS_ERROR_FILE_WRITEABLE "Fehler beim Prüfen des Zielverzeichnisses auf Schreibschutz"
     IDS_ERROR_BACKUP        "Fehler beim Erstellen einer Sicherheitskopie"
-    IDS_BACKUP_FAILED_PROMPT "Es konnte keine Sicherheitskopie der Originaldatei erzeugt werden.\nWollen Sie trotzdem fortfahren?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' kann Ihre Änderungen der linken Datei nicht zurück in '%1' packen.\n\nDie ursprüngliche Datei wird nicht geändert.\n\nMöchten Sie die ungepackte Version in einer anderen Datei speichern?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' kann Ihre Änderungen der rechten Datei nicht zurück in '%1' packen.\n\nDie ursprüngliche Datei wird nicht geändert.\n\nMöchten Sie die ungepackte Version in einer anderen Datei speichern?"

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 5decb66..b2089b3 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -1764,7 +1764,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "Ez a fájl: %1 csak olvasható. Szeretnéd ezt megváltoztatni? (Kattints a Nem gombra a fájl új néven való mentéséhez.)"
     IDS_ERROR_FILE_WRITEABLE "Hiba a cél írhatóságának ellenõrzésekor"
     IDS_ERROR_BACKUP        "Hiba a fájl biztonsági másolatának készítésekor"
-    IDS_BACKUP_FAILED_PROMPT "Nem lehetett menteni a biztonsági másolatot.\nSzeretnéd ennek ellenére folytatni?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Ez a bõvítmény '%2' nem tudja visszacsomagolni a bal oldalon megváltoztatott '%1' fájlt.\n\nAz eredeti fájl nem lett megváltoztatva.\n\nSzeretnéd menteni a kicsomagolt változatot egy másik fájlba?"
     IDS_FILEPACK_FAILED_RIGHT "Ez a bõvítmény '%2' nem tudja visszacsomagolni a jobb oldalon megváltoztatott '%1' fájlt.\n\nAz eredeti fájl nem lett megváltoztatva.\n\nSzeretnéd menteni a kicsomagolt változatot egy másik fájlba?"

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 3ce55e2..7eaefeb 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1877,7 +1877,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 è marcato come di sola lettura. Desideri non tenere conto di questa impostazione ? (No per salvare con un nuovo nome.)"
     IDS_ERROR_FILE_WRITEABLE "Errore nel controllo sui permessi di scrittura della destinazione"
     IDS_ERROR_BACKUP        "Errore durante il salvataggio di una copia di backup del file"
-    IDS_BACKUP_FAILED_PROMPT "Impossibile creare una copia di backup del file originale.\nVuoi continuare ugualmente?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Il plugin '%2' non può ricompattare nuovamente le tue modifiche al file di sinistra in '%1'.\n\nIl file originale non verrà cambiato.\n\nDesideri salvare la versione non compattata in un altro file?"
     IDS_FILEPACK_FAILED_RIGHT "Il plugin '%2' non può ricompattare nuovamente le tue modifiche al file di destra in '%1'.\n\nIl file originale non verrà cambiato.\n\nDesideri salvare la versione non compattata in un altro file?"

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index 980d62a..b639114 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1768,7 +1768,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1\82Í\93Ç\82Ý\8eæ\82è\90ê\97p\83t\83@\83C\83\8b\82Å\82·\81B \93Ç\82Ý\8eæ\82è\90ê\97p\83t\83@\83C\83\8b\82ð\8fã\8f\91\82«\82µ\82Ü\82·\82©? (\90V\82µ\82¢\83t\83@\83C\83\8b\96¼\82Å\82Í\95Û\91¶\82µ\82Ü\82¹\82ñ\81B)"
     IDS_ERROR_FILE_WRITEABLE "\83t\83@\83C\83\8b\8f\91\82«\8d\9e\82Ý\89Â\83`\83F\83b\83N\83G\83\89\81["
     IDS_ERROR_BACKUP        "\83t\83@\83C\83\8b\83o\83b\83N\83A\83b\83v\83G\83\89\81["
-    IDS_BACKUP_FAILED_PROMPT "\8c³\83t\83@\83C\83\8b\82ð\83o\83b\83N\83A\83b\83v\82Å\82«\82Ü\82¹\82ñ\81B\n\96³\8e\8b\82µ\82Ä\91±\82¯\82Ü\82·\82©?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "\83t\83@\83C\83\8b\82Ì\95Û\91¶\82É\8e¸\94s\82µ\82Ü\82µ\82½\81B\n%1\n%2\n\95Ê\96¼\82Å\95Û\91¶\82·\82é\8fê\8d\87\82ÍOk\82ð\81A\n\92\86\8e~\82·\82é\8fê\8d\87\82Í\81A\83L\83\83\83\93\83Z\83\8b\82ð\89\9f\82µ\82Ä\82­\82¾\82³\82¢"
     IDS_FILEPACK_FAILED_LEFT "\83v\83\89\83O\83C\83\93 '%2' \82Í\81A\8fC\90³\93à\97e\82ð\8d¶\91¤\82Ì\83t\83@\83C\83\8b '%1' \82É\8f\91\82«\96ß\82·\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ\81B\n\n\8c³\83t\83@\83C\83\8b\82Í\95Ï\8dX\82³\82ê\82Ü\82¹\82ñ\81B\n\n\93W\8aJ\82³\82ê\82½\82à\82Ì\82ð\95Ê\83t\83@\83C\83\8b\82É\95Û\91¶\82µ\82Ü\82·\82©?"
     IDS_FILEPACK_FAILED_RIGHT "\83v\83\89\83O\83C\83\93 '%2' \82Í\81A\8fC\90³\93à\97e\82ð\89E\91¤\82Ì\83t\83@\83C\83\8b '%1' \82É\8f\91\82«\96ß\82·\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ\81B\n\n\8c³\83t\83@\83C\83\8b\82Í\95Ï\8dX\82³\82ê\82Ü\82¹\82ñ\81B\n\n\93W\8aJ\82³\82ê\82½\82à\82Ì\82ð\95Ê\83t\83@\83C\83\8b\82É\95Û\91¶\82µ\82Ü\82·\82©?"

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index a0f69c9..4331e27 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1761,7 +1761,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 Àº ÀбâÀü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î ? (´Ù¸¥À̸§À¸·Î ÀúÀåÇÏ·Á¸é ¾Æ´Ï¿À¸¦ ¼±ÅÃÇϼ¼¿ä.)"
     IDS_ERROR_FILE_WRITEABLE "º¹»ç °¡´É üũ ½ÇÆÐ"
     IDS_ERROR_BACKUP        "ÆÄÀÏ ¹é¾÷À» ½ÇÆÐÇÏ¿´½À´Ï´Ù"
-    IDS_BACKUP_FAILED_PROMPT "¿øº» ÆÄÀÏÀ» ¹é¾÷ÇÒ ¼ö ¾ø½À´Ï´Ù.\n°è¼ÓÇϽðڽÀ´Ï±î?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 2249992..a46cb9f 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1877,7 +1877,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 er markert som skrivebeskyttet. Vil du lagre filen under et annet navn?"
     IDS_ERROR_FILE_WRITEABLE "Sjekk skrivebeskyttelsen på destinasjonen"
     IDS_ERROR_BACKUP        "Feil under backup av filen"
-    IDS_BACKUP_FAILED_PROMPT "Kan ikke ta backup av den originale filen.\nVil du fortsette allikevel?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Programtillegg '%2' klarte ikke pakke endringene dine for venstre fil tilbake inn i '%1'.\n\nDen original filen blir ikke endret.\n\nVil du lagre den upakkede versjonen fil en annen fil?"
     IDS_FILEPACK_FAILED_RIGHT "Programtillegg '%2' klarte ikke pakke endringene dine for høyre fil tilbake inn i '%1'.\n\nDen original filen blir ikke endret.\n\nVil du lagre den upakkede versjonen fil en annen fil?"

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index c9c0450..f8d2a4b 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1878,7 +1878,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 tylko do odczytu. Czy chcesz zachowaæ plik pod inn¹ nazw¹?"
     IDS_ERROR_FILE_WRITEABLE "B³¹d sprawdzania mo¿liwo\9cci zapisu w miejscu docelowym"
     IDS_ERROR_BACKUP        "B³¹d przy tworzeniu kopii zapasowej pliku"
-    IDS_BACKUP_FAILED_PROMPT "Nie mo¿na zrobiæ kopii pliku oryginalnego.\nKontynuowaæ mimo to?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Wtyczka '%2' nie mo¿e spakowaæ zmian lewego pliku w '%1'.\n\nPlik oryginalny nie zostanie zmieniony.\n\nCzy zachowaæ rozpakowan¹ wersjê w innym pliku?"
     IDS_FILEPACK_FAILED_RIGHT "Wtyczka '%2' nie mo¿e spakowaæ zmian prawego pliku w '%1'.\n\nPlik oryginalny nie zostanie zmieniony.\n\nCzy zachowaæ rozpakowan¹ wersjê w innym pliku?"

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 36df30b..ecc3c93 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1779,7 +1779,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 ïîìå÷åí êàê ""òîëüêî äëÿ ÷òåíèÿ"". Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë ? (""Íåò"" ïîçâîëÿåò çàäàòü íîâîå èìÿ ôàéëà)"
     IDS_ERROR_FILE_WRITEABLE "Îøèáêà ïðîâåðêè âîçìîæíîñòè çàïèñè â óêàçàííîå ìåñòî"
     IDS_ERROR_BACKUP        "Îøèáêà ñîçäàíèÿ ðåçåðâíîé êîïèè"
-    IDS_BACKUP_FAILED_PROMPT "Íåò âîçìîæíîñòè ñîçäàòü ðåçåðâíóþ êîïèþ îðèãèíàëà?\nÂñå ðàâíî ïðîäîëæèòü ?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Ïëàãèí '%2' íå ìîæåò çàïàêîâàòü âàøè èçìåíåíèÿ îáðàòíî â ôàéë ñëåâà '%1'.\n\nÎðèãèíàë îñòàíåòñÿ íå èçìåíåííûì.\n\nÕîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?"
     IDS_FILEPACK_FAILED_RIGHT "Ïëàãèí '%2' íå ìîæåò çàïàêîâàòü âàøè èçìåíåíèÿ îáðàòíî â ôàéë ñïðàâà '%1'.\n\nÎðèãèíàë îñòàíåòñÿ íå èçìåíåííûì.\n\nÕîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?"

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 12828b1..a7f8b60 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1878,7 +1878,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
     IDS_ERROR_FILE_WRITEABLE "Chyba pri zis\9dovaní mo\9enosti zápisu"
     IDS_ERROR_BACKUP        "Chyba pri zálohovaní súboru"
-    IDS_BACKUP_FAILED_PROMPT "Nemo\9eno zálohova\9d pôvodny súbor.\nPokraèova\9d?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 2443c78..a5fa26f 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1878,7 +1878,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 es de sólo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo con un nuevo nombre.)"
     IDS_ERROR_FILE_WRITEABLE "Error comprobando la posibilidad de escritura en destino"
     IDS_ERROR_BACKUP        "Error haciendo copia de seguridad del fichero"
-    IDS_BACKUP_FAILED_PROMPT "No pudo guardar el fichero original.\n¿Continuar de todas formas?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "El complemento '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index f4f64bc..ac4cce1 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1877,7 +1877,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 är skrivskyddad. Vill du skriva över filen (välj Nej för att spara filen med ett annat namn)?"
     IDS_ERROR_FILE_WRITEABLE "Kontrollera skrivbarhet på destinationen!"
     IDS_ERROR_BACKUP        "Fel under backup av filen"
-    IDS_BACKUP_FAILED_PROMPT "Kan inte ta backup på originalfilen.\nVill du fortsätta i alla fall?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Det gick inte att spara filen.\n%1\n%2\nVill du:\n\t-använda ett annat filnamn (Tryck Ok)\n\t-avbryta sparande av fil (Tryck Avbryt)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' kan inte packa dina förändringar av den vänstra filen tillbaka till '%1'.\n\nOriginalfilen blir inte ändrad.\n\nVill du spara den uppackade versionen till en annan fil?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' kan inte packa dina förändringar av den högra filen tillbaka till '%1'.\n\nOriginalfilen blir inte ändrad.\n\nVill du spara den uppackade versionen till en annan fil?"

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index 95fa32a..7aa8e6c 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -1767,7 +1767,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
     IDS_ERROR_FILE_WRITEABLE "Error checking destination writeability"
     IDS_ERROR_BACKUP        "Error backing up file"
-    IDS_BACKUP_FAILED_PROMPT "Unable to backup original file.\nContinue anyway?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 68900bb..8a3bee4 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1416,7 +1416,7 @@ BOOL CMainFrame::CreateBackup(LPCTSTR pszPath)
                
                if (!success)
                {
-                       if (AfxMessageBox(IDS_BACKUP_FAILED_PROMPT,
+                       if (ResMsgBox1(IDS_BACKUP_FAILED_PROMPT, pszPath,
                                        MB_YESNO | MB_ICONQUESTION | MB_DONT_ASK_AGAIN, 
                                        IDS_BACKUP_FAILED_PROMPT) != IDYES)
                                return FALSE;

diff --git a/Src/Merge.rc b/Src/Merge.rc
index b6724fe..4c32b1f 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1775,7 +1775,8 @@ BEGIN
     IDS_SAVEREADONLY_FMT    "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
     IDS_ERROR_FILE_WRITEABLE "Error checking destination writeability"
     IDS_ERROR_BACKUP        "Error backing up file"
-    IDS_BACKUP_FAILED_PROMPT "Unable to backup original file.\nContinue anyway?"
+    IDS_BACKUP_FAILED_PROMPT
+                            "Unable to backup original file:\n%1\n\nContinue anyway?"
     IDS_FILESAVE_FAILED     "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
     IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
     IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"

diff --git a/Src/readme.txt b/Src/readme.txt
index 5bbb17f..8f69c4d 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -4,6 +4,9 @@
   Src/Languages/Swedish: MergeSwedish.rc
  BUG: [ 1222705 ] DiffFileInfo copy constructor broken (current CVS)
   Src: DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp DiffItem.h FileInfo.cpp FileInfo.h
+ PATCH: [ 1220492 ] Improve backup-fail message to show actual filename
+  Src: MainFrm.cpp Merge.rc
+  Src/Languages: *.rc
 
 2005-06-15 Kimmo
  PATCH: [ 1220472 ] Don't lose selection when deleting items from dir compare