[setup - the official Cygwin setup program] branch master, updated. release_2.934-4-g9f595e18

[Jon Turney]

Diff:
---
 po/de/res.po      |  9 +++++----
 po/fr/res.po      | 16 ++++++++--------
 po/ja/res.po      | 14 +++++++-------
 po/pl/res.po      | 16 ++++++++--------
 po/tr/res.po      | 14 +++++++-------
 po/zh_Hans/res.po |  8 ++++----
 res/de/res.rc     |  9 ++++++++-
 res/fr/res.rc     |  2 +-
 res/ja/res.rc     |  2 +-
 res/pl/res.rc     |  2 +-
 res/tr/res.rc     |  2 +-
 11 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/po/de/res.po b/po/de/res.po
index 905afae9..ec025ee2 100644
--- a/po/de/res.po
+++ b/po/de/res.po
@@ -1128,12 +1128,13 @@ msgstr ""
 msgid ""
 "Target CPU mismatch\n"
 "\n"
-"You're trying to install a %s bit version of Cygwin into a directory "
-"containing a %s bit version of Cygwin.  Continuing to do so would break the "
+"You're trying to install the %s version of Cygwin into a directory "
+"containing the %s version of Cygwin.  Continuing to do so would break the "
 "existing installation.\n"
 "\n"
-"Either run setup-%s.exe to update your existing %s bit installation of "
-"Cygwin, or choose another directory for your %s bit installation."
+"Either run setup-%s.exe to update your existing %s installation of Cygwin, "
+"or choose another directory for your %s installation."
+"Target CPU mismatch\n"
 msgstr ""
 
 #: STRINGTABLE.IDS_GET_SITELIST_ERROR
diff --git a/po/fr/res.po b/po/fr/res.po
index 6af7018e..3282699a 100644
--- a/po/fr/res.po
+++ b/po/fr/res.po
@@ -1222,21 +1222,21 @@ msgstr ""
 msgid ""
 "Target CPU mismatch\n"
 "\n"
-"You're trying to install a %s bit version of Cygwin into a directory "
-"containing a %s bit version of Cygwin.  Continuing to do so would break the "
+"You're trying to install the %s version of Cygwin into a directory "
+"containing the %s version of Cygwin.  Continuing to do so would break the "
 "existing installation.\n"
 "\n"
-"Either run setup-%s.exe to update your existing %s bit installation of "
-"Cygwin, or choose another directory for your %s bit installation."
+"Either run setup-%s.exe to update your existing %s installation of Cygwin, "
+"or choose another directory for your %s installation."
 msgstr ""
 "Erreur CPU cible\n"
 "\n"
-"Vous essayez d'installer une version %s bits de Cygwin dans un dossier qui "
-"contient une version %s bits de Cygwin.  Si vous insistez, vous aller casser "
+"Vous essayez d'installer une version %s de Cygwin dans un dossier qui "
+"contient une version %s de Cygwin.  Si vous insistez, vous aller casser "
 "l'installation existante.\n"
 "\n"
-"Utilisez setup-%s.exe pour mettre à jour votre installation %s bits de "
-"Cygwin, ou choisissez un autre dossier pour votre installation %s bits."
+"Utilisez setup-%s.exe pour mettre à jour votre installation %s de "
+"Cygwin, ou choisissez un autre dossier pour votre installation %s."
 
 #: STRINGTABLE.IDS_GET_SITELIST_ERROR
 msgid ""
diff --git a/po/ja/res.po b/po/ja/res.po
index 7cfa6203..9aeb2137 100644
--- a/po/ja/res.po
+++ b/po/ja/res.po
@@ -1199,21 +1199,21 @@ msgstr ""
 msgid ""
 "Target CPU mismatch\n"
 "\n"
-"You're trying to install a %s bit version of Cygwin into a directory "
-"containing a %s bit version of Cygwin.  Continuing to do so would break the "
+"You're trying to install the %s version of Cygwin into a directory "
+"containing the %s version of Cygwin.  Continuing to do so would break the "
 "existing installation.\n"
 "\n"
-"Either run setup-%s.exe to update your existing %s bit installation of "
-"Cygwin, or choose another directory for your %s bit installation."
+"Either run setup-%s.exe to update your existing %s installation of Cygwin, "
+"or choose another directory for your %s installation."
 msgstr ""
 "ターゲットCPUの不一致\n"
 "\n"
-"%s ビット バージョンの Cygwin を、%s ビット バージョンの Cygwin を含むディレ"
+"%s バージョンの Cygwin を、%s バージョンの Cygwin を含むディレ"
 "クトリにインストールしようとしています。このまま続行すると、既存のインストー"
 "ルが壊れます。\n"
 "\n"
