PATCH: [ 1385672 ] Replace some 'file's with 'item's

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 2f62637..39d3ac4 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,9 @@
  PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
   Src: DirActions.cpp DirView.h Merge.dsp
   Src new files: FileActionScript.cpp FileActionScript.h
+ PATCH: [ 1385672 ] Replace some 'file's with 'item's
+  Src: Merge.rc
+  Src/Language: */Merge*.rc
 
 2006-01-14 Perry
  TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index e2e0143..84eb175 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Copiar o arquivo selecionado para o diretório especificado"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected file to custom directory"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Copiar os arquivos selecionados para o diretório especificado"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected file to custom directory"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Excluir o objeto selecionado a esquerda"
     ID_DIR_DEL_RIGHT        "Excluir o objeto selecionado a direita"
     ID_DIR_DEL_BOTH         "Excluir o(s) arquivo(s) selecionado(s) em ambos os lados"

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 0ccc2e4..5471165 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1940,10 +1940,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Êîïèðàíå íà ôàéëîâåòå êúì èçáðàíàòà äèðåêòîðèÿ"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected file to custom directory"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Êîïèðàíå íà ôàéëîâåòå êúì èçáðàíàòà äèðåêòîðèÿ"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected file to custom directory"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Èçòðèâàíå íà èçáðàíèÿ îáåêò îò ëÿâî"
     ID_DIR_DEL_RIGHT        "Èçòðèâàíå íà èçáðàíèÿ îáåêò îò äÿñíî"
     ID_DIR_DEL_BOTH         "Èçòðèâàíå íà èçáðàíèÿ îáåêò(è) îò äâåòå ñòðàíè"

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 09d8a90..78f6683 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1941,10 +1941,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Copia el fitxer seleccionat al directori indicat"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copia el fitxer seleccionat en un directori a triar"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Copia el fitxer seleccionat al directori indicat"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copia el fitxer seleccionat en un directori a triar"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Suprimeix els elements seleccionats a l'esquerra"
     ID_DIR_DEL_RIGHT        "Suprimeix els elements seleccionats a la dreta"
     ID_DIR_DEL_BOTH         "Suprimeix els element(s) seleccionat(s) a ambdues bandes"

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 3660026..0714d82 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1924,10 +1924,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÓÒ²àÎļþ¼Ð"
-    ID_DIR_COPY_LEFT_TO_BROWSE "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÆäËüÎļþ¼Ð"
-    ID_DIR_COPY_RIGHT_TO_LEFT "¸´ÖÆÑ¡ÔñµÄÎļþµ½×ó²àÎļþ¼Ð"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "¸´ÖÆÑ¡ÔñµÄÎļþµ½ÆäËüÎļþ¼Ð"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "ɾ³ý×ó²àÑ¡ÖеÄÏîÄ¿"
     ID_DIR_DEL_RIGHT        "ɾ³ýÓÒ²àÑ¡ÖеÄÏîÄ¿"
     ID_DIR_DEL_BOTH         "ɾ³ýÁ½²àÑ¡ÖеÄÏîÄ¿"

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index c435699..daac2ce 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "½Æ»s¿ï¨úªºÀɮרì¤w©R¦Wªº¸ê®Æ§¨"
-    ID_DIR_COPY_LEFT_TO_BROWSE "½Æ»s¿ï¨úªºÀɮרì¦Û­q¸ê®Æ§¨"
-    ID_DIR_COPY_RIGHT_TO_LEFT "½Æ»s¿ï¨úªºÀɮרì¤w©R¦Wªº¸ê®Æ§¨"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "½Æ»s¿ï¨úªºÀɮרì¦Û­q¸ê®Æ§¨"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "§R°£¦b¥ªÃ䪺¿ï¨ú¶µ¥Ø"
     ID_DIR_DEL_RIGHT        "§R°£¦b¥kÃ䪺¿ï¨ú¶µ¥Ø"
     ID_DIR_DEL_BOTH         "§R°£¨âÃ䪺¿ï¨ú¶µ¥Ø"

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 32e23aa..319000f 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Kopírovat vybrané soubory do jiného adresáre"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected file to custom directory"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Kopírovat vybrané soubory do jiného adresáre"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected file to custom directory"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Delete selected item on left"
     ID_DIR_DEL_RIGHT        "Delete selected item on right"
     ID_DIR_DEL_BOTH         "Delete selected item(s) on both sides"

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 67469cc..3a90926 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Kopier den valgte fil til den angivne mappe"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Kopier den valgte fil til en speciel mappe"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Kopier den valgte fil til den angivne mappe"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Kopier den valgte fil til en speciel mappe"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Slet det valgte element til venstre"
     ID_DIR_DEL_RIGHT        "Slet det valgte element til højre"
     ID_DIR_DEL_BOTH         "Slet de valgte element(er) på begge sider"

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 34af6c8..1caf64b 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Geselecteerd bestand naar aangegeven map kopiëren"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Geselecteerd bestand naar door gebruiker gedefinieerde map kopiëren"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Geselecteerd bestand naar aangegeven map kopiëren"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Geselecteerd bestand naar door gebruiker gedefinieerde map kopiëren"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Geselecteerde item aan de linker kant verwijderen"
     ID_DIR_DEL_RIGHT        "Geselecteerde item aan de rechter kant verwijderen"
     ID_DIR_DEL_BOTH         "Geselecteerde item(s) aan beide kanten verwijderen"

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 888200f..6fc4879 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1918,10 +1918,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT   "Copier le fichier sélectionné vers le répertoire indentifié"
-    ID_DIR_COPY_LEFT_TO_BROWSE  "Copier le fichier sélectionné vers un répertoire à indentifer"
-    ID_DIR_COPY_RIGHT_TO_LEFT   "Copier le fichier sélectionné vers le répertoire indentifié"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copier le fichier sélectionné vers un répertoire à indentifer"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT             "Supprimer l'élément sélectionné à gauche"
     ID_DIR_DEL_RIGHT            "Supprimer l'élément sélectionné à droite"
     ID_DIR_DEL_BOTH             "Supprimer l'élément sélectionné de chaque côté"

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index a52e1a5..02b4ca0 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Kopiert die ausgewählte Datei ins angegebene Verzeichnis."
-    ID_DIR_COPY_LEFT_TO_BROWSE "Kopiert die ausgewählte Datei in ein beliebiges Verzeichnis."
-    ID_DIR_COPY_RIGHT_TO_LEFT "Kopiert die ausgewählte Datei ins angegebene Verzeichnis."
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Kopiert die ausgewählte Datei in ein beliebiges Verzeichnis."
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Löscht ausgewähltes Objekt auf der linken Seite."
     ID_DIR_DEL_RIGHT        "Löscht ausgewähltes Objekt auf der rechten Seite."
     ID_DIR_DEL_BOTH         "Löscht ausgewählte Objekte auf beiden Seiten."

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 8b950c6..b591de6 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Kijelölt fájl másolása a megnevezett könyvtárba"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Kijelölt fájl másolása tetszõleges könyvtárba"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Kijelölt fájl másolása a megnevezett könyvtárba"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Kijelölt fájl másolása tetszõleges könyvtárba"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Kijelölt bal oldali elem törlése"
     ID_DIR_DEL_RIGHT        "Kijelölt jobb oldali elem törlése"
     ID_DIR_DEL_BOTH         "Kijelölt elem(ek) törlése mindkét oldalon"

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 6d0d7c8..f76be54 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Copia questo file nella cartella di destra"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copia il file selezionato in una cartella personalizzata"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Copia questo file nella cartella di sinistra"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copia il file selezionato in una cartella personalizzata"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Elimina la voce selezionata sulla sinistra"
     ID_DIR_DEL_RIGHT        "Elimina la voce selezionata sulla destra"
     ID_DIR_DEL_BOTH         "Elimina gli elementi selezionati in entrambi i lati"

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index dd61168..a5290f2 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "\91I\91ð\82³\82ê\82½\83t\83@\83C\83\8b\82ð\8ew\92è\83t\83H\83\8b\83_\82É\83R\83s\81[\82µ\82Ü\82·"
-    ID_DIR_COPY_LEFT_TO_BROWSE "\91I\91ð\82³\82ê\82½\83t\83@\83C\83\8b\82ð\91I\91ð\82³\82ê\82½\83t\83H\83\8b\83_\82É\83R\83s\81[\82µ\82Ü\82·"
-    ID_DIR_COPY_RIGHT_TO_LEFT "\91I\91ð\82³\82ê\82½\83t\83@\83C\83\8b\82ð\8ew\92è\83t\83H\83\8b\83_\82É\83R\83s\81[\82µ\82Ü\82·"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "\91I\91ð\82³\82ê\82½\83t\83@\83C\83\8b\82ð\91I\91ð\82³\82ê\82½\83t\83H\83\8b\83_\82É\83R\83s\81[\82µ\82Ü\82·"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "\8d¶\82Ì\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\8dí\8f\9c\82µ\82Ü\82·"
     ID_DIR_DEL_RIGHT        "\89E\82Ì\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\8dí\8f\9c\82µ\82Ü\82·"
     ID_DIR_DEL_BOTH         "\97¼\91¤\82Ì\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\8dí\8f\9c\82µ\82Ü\82·"

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 35c026c..ed2e486 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "¼±Åà ÆÄÀÏÁß ¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù."
-    ID_DIR_COPY_LEFT_TO_BROWSE "¼±Åà ÆÄÀÏÀ» ƯÁ¤ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù."
-    ID_DIR_COPY_RIGHT_TO_LEFT "¼±Åà ÆÄÀÏÁß ¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù."
-    ID_DIR_COPY_RIGHT_TO_BROWSE "¼±Åà ÆÄÀÏÀ» ƯÁ¤ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù."
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿ÞÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù."
     ID_DIR_DEL_RIGHT        "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿À¸¥ÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù."
     ID_DIR_DEL_BOTH         "¼±ÅÃÇÑ ÆÄÀÏÀ» ¾çÂÊ ¸ðµÎ¿¡¼­ »èÁ¦ÇÕ´Ï´Ù."

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 9bf1a45..911f69b 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Kopier den valgte filen til den angitte mappen"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Kopier den valgte filen til tilpasset mappe"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Kopier den valgte filen til den angitte mappen"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Kopier den valgte filen til tilpasset mappe"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Slett valgte elementer til venstre"
     ID_DIR_DEL_RIGHT        "Slett valgte elementer til høyre"
     ID_DIR_DEL_BOTH         "Slett de valgte element(er) på begge sider"

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 751465c..2e26382 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Kopiuj wybrany plik do wskazanego katalogu"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Kopiuj wybrany plik do katalogu"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Kopiuj wybrany plik do wskazanego katalogu"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Kopiuj wybrany plik do katalogu"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Usuñ wybran¹ pozycjê z lewej"
     ID_DIR_DEL_RIGHT        "Usuñ wybran¹ pozycjê z prawej"
     ID_DIR_DEL_BOTH         "Usuñ wybrane pozycje po obu stronach"

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 1fe0305..6571637 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Óäàëèòü âûáðàííûé ýëåìåíò ñëåâà"
     ID_DIR_DEL_RIGHT        "Óäàëèòü âûáðàííûé ýëåìåíò ñïðàâà"
     ID_DIR_DEL_BOTH         "Óäàëèòü âûáðàííûå ýëåìåíòû ñ îáîèõ ñòîðîí"

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 454c433..9b504b8 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Kopírova\9d vybrané súbory do iného adresára"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected file to custom directory"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Kopírova\9d vybrané súbory do iného adresára"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected file to custom directory"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Zma\9e vybrané polo\9eky v¾avo"
     ID_DIR_DEL_RIGHT        "Zma\9e vybrané polo\9eky vpravo"
     ID_DIR_DEL_BOTH         "Zma\9e vybrané polo\9eky na oboch stranách"

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 4ab10f2..595c671 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Copiar el fichero seleccionado al directorio especificado"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Seleccionar directorio donde copiar el fichero seleccionado"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Copiar el fichero seleccionado al directorio especificado"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Seleccionar directorio donde copiar el fichero seleccionado"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Eliminar elemento selecionado del lado izquierdo"
     ID_DIR_DEL_RIGHT        "Eliminar elemento selecionado del lado derecho"
     ID_DIR_DEL_BOTH         "Eliminar elementos seleccionados de ambos lados"

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 0ade0ee..6f80ed0 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Kopiera den valda filen till den angivna katalogen"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Kopiera vald fil till den angivna katalogen"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Kopiera den valda filen till den angivna katalogen"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Kopiera vald fil till den angivna katalogen"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Ta bort valda objekt på vänster sida"
     ID_DIR_DEL_RIGHT        "Ta bort valda objekt på höger sida"
     ID_DIR_DEL_BOTH         "Ta bort valda objekt på båda sidor"

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index 6cb341a..4952299 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected file to named directory"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected file to custom directory"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected file to named directory"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected file to custom directory"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Delete selected item on left"
     ID_DIR_DEL_RIGHT        "Delete selected item on right"
     ID_DIR_DEL_BOTH         "Delete selected item(s) on both sides"

diff --git a/Src/Merge.rc b/Src/Merge.rc
index e417d95..6a7373d 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1922,10 +1922,10 @@ END
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN
-    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected file to named directory"
-    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected file to custom directory"
-    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected file to named directory"
-    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected file to custom directory"
+    ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
+    ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
+    ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
+    ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
     ID_DIR_DEL_LEFT         "Delete selected item on left"
     ID_DIR_DEL_RIGHT        "Delete selected item on right"
     ID_DIR_DEL_BOTH         "Delete selected item(s) on both sides"