From: sdottaka@users.sourceforge.net Date: Thu, 20 Sep 2018 11:40:19 +0000 (+0900) Subject: Translation: windows -> Windows X-Git-Tag: 2.16.4+-jp-10~170^2~59 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ea7273deb3a7f5078ef053859a657f9005e7e898;p=winmerge-jp%2Fwinmerge-jp.git Translation: windows -> Windows --- diff --git a/Src/Merge.rc b/Src/Merge.rc index 31a0a51db..6786d62ef 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -2423,7 +2423,7 @@ END STRINGTABLE BEGIN IDS_SUGGEST_IGNORECODEPAGE - "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" + "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?" IDS_LOSSY_TRANSCODING_BOTH "Information lost due to encoding errors: both files" IDS_LOSSY_TRANSCODING_FIRST diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index fa089b974..dbd7f9df0 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -4478,7 +4478,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Kode-orrialde ezberdinak aurkitu dira ezkerreko (cp%d) eta eskuineko (cp%d) agirietan. \n" "Erakutsiz agiri bakoitza kode-orrialde horretan erakuspen hobeago bat emango du baina batzea/kopiatzea kaltegarria izango da.\n" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 87466409f..8ed958203 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -4477,7 +4477,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Códigos de páginas diferentes achados nos arquivos da esquerda (cp%d) e direita (cp%d). \n" "Exibir cada arquivo na sua página de código dará uma melhor exibição mas unir/copiar será perigoso.\n" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index f3823bc2c..a493dfa76 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -4401,7 +4401,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Намерена е различна кодировка в левия (cp%d) и десния (cp%d) файл. \n" "Показването на всеки файл с неговата кодировка ще даде по-добра видимост, но сравняването или копирането ще е опасно.\n" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index e33c33627..667b5d89a 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -4400,7 +4400,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Els fitxers de l'esquerra (cp%d) i de la dreta (cp%d) no tenen la mateixa pàgina de codis.\n" "En mostrar cada fitxer en la seva pròpia pàgina de codis millora la seva visualització però fa perillosa la combinació/còpia.\n" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index 08622ff90..dbd501236 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -4402,7 +4402,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "左右两侧为不同代码页的文件(左侧为cp%d，右侧为cp%d)。\n" "分别以不同代码页显示将会有较好的效果，但是合并/复制会有危险。\n" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index ee06f5ac9..28d015a79 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -4484,7 +4484,7 @@ msgstr "你想要移動到上一頁嗎？" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "左邊 (cp%d) 和右邊 (cp%d) 檔案所用的編碼頁不同。\n" "即使維持各別碼頁會分別看到文字，但合併/複製會有危險。\n" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index d3bba7206..c6a84bd38 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -4475,7 +4475,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Različite kodne stranice lijeve (ks%d) i desna (ks%d) datoteke. \n" "Prikaz svake datoteke u vlastitoj ks je ljepši, ali dovodi do teškoća prilikom spajanja ili kopiranja.\n" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 8984d1c0f..527aba776 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -4398,7 +4398,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "V souborech vlevo (cp%d) a vpravo (cp%d) bylo nalezeno rozdílné kódování.\n" "Zobrazení každého souboru v jeho znakové stránce poskytne lepší náhled, ale slučování nebo kopírování bude nebezpečné.\n" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 25d8b9266..6903a2b39 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -4532,7 +4532,7 @@ msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/" "copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage " +"Would you like to treat both files as being in the default Windows codepage " "(recommended)?" msgstr "" "Venstre fil (cp%d) og højre fil (cp%d) har ikke den samme codepage. \n" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index e1a96c734..7cde588db 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -4556,7 +4556,7 @@ msgstr "Wilt u naar de vorige pagina gaan?" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Verschillende tekensets gevonden in linker (%d) en rechter (%d) bestanden. \n" "Elk bestand in zijn eigen tekenset weergeven zal resulteren in een betere weergave, maar samenvoegen/kopiëren zal gevaarlijk zijn.\n" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 40efdec64..4ccfcaeed 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2018-09-09 10:19+0000\n" +"POT-Creation-Date: 2018-09-20 20:38+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -4240,7 +4240,7 @@ msgstr "" #: Merge.rc:4A700AB0 #, c-format -msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" +msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" #: Merge.rc:5851E4C8 diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index c9863b5a3..ef9d37c69 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -4240,7 +4240,7 @@ msgstr "" #: Merge.rc:4A700AB0 #, c-format -msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" +msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "Eri koodisivut vasemman (cp%d) ja oikean (cp%d) puolen tiedostoilla.\nTiedostojen näyttäminen omalla koodivullaan antaa paremman näytön, mutta yhdistäminen/kopiointi on vaarallista.\nHaluatko käsitellä molemmat tiedostot Windowsin oletusmerkistöllä (suositus)?" #: Merge.rc:5851E4C8 diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index ca9627955..252c88a07 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -4478,7 +4478,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Les fichiers n'ont pas la même page de code à gauche (cp%d) et à droite (cp%d). \n" "L'affichage est ainsi meilleurs cependant les copie/fusion seront dangeureuses.\n" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 5dee1f61f..d8834529c 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -4468,7 +4468,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Atopáronse diferentes páxinas de codigos na esquerda (cp%d) e na dereita (cp%d).\n" "Amosando cada arquivo coa súa páxina de códigos proporcionará unha mellor visualización pero combinar/copiar será perigoso.\n" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 9403c1865..0153d3854 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -4437,7 +4437,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\n" "Das Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gefährlich.\n" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index cb2d5ec80..d763906b8 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -4448,7 +4448,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Διαφορετικές κωδικοσελίδες ανιχνεύθηκαν στον αριστερό (cp%d) και στο δεξιό (cp%d) φάκελο. \n" "Η εμφάνιση κάθε φακέλου με τη δική του κωδικοσελίδα θα έχει εμφανισιακά καλύτερα αποτελέσματα αλλά η συγχώνευση/αντιγραφή θα είναι επικίνδυνη.\n" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 3f0bbc56f..f5cb956f7 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -4368,11 +4368,11 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "A bal (cp%d) és jobb (cp%d) oldali fájlok nem ugyanazt a kódolást használják. \n" "A különböző kódlapokkal történő kijelzés könnyebben áttekinthető de az olvasztás/törlés kockázatos lehet.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" #: Merge.rc:5851E4C8 #, c-format diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index f709176fa..5f867c0bc 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -4442,7 +4442,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Il file sinistro (cp%d) e destro (cp%d) non hanno lo stesso codice di pagina.\n" "La visualizzazione di ciascun file con il proprio codice di pagina fornirà una migliore visualizzazione ma l'unione/copia sarà pericolosa.\n" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index a38525a84..02238fbee 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -4567,7 +4567,7 @@ msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/" "copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage " +"Would you like to treat both files as being in the default Windows codepage " "(recommended)?" msgstr "" "開いたファイルで異なったコードページが検出されました。左(cp%d)、右(cp%d)\n" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 3307fe139..7ba87b469 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -4502,7 +4502,7 @@ msgstr "이전 페이지로 이동할까요?" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "왼쪽(cp%d)과 오른쪽(cp%d) 파일의 코드페이지가 서로 다릅니다.\n" "각 파일의 코드페이지로 출력하는 것이 보기는 좋으나 병합이나 복사할 때 문제가 생길 수 있습니다.\n" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 7a492a425..014589dc6 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -4475,7 +4475,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Forskjellige tegnsett funnet i venstre (cp%d) og høyre (cp%d) filer. \n" "Visning av hver fil i sitt tegnsett ser best ut, men sammenslåing/kopiering blir farlig.\n" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index a0eadadec..aab51af52 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -4536,7 +4536,7 @@ msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/" "copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage " +"Would you like to treat both files as being in the default Windows codepage " "(recommended)?" msgstr "" " در پرونده هاي راست و چپ صفحه کدهاي متفاوتي پيدا شد cp%d و cp%d \n" diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 351686c58..b54981c81 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -4476,11 +4476,11 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Różne strony kodowe w plikach po lewej (cp%d) i po prawej (cp%d). \n" "Wyświetlanie każdego pliku w odpowiedniej stronie kodowej da lepsze wyniki, ale scalenie/skopiowanie będzie niebezpieczne.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" #: Merge.rc:5851E4C8 #, c-format diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 659f0b0ff..ff2178b6d 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -4244,7 +4244,7 @@ msgstr "Deseja retroceder para a página anterior?" #: Merge.rc:4A700AB0 #, c-format -msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" +msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "Encontradas páginas de código diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d). \nApresentar cada ficheiro na sua página de código terá melhor visualização, mas combinar/copiar poderá ser arriscado.\Deseja tratar os dois ficheiros como tendo as páginas de código predefinidas para as janelas?" #: Merge.rc:5851E4C8 diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index ac51a8484..b287889a4 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -4449,7 +4449,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Seturi de caractere diferite s-au găsit în fişierul din partea stângă (cp%d) faţă de partea dreaptă (cp%d). \n" "Afişarea în setul de caractere propriu este mai potrivită dar fuziunea/copierea este periculoasă.\n" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index a428b3c10..e1c1800b1 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -4474,7 +4474,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Различные кодировки: левый - (cp%d), правый - (cp%d). \n" "Каждый из файлов может быть отображен в своей кодировке, но их слияние или копирование может повредить информацию.\n" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 8886c29af..cb406a117 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -4472,7 +4472,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Ðàçëè÷èòå êîäíå ñòðàíå íàåíå ñó ó ëåâî¼ (cp%d) è äåñíî¼ (cp%d) äàòîòåöè. \n" "Ïðèêàç ñâàêå äàòîòåêå ó êîäíî¼ ñòðàíèöè ¼å áîšè àëè ñïà¼àœå/óìíîæàâàœå íîñè îïàñíîñò.\n" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index dc612b469..10b68afe6 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -4470,7 +4470,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Les fichiers n'ont pas la même page de code à gauche (cp%d) et à droite (cp%d). \n" "L'affichage est ainsi meilleurs cependant les copie/fusion seront dangeureuses.\n" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index b62ef8cdc..ba8cbfbd9 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -4475,7 +4475,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Rozličné kódové stránky v ľavol (cp%d) a pravom (cp%d) súbore. \n" "Zobrazenie každého súboru v jeho kódovej stránke lepšie zobrazuje, ale zlučovanie/kopírovanie bude nebezpečné.\n" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index a0c64edfa..7285867f3 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -4479,7 +4479,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Leva (cp%d) in desna (cp%d) datoteka sta v različnih kodnih tabelah. \n" "Prikaz posamezne datoteke v svoji kodni tabeli bo omogočilo boljši prikaz, a združevanje/kopiranje bo nevarno.\n" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 815f5538f..0b21f09f1 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -4477,7 +4477,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Las páginas de códigos son diferentes en el archivo de la izquierda (cp%d) y el de la derecha (cp%d). \n" "Mostrar cada archivo en su página de códigos dará una mejor visualización, pero combinar/copiar sería peligroso.\n" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 4e042e3e0..d501a37b7 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -4476,7 +4476,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Vänster (cp%d) och höger (cp%d) fil har inte samma Codepage. \n" "Att visa varje fil i dess egen Codepage ger en bättre visning men sammanfogning/kopierande blir farligt.\n" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 4145083b4..6ecaa85a9 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -4566,7 +4566,7 @@ msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/" "copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage " +"Would you like to treat both files as being in the default Windows codepage " "(recommended)?" msgstr "" "Sol panodaki (cp%d) ve sağ panodaki (cp%d) dosyaların kod sayfaları " diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index 1dc719b97..78c28dbca 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -4474,7 +4474,7 @@ msgstr "" msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default windows codepage (recommended)?" +"Would you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" "Різні кодування: лівий файл - (cp%d), правий файл - (cp%d). \n" "Кожний з файлів може бути показаний в своєму кодуванні, але їхнє злиття або копіювання може пошкодити інформацію.\n"