-"setup-%s.exe を実行して既存の %s ビットの Cygwin インストールを更新するか、"
-"または %s ビットのインストール用に別のディレクトリを選択してください。"
+"setup-%s.exe を実行して既存の %s の Cygwin インストールを更新するか、"
+"または %s のインストール用に別のディレクトリを選択してください。"
 
 #: STRINGTABLE.IDS_GET_SITELIST_ERROR
 msgid ""
diff --git a/po/pl/res.po b/po/pl/res.po
index 22854c21..06fc1e01 100644
--- a/po/pl/res.po
+++ b/po/pl/res.po
@@ -1220,21 +1220,21 @@ msgstr ""
 msgid ""
 "Target CPU mismatch\n"
 "\n"
-"You're trying to install a %s bit version of Cygwin into a directory "
-"containing a %s bit version of Cygwin.  Continuing to do so would break the "
+"You're trying to install the %s version of Cygwin into a directory "
+"containing the %s version of Cygwin.  Continuing to do so would break the "
 "existing installation.\n"
 "\n"
-"Either run setup-%s.exe to update your existing %s bit installation of "
-"Cygwin, or choose another directory for your %s bit installation."
+"Either run setup-%s.exe to update your existing %s installation of Cygwin, "
+"or choose another directory for your %s installation."
 msgstr ""
 "Niezgodność procesora\n"
 "\n"
-"Próbujesz zainstalować %s bitową wersję Cygwina w katalogu zawierającym %s "
-"bitową wersję Cygwina. Kontynuowanie tego spowodowałoby uszkodzenie "
+"Próbujesz zainstalować %s wersję Cygwina w katalogu zawierającym %s "
+"wersję Cygwina. Kontynuowanie tego spowodowałoby uszkodzenie "
 "istniejÄ…cej instalacji.\n"
 "\n"
-"Uruchom setup-%s.exe, aby zaktualizować istniejącą %s-bitową instalację "
-"Cygwin, lub wybierz inny katalog dla swojej %s-bitowej instalacji."
+"Uruchom setup-%s.exe, aby zaktualizować istniejącą %s instalację "
+"Cygwin, lub wybierz inny katalog dla swojej %s instalacji."
 
 #: STRINGTABLE.IDS_GET_SITELIST_ERROR
 msgid ""
diff --git a/po/tr/res.po b/po/tr/res.po
index dec622a6..a35127e5 100644
--- a/po/tr/res.po
+++ b/po/tr/res.po
@@ -1214,20 +1214,20 @@ msgstr ""
 msgid ""
 "Target CPU mismatch\n"
 "\n"
-"You're trying to install a %s bit version of Cygwin into a directory "
-"containing a %s bit version of Cygwin.  Continuing to do so would break the "
+"You're trying to install the %s version of Cygwin into a directory "
+"containing the %s version of Cygwin.  Continuing to do so would break the "
 "existing installation.\n"
 "\n"
-"Either run setup-%s.exe to update your existing %s bit installation of "
-"Cygwin, or choose another directory for your %s bit installation."
+"Either run setup-%s.exe to update your existing %s installation of Cygwin, "
+"or choose another directory for your %s installation."
 msgstr ""
 "Hedef CPU uyuşmazlığı\n"
 "\n"
-"%s bit Cygwin sürümünü, %s bit Cygwin sürümü içeren bir dizine kurmaya "
+"%s Cygwin sürümünü, %s Cygwin sürümü içeren bir dizine kurmaya "
 "çalışıyorsunuz.  Bunu yapmaya devam etmek var olan kurulumu bozacaktır.\n"
 "\n"
-"Var olan %s bit Cygwin kurulumunu güncellemek için setup-%s.exe dosyasını "
-"çalıştırın ya da %s bit kurulumunuz için başka bir dizin seçin."
+"Var olan %s Cygwin kurulumunu güncellemek için setup-%s.exe dosyasını "
+"çalıştırın ya da %s kurulumunuz için başka bir dizin seçin."
 
 #: STRINGTABLE.IDS_GET_SITELIST_ERROR
 msgid ""
diff --git a/po/zh_Hans/res.po b/po/zh_Hans/res.po
index a378c23c..4dd79847 100644
--- a/po/zh_Hans/res.po
+++ b/po/zh_Hans/res.po
@@ -1162,12 +1162,12 @@ msgstr ""
 msgid ""
 "Target CPU mismatch\n"
 "\n"
-"You're trying to install a %s bit version of Cygwin into a directory "
-"containing a %s bit version of Cygwin.  Continuing to do so would break the "
+"You're trying to install the %s version of Cygwin into a directory "
+"containing the %s version of Cygwin.  Continuing to do so would break the "
 "existing installation.\n"
 "\n"
-"Either run setup-%s.exe to update your existing %s bit installation of "
-"Cygwin, or choose another directory for your %s bit installation."
+"Either run setup-%s.exe to update your existing %s installation of Cygwin, "
+"or choose another directory for your %s installation."
 msgstr ""
 "ç›®æ ‡ CPU 不匹配\n"
 "\n"
diff --git a/res/de/res.rc b/res/de/res.rc
index 0634db8c..4d7b26d8 100644
--- a/res/de/res.rc
+++ b/res/de/res.rc
@@ -411,7 +411,14 @@ BEGIN
     IDS_NIO_ERROR           "Internetfehler: %s"
     IDS_PREREQ_UNSOLVED_PROBLEMS
                             "WARNING - Unsolved Problems\n\nSome packages may not work properly if you continue.\n\nAre you sure you want to proceed (NOT RECOMMENDED)?"
-    IDS_MIXED_BITNESS_ERROR "Target CPU mismatch\n\nYou're trying to install a %s bit version of Cygwin into a directory containing a %s bit version of Cygwin.  Continuing to do so would break the existing installation.\n\nEither run setup-%s.exe to update your existing %s bit installation of Cygwin, or choose another directory for your %s bit installation."
+    IDS_MIXED_BITNESS_ERROR "Target CPU mismatch"
+                            "\n\n"
+                            "You're trying to install the %s version of Cygwin into a directory "
+                            "containing the %s version of Cygwin.  Continuing to do so would "
+                            "break the existing installation."
+                            "\n\n"
+                            "Either run setup-%s.exe to update your existing %s installation of Cygwin, "
+                            "or choose another directory for your %s installation."
     IDS_GET_SITELIST_ERROR  "Can't get list of download sites.\nMake sure your network settings are correct and try again."
     IDS_CONFIRM_EXIT        "Are you sure you want to exit setup? Any current download or installation will be aborted."
     IDS_CONTINUE            "Fortsetzen"
diff --git a/res/fr/res.rc b/res/fr/res.rc
index 917261e4..c503f6b0 100644
--- a/res/fr/res.rc
+++ b/res/fr/res.rc
@@ -411,7 +411,7 @@ BEGIN
     IDS_NIO_ERROR           "Erreur Internet : %s"
     IDS_PREREQ_UNSOLVED_PROBLEMS
                             "ATTENTION - Problèmes non résolus\n\nCertains paquets ne fonctionneront pas correctement si vous continuez.\n\nVoulez vous continuer (NON RECOMMANDÉ) ?"
-    IDS_MIXED_BITNESS_ERROR "Erreur CPU cible\n\nVous essayez d'installer une version %s bits de Cygwin dans un dossier qui contient une version %s bits de Cygwin.  Si vous insistez, vous aller casser l'installation existante.\n\nUtilisez setup-%s.exe pour mettre à jour votre installation %s bits de Cygwin, ou choisissez un autre dossier pour votre installation %s bits."
+    IDS_MIXED_BITNESS_ERROR "Erreur CPU cible\n\nVous essayez d'installer une version %s de Cygwin dans un dossier qui contient une version %s de Cygwin.  Si vous insistez, vous aller casser l'installation existante.\n\nUtilisez setup-%s.exe pour mettre à jour votre installation %s de Cygwin, ou choisissez un autre dossier pour votre installation %s."
     IDS_GET_SITELIST_ERROR  "Impossible d'avoir la liste des sites de téléchargement.\nVérifiez que vos paramètres réseau sont corrects et réessayez."
     IDS_CONFIRM_EXIT        "Voulez-vous vraiment quitter l'assistant ? Les téléchargements ou installations en cours seront annulés."
     IDS_CONTINUE            "Continuer"
diff --git a/res/ja/res.rc b/res/ja/res.rc
index eff57f87..396e0e3b 100755
--- a/res/ja/res.rc
+++ b/res/ja/res.rc
@@ -411,7 +411,7 @@ BEGIN
     IDS_NIO_ERROR           "インターネットエラー: %s"
     IDS_PREREQ_UNSOLVED_PROBLEMS
                             "警告 - 未解決の問題\n\n続行すると、一部のパッケージが正しく動作しない可能性があります。\n\n本当に続行しますか？(推奨されません)"
-    IDS_MIXED_BITNESS_ERROR "ターゲットCPUの不一致\n\n%s ビット バージョンの Cygwin を、%s ビット バージョンの Cygwin を含むディレクトリにインストールしようとしています。このまま続行すると、既存のインストールが壊れます。\n\nsetup-%s.exe を実行して既存の %s ビットの Cygwin インストールを更新するか、または %s ビットのインストール用に別のディレクトリを選択してください。"
+    IDS_MIXED_BITNESS_ERROR "ターゲットCPUの不一致\n\n%s バージョンの Cygwin を、%s バージョンの Cygwin を含むディレクトリにインストールしようとしています。このまま続行すると、既存のインストールが壊れます。\n\nsetup-%s.exe を実行して既存の %s の Cygwin インストールを更新するか、または %s のインストール用に別のディレクトリを選択してください。"
     IDS_GET_SITELIST_ERROR  "ダウンロードサイトのリストを取得できません。\nネットワーク設定が正しいことを確認して、もう一度お試しください。"
     IDS_CONFIRM_EXIT        "セットアップを終了してもよろしいですか? 現在のダウンロードまたはインストールはすべて中止されます。"
     IDS_CONTINUE            "続ける"
diff --git a/res/pl/res.rc b/res/pl/res.rc
index 446c38f6..af5819ac 100644
--- a/res/pl/res.rc
+++ b/res/pl/res.rc
@@ -411,7 +411,7 @@ BEGIN
     IDS_NIO_ERROR           "BÅ‚Ä…d internetowy: %s"
     IDS_PREREQ_UNSOLVED_PROBLEMS
                             "OSTRZEŻENIE — nierozwiązane problemy\n\nNiektóre pakiety mogą nie działać poprawnie, jeśli będziesz kontynuować.\n\nCzy na pewno chcesz kontynuować (NIEZALECANE)?"
-    IDS_MIXED_BITNESS_ERROR "Niezgodność procesora\n\nPróbujesz zainstalować %s bitową wersję Cygwina w katalogu zawierającym %s bitową wersję Cygwina. Kontynuowanie tego spowodowałoby uszkodzenie istniejącej instalacji.\n\nUruchom setup-%s.exe, aby zaktualizować istniejącą %s-bitową instalację Cygwin, lub wybierz inny katalog dla swojej %s-bitowej instalacji."
+    IDS_MIXED_BITNESS_ERROR "Niezgodność procesora\n\nPróbujesz zainstalować %s wersję Cygwina w katalogu zawierającym %s wersję Cygwina. Kontynuowanie tego spowodowałoby uszkodzenie istniejącej instalacji.\n\nUruchom setup-%s.exe, aby zaktualizować istniejącą %s instalację Cygwin, lub wybierz inny katalog dla swojej %s instalacji."
     IDS_GET_SITELIST_ERROR  "Nie można uzyskać listy witryn pobierania.\nUpewnij się, że ustawienia sieciowe są poprawne i spróbuj ponownie."
     IDS_CONFIRM_EXIT        "Czy na pewno chcesz wyjść z konfiguracji? Bieżące pobieranie lub instalacja zostanie przerwana."
     IDS_CONTINUE            "Kontynuuj"
diff --git a/res/tr/res.rc b/res/tr/res.rc
index acd5f08d..54124b95 100644
--- a/res/tr/res.rc
+++ b/res/tr/res.rc
@@ -411,7 +411,7 @@ BEGIN
     IDS_NIO_ERROR           "İnternet Hatası: %s"
     IDS_PREREQ_UNSOLVED_PROBLEMS
                             "UYARI - Çözülmeyen Sorunlar\n\nDevam ederseniz bazı paketler düzgün çalışmayabilir.\n\nDevam etmek istediğinizden emin misiniz (TAVSİYE EDİLMEZ)?"
-    IDS_MIXED_BITNESS_ERROR "Hedef CPU uyuşmazlığı\n\n%s bit Cygwin sürümünü, %s bit Cygwin sürümü içeren bir dizine kurmaya çalışıyorsunuz.  Bunu yapmaya devam etmek var olan kurulumu bozacaktır.\n\nVar olan %s bit Cygwin kurulumunu güncellemek için setup-%s.exe dosyasını çalıştırın ya da %s bit kurulumunuz için başka bir dizin seçin."
+    IDS_MIXED_BITNESS_ERROR "Hedef CPU uyuşmazlığı\n\n%s Cygwin sürümünü, %s Cygwin sürümü içeren bir dizine kurmaya çalışıyorsunuz.  Bunu yapmaya devam etmek var olan kurulumu bozacaktır.\n\nVar olan %s Cygwin kurulumunu güncellemek için setup-%s.exe dosyasını çalıştırın ya da %s kurulumunuz için başka bir dizin seçin."
     IDS_GET_SITELIST_ERROR  "İndirme sitelerinin listesi alınamıyor.\nAğ ayarlarınızın doğru olduğundan emin olun ve tekrar deneyin."
     IDS_CONFIRM_EXIT        "Kurucudan çıkmak istediğinizden emin misiniz? Var olan herhangi bir indirme veya kurulum işlemi iptal edilecektir."
     IDS_CONTINUE            "Devam et"