[setup - the official Cygwin setup program] branch master, updated. release_2.927

Jon Turney jturney@sourceware.org
Thu Oct 12 13:38:56 GMT 2023




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=cfc01ee74bfb22caf25fdf97c590ecf0f934e1ed

commit cfc01ee74bfb22caf25fdf97c590ecf0f934e1ed
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Apr 14 17:36:58 2023 +0100

    Enhance quiet mode to allow window to be input-disabled or hidden
    
    '-q'/'--quiet-mode' now accepts an optional parameter specifying how the
    setup wizard behaves: 'unattended' is the existing behaviour (basically,
    the wizard automatically advances rather than requiring 'next' to be
    pressed, and MessageBox()es automatically perform some default action),
    'noinput' also disables mouse and keyboard interaction with the wizard,
    and 'hidden' hides the the wizard.
    
    No exhaustive audit has taken place that there aren't places in setup
    where we don't loop forever, or get stuck waiting for user input to
    resolve some unexpected condition.
    
    (In particular, I suspect that dialogs which may occur if some
    authorization credentials need to be provided for the network connection
    to the package repository (HTTP auth, or proxy auth, or FTP password)
    don't handle unattended mode correctly, and there's currently no
    non-interactive way to provide these credentials)

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=d20523d142c6ce918ff52fa23413f23ef6373b0e

commit d20523d142c6ce918ff52fa23413f23ef6373b0e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Oct 11 15:21:33 2023 +0100

    Adjust dialog template layouts to add space needed by new translations

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=a21e95986443674f6541b32c5d1e9a26c7a4b6d0

commit a21e95986443674f6541b32c5d1e9a26c7a4b6d0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Oct 10 13:51:58 2023 +0100

    Wire up de-DE and pl-PL translations

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=c125f2e2ba9e972a671f0f2ac55c263dceb113e6

commit c125f2e2ba9e972a671f0f2ac55c263dceb113e6
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Oct 10 14:46:41 2023 +0100

    Regenerate resources with updated translation
    
    Adopt some layout changes from 'fr' resources, needed to ensure
    translations fit in available space.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=039320f6083788fd5d806c7ad7377dc8873ce96d

commit 039320f6083788fd5d806c7ad7377dc8873ce96d
Author: Lucas Haniel <luc45han@gmail.com>
Date:   Tue Oct 3 12:06:13 2023 +0000

    Translated using Weblate (Portuguese (Brazil))
    
    Currently translated at 12.1% (35 of 287 strings)
    
    Translation: cygwin-setup/cygwin-setup
    Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/pt_BR/

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=a495848a32383f6a41664d4168ad19a25e8038d9

commit a495848a32383f6a41664d4168ad19a25e8038d9
Author: Xiang Heng Wei <yylteam@hotmail.com>
Date:   Sun Sep 10 13:21:36 2023 +0000

    Translated using Weblate (Japanese)
    
    Currently translated at 13.2% (38 of 287 strings)
    
    Translation: cygwin-setup/cygwin-setup
    Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/ja/

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=6a75a512c54622589a0554eb496780b5c0be493d

commit 6a75a512c54622589a0554eb496780b5c0be493d
Author: Xiang Heng Wei <yylteam@hotmail.com>
Date:   Fri Sep 8 14:35:54 2023 +0000

    Translated using Weblate (Chinese (Simplified))
    
    Currently translated at 100.0% (287 of 287 strings)
    
    Translation: cygwin-setup/cygwin-setup
    Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/zh_Hans/

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=23ea9197ad2fe435c644d4148e19cbabde0ec9a6

commit 23ea9197ad2fe435c644d4148e19cbabde0ec9a6
Author: Xiang Heng Wei <yylteam@hotmail.com>
Date:   Sun Sep 3 06:27:35 2023 +0000

    Translated using Weblate (Japanese)
    
    Currently translated at 6.2% (18 of 287 strings)
    
    Translation: cygwin-setup/cygwin-setup
    Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/ja/

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=abd38262ff556ee33a72e7af00150db1dcea620d

commit abd38262ff556ee33a72e7af00150db1dcea620d
Author: Xiang Heng Wei <yylteam@hotmail.com>
Date:   Mon Aug 14 13:41:31 2023 +0000

    Translated using Weblate (Chinese (Simplified))
    
    Currently translated at 100.0% (287 of 287 strings)
    
    Translation: cygwin-setup/cygwin-setup
    Translate-URL: https://hosted.weblate.org/projects/cygwin-setup/cygwin-setup/zh_Hans/


Diff:
---
 Makefile.am        |   2 +-
 langopts           |   8 +
 main.cc            |  18 +-
 po/de/res.po       |   4 +-
 po/ja/res.po       |  79 +++---
 po/pt_BR/res.po    |  49 ++--
 po/zh_Hans/res.po  |  22 +-
 propsheet.cc       |  17 +-
 quiet.h            |  26 ++
 res.pot            |   4 +-
 res.rc             |  14 +-
 res/de/res.rc      | 531 ++++++++++++++++++++++++++++++++++++++
 res/en/res.rc      |  20 +-
 res/fr/res.rc      | 736 +++++++++++++++++++++--------------------------------
 res/pl/res.rc      | 531 ++++++++++++++++++++++++++++++++++++++
 res/tr/res.rc      |  25 +-
 res/zh_Hans/res.rc |  99 +++----
 17 files changed, 1584 insertions(+), 601 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 70bfd032..fac60ee9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -282,7 +282,7 @@ setup_version.c : Makefile
 pot:
 	cd $(srcdir) && rc2po -P res/en/res.rc res.pot
 
-LINGUAS=fr tr zh_Hans
+LINGUAS=de fr pl tr zh_Hans
 
 rc2po:
 	cd $(srcdir) && \
diff --git a/langopts b/langopts
index d4964b3c..d8d813ce 100755
--- a/langopts
+++ b/langopts
@@ -1,10 +1,18 @@
 #!
 
 case $1 in
+    de)       # 0407
+        lang="LANG_GERMAN"
+        sublang="SUBLANG_GERMAN"
+        ;;
     fr)       # 040c
         lang="LANG_FRENCH"
         sublang="SUBLANG_FRENCH"
         ;;
+    pl)       # 0415
+        lang="LANG_POLISH"
+        sublang="SUBLANG_DEFAULT"  # SUBLANG_POLISH_POLAND (equivalent) requires WINVER >= 0x0600
+        ;;
     tr)       # 041f
         lang="LANG_TURKISH"
         sublang="SUBLANG_DEFAULT"
diff --git a/main.cc b/main.cc
index 1d65d536..01c90b95 100644
--- a/main.cc
+++ b/main.cc
@@ -36,6 +36,7 @@
 #include "resource.h"
 #include "dialog.h"
 #include "state.h"
+#include "quiet.h"
 #include "msg.h"
 #include "find.h"
 #include "mount.h"
@@ -95,8 +96,14 @@ static StringChoiceOption::StringChoices symlink_types({
     {"wsl", SymlinkTypeWsl},
   });
 
+static StringChoiceOption::StringChoices quiet_types({
+    {"unattended", QuietUnattended},
+    {"noinput", QuietNoInput},
+    {"hidden", QuietHidden},
+  });
+
 static StringOption Arch ("", 'a', "arch", IDS_HELPTEXT_ARCH, false);
-static BoolOption UnattendedOption (false, 'q', "quiet-mode", IDS_HELPTEXT_QUIET_MODE);
+StringChoiceOption UnattendedOption (quiet_types, 'q', "quiet-mode", IDS_HELPTEXT_QUIET_MODE, true, -1, QuietUnattended);
 static BoolOption PackageManagerOption (false, 'M', "package-manager", IDS_HELPTEXT_PACKAGE_MANAGER);
 static BoolOption NoAdminOption (false, 'B', "no-admin", IDS_HELPTEXT_NO_ADMIN);
 static BoolOption WaitOption (false, 'W', "wait", IDS_HELPTEXT_WAIT);
@@ -275,8 +282,13 @@ WinMain (HINSTANCE h,
           SetThreadUILanguage(langid);
       }
 
-    unattended_mode = PackageManagerOption ? chooseronly
-			: (UnattendedOption ? unattended : attended);
+    if (PackageManagerOption)
+      unattended_mode = chooseronly;
+    else
+      if (UnattendedOption < 0)
+        unattended_mode = attended;
+      else
+        unattended_mode = unattended;
 
     bool output_only = help_option || VersionOption;
 
diff --git a/po/de/res.po b/po/de/res.po
index 9e009875..b4178cee 100644
--- a/po/de/res.po
+++ b/po/de/res.po
@@ -375,11 +375,11 @@ msgstr ""
 "sowie für alle nachfolgenden Updates verwendet.  Die folgenden Seiten führen "
 "Sie durch die Installation.\n"
 "\n"
-" Bitte beachten Sie, dass wir standardmäßig nur einen Basissatz von Paketen "
+"Bitte beachten Sie, dass wir standardmäßig nur einen Basissatz von Paketen "
 "installieren.   Cygwin bietet eine große Anzahl von Paketen für eine "
 "Vielzahl von Zwecken an.\n"
 "\n"
-" Sie können dieses Programm jederzeit in der Zukunft ausführen, um je nach "
+"Sie können dieses Programm jederzeit in der Zukunft ausführen, um je nach "
 "Bedarf Pakete hinzuzufügen, zu entfernen oder zu aktualisieren."
 
 #: DIALOG.IDD_SPLASH.LTEXT.IDC_SPLASH_TRANSLATE
diff --git a/po/ja/res.po b/po/ja/res.po
index b806689b..e98eaa33 100644
--- a/po/ja/res.po
+++ b/po/ja/res.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-04-14 13:51+0100\n"
-"PO-Revision-Date: 2023-04-18 04:49+0000\n"
+"PO-Revision-Date: 2023-09-12 04:54+0000\n"
 "Last-Translator: Xiang Heng Wei <yylteam@hotmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/cygwin-setup/"
 "cygwin-setup/ja/>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Accelerator-Marker: &\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.0.1-dev\n"
 "X-Merge-On: location\n"
 
 #: DIALOG.IDD_SOURCE.CAPTION
@@ -39,35 +39,38 @@ msgstr "ローカルディレクトリからインストール(&L)"
 
 #: DIALOG.IDD_SOURCE.LTEXT.IDC_STATIC_HEADER_TITLE
 msgid "Choose A Download Source"
-msgstr ""
+msgstr "ダウンロードソースを選択"
 
 #: DIALOG.IDD_SOURCE.LTEXT.IDC_SOURCE_SUBTEXT
 msgid ""
 "Choose whether to install or download from the internet, or install from "
 "files in a local directory."
-msgstr ""
+msgstr "インターネットからインストールまたはダウンロードするか、ローカルディレクトリ"
+"内のファイルからインストールするかを選択します。"
 
 #: DIALOG.IDD_VIRUS.CAPTION
 msgid "Cygwin Setup - Disable Virus Scanner?"
-msgstr ""
+msgstr "Cygwinのセットアップ - ウイルススキャナを無効にしますか?"
 
 #: DIALOG.IDD_VIRUS.CONTROL.IDC_DISABLE_AV
 msgid "&Disable Virus scanner"
-msgstr ""
+msgstr "ウイルススキャナを無効にする(&D)"
 
 #: DIALOG.IDD_VIRUS.CONTROL.IDC_LEAVE_AV
 msgid "&Leave Virus scanner alone"
-msgstr ""
+msgstr "ウイルススキャナを保持する(&L)"
 
 #: DIALOG.IDD_VIRUS.LTEXT.IDC_STATIC_HEADER_TITLE
 msgid "Choose whether to disable your virus scanner while installing."
-msgstr ""
+msgstr "インストール中にウイルススキャナを無効にするかどうかを選択します。"
 
 #: DIALOG.IDD_VIRUS.LTEXT.IDC_STATIC
 msgid ""
 "Some Antivirus programs, notably McAfee, cause a blue screen on Windows XP "
 "computers during installation of Cygwin."
 msgstr ""
+"一部のウイルス対策プログラム、特にマカフィーは、Cygwin のインストール中に "
+"Windows XP コンピューターでブルースクリーンを引き起こします。"
 
 #: DIALOG.IDD_VIRUS.LTEXT.IDC_STATIC
 msgid ""
@@ -75,73 +78,79 @@ msgid ""
 "during the installation process, and re-enable it when the install is "
 "complete."
 msgstr ""
+"問題である可能性のあるものが検出されました。Cygwin セットアップは、インストー"
+"ルプロセス中にこれを無効にし、インストールが完了したら再度有効にすることがで"
+"きます。"
 
 #: DIALOG.IDD_LOCAL_DIR.CAPTION
 msgid "Cygwin Setup - Select Local Package Directory"
-msgstr ""
+msgstr "Cygwin セットアップ - ローカルパッケージディレクトリの選択"
 
 #: DIALOG.IDD_LOCAL_DIR.LTEXT.IDC_STATIC_HEADER_TITLE
 msgid "Select Local Package Directory"
-msgstr ""
+msgstr "ローカルパッケージディレクトリの選択"
 
 #: DIALOG.IDD_LOCAL_DIR.LTEXT.IDC_LOCAL_DIR_DOWNLOAD_DESC
 msgid ""
 "Select a directory where you want Setup to store the installation files it "
 "downloads.  The directory will be created if it does not already exist."
-msgstr ""
+msgstr "セットアップがダウンロードするインストール ファイルを保存するディレクトリを選"
+"択します。ディレクトリが存在しない場合は作成されます。"
 
 #: DIALOG.IDD_LOCAL_DIR.LTEXT.IDC_LOCAL_DIR_INSTALL_DESC
 msgid ""
 "Select a directory where Setup should look for downloaded installation files."
-msgstr ""
+msgstr "セットアップでダウンロードされたインストール "
+"ファイルを検索するディレクトリを選択します。"
 
 #: DIALOG.IDD_LOCAL_DIR.GROUPBOX.IDC_LOCALDIR_GRP
 msgid "Local Package Directory"
-msgstr ""
+msgstr "ローカルパッケージディレクトリ"
 
 #: DIALOG.IDD_LOCAL_DIR.PUSHBUTTON.IDC_LOCAL_DIR_BROWSE
 msgctxt "DIALOG.IDD_LOCAL_DIR.PUSHBUTTON.IDC_LOCAL_DIR_BROWSE"
 msgid "B&rowse..."
-msgstr ""
+msgstr "ブラウズ..."
 
 #: DIALOG.IDD_ROOT.CAPTION
 msgid "Cygwin Setup - Choose Installation Directory"
-msgstr ""
+msgstr "Cygwin セットアップ - インストールディレクトリの選択"
 
 #: DIALOG.IDD_ROOT.LTEXT.IDC_STATIC_HEADER_TITLE
 msgid "Select Root Install Directory"
-msgstr ""
+msgstr "ルートインストールディレクトリの選択"
 
 #: DIALOG.IDD_ROOT.LTEXT.IDC_ROOTDIR_SUBTEXT
 msgid ""
 "Select the directory where you want to install Cygwin.  Also choose a few "
 "installation parameters."
-msgstr ""
+msgstr "Cygwin をインストールするディレクトリを、いくつかのインストールパラメータとと"
+"もに選択します。"
 
 #: DIALOG.IDD_ROOT.GROUPBOX.IDC_ROOTDIR_GRP
 msgid "Root Directory"
-msgstr ""
+msgstr "ルートディレクトリ"
 
 #: DIALOG.IDD_ROOT.PUSHBUTTON.IDC_ROOT_BROWSE
 msgctxt "DIALOG.IDD_ROOT.PUSHBUTTON.IDC_ROOT_BROWSE"
 msgid "B&rowse..."
-msgstr ""
+msgstr "ブラウズ..."
 
 #: DIALOG.IDD_ROOT.GROUPBOX.IDC_INSTALLFOR_GRP
 msgid "Install For"
-msgstr ""
+msgstr "インストール対象"
 
 #: DIALOG.IDD_ROOT.CONTROL.IDC_ROOT_SYSTEM
 msgid "&All Users (RECOMMENDED)"
-msgstr ""
+msgstr "すべてのユーザー (推奨)(&A)"
 
 #: DIALOG.IDD_ROOT.CONTROL.IDC_ROOT_USER
 msgid "Just &Me"
-msgstr ""
+msgstr "現在のユーザー(&M)"
 
 #: DIALOG.IDD_ROOT.LTEXT.IDC_ALLUSERS_TEXT
 msgid "Cygwin will be available to all users of the system."
-msgstr ""
+msgstr "Cygwin は、システムのすべてのユーザーが利用できるようになります。"
 
 #: DIALOG.IDD_ROOT.LTEXT.IDC_JUSTME_TEXT
 msgid ""
@@ -150,46 +159,50 @@ msgid ""
 "current user.  Only select this if you lack Administrator privileges or if "
 "you have specific needs."
 msgstr ""
+"Cygwin は引き続きすべてのユーザーが使用できますが、デスクトップアイコン、"
+"Cygwin メニューエントリ、および重要なインストーラー情報は現在のユーザーのみが"
+"利用できます。管理者権限がない場合、または特定のニーズがある場合にのみ、これ"
+"を選択してください。"
 
 #: DIALOG.IDD_SITE.CAPTION
 msgid "Cygwin Setup - Choose Download Site(s)"
-msgstr ""
+msgstr "Cygwin のセットアップ - ダウンロードサイトを選択"
 
 #: DIALOG.IDD_SITE.LTEXT.IDC_STATIC
 msgid "Available Download Sites:"
-msgstr ""
+msgstr "利用可能なダウンロードサイト:"
 
 #: DIALOG.IDD_SITE.LTEXT.IDC_STATIC
 msgid "Choose a site from this list, or add your own sites to the list."
-msgstr ""
+msgstr "このリストからサイトを選択するか、独自のサイトをリストに追加します。"
 
 #: DIALOG.IDD_SITE.LTEXT.IDC_STATIC_HEADER_TITLE
 msgid "Choose A Download Site"
-msgstr ""
+msgstr "ダウンロードサイトを選択"
 
 #: DIALOG.IDD_SITE.LTEXT.IDC_SITE_USERURL
 msgid "User URL:"
-msgstr ""
+msgstr "ユーザーサイト:"
 
 #: DIALOG.IDD_SITE.PUSHBUTTON.IDC_BUTTON_ADD_URL
 msgid "Add"
-msgstr ""
+msgstr "追加"
 
 #: DIALOG.IDD_NET.CAPTION
 msgid "Cygwin Setup - Select Connection Type"
-msgstr ""
+msgstr "Cygwinセットアップ - インターネット接続タイプの選択"
 
 #: DIALOG.IDD_NET.CONTROL.IDC_NET_PRECONFIG
 msgid "Use &System Proxy Settings"
-msgstr ""
+msgstr "システム プロキシ設定を使用する"
 
 #: DIALOG.IDD_NET.CONTROL.IDC_NET_DIRECT
 msgid "&Direct Connection"
-msgstr ""
+msgstr "プロキシなし"
 
 #: DIALOG.IDD_NET.CONTROL.IDC_NET_PROXY
 msgid "Use HTTP/FTP &Proxy:"
-msgstr ""
+msgstr "HTTP/FTP プロキシを使用する:"
 
 #: DIALOG.IDD_NET.RTEXT.IDC_STATIC
 msgid "Proxy &Host"
diff --git a/po/pt_BR/res.po b/po/pt_BR/res.po
index 5aef7a42..e87eafbe 100644
--- a/po/pt_BR/res.po
+++ b/po/pt_BR/res.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-04-14 13:51+0100\n"
-"PO-Revision-Date: 2023-03-20 19:37+0000\n"
-"Last-Translator: Fernando Lopes <fefehex12@gmail.com>\n"
+"PO-Revision-Date: 2023-10-04 12:10+0000\n"
+"Last-Translator: Lucas Haniel <luc45han@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "cygwin-setup/cygwin-setup/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Accelerator-Marker: &\n"
-"X-Generator: Weblate 4.16.2-dev\n"
+"X-Generator: Weblate 5.1-dev\n"
 "X-Merge-On: location\n"
 
 #: DIALOG.IDD_SOURCE.CAPTION
@@ -104,54 +104,58 @@ msgstr ""
 msgid ""
 "Select a directory where Setup should look for downloaded installation files."
 msgstr ""
+"Selecione um diretório onde a Instalação deverá procurar os arquivos de "
+"instalação baixados."
 
 #: DIALOG.IDD_LOCAL_DIR.GROUPBOX.IDC_LOCALDIR_GRP
 msgid "Local Package Directory"
-msgstr ""
+msgstr "Diretório de pacotes locais"
 
 #: DIALOG.IDD_LOCAL_DIR.PUSHBUTTON.IDC_LOCAL_DIR_BROWSE
 msgctxt "DIALOG.IDD_LOCAL_DIR.PUSHBUTTON.IDC_LOCAL_DIR_BROWSE"
 msgid "B&rowse..."
-msgstr ""
+msgstr "Navegar..."
 
 #: DIALOG.IDD_ROOT.CAPTION
 msgid "Cygwin Setup - Choose Installation Directory"
-msgstr ""
+msgstr "Configuração do Cygwin - Escolha o diretório de instalação"
 
 #: DIALOG.IDD_ROOT.LTEXT.IDC_STATIC_HEADER_TITLE
 msgid "Select Root Install Directory"
-msgstr ""
+msgstr "Selecione o diretório de instalação do root"
 
 #: DIALOG.IDD_ROOT.LTEXT.IDC_ROOTDIR_SUBTEXT
 msgid ""
 "Select the directory where you want to install Cygwin.  Also choose a few "
 "installation parameters."
 msgstr ""
+"Selecione o diretório onde deseja instalar o Cygwin. Escolha também alguns "
+"parâmetros de instalação."
 
 #: DIALOG.IDD_ROOT.GROUPBOX.IDC_ROOTDIR_GRP
 msgid "Root Directory"
-msgstr ""
+msgstr "Diretório Root"
 
 #: DIALOG.IDD_ROOT.PUSHBUTTON.IDC_ROOT_BROWSE
 msgctxt "DIALOG.IDD_ROOT.PUSHBUTTON.IDC_ROOT_BROWSE"
 msgid "B&rowse..."
-msgstr ""
+msgstr "Navegar..."
 
 #: DIALOG.IDD_ROOT.GROUPBOX.IDC_INSTALLFOR_GRP
 msgid "Install For"
-msgstr ""
+msgstr "Instalar para"
 
 #: DIALOG.IDD_ROOT.CONTROL.IDC_ROOT_SYSTEM
 msgid "&All Users (RECOMMENDED)"
-msgstr ""
+msgstr "Todos os usuários (RECOMENDADO)"
 
 #: DIALOG.IDD_ROOT.CONTROL.IDC_ROOT_USER
 msgid "Just &Me"
-msgstr ""
+msgstr "Apenas eu"
 
 #: DIALOG.IDD_ROOT.LTEXT.IDC_ALLUSERS_TEXT
 msgid "Cygwin will be available to all users of the system."
-msgstr ""
+msgstr "Cygwin estará disponível para todos os usuários do sistema."
 
 #: DIALOG.IDD_ROOT.LTEXT.IDC_JUSTME_TEXT
 msgid ""
@@ -160,34 +164,39 @@ msgid ""
 "current user.  Only select this if you lack Administrator privileges or if "
 "you have specific needs."
 msgstr ""
+"O Cygwin ainda estará disponível para todos os usuários, mas os ícones da "
+"área de trabalho, as entradas do menu Cygwin e informações importantes do "
+"instalador estão disponíveis apenas para o usuário atual. Selecione esta "
+"opção apenas se você não tiver privilégios de administrador ou se tiver "
+"necessidades específicas."
 
 #: DIALOG.IDD_SITE.CAPTION
 msgid "Cygwin Setup - Choose Download Site(s)"
-msgstr ""
+msgstr "Configuração do Cygwin - Escolha o(s) site(s) de download"
 
 #: DIALOG.IDD_SITE.LTEXT.IDC_STATIC
 msgid "Available Download Sites:"
-msgstr ""
+msgstr "Sites de download disponíveis:"
 
 #: DIALOG.IDD_SITE.LTEXT.IDC_STATIC
 msgid "Choose a site from this list, or add your own sites to the list."
-msgstr ""
+msgstr "Escolha um site nesta lista ou adicione seus próprios sites à lista."
 
 #: DIALOG.IDD_SITE.LTEXT.IDC_STATIC_HEADER_TITLE
 msgid "Choose A Download Site"
-msgstr ""
+msgstr "Escolha um site de download"
 
 #: DIALOG.IDD_SITE.LTEXT.IDC_SITE_USERURL
 msgid "User URL:"
-msgstr ""
+msgstr "URL do usuário:"
 
 #: DIALOG.IDD_SITE.PUSHBUTTON.IDC_BUTTON_ADD_URL
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #: DIALOG.IDD_NET.CAPTION
 msgid "Cygwin Setup - Select Connection Type"
-msgstr ""
+msgstr "Configuração do Cygwin - Selecione o tipo de conexão"
 
 #: DIALOG.IDD_NET.CONTROL.IDC_NET_PRECONFIG
 msgid "Use &System Proxy Settings"
diff --git a/po/zh_Hans/res.po b/po/zh_Hans/res.po
index 91b21e62..2e179eaa 100644
--- a/po/zh_Hans/res.po
+++ b/po/zh_Hans/res.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-04-14 13:51+0100\n"
-"PO-Revision-Date: 2023-04-29 11:48+0000\n"
+"PO-Revision-Date: 2023-09-09 14:58+0000\n"
 "Last-Translator: Xiang Heng Wei <yylteam@hotmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "cygwin-setup/cygwin-setup/zh_Hans/>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Accelerator-Marker: &\n"
-"X-Generator: Weblate 4.18-dev\n"
+"X-Generator: Weblate 5.0.1-dev\n"
 "X-Merge-On: location\n"
 
 #: DIALOG.IDD_SOURCE.CAPTION
@@ -340,7 +340,7 @@ msgstr "Cygwin 安装程序"
 
 #: DIALOG.IDD_SPLASH.LTEXT.IDC_STATIC_WELCOME_TITLE
 msgid "Cygwin Net Release Setup Program"
-msgstr "Cygwin 网络版安装程序"
+msgstr "Cygwin 在线安装程序"
 
 #: DIALOG.IDD_SPLASH.LTEXT.IDC_SPLASH_TEXT
 msgid ""
@@ -1007,7 +1007,7 @@ msgstr "未知"
 
 #: STRINGTABLE.IDS_ACTION_SOURCE
 msgid "Source"
-msgstr "源"
+msgstr "源代码"
 
 #: STRINGTABLE.IDS_VIEW_FULL
 msgid "Full"
@@ -1047,11 +1047,11 @@ msgstr "软件包"
 
 #: STRINGTABLE.IDS_COLUMN_CURRENT
 msgid "Current"
-msgstr "当前"
+msgstr "当前状态"
 
 #: STRINGTABLE.IDS_COLUMN_NEW
 msgid "New"
-msgstr "新建"
+msgstr "操作"
 
 #: STRINGTABLE.IDS_COLUMN_SOURCE
 msgid "Src?"
@@ -1191,7 +1191,7 @@ msgstr ""
 msgid ""
 "Are you sure you want to exit setup? Any current download or installation "
 "will be aborted."
-msgstr "是否确实要退出安装程序?任何当前的下载或安装都将中止。"
+msgstr "是否确实要退出安装程序?任何当前的下载或安装操作都将被中止。"
 
 #: STRINGTABLE.IDS_CONTINUE
 msgid "Continue"
@@ -1245,7 +1245,7 @@ msgstr "下载"
 
 #: STRINGTABLE.IDS_CONFIRM_NOTHING
 msgid "No changes"
-msgstr "没有变化"
+msgstr "不更改"
 
 #: STRINGTABLE.IDS_CONFIRM_AUTO_ADD
 msgid "(automatically added)"
@@ -1266,7 +1266,7 @@ msgstr "无法解压缩"
 
 #: STRINGTABLE.IDS_USER_URL_TOOLTIP
 msgid "Additional site URL, path or UNC path"
-msgstr "其他站点地址、路径或 UNC 路径"
+msgstr "其他站点的网址、路径或 UNC 路径"
 
 #: STRINGTABLE.IDS_HELPTEXT_ERROR
 msgid "Error during option processing."
@@ -1441,7 +1441,7 @@ msgstr "s-expr 格式的额外 DSA 公钥"
 
 #: STRINGTABLE.IDS_HELPTEXT_SITE
 msgid "Download site URL, path or UNC path"
-msgstr "下载站点地址、路径或 UNC 路径"
+msgstr "下载站点的网址、路径或 UNC 路径"
 
 #: STRINGTABLE.IDS_HELPTEXT_SYMLINK_TYPE
 msgid "Symlink type (lnk, native, sys, wsl)"
@@ -1457,7 +1457,7 @@ msgstr "同时升级已安装的软件包"
 
 #: STRINGTABLE.IDS_HELPTEXT_USER_AGENT
 msgid "User agent string for HTTP requests"
-msgstr "用于 HTTP 请求的用户代理字符串"
+msgstr "用于 HTTP 请求的用户代理(User Agent)字符串"
 
 #: STRINGTABLE.IDS_HELPTEXT_VERBOSE
 msgid "Verbose output"
diff --git a/propsheet.cc b/propsheet.cc
index a2dca458..092293f0 100644
--- a/propsheet.cc
+++ b/propsheet.cc
@@ -25,6 +25,7 @@
 #include "ControlAdjuster.h"
 #include "choose.h"
 #include "msg.h"
+#include "quiet.h"
 
 // Sort of a "hidden" Windows structure.  Used in the PropSheetCallback.
 #include <pshpack1.h>
@@ -243,16 +244,28 @@ PropSheetProc (HWND hwndDlg, UINT uMsg, LPARAM lParam)
     {
     case PSCB_PRECREATE:
       {
-	LONG additionalStyle =
-	  (WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME);
+        LONG additionalStyle = (WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME);
+
+        // 'noinput' quiet mode adds WS_DISABLE to prevent user interaction
+        // with the propsheet
+        if (UnattendedOption == QuietNoInput)
+          additionalStyle |= WS_DISABLED;
+
+        // 'hidden' quiet mode totally hides the propsheet window
+        LONG forbiddenStyle = 0;
+        if (UnattendedOption == QuietHidden)
+          forbiddenStyle |= WS_VISIBLE;
+
 	// Add a minimize box to the sheet/wizard.
 	if (((LPDLGTEMPLATEEX) lParam)->signature == 0xFFFF)
 	  {
 	    ((LPDLGTEMPLATEEX) lParam)->style |= additionalStyle;
+            ((LPDLGTEMPLATEEX) lParam)->style &= ~forbiddenStyle;
 	  }
 	else
 	  {
 	    ((LPDLGTEMPLATE) lParam)->style |= additionalStyle;
+            ((LPDLGTEMPLATE) lParam)->style &= ~forbiddenStyle;
 	  }
       }
       return TRUE;
diff --git a/quiet.h b/quiet.h
new file mode 100644
index 00000000..9f2b6d8e
--- /dev/null
+++ b/quiet.h
@@ -0,0 +1,26 @@
+/*
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     A copy of the GNU General Public License can be found at
+ *     http://www.gnu.org/
+ *
+ */
+
+#ifndef SETUP_QUIET_H
+#define SETUP_QUIET_H
+
+#include "getopt++/StringChoiceOption.h"
+
+typedef enum
+{
+  QuietUnattended,
+  QuietNoInput,
+  QuietHidden,
+} QuietEnum;
+
+extern StringChoiceOption UnattendedOption;
+
+#endif /* SETUP_QUIET_H */
diff --git a/res.pot b/res.pot
index 25fec424..a4994e41 100644
--- a/res.pot
+++ b/res.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-14 13:51+0100\n"
+"POT-Creation-Date: 2023-10-11 16:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1308,7 +1308,7 @@ msgid "URL or absolute path of extra public key file (RFC4880 format)"
 msgstr ""
 
 #: STRINGTABLE.IDS_HELPTEXT_QUIET_MODE
-msgid "Unattended setup mode"
+msgid "Unattended setup mode (unattended, noinput, hidden)"
 msgstr ""
 
 #: STRINGTABLE.IDS_HELPTEXT_REMOVE_CATEGORIES
diff --git a/res.rc b/res.rc
index 8419111a..c2aef025 100644
--- a/res.rc
+++ b/res.rc
@@ -16,25 +16,25 @@
 #define SETUP_HEADICON_X		(SETUP_STANDARD_DIALOG_W - 27)
 
 // Width for Keep/Prev/Curr/Exp buttons.
-#define SETUP_KPCE_W		(35)
+#define SETUP_KPCE_W		(52)
 
 // Right-aligned controls.
-#define SETUP_EXP_X		(SETUP_STANDARD_DIALOG_W - SETUP_KPCE_W - 7)
+#define SETUP_EXP_X		(SETUP_STANDARD_DIALOG_W - SETUP_KPCE_W/2 - 7)
 #define SETUP_SYNC_X		(SETUP_EXP_X - SETUP_KPCE_W - 5)
 #define SETUP_BEST_X		(SETUP_SYNC_X - SETUP_KPCE_W - 5)
 #define SETUP_KEEP_X		(SETUP_BEST_X - SETUP_KPCE_W - 5)
 
 // Left-aligned controls.
 #define SETUP_VIEW_X		(7)
-#define SETUP_VIEW_W		(20)
+#define SETUP_VIEW_W		(30)
 #define SETUP_VIEWLIST_X		(SETUP_VIEW_X + SETUP_VIEW_W + 2)
-#define SETUP_VIEWLIST_W		(60)
-#define SETUP_SEARCH_X		(SETUP_VIEWLIST_X + SETUP_VIEWLIST_W + 2)
+#define SETUP_VIEWLIST_W		(68)
+#define SETUP_SEARCH_X		(SETUP_VIEWLIST_X + SETUP_VIEWLIST_W)
 #define SETUP_SEARCH_W		(32)
 #define SETUP_SEARCHTEXT_X	(SETUP_SEARCH_X + SETUP_SEARCH_W + 2)
 #define SETUP_SEARCHTEXT_W	(60)
 #define SETUP_CLEAR_X		(SETUP_SEARCHTEXT_X + SETUP_SEARCHTEXT_W + 2)
-#define SETUP_CLEAR_W		(30)
+#define SETUP_CLEAR_W		(38)
 #define SETUP_CHOOSE_X          (7)
 #define SETUP_CHOOSE_W          (SETUP_STANDARD_DIALOG_W - 2*SETUP_CHOOSE_X)
 
@@ -84,6 +84,8 @@ CYGWIN-TERMINAL.ICON    FILE    "cygwin-terminal.ico"
 //
 // Translations
 
+#include "res/de/res.rc"
 #include "res/fr/res.rc"
+#include "res/pl/res.rc"
 #include "res/tr/res.rc"
 #include "res/zh_Hans/res.rc"
diff --git a/res/de/res.rc b/res/de/res.rc
new file mode 100644
index 00000000..f3a0e31e
--- /dev/null
+++ b/res/de/res.rc
@@ -0,0 +1,531 @@
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin Setup - Installationsart wählen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "&Installation aus dem Internet\n(heruntergeladene Dateien werden zur späteren Wiederverwendung aufbewahrt)",IDC_SOURCE_NETINST,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE | BS_TOP,71,60,200,30
+    CONTROL         "&Download ohne Installation",IDC_SOURCE_DOWNLOAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,90,200,10
+    CONTROL         "Installation aus dem &Lokalen Verzeichnis",IDC_SOURCE_LOCALDIR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,120,200,10
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Download-Quelle wählen",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Wählen Sie, ob Sie die Software aus dem Internet herunterladen und installieren möchten oder ob Sie sie aus Dateien aus einem lokalen Verzeichnis installieren möchten.",IDC_SOURCE_SUBTEXT,21,9,239,16,NOT WS_GROUP
+END
+
+IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin Setup - Virenscanner deaktivieren?"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "&Virenscanner deaktivieren",IDC_DISABLE_AV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,69,115,10
+    CONTROL         "Virenscanner allein &lassen",IDC_LEAVE_AV,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Wählen Sie, ob Sie Ihren Virenscanner während der Installation deaktivieren möchten.",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Einige Antivirenprogramme, insbesondere McAfee, verursachen auf Windows XP-Computern während der Installation von Cygwin einen Bluescreen.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "One that may be a problem has been detected. Cygwin setup can disable this during the installation process, and re-enable it when the install is complete.",IDC_STATIC,21,32,239,24,NOT WS_GROUP
+END
+
+IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin Setup - Lokales Paketverzeichnis auswählen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Lokales Paketverzeichnis auswählen",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Wählen Sie ein Verzeichnis aus, in dem Setup die heruntergeladenen Installationsdateien speichern soll.  Das Verzeichnis wird erstellt, wenn es noch nicht vorhanden ist.",IDC_LOCAL_DIR_DOWNLOAD_DESC,21,9,248,16,NOT WS_GROUP
+    LTEXT           "Wählen Sie ein Verzeichnis aus, in dem Setup nach heruntergeladenen Installationsdateien suchen soll.",IDC_LOCAL_DIR_INSTALL_DESC,21,9,248,16,NOT WS_GROUP
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    GROUPBOX        "Lokales Paketverzeichnis",IDC_LOCALDIR_GRP,5,35,330,35
+    EDITTEXT        IDC_LOCAL_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Durchsuchen...",IDC_LOCAL_DIR_BROWSE,277,47,52,14,WS_TABSTOP
+END
+
+IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin Setup - Installationsverzeichnis wählen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Root-Installationsverzeichnis auswählen",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Wählen Sie das Verzeichnis, in dem Sie Cygwin installieren möchten. Wählen Sie auch einige Installationsparameter.",IDC_ROOTDIR_SUBTEXT,21,9,239,16,NOT WS_GROUP
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    GROUPBOX        "Root Directory",IDC_ROOTDIR_GRP,5,35,330,35
+    EDITTEXT        IDC_ROOT_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Durchsuchen...",IDC_ROOT_BROWSE,277,47,52,14,WS_TABSTOP
+    GROUPBOX        "Installieren für",IDC_INSTALLFOR_GRP,5,76,330,101
+    CONTROL         "&Alle Benutzer (EMPFOHLEN)",IDC_ROOT_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,13,89,130,8
+    CONTROL         "Nur für &Mich",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,130,130,8
+    LTEXT           "Cygwin wird für alle Benutzer des Systems verfügbar sein.",IDC_ALLUSERS_TEXT,25,101,300,28
+    LTEXT           "Cygwin steht weiterhin allen Benutzern zur Verfügung, aber Desktop-Symbole, Cygwin-Menüeinträge und wichtige Informationen des Installationsprogramms sind nur für den aktuellen Benutzer verfügbar.  Wählen Sie diese Option nur, wenn Sie keine Administratorrechte haben oder wenn Sie spezielle Anforderungen haben.",IDC_JUSTME_TEXT,25,140,300,32
+END
+
+IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+    WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+CAPTION "Cygwin-Setup - Download-Site(n) auswählen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Verfügbare Download-Seiten:",IDC_STATIC,66,34,183,8,NOT WS_GROUP
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Wählen Sie eine Seite aus dieser Liste aus oder fügen Sie der Liste Ihre eigenen Seiten hinzu.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Wählen Sie eine Download-Site",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    EDITTEXT        IDC_EDIT_USER_URL,65,160,185,14,ES_AUTOHSCROLL | WS_GROUP
+    LTEXT           "Benutzer-URL:",IDC_SITE_USERURL,15,162,45,8,NOT WS_GROUP
+    PUSHBUTTON      "Hinzufügen",IDC_BUTTON_ADD_URL,255,160,50,14
+END
+
+IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin-Einrichtung - Verbindungsart auswählen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "&System-Proxy-Einstellungen verwenden",IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
+    CONTROL         "&Direkte Verbindung",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
+    CONTROL         "HTTP/FTP-&Proxy verwenden:",IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,185,10
+    EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP
+    EDITTEXT        IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "",IDC_STATIC,60,95,185,50
+    RTEXT           "Proxy &Host",IDC_STATIC,65,105,50,12,SS_CENTERIMAGE | NOT WS_GROUP
+    RTEXT           "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT WS_GROUP
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Das Setup muss wissen, wie Sie es mit dem Internet verbinden wollen.   Wählen Sie unten die entsprechenden Einstellungen aus.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Wählen Sie Ihre Internetverbindung aus",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+END
+
+IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Cygwin-Einrichtung"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Wird installiert...",IDC_INS_ACTION,45,55,205,8,SS_ENDELLIPSIS
+    LTEXT           "(PKT)",IDC_INS_PKG,45,70,205,8,SS_ENDELLIPSIS
+    LTEXT           "(DATEI)",IDC_INS_FILE,45,85,205,8,SS_ENDELLIPSIS
+    CONTROL         "Fortschritt1",IDC_INS_DISKFULL,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,130,155,10
+    CONTROL         "Fortschritt1",IDC_INS_IPROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,115,155,10
+    CONTROL         "Fortschritt1",IDC_INS_PPROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,100,155,10
+    LTEXT           "Paket:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
+    LTEXT           "Gesamt:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
+    LTEXT           "Festplatte:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Auf dieser Seite wird der Fortschritt beim Herunterladen oder bei der Installation angezeigt.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Fortschritt",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+END
+
+IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Proxy-Authentifizierung erforderlich"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
+    LTEXT           "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+    LTEXT           "&Passwort",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Proxy-Autorisierung erforderlich",IDC_STATIC,65,10,145,10
+    DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
+    PUSHBUTTON      "Abbrechen",IDCANCEL,165,75,45,15
+END
+
+IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Server-Authentifizierung erforderlich"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
+    LTEXT           "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+    LTEXT           "&Passwort",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Server-Autorisierung erforderlich",IDC_STATIC,65,10,145,10
+    DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
+    PUSHBUTTON      "Abbrechen",IDCANCEL,165,75,45,15
+END
+
+IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+    WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin-Einrichtung"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Cygwin Net Release Setup-Programm",IDC_STATIC_WELCOME_TITLE,115,1,195,24
+    LTEXT           "Dieses Setup-Programm wird für die Erstinstallation der Cygwin-Umgebung sowie für alle nachfolgenden Updates verwendet.  Die folgenden Seiten führen Sie durch die Installation.\n\nBitte beachten Sie, dass wir standardmäßig nur einen Basissatz von Paketen installieren.   Cygwin bietet eine große Anzahl von Paketen für eine Vielzahl von Zwecken an.\n\nSie können dieses Programm jederzeit in der Zukunft ausführen, um je nach Bedarf Pakete hinzuzufügen, zu entfernen oder zu aktualisieren.",IDC_SPLASH_TEXT,115,25,195,100
+    ICON            IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE
+    LTEXT           "",IDC_VERSION,115,127,195,10
+    LTEXT           "",IDC_SPLASH_COPYR,115,140,195,8
+    LTEXT           "",IDC_SPLASH_URL,115,152,90,8
+    LTEXT           "Tragen Sie zur Ãœbersetzung dieses Programms bei.",IDC_SPLASH_TRANSLATE,115,164,195,8
+END
+
+IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+    WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin-Einrichtung - Installationsstatus und Symbole erstellen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "Symbol auf &Desktop erstellen",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,110,8
+    CONTROL         "Symbol zum &Startmenü hinzufügen",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,140,8
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Tell setup if you want it to create a few icons for convenient access to the Cygwin environment.",IDC_DESKTOP_HEADER_INSTALL,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Symbole erstellen",IDC_DESKTOP_HEADER_TITLE_INSTALL,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Zeigt den Installationsstatus im Nur-Download-Modus an.",IDC_DESKTOP_HEADER_DOWNLOAD,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Installation abgeschlossen",IDC_DESKTOP_HEADER_TITLE_DOWNLOAD,7,0,258,8,NOT WS_GROUP
+    CONTROL         "",IDC_DESKTOP_SEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,135,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Installationsstatus",IDC_STATUS_HEADER,7,140,258,8,NOT WS_GROUP
+    LTEXT           "Cygwin-Installation erfolgreich abgeschlossen.",IDC_STATUS,21,149,279,36,NOT WS_GROUP
+END
+
+IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "FTP-Authentifizierung erforderlich"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
+    LTEXT           "&Benutzer-ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+    LTEXT           "&Passwort",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "FTP-Autorisierung erforderlich",IDC_STATIC,65,10,145,10
+    DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
+    PUSHBUTTON      "Abbrechen",IDCANCEL,165,75,45,15
+END
+
+IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Cygwin-Einrichtung - Pakete auswählen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Ansicht",IDC_CHOOSE_VIEWCAPTION,SETUP_VIEW_X,33,SETUP_VIEW_W,10
+    COMBOBOX        IDC_CHOOSE_VIEW,SETUP_VIEWLIST_X,30,SETUP_VIEWLIST_W,84,CBS_DROPDOWNLIST | WS_TABSTOP
+    RTEXT           "&Suchen",IDC_STATIC,SETUP_SEARCH_X,33,SETUP_SEARCH_W,10,SS_CENTERIMAGE,WS_EX_RIGHT
+    CONTROL         "Suchen ",IDC_CHOOSE_DO_SEARCH,"Button",BS_PUSHBUTTON | NOT WS_VISIBLE,SETUP_SEARCH_X,33,SETUP_SEARCH_W,14
+    EDITTEXT        IDC_CHOOSE_SEARCH_EDIT,SETUP_SEARCHTEXT_X,30,SETUP_SEARCHTEXT_W,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Clear",IDC_CHOOSE_CLEAR_SEARCH,SETUP_CLEAR_X,30,SETUP_CLEAR_W,14
+    CONTROL         "&Behalten",IDC_CHOOSE_KEEP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,SETUP_KEEP_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Beste",IDC_CHOOSE_BEST,"Button",BS_AUTORADIOBUTTON,SETUP_BEST_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Synchronisieren",IDC_CHOOSE_SYNC,"Button",BS_AUTORADIOBUTTON,SETUP_SYNC_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Test",IDC_CHOOSE_EXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,SETUP_EXP_X,30,SETUP_KPCE_W,14
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    CONTROL         "",IDC_CHOOSE_LIST,WC_LISTVIEW,LVS_NOSORTHEADER | LVS_REPORT | LVS_SINGLESEL | WS_TABSTOP,SETUP_CHOOSE_X,47,SETUP_CHOOSE_W,120,WS_EX_CLIENTEDGE
+    CONTROL         "Veraltete Pakete &ausblenden",IDC_CHOOSE_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,160,14
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Pakete zum Herunterladen auswählen.",IDC_CHOOSE_INST_TEXT_DOWNLOAD,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Pakete zum Installieren auswählen.",IDC_CHOOSE_INST_TEXT_INSTALL,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Pakete auswählen",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+END
+
+IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Cygwin-Einrichtung - Abhängigkeiten auflösen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Abhängigkeiten auflösen",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Die folgenden Probleme traten beim Versuch auf, Abhängigkeiten zu erfüllen.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    CONTROL         "Vorgegebene Problemlösungen &akzeptieren",IDC_PREREQ_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,225,14
+    EDITTEXT        IDC_PREREQ_EDIT,7,41,303,124,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+END
+
+IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
+    WS_SYSMENU
+CAPTION "Cygwin-Einrichtung - Änderungen überprüfen und bestätigen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Änderungen überprüfen und bestätigen",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    EDITTEXT        IDC_CONFIRM_EDIT,7,41,325,131,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+END
+
+IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin Setup - Veraltete Mirror-Server verwenden?"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Warnung:",IDC_STATIC,7,8,40,8
+    LTEXT           "Ein oder mehrere Mirror-Server, die Sie ausgewählt haben, stehen nicht mehr auf der Liste der offiziellen Cygwin Mirror-Server. Es/Sie kann/können veraltet sein oder einige Pakete fehlen.  Dies betrifft die folgenden Mirror-Server:",IDC_STATIC,47,8,263,32
+    EDITTEXT        IDC_DROP_MIRRORS,7,40,303,40,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+    LTEXT           "Wenn Sie Probleme mit der Installation haben, sollten Sie nur offizielle Mirror-Server ausprobieren.\n\n Möchten Sie fortfahren, indem Sie diesen/diese Mirror-Server verwenden?",IDC_STATIC,7,88,303,24
+    CONTROL         "&Mich nicht mehr vor diesem/den Mirror-Server(n) warnen",IDC_DROP_NOWARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,213,15
+    PUSHBUTTON      "&Ja",IDYES,220,120,45,15
+    DEFPUSHBUTTON   "&Nein",IDNO,265,120,45,15
+END
+
+IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Herunterladen unvollständig"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_WARNING,IDC_HEADICON,10,10
+    LTEXT           "Die folgenden Pakete hatten Download-Fehler:",IDC_STATIC,7,8,320,16
+    EDITTEXT        IDC_DOWNLOAD_EDIT,7,24,320,88,WS_VSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL
+    LTEXT           "Wählen Sie 'Wiederholen', um den Download erneut zu starten, 'Zurück', um zur Paketauswahl-Seite zurückzukehren, 'Weiter', um trotzdem fortzufahren (NICHT EMPFOHLEN) oder 'Abbrechen', um zu beenden.",IDC_STATIC,7,120,320,24
+    DEFPUSHBUTTON   "&Wiederholen",IDRETRY,45,150,50,15
+    PUSHBUTTON      "&Zurück",IDC_BACK,110,150,50,15
+    PUSHBUTTON      "&Fortsetzen",IDIGNORE,175,150,50,15
+    PUSHBUTTON      "Abbrechen",IDABORT,240,150,50,15
+END
+
+IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
+    WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin-Einrichtung - Ausführen von Nachinstallationsskripten"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Nachinstallations-Skriptfehler",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Dies bedeutet nicht unbedingt, dass die betroffenen Pakete nicht richtig funktionieren, aber bitte überprüfen Sie /var/log/setup.log.full und melden Sie alle Probleme.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    EDITTEXT        IDC_POSTINSTALL_EDIT,7,41,303,112,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+END
+
+IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Datei in Verwendung entdeckt"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_WARNING,IDC_HEADICON,10,10
+    LTEXT           "Kann nicht extrahiert werden",IDC_FILE_INUSE_MSG,33,10,234,8,SS_PATHELLIPSIS
+    LTEXT           "Die Datei wird von den folgenden Prozessen verwendet:",IDC_STATIC,33,28,234,8
+    EDITTEXT        IDC_FILE_INUSE_EDIT,33,40,234,32,WS_VSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL | NOT WS_TABSTOP
+    LTEXT           "Wählen Sie 'Wiederholen' zum erneuten Versuch, 'Stop' zum Beenden von Prozessen und zum erneuten Versuch oder 'Weiter', um trotzdem fortzufahren (die Datei wird nach einem Neustart aktualisiert).",IDC_FILE_INUSE_HELP_0,33,80,234,24,NOT WS_GROUP
+    LTEXT           "Wählen Sie 'Erneut versuchen' um es erneut zu versuchen, wählen Sie 'Beenden', um Prozesse zu beenden und erneut zu versuchen, oder wählen Sie 'Fortfahren', um trotzdem fortzufahren (die Datei wird nach einem Neustart aktualisiert).",IDC_FILE_INUSE_HELP_1,33,80,234,24,NOT WS_GROUP
+    LTEXT           "Select 'Retry' to retry, select 'Kill' to forcibly kill all processes and retry, or select 'Continue' to go on anyway (the file will be updated after a reboot).",IDC_FILE_INUSE_HELP_2,33,80,234,24,NOT WS_GROUP
+    PUSHBUTTON      "&Wiederholen",IDIGNORE,45,112,55,15
+    DEFPUSHBUTTON   "Prozesse &stoppen",IDRETRY,111,112,55,15
+    PUSHBUTTON      "&Fortsetzen",IDCONTINUE,177,112,55,15
+END
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_ROOT_SLASH          "Warning: we recommend you do not use the root of your hard drive as the cygwin root, to prevent possible conflicts with other programs.  Proceed anyway?"
+    IDS_ROOT_SPACE          "You should not choose a root path that include spaces in directory names.  Proceed anyway?"
+    IDS_ERR_OPEN_WRITE      "Can't open %s for writing: %s"
+    IDS_SETUPINI_MISSING    "Unable to get %s from <%s>"
+    IDS_OLD_SETUPINI        "This setup.ini is older than the one you used last time you installed cygwin.  Proceed anyway?"
+    IDS_NOTHING_INSTALLED   "Es musste nichts installiert werden"
+    IDS_INSTALL_COMPLETE    "Installation abgeschlossen"
+    IDS_REBOOT_REQUIRED     "In-use files have been replaced. You need to reboot as soon as possible to activate the new versions. Cygwin may operate incorrectly until you reboot."
+    IDS_ERR_OPEN_READ       "Can't open %s for reading: %s"
+    IDS_ROOT_ABSOLUTE       "The install directory must be absolute, with both a drive letter and leading slash, like C:\\Cygwin"
+    IDS_DOWNLOAD_COMPLETE   "Herunterladen abgeschlossen"
+    IDS_NOLOGFILE           "Cannot open log file %s for writing"
+    IDS_UNINSTALL_COMPLETE  "Uninstalls complete."
+    IDS_ERR_CHDIR           "Could not change dir to %s: %s [%.8x]"
+    IDS_OLD_SETUP_VERSION   "This setup is version %s, but setup.ini claims version %s is available.\nYou might want to upgrade to get the latest features and bug fixes."
+    IDS_DOWNLOAD_INCOMPLETE "Download Incomplete.  Try again?"
+    IDS_DOWNLOAD_INCOMPLETE_EXIT
+                            "Download incomplete.  Check %s for details"
+    IDS_INSTALL_ERROR       "Installation error (%s), Continue with other packages?"
+    IDS_INSTALL_INCOMPLETE  "Installation incomplete.  Check %s for details"
+    IDS_CORRUPT_PACKAGE     "Package %s has a corrupt local copy, please remove and retry."
+    IDS_QUERY_CORRUPT       "The file %s is corrupt.  Delete it and download again?"
+    IDS_SKIP_PACKAGE        "%s\nMöchten Sie dieses Paket überspringen?"
+    IDS_UNCAUGHT_EXCEPTION  "Fatal Error: Uncaught Exception\nThread: %s\nType: %s\nMessage: %s"
+    IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO
+                            "Fatal Error: Uncaught Exception\nThread: %s\nType: %s\nMessage: %s\nAppErrNo: %d"
+    IDS_TRUSTKEEP_TOOLTIP   "Sets all packages to their currently installed version.  This is equivalent to telling setup not to make any changes to any package."
+    IDS_TRUSTCURR_TOOLTIP   "Stellt alle Pakete auf die beste verfügbare Version ein (EMPFOHLEN)."
+    IDS_TRUSTSYNC_TOOLTIP   "Sets all packages to the version available from the package repository, downgrading if necessary."
+    IDS_TRUSTEXP_TOOLTIP    "Testpakete aktivieren."
+    IDS_VIEWBUTTON_TOOLTIP  "Select the package view.  This determines which packages are shown below.\n\nCategory: Group by package category.  Click on '+' to expand.\n\nFull: Show all packages.\n\nPending: Show only packages that are about to be installed, removed, or upgraded.  This tells you what is going to change when you press 'Next'.\n\nUp To Date: Show installed packages that need no action because they are at the desired version already.\n\nNot installed: Show packages that are are not currently installed and haven't been selected for installation.\n\nPicked: Show installed packages that were selected, not installed as a dependency.\n\nRemovable: Show installed packages that were selected and could be safely removed.  No other installed or selected packages depend on these packages.\n\nUnneeded: Show automatically installed packages that could now be safely removed.  Other installed or selected packages no longer depend on these packages."
+    IDS_HIDEOBS_TOOLTIP     "If selected, setup will hide packages in categories with names that begin with '_'.  Such packages are usually empty placeholders for packages that have been removed or renamed, or are infrastructure packages that are handled automatically."
+    IDS_SIG_INVALID         "Mirror Error:  Setup.ini signature %s from %s failed to verify.\nPossible corrupt mirror?  Setup.ini rejected."
+    IDS_CRYPTO_ERROR        "Internal Error:  gcrypt library error %d %s"
+    IDS_SEARCH_TOOLTIP      "Search for this string in package names."
+    IDS_MAYBE_MKDIR         "Directory %s does not exist, would you like me to create it?"
+    IDS_CANT_MKDIR          "Couldn't create directory %s, sorry.  (Is drive full or read-only?)"
+    IDS_NO_LOCALDIR         "Local package directory %s not found.\nYou can still remove installed\npackages, but there will be nothing to install.\n\nPress OK if that's what you wanted\nor Cancel to choose a different directory."
+    IDS_ELEVATED            "Hand installation over to elevated child process."
+    IDS_INSTALLEDB_VERSION  "Unknown INSTALLED.DB version"
+    IDS_NO_MIRROR_LST       "Could not download mirror sites list"
+    IDS_PROGRESS_PROGRESS   "Fortschritt:"
+    IDS_PROGRESS_PACKAGE    "Paket:"
+    IDS_PROGRESS_CONNECTING "Wird verbunden..."
+    IDS_PROGRESS_CHECKING   "Checking for packages to download..."
+    IDS_PROGRESS_DOWNLOADING
+                            "Wird heruntergeladen..."
+    IDS_PROGRESS_PARSING    "Parsing..."
+    IDS_PROGRESS_PREREMOVE  "Running preremove script..."
+    IDS_PROGRESS_UNINSTALL  "Wird deinstalliert..."
+    IDS_PROGRESS_INSTALL    "Wird installiert..."
+    IDS_PROGRESS_CALCULATING
+                            "Wird berechnet..."
+    IDS_PROGRESS_POSTINSTALL
+                            "Wird ausgeführt..."
+    IDS_PROGRESS_SOLVING    "Abhängigkeiten werden aufgelöst..."
+    IDS_ACTION_DEFAULT      "Standard"
+    IDS_ACTION_INSTALL      "Installieren"
+    IDS_ACTION_UNINSTALL    "Deinstallieren"
+    IDS_ACTION_SKIP         "Ãœberspringen"
+    IDS_ACTION_KEEP         "Behalten"
+    IDS_ACTION_REINSTALL    "Neu installieren"
+    IDS_ACTION_RETRIEVE     "Abrufen"
+    IDS_ACTION_UNKNOWN      "Unbekannt"
+    IDS_ACTION_SOURCE       "Quelle"
+    IDS_VIEW_FULL           "Vollständig"
+    IDS_VIEW_PENDING        "Ausstehend"
+    IDS_VIEW_UPTODATE       "Auf dem neuesten Stand"
+    IDS_VIEW_NOTINSTALLED   "Nicht installiert"
+    IDS_VIEW_PICKED         "Picked"
+    IDS_VIEW_REMOVABLE      "Entfernbar"
+    IDS_VIEW_UNNEEDED       "Unnötig"
+    IDS_VIEW_CATEGORY       "Kategorie"
+    IDS_COLUMN_PACKAGE      "Paket"
+    IDS_COLUMN_CURRENT      "Aktuell"
+    IDS_COLUMN_NEW          "Neu"
+    IDS_COLUMN_SOURCE       "Src?"
+    IDS_COLUMN_CATEGORIES   "Kategorien"
+    IDS_COLUMN_SIZE         "Größe"
+    IDS_COLUMN_DESCR        "Beschreibung"
+    IDS_MBOX_CAPTION        "Cygwin-Einrichtung"
+    IDS_EXTRACTION_FAILED   "Unable to extract /%s -- corrupt package?"
+    IDS_EXTRACTION_INUSE    "Unable to extract /%s -- error writing file\n\nThe file is in use or some other error occurred.\n\nPlease stop all Cygwin processes and select ""Retry"", or select ""Continue"" to go on anyway (the file will be updated after a reboot).\n"
+    IDS_INSTALL_OLD_CYGWIN  "An old version of cygwin1.dll was found here:\n%s\nDelete?"
+    IDS_INSTALL_DELETE_OLD_CYGWIN_FAILED
+                            "Couldn't delete file %s.\nIs the DLL in use by another application?\nYou should delete the old version of cygwin1.dll at your earliest convenience."
+    IDS_SHELLLINK_FAILED    "CoCreateInstance failed with error 0x%x.\nSetup will not be able to create Cygwin Icons in the Start Menu or on the Desktop."
+    IDS_UNSUPPORTED_WINDOWS_VERSION
+                            "Cygwin wird unter dieser Windows-Version nicht unterstützt"
+    IDS_UNSUPPORTED_WINDOWS_ARCH
+                            "Cygwin wird unter 32-Bit-Windows nicht unterstützt"
+    IDS_DEPRECATED_WINDOWS_VERSION
+                            "Cygwin-Unterstützung für diese Windows-Version ist veraltet und wird in der nächsten Hauptversion entfernt werden"
+    IDS_MOUNT_REGISTRY_KEY_FAILED
+                            "Couldn't create registry key to store installation path"
+    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_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"
+    IDS_CHOOSER_EMPTY_NO_PACKAGES
+                            "Keine Pakete gefunden."
+    IDS_CHOOSER_EMPTY_DOWNLOAD
+                            "Nichts zum Herunterladen."
+    IDS_CHOOSER_EMPTY_INSTALL
+                            "Nichts zum Installieren oder Aktualisieren."
+    IDS_ROOT_BROWSE_TITLE   "Wählen Sie ein Installations-Stammverzeichnis aus"
+    IDS_LOCALDIR_BROWSE_DOWNLOAD_TITLE
+                            "Herunterladeverzeichnis auswählen"
+    IDS_LOCALDIR_BROWSE_PACKAGE_TITLE
+                            "Lokales Paketverzeichnis auswählen"
+    IDS_PROGRESS_CHECKING_HASH
+                            "Checking %s for %s"
+    IDS_PROGRESS_DOWNLOADING_FROM
+                            "%s von %s"
+    IDS_CONFIRM_UNINSTALL   "Deinstallieren"
+    IDS_CONFIRM_INSTALL     "Installieren"
+    IDS_CONFIRM_DOWNLOAD    "Herunterladen"
+    IDS_CONFIRM_NOTHING     "Keine Änderungen"
+    IDS_CONFIRM_AUTO_ADD    "(automatisch hinzugefügt)"
+    IDS_CONFIRM_SOURCE      "(Quelle)"
+    IDS_FILE_INUSE_KILL     "Prozess &abtöten"
+    IDS_FILE_INUSE_MSG      "Unable to extract"
+    IDS_USER_URL_TOOLTIP    "Additional site URL, path or UNC path"
+END
+
+//
+// Option Helptext String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_HELPTEXT_ERROR      "Error during option processing."
+    IDS_HELPTEXT_HEADER     "Befehlszeilenoptionen:"
+    IDS_HELPTEXT_FOOTER     "The default is to both download and install packages, unless either --download or --local-install is specified."
+    IDS_HELPTEXT_ALLOW_TEST "Consider package versions marked test"
+    IDS_HELPTEXT_ALLOW_UNSUPPORTED_WINDOWS
+                            "Allow old, unsupported Windows versions"
+    IDS_HELPTEXT_ARCH       "Zu installierende Architektur (x86_64 oder x86)"
+    IDS_HELPTEXT_CATEGORIES "Zu installierende Kategorien angeben"
+    IDS_HELPTEXT_COMPACTOS  "Compress installed files with Compact OS (xpress4k, xpress8k, xpress16k, lzx)"
+    IDS_HELPTEXT_DELETE_ORPHANS
+                            "Verwaiste Pakete entfernen"
+    IDS_HELPTEXT_DISABLE_ANTIVIRUS
+                            "Disable known or suspected buggy anti virus software packages during execution"
+    IDS_HELPTEXT_DOWNLOAD   "Pakete aus dem Internet herunterladen"
+    IDS_HELPTEXT_FORCE_CURRENT
+                            "Aktuelle Version für alle Pakete auswählen"
+    IDS_HELPTEXT_HELP       "Hilfe ausgeben"
+    IDS_HELPTEXT_INCLUDE_SOURCE
+                            "Quellen für jedes installierte Paket automatisch installieren"
+    IDS_HELPTEXT_INI_BASENAME
+                            "Use a different basename, e.g. ""foo"", instead of ""setup"""
+    IDS_HELPTEXT_KEEP_UNTRUSTED_KEYS
+                            "Use untrusted keys and retain all"
+    IDS_HELPTEXT_LANG       "Specify GUI language langid"
+    IDS_HELPTEXT_LOCAL_INSTALL
+                            "Pakete aus lokalem Verzeichnis installieren"
+    IDS_HELPTEXT_LOCAL_PACKAGE_DIR
+                            "Lokales Paketverzeichnis"
+    IDS_HELPTEXT_MIRROR_MODE
+                            "Skip package availability check when installing from local directory (requires local directory to be clean mirror!)"
+    IDS_HELPTEXT_NO_ADMIN   "Ausführung als Administrator nicht überprüfen und erzwingen"
+    IDS_HELPTEXT_NO_DESKTOP "Erstellung einer Desktop-Verknüpfung deaktivieren"
+    IDS_HELPTEXT_NO_REPLACEONREBOOT
+                            "Disable replacing in-use files on next reboot"
+    IDS_HELPTEXT_NO_SHORTCUTS
+                            "Disable creation of desktop and start menu shortcuts"
+    IDS_HELPTEXT_NO_STARTMENU
+                            "Disable creation of start menu shortcut"
+    IDS_HELPTEXT_NO_VERIFY  "Don't verify setup.ini signatures"
+    IDS_HELPTEXT_NO_VERSION_CHECK
+                            "Suppress checking if a newer version of setup is available"
+    IDS_HELPTEXT_NO_WARN_DEPRECATED_WINDOWS
+                            "Don't warn about deprecated Windows versions"
+    IDS_HELPTEXT_NO_WRITE_REGISTRY
+                            "Don't write root installation directory to registry"
+    IDS_HELPTEXT_OLD_KEYS   "Enable old cygwin.com keys"
+    IDS_HELPTEXT_ONLY_SITE  "Do not download mirror list.  Only use sites specified with -s"
+    IDS_HELPTEXT_PACKAGES   "Zu installierende Pakete angeben"
+    IDS_HELPTEXT_PACKAGE_MANAGER
+                            "Semi-attended chooser-only mode"
+    IDS_HELPTEXT_PROXY      "HTTP/FTP proxy (host:port)"
+    IDS_HELPTEXT_PRUNE_INSTALL
+                            "Prune the installation to only the requested packages"
+    IDS_HELPTEXT_PUBKEY     "URL or absolute path of extra public key file (RFC4880 format)"
+    IDS_HELPTEXT_QUIET_MODE "Unattended setup mode"
+    IDS_HELPTEXT_REMOVE_CATEGORIES
+                            "Zu deinstallierende Kategorien angeben"
+    IDS_HELPTEXT_REMOVE_PACKAGES
+                            "Zu deinstallierende Pakete angeben"
+    IDS_HELPTEXT_ROOT       "Stamm-Installationsverzeichnis"
+    IDS_HELPTEXT_SEXPR_PUBKEY
+                            "Extra DSA public key in s-expr format"
+    IDS_HELPTEXT_SITE       "Download site URL, path or UNC path"
+    IDS_HELPTEXT_SYMLINK_TYPE
+                            "Symlink type (lnk, native, sys, wsl)"
+    IDS_HELPTEXT_UNTRUSTED_KEYS
+                            "Use untrusted saved extra keys"
+    IDS_HELPTEXT_UPGRADE_ALSO
+                            "Also upgrade installed packages"
+    IDS_HELPTEXT_USER_AGENT "User agent string for HTTP requests"
+    IDS_HELPTEXT_VERBOSE    "Ausführliche Ausgabe"
+    IDS_HELPTEXT_VERSION    "Version anzeigen"
+    IDS_HELPTEXT_WAIT       "When elevating, wait for elevated child process"
+END
diff --git a/res/en/res.rc b/res/en/res.rc
index e2f04fdd..20cd921e 100644
--- a/res/en/res.rc
+++ b/res/en/res.rc
@@ -74,8 +74,8 @@ BEGIN
                     SETUP_STANDARD_DIALOG_W,1
 
     GROUPBOX        "Local Package Directory",IDC_LOCALDIR_GRP,5,35,330,35
-    EDITTEXT        IDC_LOCAL_DIR,13,47,270,14,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "B&rowse...",IDC_LOCAL_DIR_BROWSE,285,47,44,14,WS_TABSTOP
+    EDITTEXT        IDC_LOCAL_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "B&rowse...",IDC_LOCAL_DIR_BROWSE,277,47,52,14,WS_TABSTOP
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -93,8 +93,8 @@ BEGIN
                     SETUP_STANDARD_DIALOG_W,1
 
     GROUPBOX        "Root Directory",IDC_ROOTDIR_GRP,5,35,330,35
-    EDITTEXT        IDC_ROOT_DIR,13,47,270,14,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "B&rowse...",IDC_ROOT_BROWSE,285,47,44,14,WS_TABSTOP
+    EDITTEXT        IDC_ROOT_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "B&rowse...",IDC_ROOT_BROWSE,277,47,52,14,WS_TABSTOP
 
     GROUPBOX        "Install For",IDC_INSTALLFOR_GRP,5,76,330,101
     CONTROL         "&All Users (RECOMMENDED)",IDC_ROOT_SYSTEM,"Button",
@@ -144,9 +144,9 @@ BEGIN
     CONTROL         "Use &System Proxy Settings",IDC_NET_PRECONFIG,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
     CONTROL         "&Direct Connection",IDC_NET_DIRECT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
     CONTROL         "Use HTTP/FTP &Proxy:",IDC_NET_PROXY,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,88,10
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,185,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | 
                     WS_DISABLED | WS_GROUP
     EDITTEXT        IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL | 
@@ -246,7 +246,7 @@ BEGIN
                     "\n\n"
                     "You can always run this program at any time in "
                     "the future to add, remove, or upgrade packages as "
-                    "necessary.",IDC_SPLASH_TEXT,115,25,195,90
+                    "necessary.",IDC_SPLASH_TEXT,115,25,195,100
     ICON            IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE
     LTEXT           "",IDC_VERSION,115,127,195,10
     LTEXT           "",IDC_SPLASH_COPYR,115,140,195,8
@@ -261,9 +261,9 @@ CAPTION "Cygwin Setup - Installation Status and Create Icons"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "Create icon on &Desktop",IDC_ROOT_DESKTOP,"Button",
-                    BS_AUTOCHECKBOX,108,78,100,8
+                    BS_AUTOCHECKBOX,108,78,110,8
     CONTROL         "Add icon to &Start Menu",IDC_ROOT_MENU,"Button",
-                    BS_AUTOCHECKBOX,108,93,100,8
+                    BS_AUTOCHECKBOX,108,93,140,8
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     SETUP_STANDARD_DIALOG_W,1
@@ -693,7 +693,7 @@ BEGIN
     IDS_HELPTEXT_PROXY "HTTP/FTP proxy (host:port)"
     IDS_HELPTEXT_PRUNE_INSTALL "Prune the installation to only the requested packages"
     IDS_HELPTEXT_PUBKEY "URL or absolute path of extra public key file (RFC4880 format)"
-    IDS_HELPTEXT_QUIET_MODE "Unattended setup mode"
+    IDS_HELPTEXT_QUIET_MODE "Unattended setup mode (unattended, noinput, hidden)"
     IDS_HELPTEXT_REMOVE_CATEGORIES "Specify categories to uninstall"
     IDS_HELPTEXT_REMOVE_PACKAGES "Specify packages to uninstall"
     IDS_HELPTEXT_ROOT "Root installation directory"
diff --git a/res/fr/res.rc b/res/fr/res.rc
index d66b8e2d..c0396bf0 100644
--- a/res/fr/res.rc
+++ b/res/fr/res.rc
@@ -1,8 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// French (fr_FR) resources
-//
-
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 
 /////////////////////////////////////////////////////////////////////////////
@@ -15,26 +10,13 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Choisissez le type d'installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "&Installer depuis Internet\n(les fichiers téléchargés seront gardés pour une réutilisation ultérieure)",
-                    IDC_SOURCE_NETINST, "Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE
-                    | BS_TOP,
-                    71, 60, 200, 30
-    CONTROL         "&Télécharger sans installer",
-                    IDC_SOURCE_DOWNLOAD, "Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,
-                    71, 90, 200, 10
-    CONTROL         "Installer depuis un dossier &local",IDC_SOURCE_LOCALDIR,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,
-                    71,120,200,10
-    ICON            IDI_CYGWIN, IDC_HEADICON, SETUP_HEADICON_X, 0, 21, 20
-    CONTROL         "", IDC_HEADSEPARATOR, "Static", SS_BLACKFRAME | SS_SUNKEN,
-                    0, 28, SETUP_STANDARD_DIALOG_W, 1
-    LTEXT           "Choisissez la source du téléchargement",IDC_STATIC_HEADER_TITLE,
-                    7, 0, 258, 8, NOT WS_GROUP
-    LTEXT           "Choisissez si vous installez ou téléchargez depuis Internet, ou installez des fichiers depuis un dossier local.",
-                    IDC_SOURCE_SUBTEXT,
-                    21, 9, 239, 16, NOT WS_GROUP
+    CONTROL         "&Installer depuis Internet\n(les fichiers téléchargés seront gardés pour une réutilisation ultérieure)",IDC_SOURCE_NETINST,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE | BS_TOP,71,60,200,30
+    CONTROL         "&Télécharger sans installer",IDC_SOURCE_DOWNLOAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,90,200,10
+    CONTROL         "Installer depuis un dossier &local",IDC_SOURCE_LOCALDIR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,120,200,10
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Choisissez la source du téléchargement",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Choisissez si vous installez ou téléchargez depuis Internet, ou installez des fichiers depuis un dossier local.",IDC_SOURCE_SUBTEXT,21,9,239,16,NOT WS_GROUP
 END
 
 IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -42,19 +24,13 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Inhiber l'Anti-Virus ?"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "&Inhiber l'anti-virus",IDC_DISABLE_AV,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,69,115,10
-    CONTROL         "&Laisser l'anti-virus tranquille",IDC_LEAVE_AV,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
+    CONTROL         "&Inhiber l'anti-virus",IDC_DISABLE_AV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,69,115,10
+    CONTROL         "&Laisser l'anti-virus tranquille",IDC_LEAVE_AV,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
-                    SETUP_STANDARD_DIALOG_W,1
-    LTEXT           "Choisissez si vous inhibez votre anti-virus pendant l'installation.",IDC_STATIC_HEADER_TITLE,7,0,
-                    258,8,NOT WS_GROUP
-    LTEXT           "Certains anti-virus, notamment McAfee, génèrent un écran bleu sur Windows XP lors de l'installation de Cygwin.",
-                    IDC_STATIC,21,9,239,16,NOT WS_GROUP
-    LTEXT           "Un anti-virus problématique a été détecté. L'assistant Cygwin peut l'inhiber pendant le processus d'installation, et le revalider à la fin de l'installation.",
-                    IDC_STATIC,21,32,239,24,NOT WS_GROUP
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Choisissez si vous inhibez votre anti-virus pendant l'installation.",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Certains anti-virus, notamment McAfee, génèrent un écran bleu sur Windows XP lors de l'installation de Cygwin.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Un anti-virus problématique a été détecté. L'assistant Cygwin peut l'inhiber pendant le processus d'installation, et le revalider à la fin de l'installation.",IDC_STATIC,21,32,239,24,NOT WS_GROUP
 END
 
 IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -62,20 +38,14 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Sélection du dossier local des paquets"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Sélection du dossier local des paquets",IDC_STATIC_HEADER_TITLE,
-                    7,0,258,8,NOT WS_GROUP
-    LTEXT           "Choisir un dossier pour enregistrer les fichiers "
-                    "téléchargés. Ce dossier sera créé s'il n'existe pas.",
-                    IDC_LOCAL_DIR_DOWNLOAD_DESC,21,9,248,16,NOT WS_GROUP
-    LTEXT           "Choisir un dossier où l'assistant ira chercher les "
-                    "fichiers téléchargés.",
-                    IDC_LOCAL_DIR_INSTALL_DESC,21,9,248,16,NOT WS_GROUP
+    LTEXT           "Sélection du dossier local des paquets",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Choisir un dossier pour enregistrer les fichiers téléchargés. Ce dossier sera créé s'il n'existe pas.",IDC_LOCAL_DIR_DOWNLOAD_DESC,21,9,248,16,NOT WS_GROUP
+    LTEXT           "Choisir un dossier où l'assistant ira chercher les fichiers téléchargés.",IDC_LOCAL_DIR_INSTALL_DESC,21,9,248,16,NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
-                    SETUP_STANDARD_DIALOG_W,1
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     GROUPBOX        "Dossier local des paquets",IDC_LOCALDIR_GRP,5,35,330,35
-    EDITTEXT        IDC_LOCAL_DIR,13,47,270,14,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Par&courir...",IDC_LOCAL_DIR_BROWSE,285,47,44,14,WS_TABSTOP
+    EDITTEXT        IDC_LOCAL_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Par&courir...",IDC_LOCAL_DIR_BROWSE,277,47,52,14,WS_TABSTOP
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -83,52 +53,33 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Choix du dossier d'installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Sélection du dossier racine", IDC_STATIC_HEADER_TITLE,
-                    7,0,258,8,NOT WS_GROUP
-    LTEXT           "Sélectionnez le dossier où installer Cygwin. "
-                    "Choisissez également des paramètres d'installation.",
-                    IDC_ROOTDIR_SUBTEXT,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Sélection du dossier racine",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Sélectionnez le dossier où installer Cygwin. Choisissez également des paramètres d'installation.",IDC_ROOTDIR_SUBTEXT,21,9,239,16,NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
-                    SETUP_STANDARD_DIALOG_W,1
-
-    GROUPBOX        "Dossier racine", IDC_ROOTDIR_GRP,5,35,330,35
-    EDITTEXT        IDC_ROOT_DIR,15,47,270,14,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Pa&rcourir...",IDC_ROOT_BROWSE,285,47,44,14,WS_TABSTOP
-
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    GROUPBOX        "Dossier racine",IDC_ROOTDIR_GRP,5,35,330,35
+    EDITTEXT        IDC_ROOT_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Pa&rcourir...",IDC_ROOT_BROWSE,277,47,52,14,WS_TABSTOP
     GROUPBOX        "Installer pour",IDC_INSTALLFOR_GRP,5,76,330,101
-    CONTROL         "&Tout le monde (RECOMMANDÉ)",IDC_ROOT_SYSTEM,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,13,89,130,8
-    CONTROL         "Juste &Moi",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON |
-                    WS_TABSTOP,13,130,130,8
-    LTEXT           "Cygwin sera disponible pour tous les utilisateurs.",
-                    IDC_ALLUSERS_TEXT,25,101,300,28
-    LTEXT           "Cygwin sera disponible pour tous les utilisateurs "
-                    "mais les icônes et les menus uniquement pour l'utilisateur "
-                    "en cours. Ne sélectionner que si vous n'avez pas les droits "
-                    "administrateur ou en cas de besoin spécifique.",
-                    IDC_JUSTME_TEXT,25,140,300,32
+    CONTROL         "&Tout le monde (RECOMMANDÉ)",IDC_ROOT_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,13,89,130,8
+    CONTROL         "Juste &Moi",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,130,130,8
+    LTEXT           "Cygwin sera disponible pour tous les utilisateurs.",IDC_ALLUSERS_TEXT,25,101,300,28
+    LTEXT           "Cygwin sera disponible pour tous les utilisateurs mais les icônes et les menus uniquement pour l'utilisateur en cours. Ne sélectionner que si vous n'avez pas les droits administrateur ou en cas de besoin spécifique.",IDC_JUSTME_TEXT,25,140,300,32
 END
 
 IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
     WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Assistant Cygwin - Choix site(s) de téléchargement"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT |
-                    LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP |
-                    WS_TABSTOP
-    LTEXT           "Sites disponibles :",IDC_STATIC,66,34,183,8,NOT
-                    WS_GROUP
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
-                    SETUP_STANDARD_DIALOG_W,1
-    LTEXT           "Choisissez un site dans cette liste, ou ajoutez vos propres sites à la liste.",
-                    IDC_STATIC,21,9,239,16,NOT WS_GROUP
-    LTEXT           "Choisissez un site de téléchargement",IDC_STATIC_HEADER_TITLE,7,0,258,
-                    8,NOT WS_GROUP
+    LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Sites disponibles :",IDC_STATIC,66,34,183,8,NOT WS_GROUP
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Choisissez un site dans cette liste, ou ajoutez vos propres sites à la liste.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Choisissez un site de téléchargement",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
     EDITTEXT        IDC_EDIT_USER_URL,65,160,185,14,ES_AUTOHSCROLL | WS_GROUP
     LTEXT           "URL perso :",IDC_SITE_USERURL,15,162,45,8,NOT WS_GROUP
     PUSHBUTTON      "Ajouter",IDC_BUTTON_ADD_URL,255,160,50,14
@@ -139,53 +90,38 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Sélection du type de connexion"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "Utiliser les paramètres proxy &Système",IDC_NET_PRECONFIG,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
-    CONTROL         "Connexion &directe",IDC_NET_DIRECT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
-    CONTROL         "Utiliser le &proxy HTTP/FTP :",IDC_NET_PROXY,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,110,10
-    EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL |
-                    WS_DISABLED | WS_GROUP
-    EDITTEXT        IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL |
-                    WS_DISABLED
+    CONTROL         "Utiliser les paramètres proxy &Système",IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
+    CONTROL         "Connexion &directe",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
+    CONTROL         "Utiliser le &proxy HTTP/FTP :",IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,185,10
+    EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP
+    EDITTEXT        IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL | WS_DISABLED
     GROUPBOX        "",IDC_STATIC,60,95,185,50
-    RTEXT           "&Serveur proxy",IDC_STATIC,65,105,50,12,SS_CENTERIMAGE |
-                    NOT WS_GROUP
-    RTEXT           "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT
-                    WS_GROUP
+    RTEXT           "&Serveur proxy",IDC_STATIC,65,105,50,12,SS_CENTERIMAGE | NOT WS_GROUP
+    RTEXT           "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
-                    SETUP_STANDARD_DIALOG_W,1
-    LTEXT           "L'assistant a besoin de savoir comment vous désirez le connecter à Internet. Choisissez un paramètre approprié ci-dessous.",
-                    IDC_STATIC,21,9,239,16,NOT WS_GROUP
-    LTEXT           "Sélectionnez votre connexion Internet",
-                    IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "L'assistant a besoin de savoir comment vous désirez le connecter à Internet. Choisissez un paramètre approprié ci-dessous.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Sélectionnez votre connexion Internet",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
 END
 
 IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION |
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Assistant Cygwin"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "Installation...",IDC_INS_ACTION,45,55,205,8,SS_ENDELLIPSIS
     LTEXT           "(PAQUET)",IDC_INS_PKG,45,70,205,8,SS_ENDELLIPSIS
-    LTEXT           "(FICHIER)",IDC_INS_FILE,45,85,205,10,SS_ENDELLIPSIS
-    CONTROL         "Progress1",IDC_INS_DISKFULL,"msctls_progress32",
-                    PBS_SMOOTH | WS_BORDER,95,130,155,10
-    CONTROL         "Progress1",IDC_INS_IPROGRESS,"msctls_progress32",
-                    PBS_SMOOTH | WS_BORDER,95,115,155,10
-    CONTROL         "Progress1",IDC_INS_PPROGRESS,"msctls_progress32",
-                    PBS_SMOOTH | WS_BORDER,95,100,155,10
-    LTEXT           "Paquet :",IDC_INS_BL_PACKAGE,45,100,50,8,NOT WS_GROUP
-    LTEXT           "Total  :",IDC_INS_BL_TOTAL,45,115,50,8,NOT WS_GROUP
-    LTEXT           "Disque :",IDC_INS_BL_DISK,45,130,50,8,NOT WS_GROUP
+    LTEXT           "(FICHIER)",IDC_INS_FILE,45,85,205,8,SS_ENDELLIPSIS
+    CONTROL         "Progress1",IDC_INS_DISKFULL,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,130,155,10
+    CONTROL         "Progress1",IDC_INS_IPROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,115,155,10
+    CONTROL         "Progress1",IDC_INS_PPROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,100,155,10
+    LTEXT           "Paquet :",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
+    LTEXT           "Total  :",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
+    LTEXT           "Disque :",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
-                    SETUP_STANDARD_DIALOG_W,1
-    LTEXT           "Cette page affiche l'avancement du téléchargement ou de l'installation.",
-                    IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Cette page affiche l'avancement du téléchargement ou de l'installation.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
     LTEXT           "Avancement",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
 END
 
@@ -195,11 +131,9 @@ CAPTION "Authentification proxy requise"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
-    LTEXT           "&Identifiant proxy",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
-                    WS_EX_RIGHT
+    LTEXT           "&Identifiant proxy",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
     EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-    LTEXT           "&Mot de passe",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,
-                    WS_EX_RIGHT
+    LTEXT           "&Mot de passe",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
     EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT           "Authentification proxy requise",IDC_STATIC,65,10,145,10
     DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
@@ -212,11 +146,9 @@ CAPTION "Authentification serveur requise"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
-    LTEXT           "&Identifiant",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
-                    WS_EX_RIGHT
+    LTEXT           "&Identifiant",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
     EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-    LTEXT           "&Mot de passe",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,
-                    WS_EX_RIGHT
+    LTEXT           "&Mot de passe",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
     EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT           "Authentification serveur requise",IDC_STATIC,65,10,145,10
     DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
@@ -224,54 +156,37 @@ BEGIN
 END
 
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
     WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Programme Assistant Cygwin",
-                    IDC_STATIC_WELCOME_TITLE,115,1,195,24
-    LTEXT           "Cet assistant est utilisé pour l'installation initiale "
-		    "de l'environnement Cygwin ainsi que pour ses mises à jour. "
-		    "Les pages suivantes vont vous guider durant l'installation. "
-                    "\n\n"
-		    "Notez que Cygwin inclus un grand nombre de paquets "
-		    "destinés à de multiples usages. Nous ne pourrons installer "
-		    "par défaut qu'un jeu de paquets de base."
-                    "\n\n"
-		    "Redémarrez ce programme ultérieurement pour ajouter, enlever ou "
-		    "mettre à jour des paquets si nécessaire.",IDC_SPLASH_TEXT,115,25,195,90
+    LTEXT           "Programme Assistant Cygwin",IDC_STATIC_WELCOME_TITLE,115,1,195,24
+    LTEXT           "Cet assistant est utilisé pour l'installation initiale de l'environnement Cygwin ainsi que pour ses mises à jour. Les pages suivantes vont vous guider durant l'installation. \n\nNotez que Cygwin inclus un grand nombre de paquets destinés à de multiples usages. Nous ne pourrons installer par défaut qu'un jeu de paquets de base.\n\nRedémarrez ce programme ultérieurement pour ajouter, enlever ou mettre à jour des paquets si nécessaire.",IDC_SPLASH_TEXT,115,25,195,100
     ICON            IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE
     LTEXT           "",IDC_VERSION,115,127,195,10
     LTEXT           "",IDC_SPLASH_COPYR,115,140,195,8
     LTEXT           "",IDC_SPLASH_URL,115,152,90,8
-    LTEXT           "Contribute to translations of this program.",IDC_SPLASH_TRANSLATE,115,164,195,8
+    LTEXT           "Contribuer à la traduction de ce programme.",IDC_SPLASH_TRANSLATE,115,164,195,8
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
     WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - État de l'installation et création des icônes"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "Créer une icône sur le &bureau",IDC_ROOT_DESKTOP,"Button",
-                    BS_AUTOCHECKBOX,108,78,110,8
-    CONTROL         "Ajouter une icône au menu &Démarrer",IDC_ROOT_MENU,"Button",
-                    BS_AUTOCHECKBOX,108,93,140,8
+    CONTROL         "Créer une icône sur le &bureau",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,110,8
+    CONTROL         "Ajouter une icône au menu &Démarrer",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,140,8
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
-                    SETUP_STANDARD_DIALOG_W,1
-    LTEXT           "Indiquez à l'assistant si vous voulez créer des icônes pour un accès aisé à Cygwin.",
-                    IDC_DESKTOP_HEADER_INSTALL,21,9,239,16,NOT WS_GROUP
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Indiquez à l'assistant si vous voulez créer des icônes pour un accès aisé à Cygwin.",IDC_DESKTOP_HEADER_INSTALL,21,9,239,16,NOT WS_GROUP
     LTEXT           "Création des icônes",IDC_DESKTOP_HEADER_TITLE_INSTALL,7,0,258,8,NOT WS_GROUP
-    LTEXT           "Montre l'état de l'installation en mode téléchargement seulement.",
-                    IDC_DESKTOP_HEADER_DOWNLOAD,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Montre l'état de l'installation en mode téléchargement seulement.",IDC_DESKTOP_HEADER_DOWNLOAD,21,9,239,16,NOT WS_GROUP
     LTEXT           "Installation terminée",IDC_DESKTOP_HEADER_TITLE_DOWNLOAD,7,0,258,8,NOT WS_GROUP
-    CONTROL         "",IDC_DESKTOP_SEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,
-                    0,155,SETUP_STANDARD_DIALOG_W,1
-    LTEXT           "État de l'installation",IDC_STATUS_HEADER,7,160,258,8,NOT WS_GROUP
-    LTEXT           "Installation de Cygwin terminée avec succès.",IDC_STATUS,
-                    21,169,239,16,NOT WS_GROUP
+    CONTROL         "",IDC_DESKTOP_SEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,135,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "État de l'installation",IDC_STATUS_HEADER,7,140,258,8,NOT WS_GROUP
+    LTEXT           "Installation de Cygwin terminée avec succès.",IDC_STATUS,21,149,279,36,NOT WS_GROUP
 END
 
 IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
@@ -280,11 +195,9 @@ CAPTION "Authentification FTP requise"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
-    LTEXT           "&Identifiant",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
-                    WS_EX_RIGHT
+    LTEXT           "&Identifiant",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
     EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-    LTEXT           "&Mot de passe",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,
-                    WS_EX_RIGHT
+    LTEXT           "&Mot de passe",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
     EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT           "Authentification FTP requise",IDC_STATIC,65,10,145,10
     DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
@@ -292,66 +205,42 @@ BEGIN
 END
 
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Assistant Cygwin - Sélection des paquets"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "&Voir", IDC_CHOOSE_VIEWCAPTION, SETUP_VIEW_X, 33,
-                    SETUP_VIEW_W, 10
-    COMBOBOX        IDC_CHOOSE_VIEW, SETUP_VIEWLIST_X, 30, SETUP_VIEWLIST_W, 84,
-                    CBS_DROPDOWNLIST | WS_TABSTOP
-    RTEXT           "&Chercher", IDC_STATIC, SETUP_SEARCH_X, 33, SETUP_SEARCH_W,
-                    10, SS_CENTERIMAGE, WS_EX_RIGHT
-    CONTROL         "Chercher ", IDC_CHOOSE_DO_SEARCH, "Button", BS_PUSHBUTTON | NOT
-                    WS_VISIBLE, SETUP_SEARCH_X, 33, SETUP_SEARCH_W, 14
-    EDITTEXT        IDC_CHOOSE_SEARCH_EDIT, SETUP_SEARCHTEXT_X, 30,
-                    SETUP_SEARCHTEXT_W, 14, ES_AUTOHSCROLL
-    PUSHBUTTON      "&Efface", IDC_CHOOSE_CLEAR_SEARCH, SETUP_CLEAR_X, 30,
-                    SETUP_CLEAR_W, 14
-    CONTROL         "&Garde",IDC_CHOOSE_KEEP,"Button",BS_AUTORADIOBUTTON
-                    | WS_GROUP | WS_TABSTOP, SETUP_KEEP_X, 30, SETUP_KPCE_W, 14
-    CONTROL         "&Mieux", IDC_CHOOSE_BEST, "Button", BS_AUTORADIOBUTTON,
-                    SETUP_BEST_X, 30, SETUP_KPCE_W, 14
-    CONTROL         "&Sync", IDC_CHOOSE_SYNC, "Button", BS_AUTORADIOBUTTON,
-                    SETUP_SYNC_X, 30, SETUP_KPCE_W, 14
-    CONTROL         "&Test", IDC_CHOOSE_EXP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    SETUP_EXP_X, 30, SETUP_KPCE_W, 14
-    CONTROL         "", IDC_HEADSEPARATOR, "Static", SS_BLACKFRAME | SS_SUNKEN,
-                    0, 28, SETUP_STANDARD_DIALOG_W, 1
-    CONTROL         "", IDC_CHOOSE_LIST, WC_LISTVIEW, LVS_NOSORTHEADER | LVS_REPORT | LVS_SINGLESEL | WS_TABSTOP,
-                    SETUP_CHOOSE_X, 47, SETUP_CHOOSE_W, 120, WS_EX_CLIENTEDGE
-    CONTROL         "&Cacher les paquets obsolètes", IDC_CHOOSE_HIDE,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 167, 160, 14
-    ICON            IDI_CYGWIN, IDC_HEADICON, SETUP_HEADICON_X, 0, 21, 20
-    LTEXT           "Sélectionnez les paquets à télécharger.",
-                    IDC_CHOOSE_INST_TEXT_DOWNLOAD, 21, 9, 239, 16, NOT WS_GROUP
-    LTEXT           "Sélectionnez les paquets à installer.",
-                    IDC_CHOOSE_INST_TEXT_INSTALL, 21, 9, 239, 16, NOT WS_GROUP
-    LTEXT           "Sélection des paquets",IDC_STATIC_HEADER_TITLE,7,0,258,8,
-                    NOT WS_GROUP
+    LTEXT           "&Voir",IDC_CHOOSE_VIEWCAPTION,SETUP_VIEW_X,33,SETUP_VIEW_W,10
+    COMBOBOX        IDC_CHOOSE_VIEW,SETUP_VIEWLIST_X,30,SETUP_VIEWLIST_W,84,CBS_DROPDOWNLIST | WS_TABSTOP
+    RTEXT           "&Chercher",IDC_STATIC,SETUP_SEARCH_X,33,SETUP_SEARCH_W,10,SS_CENTERIMAGE,WS_EX_RIGHT
+    CONTROL         "Chercher ",IDC_CHOOSE_DO_SEARCH,"Button",BS_PUSHBUTTON | NOT WS_VISIBLE,SETUP_SEARCH_X,33,SETUP_SEARCH_W,14
+    EDITTEXT        IDC_CHOOSE_SEARCH_EDIT,SETUP_SEARCHTEXT_X,30,SETUP_SEARCHTEXT_W,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Efface",IDC_CHOOSE_CLEAR_SEARCH,SETUP_CLEAR_X,30,SETUP_CLEAR_W,14
+    CONTROL         "&Garde",IDC_CHOOSE_KEEP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,SETUP_KEEP_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Mieux",IDC_CHOOSE_BEST,"Button",BS_AUTORADIOBUTTON,SETUP_BEST_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Sync",IDC_CHOOSE_SYNC,"Button",BS_AUTORADIOBUTTON,SETUP_SYNC_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Test",IDC_CHOOSE_EXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,SETUP_EXP_X,30,SETUP_KPCE_W,14
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    CONTROL         "",IDC_CHOOSE_LIST,WC_LISTVIEW,LVS_NOSORTHEADER | LVS_REPORT | LVS_SINGLESEL | WS_TABSTOP,SETUP_CHOOSE_X,47,SETUP_CHOOSE_W,120,WS_EX_CLIENTEDGE
+    CONTROL         "&Cacher les paquets obsolètes",IDC_CHOOSE_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,160,14
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Sélectionnez les paquets à télécharger.",IDC_CHOOSE_INST_TEXT_DOWNLOAD,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Sélectionnez les paquets à installer.",IDC_CHOOSE_INST_TEXT_INSTALL,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Sélection des paquets",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
 END
 
 IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Assistant Cygwin - Résolution des dépendances"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,
-                    0,28,SETUP_STANDARD_DIALOG_W,1
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    LTEXT           "Résolution des dépendances",IDC_STATIC_HEADER_TITLE,
-                    7,0,258,8,NOT WS_GROUP
-    LTEXT           "Les problèmes suivants apparaissent lors de la résolution "
-                    "des dépendances.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
-    CONTROL         "&Accepter la solution par défaut"
-                    ,IDC_PREREQ_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    7,167,225,14
-    EDITTEXT        IDC_PREREQ_EDIT,7,41,303,124,WS_VSCROLL | WS_HSCROLL |
-                    ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL |
-                    ES_AUTOVSCROLL
-
+    LTEXT           "Résolution des dépendances",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Les problèmes suivants apparaissent lors de la résolution des dépendances.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    CONTROL         "&Accepter la solution par défaut",IDC_PREREQ_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,225,14
+    EDITTEXT        IDC_PREREQ_EDIT,7,41,303,124,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
 END
 
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -360,14 +249,10 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
 CAPTION "Assistant Cygwin - Revoir et confirmer les changements"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,
-                    0,28,SETUP_STANDARD_DIALOG_W,1
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    LTEXT           "Revoir et confirmer les changements",IDC_STATIC_HEADER_TITLE,
-                    7,0,258,8,NOT WS_GROUP
-    EDITTEXT        IDC_CONFIRM_EDIT,7,41,325,131,WS_VSCROLL | WS_HSCROLL |
-                    ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL |
-                    ES_AUTOVSCROLL
+    LTEXT           "Revoir et confirmer les changements",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    EDITTEXT        IDC_CONFIRM_EDIT,7,41,325,131,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
 END
 
 IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
@@ -376,24 +261,12 @@ CAPTION "Assistant Cygwin - Utiliser les sites miroirs éliminés ?"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "Attention :",IDC_STATIC,7,8,40,8
-    LTEXT           "Un ou plusieurs miroirs sélectionnés ne sont plus "
-                    "dans la liste officielle des miroirs Cygwin. "
-                    "Certains paquets peuvent manquer ou ne pas être à jour.\n"
-                    "Ceci concerne le(s) miroir(s) suivant(s) :",
-                    IDC_STATIC,47,8,263,32
-    EDITTEXT        IDC_DROP_MIRRORS,7,40,303,40,WS_VSCROLL | WS_HSCROLL |
-                    ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL |
-                    ES_AUTOVSCROLL
-    LTEXT           "Si vous avez des problèmes à l'installation pensez à "
-                    "n'utiliser que les miroirs officiels.\n\n"
-                    "Voulez-vous continuer avec ce(s) miroir(s) ?",
-                    IDC_STATIC,7,88,303,24
-    CONTROL         "&Ne plus me prévenir pour ce(s) miroir(s)",
-                    IDC_DROP_NOWARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    7,120,213,15
+    LTEXT           "Un ou plusieurs miroirs sélectionnés ne sont plus dans la liste officielle des miroirs Cygwin. Certains paquets peuvent manquer ou ne pas être à jour.\nCeci concerne le(s) miroir(s) suivant(s) :",IDC_STATIC,47,8,263,32
+    EDITTEXT        IDC_DROP_MIRRORS,7,40,303,40,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+    LTEXT           "Si vous avez des problèmes à l'installation pensez à n'utiliser que les miroirs officiels.\n\nVoulez-vous continuer avec ce(s) miroir(s) ?",IDC_STATIC,7,88,303,24
+    CONTROL         "&Ne plus me prévenir pour ce(s) miroir(s)",IDC_DROP_NOWARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,213,15
     PUSHBUTTON      "&Oui",IDYES,220,120,45,15
     DEFPUSHBUTTON   "&Non",IDNO,265,120,45,15
-
 END
 
 IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -402,16 +275,9 @@ CAPTION "Téléchargement Incomplet"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            IDI_WARNING,IDC_HEADICON,10,10
-    LTEXT           "Les paquets suivants ont des erreurs de téléchargement :",
-                    IDC_STATIC,7,8,320,16
-    EDITTEXT        IDC_DOWNLOAD_EDIT,7,24,320,88,WS_VSCROLL |
-                    ES_LEFT | ES_MULTILINE | ES_READONLY |
-                    ES_AUTOVSCROLL
-    LTEXT           "Choisissez 'Recommencer' pour relancer le téléchargement, "
-                    "'Précédent' pour revenir à la page de sélection des paquets, "
-                    "'Continuer' pour forcer la suite (NON RECOMMANDÉ), ou "
-                    "'Annuler' pour quitter.",
-                    IDC_STATIC,7,120,320,24
+    LTEXT           "Les paquets suivants ont des erreurs de téléchargement :",IDC_STATIC,7,8,320,16
+    EDITTEXT        IDC_DOWNLOAD_EDIT,7,24,320,88,WS_VSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL
+    LTEXT           "Choisissez 'Recommencer' pour relancer le téléchargement, 'Précédent' pour revenir à la page de sélection des paquets, 'Continuer' pour forcer la suite (NON RECOMMANDÉ), ou 'Annuler' pour quitter.",IDC_STATIC,7,120,320,24
     DEFPUSHBUTTON   "&Recommencer",IDRETRY,45,150,50,15
     PUSHBUTTON      "&Précédent",IDC_BACK,110,150,50,15
     PUSHBUTTON      "&Continuer",IDIGNORE,175,150,50,15
@@ -424,18 +290,11 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
 CAPTION "Assistant Cygwin - Lancement des scripts post-installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,
-                    0,28,SETUP_STANDARD_DIALOG_W,1
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    LTEXT           "Erreurs dans les scripts",IDC_STATIC_HEADER_TITLE,
-                    7,0,258,8,NOT WS_GROUP
-    LTEXT           "Ceci n'indique pas forcément que les paquets concernés"
-                    "ne fonctionneront pas, mais consultez "
-                    "/var/log/setup.log.full avant de reporter un problème.",
-                    IDC_STATIC,21,9,239,16,NOT WS_GROUP
-    EDITTEXT        IDC_POSTINSTALL_EDIT,7,41,303,112,WS_VSCROLL | WS_HSCROLL |
-                    ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL |
-                    ES_AUTOVSCROLL
+    LTEXT           "Erreurs dans les scripts",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Ceci n'indique pas forcément que les paquets concernésne fonctionneront pas, mais consultez /var/log/setup.log.full avant de reporter un problème.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    EDITTEXT        IDC_POSTINSTALL_EDIT,7,41,303,112,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
 END
 
 IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
@@ -444,25 +303,12 @@ CAPTION "Détection d'un fichier en cours d'utilisation"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            IDI_WARNING,IDC_HEADICON,10,10
-    LTEXT           "Impossible d'extraire",
-                    IDC_FILE_INUSE_MSG,33,10,234,8,SS_PATHELLIPSIS
-    LTEXT           "Ce fichier est en cours d'utilisation par :",
-                    IDC_STATIC,33,28,234,8
-    EDITTEXT        IDC_FILE_INUSE_EDIT,33,40,234,32,WS_VSCROLL |
-                    ES_LEFT | ES_MULTILINE | ES_READONLY |
-                    ES_AUTOVSCROLL | NOT WS_TABSTOP
-    LTEXT           "Choisir 'Recommencer' pour recommencer, "
-                    "choisir 'Stop' pour arrêter les process et recommencer, ou "
-                    "choisir 'Continuer' pour procéder (le fichier sera mis à jour après un redémarrage).",
-                    IDC_FILE_INUSE_HELP_0,33,80,234,24,NOT WS_GROUP
-    LTEXT           "Choisir 'Recommencer' pour ré-essayer, "
-                    "choisir 'Tuer' pour tuer les processus et ré-essayer, ou "
-                    "choisir 'Continuer' pour poursuivre (le fichier sera mis à jour après un redémarrage).",
-                    IDC_FILE_INUSE_HELP_1,33,80,234,24,NOT WS_GROUP
-    LTEXT           "Choisir 'Recommencer' pour ré-essayer, "
-                    "choisir 'Tuer' pour forcer la fin des processus et ré-essayer, ou "
-                    "choisir 'Continuer' pour poursuivre (le fichier sera mis à jour après un redémarrage).",
-                    IDC_FILE_INUSE_HELP_2,33,80,234,24,NOT WS_GROUP
+    LTEXT           "Impossible d'extraire",IDC_FILE_INUSE_MSG,33,10,234,8,SS_PATHELLIPSIS
+    LTEXT           "Ce fichier est en cours d'utilisation par :",IDC_STATIC,33,28,234,8
+    EDITTEXT        IDC_FILE_INUSE_EDIT,33,40,234,32,WS_VSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL | NOT WS_TABSTOP
+    LTEXT           "Choisir 'Recommencer' pour recommencer, choisir 'Stop' pour arrêter les process et recommencer, ou choisir 'Continuer' pour procéder (le fichier sera mis à jour après un redémarrage).",IDC_FILE_INUSE_HELP_0,33,80,234,24,NOT WS_GROUP
+    LTEXT           "Choisir 'Recommencer' pour ré-essayer, choisir 'Tuer' pour tuer les processus et ré-essayer, ou choisir 'Continuer' pour poursuivre (le fichier sera mis à jour après un redémarrage).",IDC_FILE_INUSE_HELP_1,33,80,234,24,NOT WS_GROUP
+    LTEXT           "Choisir 'Recommencer' pour ré-essayer, choisir 'Tuer' pour forcer la fin des processus et ré-essayer, ou choisir 'Continuer' pour poursuivre (le fichier sera mis à jour après un redémarrage).",IDC_FILE_INUSE_HELP_2,33,80,234,24,NOT WS_GROUP
     PUSHBUTTON      "&Recommencer",IDIGNORE,45,112,55,15
     DEFPUSHBUTTON   "&Stop",IDRETRY,111,112,55,15
     PUSHBUTTON      "&Continuer",IDCONTINUE,177,112,55,15
@@ -491,149 +337,116 @@ BEGIN
     IDS_ERR_CHDIR           "Impossible de changer le dossier vers %s : %s [%.8x]"
     IDS_OLD_SETUP_VERSION   "Cet assistant est en version %s, mais setup.ini indique que la version %s est disponible.\nVous devriez le mettre à jour pour avoir les dernière fonctionnalités et corrections de bogues."
     IDS_DOWNLOAD_INCOMPLETE "Téléchargement incomplet. Recommencer ?"
-    IDS_DOWNLOAD_INCOMPLETE_EXIT  "Téléchargement incomplet. Vérifiez %s pour avoir des détails"
-    IDS_INSTALL_ERROR	    "Erreur d'installation (%s), Continuer avec les autres paquets ?"
+    IDS_DOWNLOAD_INCOMPLETE_EXIT
+                            "Téléchargement incomplet. Vérifiez %s pour avoir des détails"
+    IDS_INSTALL_ERROR       "Erreur d'installation (%s), Continuer avec les autres paquets ?"
     IDS_INSTALL_INCOMPLETE  "Installation incomplète. Vérifiez %s pour les détails"
     IDS_CORRUPT_PACKAGE     "Le fichier du paquet %s a une copie locale altérée, supprimez la et recommencez."
     IDS_QUERY_CORRUPT       "Le fichier %s est corrompu. Effacer et re-télécharger ?"
-    IDS_SKIP_PACKAGE	    "%s\nVoulez-vous passer ce paquet ?"
+    IDS_SKIP_PACKAGE        "%s\nVoulez-vous passer ce paquet ?"
     IDS_UNCAUGHT_EXCEPTION  "Erreur Fatale : exception non traitée\nThread : %s\nType : %s\nMessage : %s"
-    IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO  "Erreur Fatale : exception non traitée\nThread : %s\nType : %s\nMessage : %s\nAppErrNo : %d"
-    IDS_TRUSTKEEP_TOOLTIP   "Garde tous les paquets à la version installée. "
-       "Ceci est équivalent à demander à l'assistant de ne faire aucun "
-	   "changement aux paquets."
-    IDS_TRUSTCURR_TOOLTIP   "Sélectionne globalement la version qui est actuellement "
-       "considérée comme la meilleure (RECOMMANDÉ)."
-    IDS_TRUSTSYNC_TOOLTIP   "Sélectionne globalement la version qui est disponible "
-       "dans le site, éventuellement une version plus ancienne."
+    IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO
+                            "Erreur Fatale : exception non traitée\nThread : %s\nType : %s\nMessage : %s\nAppErrNo : %d"
+    IDS_TRUSTKEEP_TOOLTIP   "Garde tous les paquets à la version installée. Ceci est équivalent à demander à l'assistant de ne faire aucun changement aux paquets."
+    IDS_TRUSTCURR_TOOLTIP   "Sélectionne globalement la version qui est actuellement considérée comme la meilleure (RECOMMANDÉ)."
+    IDS_TRUSTSYNC_TOOLTIP   "Sélectionne globalement la version qui est disponible dans le site, éventuellement une version plus ancienne."
     IDS_TRUSTEXP_TOOLTIP    "Autoriser les versions de test."
-    IDS_VIEWBUTTON_TOOLTIP  "Itérer les différentes vues des paquets.  Ceci détermine"
-       " quels paquets seront montrés dans la vue ci-dessous.\n"
-       "\n"
-       "Catégorie : regroupe par catégorie de paquets. Cliquez sur '+' pour étendre.\n"
-       "\n"
-       "Tout : montre tous les paquets.\n"
-       "\n"
-       "En attente : montre uniquement les paquets à ajouter, enlever ou mettre à jour. "
-       "Ceci montre ce que l'assistant est sur le point de modifier "
-       "lors de l'appui sur 'Suivant'.\n"
-       "\n"
-       "À jour : montre les paquets installés qui ne nécessitent pas d'action.\n"
-       "\n"
-       "Non installé : montre les paquets non installés ou qui ne sont pas "
-       "sélectionnés pour installation.\n"
-       "\n"
-       "Choisi : montre les paquets installés qui ont été sélectionnés, et non installés "
-       "pour résoudre une dépendance."
-       // "Removable: ... XXX: Missing translation"
-       // "Unneeded: ... XXX: Missing translation"
-    IDS_HIDEOBS_TOOLTIP     "L'assistant cachera les paquets des catégories dont "
-       "le nom commence par '_'.  Ces paquets sont vides et sont des emplacements "
-       "pour des paquets éliminés ou renommés, ou encore des paquets "
-       "d'infrastructure gérés automatiquement."
-    IDS_SIG_INVALID    "Erreur pour le miroir :  la signature de Setup.ini %s de %s est impossible à vérifier.\nLe miroir est peut-être corrompu ?  Setup.ini rejeté."
-    IDS_CRYPTO_ERROR   "Erreur interne :  erreur %d %s de la librairie gcrypt"
-    IDS_SEARCH_TOOLTIP "Chercher cette valeur dans les noms des paquets."
-    IDS_MAYBE_MKDIR    "Dossier %s absent, voulez-vous le créer ?"
-    IDS_CANT_MKDIR     "Impossible de créer le dossier %s, désolé.  (Disque plein ou uniquement en lecture ?)"
-    IDS_NO_LOCALDIR    "Dossier local des paquets %s absent.\nVoulez-vous efface les paquets, \n"
-      "mais il n'y aura rien à installer\n\nChoisir OK si c'est ce que vous voulez\nou Annuler pour choisir un autre dossier."
-    IDS_ELEVATED       "Passer l'installation au process Administrateur."
-    IDS_INSTALLEDB_VERSION "Version de INSTALLED.DB inconnue"
-    IDS_NO_MIRROR_LST  "Impossible de télécharger la liste des sites miroirs"
-    IDS_PROGRESS_PROGRESS "Progression :"
-    IDS_PROGRESS_PACKAGE "Paquet :"
+    IDS_VIEWBUTTON_TOOLTIP  "Itérer les différentes vues des paquets.  Ceci détermine quels paquets seront montrés dans la vue ci-dessous.\n\nCatégorie : regroupe par catégorie de paquets. Cliquez sur '+' pour étendre.\n\nTout : montre tous les paquets.\n\nEn attente : montre uniquement les paquets en attente d'ajou, retrait ou mise à jour. Ceci montre ce que l'assistant est sur le point de modifier lors de l'appui sur 'Suivant'.\n\nÀ jour : montre les paquets installés qui ne nécessitent pas d'action.\n\nNon installé : montre les paquets non installés ou qui ne sont pas sélectionnés pour installation.\n\nChoisi : montre les paquets installés qui ont été sélectionnés, et non pas installés pour résoudre une dépendance.\n\nSupprimable : montre les paquets installés qui ont été sélectionnés et peuvent être supprimer en toute sécurité.  Aucun autre paquet installé ou sélectionné ne dépend de ces paquets.\n\nSuperflu : montre les paquets installés automatiquement qui peuvent maintenant être supprimer en toute sécurité.  Les autres paquets installés ou sélectionnés ne dépendent plus de ces paquets."
+    IDS_HIDEOBS_TOOLTIP     "L'assistant cachera les paquets des catégories dont le nom commence par '_'.  Ces paquets sont vides et sont des emplacements pour des paquets éliminés ou renommés, ou encore des paquets d'infrastructure gérés automatiquement."
+    IDS_SIG_INVALID         "Erreur pour le miroir :  la signature de Setup.ini %s de %s est impossible à vérifier.\nLe miroir est peut-être corrompu ?  Setup.ini rejeté."
+    IDS_CRYPTO_ERROR        "Erreur interne :  erreur %d %s de la librairie gcrypt"
+    IDS_SEARCH_TOOLTIP      "Chercher cette valeur dans les noms des paquets."
+    IDS_MAYBE_MKDIR         "Dossier %s absent, voulez-vous le créer ?"
+    IDS_CANT_MKDIR          "Impossible de créer le dossier %s, désolé.  (Disque plein ou uniquement en lecture ?)"
+    IDS_NO_LOCALDIR         "Dossier local des paquets %s absent.\nVoulez-vous efface les paquets, \nmais il n'y aura rien à installer\n\nChoisir OK si c'est ce que vous voulez\nou Annuler pour choisir un autre dossier."
+    IDS_ELEVATED            "Passer l'installation au process Administrateur."
+    IDS_INSTALLEDB_VERSION  "Version de INSTALLED.DB inconnue"
+    IDS_NO_MIRROR_LST       "Impossible de télécharger la liste des sites miroirs"
+    IDS_PROGRESS_PROGRESS   "Progression :"
+    IDS_PROGRESS_PACKAGE    "Paquet :"
     IDS_PROGRESS_CONNECTING "Connexion..."
-    IDS_PROGRESS_CHECKING "Recherche de paquets à télécharger..."
-    IDS_PROGRESS_DOWNLOADING "Télécharge..."
-    IDS_PROGRESS_PARSING "Analyse..."
-    IDS_PROGRESS_PREREMOVE "Lancement du script de pré-désinstallation..."
-    IDS_PROGRESS_UNINSTALL "Désinstalle..."
-    IDS_PROGRESS_INSTALL "Installe..."
-    IDS_PROGRESS_CALCULATING "Calcul..."
-    IDS_PROGRESS_POSTINSTALL "Exécution..."
-    IDS_PROGRESS_SOLVING "Résolution des dépendances..."
-    IDS_ACTION_DEFAULT "Par défaut"
-    IDS_ACTION_INSTALL "Installe"
-    IDS_ACTION_UNINSTALL "Désinstalle"
-    IDS_ACTION_SKIP "Passe"
-    IDS_ACTION_KEEP "Garde"
-    IDS_ACTION_REINSTALL "Réinstalle"
-    IDS_ACTION_RETRIEVE "Récupère"
-    IDS_ACTION_UNKNOWN "Inconnu"
-    IDS_ACTION_SOURCE "Source"
-    IDS_VIEW_FULL "Tout"
-    IDS_VIEW_PENDING "En attente"
-    IDS_VIEW_UPTODATE "À jour"
-    IDS_VIEW_NOTINSTALLED "Non installé"
-    IDS_VIEW_PICKED "Sélectionné"
-    // IDS_VIEW_REMOVABLE "XXX: missing translation"
-    // IDS_VIEW_UNNEEDED "XXX: missing translation"
-    IDS_VIEW_CATEGORY  "Catégorie"
-    IDS_COLUMN_PACKAGE "Paquet"
-    IDS_COLUMN_CURRENT "Actuel"
-    IDS_COLUMN_NEW "Nouveau"
-    IDS_COLUMN_SOURCE "Src?"
-    IDS_COLUMN_CATEGORIES "Catégories"
-    IDS_COLUMN_SIZE "Taille"
-    IDS_COLUMN_DESCR "Description"
-    IDS_MBOX_CAPTION "Assistant Cygwin"
-    IDS_EXTRACTION_FAILED "Impossible d'extraire /%s -- paquet corrompu ?"
-    IDS_EXTRACTION_INUSE
-        "Incapable d'extraire /%s -- erreur à l'écriture du fichier\n\n"
-        "Le fichier est utilisé ou une autre erreur est survenue.\n\n"
-        "Arrêtez tous les processus Cygwin et sélectionnez «Recommencer», ou\n\n"
-        "«Continuer» pour poursuivre (il faudra redémarrer).\n\n"
-    IDS_INSTALL_OLD_CYGWIN "Une ancienne version de cygwin1.dll a été trouvée ici :\n%s\nEffacer ?"
-    IDS_INSTALL_DELETE_OLD_CYGWIN_FAILED "Impossible de supprimer le fichier %s.\n"
-        "La DLL est peut être utilisée par une autre application ?\n"
-        "Vous devriez effacer la vieille version de cygwin1.dll "
-        "dès que possible."
-    IDS_SHELLLINK_FAILED
-        "CoCreateInstance : échec avec erreur 0x%x.\n"
-        "L'assistant ne sera pas capable de créer les icônes "
-        "Cygwin dans le menu Démarrer ou sur le bureau."
-    IDS_UNSUPPORTED_WINDOWS_VERSION "Cygwin n'est pas supporté pour cette version de Windows"
-    // IDS_UNSUPPORTED_WINDOWS_ARCH "XXX: Missing translation"
-    IDS_DEPRECATED_WINDOWS_VERSION "Cygwin n'est plus supporté pour cette version de Windows, et sera enlevé dans la prochaine version majeure"
-    IDS_MOUNT_REGISTRY_KEY_FAILED "Impossible de créer la clé de registre pour enregistrer le chemin d'installation"
-    IDS_NIO_ERROR "Erreur Internet : %s"
+    IDS_PROGRESS_CHECKING   "Recherche de paquets à télécharger..."
+    IDS_PROGRESS_DOWNLOADING
+                            "Télécharge..."
+    IDS_PROGRESS_PARSING    "Analyse..."
+    IDS_PROGRESS_PREREMOVE  "Lancement du script de pré-désinstallation..."
+    IDS_PROGRESS_UNINSTALL  "Désinstalle..."
+    IDS_PROGRESS_INSTALL    "Installe..."
+    IDS_PROGRESS_CALCULATING
+                            "Calcul..."
+    IDS_PROGRESS_POSTINSTALL
+                            "Exécution..."
+    IDS_PROGRESS_SOLVING    "Résolution des dépendances..."
+    IDS_ACTION_DEFAULT      "Par défaut"
+    IDS_ACTION_INSTALL      "Installe"
+    IDS_ACTION_UNINSTALL    "Désinstalle"
+    IDS_ACTION_SKIP         "Passe"
+    IDS_ACTION_KEEP         "Garde"
+    IDS_ACTION_REINSTALL    "Réinstalle"
+    IDS_ACTION_RETRIEVE     "Récupère"
+    IDS_ACTION_UNKNOWN      "Inconnu"
+    IDS_ACTION_SOURCE       "Source"
+    IDS_VIEW_FULL           "Tout"
+    IDS_VIEW_PENDING        "En attente"
+    IDS_VIEW_UPTODATE       "À jour"
+    IDS_VIEW_NOTINSTALLED   "Non installé"
+    IDS_VIEW_PICKED         "Sélectionné"
+    IDS_VIEW_REMOVABLE      "Supprimable"
+    IDS_VIEW_UNNEEDED       "Superflu"
+    IDS_VIEW_CATEGORY       "Catégorie"
+    IDS_COLUMN_PACKAGE      "Paquet"
+    IDS_COLUMN_CURRENT      "Actuel"
+    IDS_COLUMN_NEW          "Nouveau"
+    IDS_COLUMN_SOURCE       "Src?"
+    IDS_COLUMN_CATEGORIES   "Catégories"
+    IDS_COLUMN_SIZE         "Taille"
+    IDS_COLUMN_DESCR        "Description"
+    IDS_MBOX_CAPTION        "Assistant Cygwin"
+    IDS_EXTRACTION_FAILED   "Impossible d'extraire /%s -- paquet corrompu ?"
+    IDS_EXTRACTION_INUSE    "Incapable d'extraire /%s -- erreur à l'écriture du fichier\n\nLe fichier est utilisé ou une autre erreur est survenue.\n\nArrêtez tous les processus Cygwin et sélectionnez «Recommencer», ou\n\n«Continuer» pour poursuivre (il faudra redémarrer).\n\n"
+    IDS_INSTALL_OLD_CYGWIN  "Une ancienne version de cygwin1.dll a été trouvée ici :\n%s\nEffacer ?"
+    IDS_INSTALL_DELETE_OLD_CYGWIN_FAILED
+                            "Impossible de supprimer le fichier %s.\nLa DLL est peut être utilisée par une autre application ?\nVous devriez effacer la vieille version de cygwin1.dll dès que possible."
+    IDS_SHELLLINK_FAILED    "CoCreateInstance : échec avec erreur 0x%x.\nL'assistant ne sera pas capable de créer les icônes Cygwin dans le menu Démarrer ou sur le bureau."
+    IDS_UNSUPPORTED_WINDOWS_VERSION
+                            "Cygwin n'est pas supporté pour cette version de Windows"
+    IDS_UNSUPPORTED_WINDOWS_ARCH
+                            "Cygwin n'est pas disponible sous Windows 32 bits"
+    IDS_DEPRECATED_WINDOWS_VERSION
+                            "Cygwin n'est plus supporté pour cette version de Windows, et sera enlevé dans la prochaine version majeure"
+    IDS_MOUNT_REGISTRY_KEY_FAILED
+                            "Impossible de créer la clé de registre pour enregistrer le chemin d'installation"
+    IDS_NIO_ERROR           "Erreur Internet : %s"
     IDS_PREREQ_UNSOLVED_PROBLEMS
-        "ATTENTION - Problèmes non résolus"
-        "\n\n"
-        "Certains paquets ne fonctionneront pas correctement si vous continuez."
-        "\n\n"
-        "Voulez vous continuer (NON RECOMMANDÉ) ?"
-    IDS_MIXED_BITNESS_ERROR
-        "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 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."
-    IDS_GET_SITELIST_ERROR
-        "Impossible d'avoir la liste des sites de téléchargement.\n"
-        "Vé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"
-    IDS_CHOOSER_EMPTY_NO_PACKAGES "Pas de paquet trouvé."
-    IDS_CHOOSER_EMPTY_DOWNLOAD "Rien à télécharger."
-    IDS_CHOOSER_EMPTY_INSTALL "Rien à installer ou mettre à jour."
-    IDS_ROOT_BROWSE_TITLE "Choisissez le dossier racine de l'installation"
-    IDS_LOCALDIR_BROWSE_DOWNLOAD_TITLE "Choisissez le dossier pour le téléchargement"
-    IDS_LOCALDIR_BROWSE_PACKAGE_TITLE  "Choisissez le dossier local"
-    IDS_PROGRESS_CHECKING_HASH "Vérification %s pour %s"
-    IDS_PROGRESS_DOWNLOADING_FROM "%s depuis %s"
-    IDS_CONFIRM_UNINSTALL "Désinstalle"
-    IDS_CONFIRM_INSTALL "Installe"
-    IDS_CONFIRM_DOWNLOAD "Télécharge"
-    IDS_CONFIRM_NOTHING "Pas de changement"
-    IDS_CONFIRM_AUTO_ADD "(ajouté automatiquement)"
-    IDS_CONFIRM_SOURCE "(source)"
-    IDS_FILE_INUSE_KILL "&Tuer les processus"
-    IDS_FILE_INUSE_MSG "Incapable d'extraire"
+                            "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_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"
+    IDS_CHOOSER_EMPTY_NO_PACKAGES
+                            "Pas de paquet trouvé."
+    IDS_CHOOSER_EMPTY_DOWNLOAD
+                            "Rien à télécharger."
+    IDS_CHOOSER_EMPTY_INSTALL
+                            "Rien à installer ou mettre à jour."
+    IDS_ROOT_BROWSE_TITLE   "Choisissez le dossier racine de l'installation"
+    IDS_LOCALDIR_BROWSE_DOWNLOAD_TITLE
+                            "Choisissez le dossier pour le téléchargement"
+    IDS_LOCALDIR_BROWSE_PACKAGE_TITLE
+                            "Choisissez le dossier local"
+    IDS_PROGRESS_CHECKING_HASH
+                            "Vérification %s pour %s"
+    IDS_PROGRESS_DOWNLOADING_FROM
+                            "%s depuis %s"
+    IDS_CONFIRM_UNINSTALL   "Désinstalle"
+    IDS_CONFIRM_INSTALL     "Installe"
+    IDS_CONFIRM_DOWNLOAD    "Télécharge"
+    IDS_CONFIRM_NOTHING     "Pas de changement"
+    IDS_CONFIRM_AUTO_ADD    "(ajouté automatiquement)"
+    IDS_CONFIRM_SOURCE      "(source)"
+    IDS_FILE_INUSE_KILL     "&Tuer les processus"
+    IDS_FILE_INUSE_MSG      "Incapable d'extraire"
+    IDS_USER_URL_TOOLTIP    "URL de site, chemin d’accès ou chemin UNC supplémentaires"
 END
 
 //
@@ -642,54 +455,77 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_HELPTEXT_ERROR "Erreur pendant l'analyse des options."
-    IDS_HELPTEXT_HEADER "Options de la ligne de commandes :"
-    IDS_HELPTEXT_FOOTER "Par défault téléchargement et installation des paquets, sauf si --download ou --local-install sont spécifiés."
+    IDS_HELPTEXT_ERROR      "Erreur pendant l'analyse des options."
+    IDS_HELPTEXT_HEADER     "Options de la ligne de commandes :"
+    IDS_HELPTEXT_FOOTER     "Par défault téléchargement et installation des paquets, sauf si --download ou --local-install sont spécifiés."
     IDS_HELPTEXT_ALLOW_TEST "Prendre en compte les paquets marqués test"
-    IDS_HELPTEXT_ALLOW_UNSUPPORTED_WINDOWS "Autoriser les vieilles versions de Windows"
-    IDS_HELPTEXT_ARCH "Architecture à installer (x86_64 ou x86)"
+    IDS_HELPTEXT_ALLOW_UNSUPPORTED_WINDOWS
+                            "Autoriser les vieilles versions de Windows"
+    IDS_HELPTEXT_ARCH       "Architecture à installer (x86_64 ou x86)"
     IDS_HELPTEXT_CATEGORIES "Spécifie les catégories à installer"
     IDS_HELPTEXT_COMPACTOS  "Compresser les fichiers installés avec Compact OS (xpress4k, xpress8k, xpress16k, lzx)"
-    IDS_HELPTEXT_DELETE_ORPHANS "Supprimer les paquets orphelins"
-    IDS_HELPTEXT_DISABLE_ANTIVIRUS "Inhibe les anti-virus buggés à l'exécution"
-    IDS_HELPTEXT_DOWNLOAD "Télécharger depuis internet"
-    IDS_HELPTEXT_FORCE_CURRENT "Choisir la version courante pour tous les paquets"
-    IDS_HELPTEXT_HELP "Afficher l'aide"
-    IDS_HELPTEXT_INCLUDE_SOURCE "Ajouter automatiquement les sources de chaque paquet installé"
-    IDS_HELPTEXT_INI_BASENAME "Utiliser un nom de base différent, p.ex. «toto», au lieu de «setup»"
-    IDS_HELPTEXT_KEEP_UNTRUSTED_KEYS "Utiliser les clés non-fiables et les garder"
-    IDS_HELPTEXT_LANG "Choisir la langue de l'IHM"
-    IDS_HELPTEXT_LOCAL_INSTALL "Installer depuis un répertoire local"
-    IDS_HELPTEXT_LOCAL_PACKAGE_DIR "Dossier local pour les paquets"
-    IDS_HELPTEXT_MIRROR_MODE "Ne pas vérifier la présence d'un paquet depuis un dossier local (celui-ci doit être un miroir propre !)"
-    IDS_HELPTEXT_NO_ADMIN "Ne pas vérifier et forcer à installer en tant qu'administrateur"
+    IDS_HELPTEXT_DELETE_ORPHANS
+                            "Supprimer les paquets orphelins"
+    IDS_HELPTEXT_DISABLE_ANTIVIRUS
+                            "Inhibe les anti-virus buggés à l'exécution"
+    IDS_HELPTEXT_DOWNLOAD   "Télécharger depuis internet"
+    IDS_HELPTEXT_FORCE_CURRENT
+                            "Choisir la version courante pour tous les paquets"
+    IDS_HELPTEXT_HELP       "Afficher l'aide"
+    IDS_HELPTEXT_INCLUDE_SOURCE
+                            "Ajouter automatiquement les sources de chaque paquet installé"
+    IDS_HELPTEXT_INI_BASENAME
+                            "Utiliser un nom de base différent, p.ex. «toto», au lieu de «setup»"
+    IDS_HELPTEXT_KEEP_UNTRUSTED_KEYS
+                            "Utiliser les clés non-fiables et les garder"
+    IDS_HELPTEXT_LANG       "Choisir la langue de l'IHM"
+    IDS_HELPTEXT_LOCAL_INSTALL
+                            "Installer depuis un répertoire local"
+    IDS_HELPTEXT_LOCAL_PACKAGE_DIR
+                            "Dossier local pour les paquets"
+    IDS_HELPTEXT_MIRROR_MODE
+                            "Ne pas vérifier la présence d'un paquet depuis un dossier local (celui-ci doit être un miroir propre !)"
+    IDS_HELPTEXT_NO_ADMIN   "Ne pas vérifier et forcer à installer en tant qu'administrateur"
     IDS_HELPTEXT_NO_DESKTOP "Pas de création de raccourci de bureau"
-    IDS_HELPTEXT_NO_REPLACEONREBOOT "Inhibe le remplacement des fichiers en cours d'utilisation au prochain redémarrage"
-    IDS_HELPTEXT_NO_SHORTCUTS "Pas de création de raccourcis de bureau et de menu"
-    IDS_HELPTEXT_NO_STARTMENU "Pas de création de raccourci de menu"
-    IDS_HELPTEXT_NO_VERIFY "Ne pas vérifier les signatures de setup.ini"
-    IDS_HELPTEXT_NO_VERSION_CHECK "Ne pas vérifier si une version plus récente de l'assistant est disponible"
-    IDS_HELPTEXT_NO_WARN_DEPRECATED_WINDOWS "Ne pas avertir pour les vieilles versions de Windows"
+    IDS_HELPTEXT_NO_REPLACEONREBOOT
+                            "Inhibe le remplacement des fichiers en cours d'utilisation au prochain redémarrage"
+    IDS_HELPTEXT_NO_SHORTCUTS
+                            "Pas de création de raccourcis de bureau et de menu"
+    IDS_HELPTEXT_NO_STARTMENU
+                            "Pas de création de raccourci de menu"
+    IDS_HELPTEXT_NO_VERIFY  "Ne pas vérifier les signatures de setup.ini"
+    IDS_HELPTEXT_NO_VERSION_CHECK
+                            "Ne pas vérifier si une version plus récente de l'assistant est disponible"
+    IDS_HELPTEXT_NO_WARN_DEPRECATED_WINDOWS
+                            "Ne pas avertir pour les vieilles versions de Windows"
     IDS_HELPTEXT_NO_WRITE_REGISTRY
                             "Ne pas écrire le répertoire d'installation racine dans le registre"
-    IDS_HELPTEXT_OLD_KEYS "Utiliser les anciennes clés de cygwin.com"
-    IDS_HELPTEXT_ONLY_SITE "Ignorer tous les sites sauf ceux spécifiés par -s"
-    IDS_HELPTEXT_PACKAGES "Spécifie les paquets à installer"
-    IDS_HELPTEXT_PACKAGE_MANAGER "Mode assistant sélection seulement"
-    IDS_HELPTEXT_PROXY "Proxy HTTP/FTP (serveur:port)"
-    IDS_HELPTEXT_PRUNE_INSTALL "Purger l'installation pour n'avoir que les paquets demandés"
-    IDS_HELPTEXT_PUBKEY "URL ou chemin complet d'une clé publique supplémentaire (format RFC4880)"
+    IDS_HELPTEXT_OLD_KEYS   "Utiliser les anciennes clés de cygwin.com"
+    IDS_HELPTEXT_ONLY_SITE  "Ignorer tous les sites sauf ceux spécifiés par -s"
+    IDS_HELPTEXT_PACKAGES   "Spécifie les paquets à installer"
+    IDS_HELPTEXT_PACKAGE_MANAGER
+                            "Mode assistant sélection seulement"
+    IDS_HELPTEXT_PROXY      "Proxy HTTP/FTP (serveur:port)"
+    IDS_HELPTEXT_PRUNE_INSTALL
+                            "Purger l'installation pour n'avoir que les paquets demandés"
+    IDS_HELPTEXT_PUBKEY     "URL ou chemin complet d'une clé publique supplémentaire (format RFC4880)"
     IDS_HELPTEXT_QUIET_MODE "Assistant sans messages"
-    IDS_HELPTEXT_REMOVE_CATEGORIES "Spécifie les catégories à désinstaller"
-    IDS_HELPTEXT_REMOVE_PACKAGES "Spécifie les paquets à désinstaller"
-    IDS_HELPTEXT_ROOT "Dossier racine de l'installation"
-    IDS_HELPTEXT_SEXPR_PUBKEY "Clé publique DSA supplémentaire au format s-expr"
-    IDS_HELPTEXT_SITE "URL du site de téléchargement"
-    IDS_HELPTEXT_SYMLINK_TYPE "Type de lien symbolique (lnk, native, sys, wsl)"
-    IDS_HELPTEXT_UNTRUSTED_KEYS "Utiliser les clés non-fiables enregistrées"
-    IDS_HELPTEXT_UPGRADE_ALSO "Mettre à jour les paquets installés"
+    IDS_HELPTEXT_REMOVE_CATEGORIES
+                            "Spécifie les catégories à désinstaller"
+    IDS_HELPTEXT_REMOVE_PACKAGES
+                            "Spécifie les paquets à désinstaller"
+    IDS_HELPTEXT_ROOT       "Dossier racine de l'installation"
+    IDS_HELPTEXT_SEXPR_PUBKEY
+                            "Clé publique DSA supplémentaire au format s-expr"
+    IDS_HELPTEXT_SITE       "URL, chemin d’accès ou chemin UNC du site de téléchargement"
+    IDS_HELPTEXT_SYMLINK_TYPE
+                            "Type de lien symbolique (lnk, native, sys, wsl)"
+    IDS_HELPTEXT_UNTRUSTED_KEYS
+                            "Utiliser les clés non-fiables enregistrées"
+    IDS_HELPTEXT_UPGRADE_ALSO
+                            "Mettre à jour les paquets installés"
     IDS_HELPTEXT_USER_AGENT "« User agent » pour les requêtes HTTP"
-    IDS_HELPTEXT_VERBOSE "Affichages verbeux"
-    IDS_HELPTEXT_VERSION "Montrer la version"
-    IDS_HELPTEXT_WAIT "Attendre le process fils en mode élévation"
+    IDS_HELPTEXT_VERBOSE    "Affichages verbeux"
+    IDS_HELPTEXT_VERSION    "Montrer la version"
+    IDS_HELPTEXT_WAIT       "Attendre le process fils en mode élévation"
 END
diff --git a/res/pl/res.rc b/res/pl/res.rc
new file mode 100644
index 00000000..a4b30686
--- /dev/null
+++ b/res/pl/res.rc
@@ -0,0 +1,531 @@
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalacja Cygwin - wybierz typ instalacji"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "&Zainstaluj z Internetu\n(pobrane pliki zostaną zachowane do ponownego wykorzystania w przyszłości)",IDC_SOURCE_NETINST,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE | BS_TOP,71,60,200,30
+    CONTROL         "&Pobierz bez instalacji",IDC_SOURCE_DOWNLOAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,90,200,10
+    CONTROL         "Zainstaluj z &katalogu lokalnego",IDC_SOURCE_LOCALDIR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,120,200,10
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Wybierz źródło pobierania",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Wybierz, czy chcesz zainstalować lub pobrać z Internetu, czy też zainstalować z plików w lokalnym katalogu.",IDC_SOURCE_SUBTEXT,21,9,239,16,NOT WS_GROUP
+END
+
+IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin Setup - Wyłączyć skaner antywirusowy?"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "&Wyłącz skaner antywirusowy",IDC_DISABLE_AV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,69,115,10
+    CONTROL         "& Zostaw skaner antywirusowy w spokoju",IDC_LEAVE_AV,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Wybierz, czy skaner antywirusowy ma zostać wyłączony podczas instalacji.",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Niektóre programy antywirusowe, w szczególności McAfee, powodują niebieski ekran na komputerach z systemem Windows XP podczas instalacji Cygwin.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Wykryto jeden, który może być problemem. Instalator Cygwin może wyłączyć tę funkcję podczas procesu instalacji i włączyć ją ponownie po zakończeniu instalacji.",IDC_STATIC,21,32,239,24,NOT WS_GROUP
+END
+
+IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfiguracja Cygwin - Wybierz lokalny katalog pakietów"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Wybierz lokalny katalog pakietów",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Wybierz katalog, w którym Instalator ma przechowywać pobierane pliki instalacyjne.  Katalog zostanie utworzony, jeśli jeszcze nie istnieje.",IDC_LOCAL_DIR_DOWNLOAD_DESC,21,9,248,16,NOT WS_GROUP
+    LTEXT           "Wybierz katalog, w którym Instalator ma szukać pobranych plików instalacyjnych.",IDC_LOCAL_DIR_INSTALL_DESC,21,9,248,16,NOT WS_GROUP
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    GROUPBOX        "Lokalny katalog pakietów",IDC_LOCALDIR_GRP,5,35,330,35
+    EDITTEXT        IDC_LOCAL_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "PrzeglÄ…daj...",IDC_LOCAL_DIR_BROWSE,277,47,52,14,WS_TABSTOP
+END
+
+IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Instalacja Cygwin - wybierz katalog instalacyjny"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Wybierz główny katalog instalacji",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Wybierz katalog, w którym chcesz zainstalować Cygwin.  Wybierz także kilka parametrów instalacji.",IDC_ROOTDIR_SUBTEXT,21,9,239,16,NOT WS_GROUP
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    GROUPBOX        "Katalog główny",IDC_ROOTDIR_GRP,5,35,330,35
+    EDITTEXT        IDC_ROOT_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "PrzeglÄ…daj...",IDC_ROOT_BROWSE,277,47,52,14,WS_TABSTOP
+    GROUPBOX        "Zainstaluj dla",IDC_INSTALLFOR_GRP,5,76,330,101
+    CONTROL         "&Wszyscy użytkownicy (ZALECANE)",IDC_ROOT_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,13,89,130,8
+    CONTROL         "Tylko &dla mnie",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,130,130,8
+    LTEXT           "Cygwin jest dostępny dla wszystkich użytkowników systemu.",IDC_ALLUSERS_TEXT,25,101,300,28
+    LTEXT           "Program Cygwin będzie nadal dostępny dla wszystkich użytkowników, ale ikony pulpitu, pozycje menu Cygwin i ważne informacje instalatora będą dostępne tylko dla bieżącego użytkownika.  Wybierz tę opcję tylko wtedy, gdy nie masz uprawnień administratora lub gdy masz określone potrzeby.",IDC_JUSTME_TEXT,25,140,300,32
+END
+
+IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+    WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+CAPTION "Konfiguracja Cygwin - wybierz stronÄ™(y) pobierania"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Dostępne strony do pobrania:",IDC_STATIC,66,34,183,8,NOT WS_GROUP
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Wybierz witrynę z tej listy lub dodaj własne witryny do listy.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Wybierz witrynÄ™ pobierania",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    EDITTEXT        IDC_EDIT_USER_URL,65,160,185,14,ES_AUTOHSCROLL | WS_GROUP
+    LTEXT           "URL użytkownika:",IDC_SITE_USERURL,15,162,45,8,NOT WS_GROUP
+    PUSHBUTTON      "Dodawać",IDC_BUTTON_ADD_URL,255,160,50,14
+END
+
+IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+CAPTION "Konfiguracja Cygwin - Wybierz typ połączenia"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "Użyj &Systemowych ustawień serwera proxy",IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
+    CONTROL         "&Bezpośrednie połączenie",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
+    CONTROL         "Użyj protokołu HTTP/FTP &Proxy:",IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,185,10
+    EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP
+    EDITTEXT        IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "",IDC_STATIC,60,95,185,50
+    RTEXT           "Proxy i Host",IDC_STATIC,65,105,50,12,SS_CENTERIMAGE | NOT WS_GROUP
+    RTEXT           "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT WS_GROUP
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Instalator musi wiedzieć, w jaki sposób ma łączyć się z Internetem.  Wybierz odpowiednie ustawienia poniżej.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Wybierz swoje połączenie internetowe",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+END
+
+IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Konfiguracja Cygwin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Instalowanie...",IDC_INS_ACTION,45,55,205,8,SS_ENDELLIPSIS
+    LTEXT           "(PKG)",IDC_INS_PKG,45,70,205,8,SS_ENDELLIPSIS
+    LTEXT           "(PLIK)",IDC_INS_FILE,45,85,205,8,SS_ENDELLIPSIS
+    CONTROL         "Postęp1",IDC_INS_DISKFULL,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,130,155,10
+    CONTROL         "Postęp1",IDC_INS_IPROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,115,155,10
+    CONTROL         "Postęp1",IDC_INS_PPROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,100,155,10
+    LTEXT           "Pakiet:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
+    LTEXT           "Razem:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
+    LTEXT           "Dysk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Na tej stronie wyświetlany jest postęp pobierania lub instalacji.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Postęp",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+END
+
+IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Wymagane uwierzytelnienie proxy"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
+    LTEXT           "Proxy i identyfikator użytkownika",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+    LTEXT           "Hasło",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Wymagana autoryzacja serwera proxy",IDC_STATIC,65,10,145,10
+    DEFPUSHBUTTON   "OK",IDOK,100,75,45,15,WS_DISABLED
+    PUSHBUTTON      "Anuluj",IDCANCEL,165,75,45,15
+END
+
+IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Wymagane uwierzytelnienie serwera"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
+    LTEXT           "&ID użytkownika",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+    LTEXT           "&Hasło",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Wymagana autoryzacja serwera",IDC_STATIC,65,10,145,10
+    DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
+    PUSHBUTTON      "Anuluj",IDCANCEL,165,75,45,15
+END
+
+IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+    WS_CAPTION | WS_SYSMENU
+CAPTION "Konfiguracja Cygwin"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Program instalacyjny Cygwin Net Release",IDC_STATIC_WELCOME_TITLE,115,1,195,24
+    LTEXT           "Ten program instalacyjny jest używany do początkowej instalacji środowiska Cygwin, jak również wszystkich późniejszych aktualizacji. Kolejne strony poprowadzą Cię przez instalację.\n\nProszę zauważyć, że domyślnie instalujemy tylko podstawowy zestaw pakietów.  Cygwin dostarcza dużą liczbę pakietów o różnym przeznaczeniu.\n\nZawsze możesz uruchomić ten program w dowolnym momencie w przyszłości, aby dodać, usunąć lub uaktualnić pakiety w razie potrzeby.",IDC_SPLASH_TEXT,115,25,195,100
+    ICON            IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE
+    LTEXT           "",IDC_VERSION,115,127,195,10
+    LTEXT           "",IDC_SPLASH_COPYR,115,140,195,8
+    LTEXT           "",IDC_SPLASH_URL,115,152,90,8
+    LTEXT           "Przyczyniaj się do tłumaczeń tego programu.",IDC_SPLASH_TRANSLATE,115,164,195,8
+END
+
+IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
+    WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin Setup - Status instalacji i tworzenie ikon"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "Utwórz ikonę na &Pulpicie",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,110,8
+    CONTROL         "Dodaj ikonÄ™ do &Menu Start",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,140,8
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Powiedz instalatorowi, czy chcesz, aby utworzył kilka ikon dla wygodnego dostępu do środowiska Cygwin.",IDC_DESKTOP_HEADER_INSTALL,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Tworzenie ikon",IDC_DESKTOP_HEADER_TITLE_INSTALL,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Pokazuje stan instalacji w trybie tylko do pobrania.",IDC_DESKTOP_HEADER_DOWNLOAD,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Instalacja zakończona",IDC_DESKTOP_HEADER_TITLE_DOWNLOAD,7,0,258,8,NOT WS_GROUP
+    CONTROL         "",IDC_DESKTOP_SEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,135,SETUP_STANDARD_DIALOG_W,1
+    LTEXT           "Stan instalacji",IDC_STATUS_HEADER,7,140,258,8,NOT WS_GROUP
+    LTEXT           "Instalacja Cygwin zakończyła się pomyślnie.",IDC_STATUS,21,149,279,36,NOT WS_GROUP
+END
+
+IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Wymagane uwierzytelnienie FTP"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
+    LTEXT           "&ID użytkownika",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+    LTEXT           "&Hasło",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Wymagana autoryzacja FTP",IDC_STATIC,65,10,145,10
+    DEFPUSHBUTTON   "&OK",IDOK,100,75,45,15,WS_DISABLED
+    PUSHBUTTON      "Anuluj",IDCANCEL,165,75,45,15
+END
+
+IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Konfiguracja Cygwin - wybór pakietów"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&PodglÄ…d",IDC_CHOOSE_VIEWCAPTION,SETUP_VIEW_X,33,SETUP_VIEW_W,10
+    COMBOBOX        IDC_CHOOSE_VIEW,SETUP_VIEWLIST_X,30,SETUP_VIEWLIST_W,84,CBS_DROPDOWNLIST | WS_TABSTOP
+    RTEXT           "&Szukaj",IDC_STATIC,SETUP_SEARCH_X,33,SETUP_SEARCH_W,10,SS_CENTERIMAGE,WS_EX_RIGHT
+    CONTROL         "Szukaj ",IDC_CHOOSE_DO_SEARCH,"Button",BS_PUSHBUTTON | NOT WS_VISIBLE,SETUP_SEARCH_X,33,SETUP_SEARCH_W,14
+    EDITTEXT        IDC_CHOOSE_SEARCH_EDIT,SETUP_SEARCHTEXT_X,30,SETUP_SEARCHTEXT_W,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Wyczyść",IDC_CHOOSE_CLEAR_SEARCH,SETUP_CLEAR_X,30,SETUP_CLEAR_W,14
+    CONTROL         "&Zachowaj",IDC_CHOOSE_KEEP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,SETUP_KEEP_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Najlepszy",IDC_CHOOSE_BEST,"Button",BS_AUTORADIOBUTTON,SETUP_BEST_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Synchronizuj",IDC_CHOOSE_SYNC,"Button",BS_AUTORADIOBUTTON,SETUP_SYNC_X,30,SETUP_KPCE_W,14
+    CONTROL         "&Test",IDC_CHOOSE_EXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,SETUP_EXP_X,30,SETUP_KPCE_W,14
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    CONTROL         "",IDC_CHOOSE_LIST,WC_LISTVIEW,LVS_NOSORTHEADER | LVS_REPORT | LVS_SINGLESEL | WS_TABSTOP,SETUP_CHOOSE_X,47,SETUP_CHOOSE_W,120,WS_EX_CLIENTEDGE
+    CONTROL         "&Ukryj przestarzałe pakiety",IDC_CHOOSE_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,160,14
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Wybrane pakiety do pobrania.",IDC_CHOOSE_INST_TEXT_DOWNLOAD,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Wybrane pakiety do instalowania.",IDC_CHOOSE_INST_TEXT_INSTALL,21,9,239,16,NOT WS_GROUP
+    LTEXT           "Wybierz pakiety",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+END
+
+IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Konfiguracja Cygwin - rozwiązywanie zależności"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Rozwiązywanie zależności",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Wystąpiły następujące problemy podczas próby spełnienia zależności.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    CONTROL         "&Zaakceptuj domyślne rozwiązania problemów",IDC_PREREQ_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,225,14
+    EDITTEXT        IDC_PREREQ_EDIT,7,41,303,124,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+END
+
+IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
+    WS_SYSMENU
+CAPTION "Konfiguracja Cygwin - przejrzyj i potwierdź zmiany"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Przejrzyj i potwierdź zmiany",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    EDITTEXT        IDC_CONFIRM_EDIT,7,41,325,131,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+END
+
+IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cygwin Setup - Używasz zrzuconych serwerów lustrzanych?"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Ostrzeżenie:",IDC_STATIC,7,8,40,8
+    LTEXT           "Jeden lub więcej wybranych serwerów lustrzanych nie znajduje się już na liście oficjalnych serwerów lustrzanych Cygwin. Może być nieaktualny lub może brakować w nim niektórych pakietów.\nDotyczy to następujących serwerów lustrzanych:",IDC_STATIC,47,8,263,32
+    EDITTEXT        IDC_DROP_MIRRORS,7,40,303,40,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+    LTEXT           "W przypadku problemów z instalacją warto rozważyć wypróbowanie wyłącznie oficjalnych serwerów lustrzanych.\n\nCzy chcesz kontynuować korzystanie z tego serwera lustrzanego?",IDC_STATIC,7,88,303,24
+    CONTROL         "&Nie ostrzegaj mnie ponownie o tym/tych serwerach lustrzanych",IDC_DROP_NOWARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,213,15
+    PUSHBUTTON      "&Tak",IDYES,220,120,45,15
+    DEFPUSHBUTTON   "&Nie",IDNO,265,120,45,15
+END
+
+IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Pobieranie zakończone"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_WARNING,IDC_HEADICON,10,10
+    LTEXT           "Wystąpiły błędy pobierania następujących pakietów:",IDC_STATIC,7,8,320,16
+    EDITTEXT        IDC_DOWNLOAD_EDIT,7,24,320,88,WS_VSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL
+    LTEXT           "Wybierz ""Ponów próbę"", aby ponowić próbę pobrania, ""Wstecz"", aby powrócić do strony wyboru pakietu, ""Kontynuuj"", aby kontynuować (NIEZALECANE) lub ""Anuluj"", aby wyjść.",IDC_STATIC,7,120,320,24
+    DEFPUSHBUTTON   "&Ponów",IDRETRY,45,150,50,15
+    PUSHBUTTON      "&Wstecz",IDC_BACK,110,150,50,15
+    PUSHBUTTON      "&Kontynuuj",IDIGNORE,175,150,50,15
+    PUSHBUTTON      "Anuluj",IDABORT,240,150,50,15
+END
+
+IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
+    WS_CAPTION | WS_SYSMENU
+CAPTION "Konfiguracja Cygwin - uruchamianie skryptów poinstalacyjnych"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
+    ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
+    LTEXT           "Błędy skryptu poinstalacyjnego",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "Nie musi to oznaczać, że pakiety, których dotyczy problem, nie będą działać poprawnie, ale prosimy o sprawdzenie /var/log/setup.log.full i zgłoszenie wszelkich problemów.",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    EDITTEXT        IDC_POSTINSTALL_EDIT,7,41,303,112,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
+END
+
+IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Wykryto plik w użyciu"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    ICON            IDI_WARNING,IDC_HEADICON,10,10
+    LTEXT           "Nie można wyodrębnić",IDC_FILE_INUSE_MSG,33,10,234,8,SS_PATHELLIPSIS
+    LTEXT           "Plik jest używany przez następujące procesy:",IDC_STATIC,33,28,234,8
+    EDITTEXT        IDC_FILE_INUSE_EDIT,33,40,234,32,WS_VSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL | NOT WS_TABSTOP
+    LTEXT           "Wybierz ""Ponów próbę"", aby ponowić próbę, wybierz ""Zatrzymaj"", aby zatrzymać procesy i spróbuj ponownie, lub wybierz ""Kontynuuj"", aby mimo to kontynuować (plik zostanie zaktualizowany po ponownym uruchomieniu).",IDC_FILE_INUSE_HELP_0,33,80,234,24,NOT WS_GROUP
+    LTEXT           "Wybierz ""Ponów próbę"", aby ponowić próbę, wybierz ""Zabij"", aby zabić procesy i spróbuj ponownie, lub wybierz ""Kontynuuj"", aby mimo to kontynuować (plik zostanie zaktualizowany po ponownym uruchomieniu).",IDC_FILE_INUSE_HELP_1,33,80,234,24,NOT WS_GROUP
+    LTEXT           "Wybierz ""Ponów próbę"", aby ponowić próbę, wybierz ""Zabij"", aby wymusić zabicie wszystkich procesów i ponów próbę, lub wybierz ""Kontynuuj"", aby kontynuować (plik zostanie zaktualizowany po ponownym uruchomieniu).",IDC_FILE_INUSE_HELP_2,33,80,234,24,NOT WS_GROUP
+    PUSHBUTTON      "&Ponów",IDIGNORE,45,112,55,15
+    DEFPUSHBUTTON   "&Zatrzymaj procesy",IDRETRY,111,112,55,15
+    PUSHBUTTON      "&Kontynuuj",IDCONTINUE,177,112,55,15
+END
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_ROOT_SLASH          "Ostrzeżenie: zalecamy, aby nie używać katalogu głównego dysku twardego jako katalogu głównego cygwin, aby zapobiec możliwym konfliktom z innymi programami.  Kontynuować?"
+    IDS_ROOT_SPACE          "Nie należy wybierać ścieżki katalogu głównego, która zawiera spacje w nazwach katalogów.  Kontynuować?"
+    IDS_ERR_OPEN_WRITE      "Nie można otworzyć %s do zapisu: %s"
+    IDS_SETUPINI_MISSING    "Nie można pobrać %s z <%s>"
+    IDS_OLD_SETUPINI        "Plik setup.ini jest starszy niż ten, którego użyłeś podczas ostatniej instalacji cygwin.  Kontynuować mimo to?"
+    IDS_NOTHING_INSTALLED   "Nic nie wymagało zainstalowania"
+    IDS_INSTALL_COMPLETE    "Instalacja zakończona"
+    IDS_REBOOT_REQUIRED     "Używane pliki zostały zastąpione. Musisz jak najszybciej ponownie uruchomić komputer, aby aktywować nowe wersje. Cygwin może działać niepoprawnie do momentu ponownego uruchomienia komputera."
+    IDS_ERR_OPEN_READ       "Nie można otworzyć %s do odczytu: %s"
+    IDS_ROOT_ABSOLUTE       "Katalog instalacyjny musi być katalogiem bezwzględnym, zawierającym zarówno literę dysku, jak i wiodący ukośnik, na przykład C:\\Cygwin"
+    IDS_DOWNLOAD_COMPLETE   "Pobieranie zakończone"
+    IDS_NOLOGFILE           "Nie można otworzyć pliku dziennika %s do zapisu"
+    IDS_UNINSTALL_COMPLETE  "Odinstalowywanie zostało zakończone."
+    IDS_ERR_CHDIR           "Nie można zmienić katalogu na %s: %s [%.8x]"
+    IDS_OLD_SETUP_VERSION   "Ta konfiguracja jest w wersji %s, ale plik setup.ini twierdzi, że wersja %s jest dostępna.\nMożesz chcieć uaktualnić, aby uzyskać najnowsze funkcje i poprawki błędów."
+    IDS_DOWNLOAD_INCOMPLETE "Pobieranie niekompletne.  Spróbować ponownie?"
+    IDS_DOWNLOAD_INCOMPLETE_EXIT
+                            "Pobieranie jest niekompletne.  Sprawdź %s, aby uzyskać szczegółowe informacje"
+    IDS_INSTALL_ERROR       "Błąd instalacji (%s), kontynuować z innymi pakietami?"
+    IDS_INSTALL_INCOMPLETE  "Instalacja niekompletna.  Sprawdź %s, aby uzyskać szczegółowe informacje"
+    IDS_CORRUPT_PACKAGE     "Pakiet %s ma uszkodzoną kopię lokalną, usuń ją i spróbuj ponownie."
+    IDS_QUERY_CORRUPT       "Plik %s jest uszkodzony. Usunąć go i pobrać ponownie?"
+    IDS_SKIP_PACKAGE        "%S\nCzy chcesz pominąć ten pakiet?"
+    IDS_UNCAUGHT_EXCEPTION  "Błąd krytyczny: Niewykryty wyjątek\nWątek: %s\nTyp: %s\nWiadomość: %s"
+    IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO
+                            "Błąd krytyczny: Niewykryty wyjątek\nWątek: %s\nTyp: %s\nWiadomość: %s\nNr błędu aplikacji: %d"
+    IDS_TRUSTKEEP_TOOLTIP   "Ustawia wszystkie pakiety na ich aktualnie zainstalowaną wersję. Jest to równoznaczne z poinformowaniem instalatora, aby nie wprowadzał żadnych zmian w żadnym pakiecie."
+    IDS_TRUSTCURR_TOOLTIP   "Ustawia wszystkie pakiety na najlepszą dostępną wersję (ZALECANE)."
+    IDS_TRUSTSYNC_TOOLTIP   "Ustawia wszystkie pakiety na wersję dostępną z repozytorium pakietów, w razie potrzeby obniżając ich wersję."
+    IDS_TRUSTEXP_TOOLTIP    "WÅ‚Ä…cz pakiety testowe."
+    IDS_VIEWBUTTON_TOOLTIP  "Wybierz widok pakietu. Określa to, które pakiety są pokazane poniżej.\n\nKategoria: Grupa według kategorii pakietu. Kliknij ""+"", aby rozwinąć.\n\nPełny: Pokaż wszystkie pakiety.\n\nOczekujące: Pokaż tylko pakiety, które mają zostać zainstalowane, usunięte lub uaktualnione. To powie ci, co się zmieni po naciśnięciu ""Dalej"".\n\nAktualne: Pokaż zainstalowane pakiety, które nie wymagają żadnych działań, ponieważ są już w żądanej wersji.\n\nNiezainstalowane: Pokaż pakiety, które nie są aktualnie zainstalowane i nie zostały wybrane do instalacji.\n\nWybrane: Pokaż zainstalowane pakiety, które zostały wybrane, a nie zainstalowane jako zależność.\n\nUsuwalne: Pokaż zainstalowane pakiety, które zostały wybrane i można je bezpiecznie usunąć. Żadne inne zainstalowane lub wybrane pakiety nie zależą od tych pakietów.\n\nNiepotrzebne: Pokaż automatycznie zainstalowane pakiety, które można teraz bezpiecznie usunąć. Inne zainstalowane lub wybrane pakiety nie są już zależne od tych pakietów."
+    IDS_HIDEOBS_TOOLTIP     "Jeśli ta opcja jest zaznaczona, instalator ukryje pakiety w kategoriach o nazwach zaczynających się od ""_"". Takie pakiety są zwykle pustymi symbolami zastępczymi dla pakietów, które zostały usunięte lub których nazwy zostały zmienione, lub są pakietami infrastruktury, które są obsługiwane automatycznie."
+    IDS_SIG_INVALID         "Błąd kopii lustrzanej: nie udało się zweryfikować podpisu Setup.ini %s z %s.\nMożliwe uszkodzenie kopii lustrzanej? Plik Setup.ini został odrzucony."
+    IDS_CRYPTO_ERROR        "Błąd wewnętrzny: błąd biblioteki gcrypt %d %s"
+    IDS_SEARCH_TOOLTIP      "Wyszukaj ten ciąg w nazwach pakietów."
+    IDS_MAYBE_MKDIR         "Katalog %s nie istnieje, czy mam go utworzyć?"
+    IDS_CANT_MKDIR          "Nie można utworzyć katalogu %s, przepraszamy.  (Dysk jest pełny lub tylko do odczytu?)"
+    IDS_NO_LOCALDIR         "Nie znaleziono lokalnego katalogu pakietów %s.\nNadal można usunąć zainstalowane\npakiety, ale nie będzie nic do zainstalowania.\n\nNaciśnij OK, jeśli tego chcesz\nlub Anuluj, aby wybrać inny katalog."
+    IDS_ELEVATED            "Przekaż instalację procesowi potomnemu z podwyższonym poziomem uprawnień."
+    IDS_INSTALLEDB_VERSION  "Nieznana wersja INSTALLED.DB"
+    IDS_NO_MIRROR_LST       "Nie można pobrać listy witryn lustrzanych"
+    IDS_PROGRESS_PROGRESS   "Postęp:"
+    IDS_PROGRESS_PACKAGE    "Pakiet:"
+    IDS_PROGRESS_CONNECTING "Łączenie..."
+    IDS_PROGRESS_CHECKING   "Sprawdzanie pakietów do pobrania..."
+    IDS_PROGRESS_DOWNLOADING
+                            "Pobieranie..."
+    IDS_PROGRESS_PARSING    "Analizowanie..."
+    IDS_PROGRESS_PREREMOVE  "Uruchamiam skrypt preremove..."
+    IDS_PROGRESS_UNINSTALL  "Odinstalowywanie..."
+    IDS_PROGRESS_INSTALL    "Instalacja..."
+    IDS_PROGRESS_CALCULATING
+                            "Obliczanie..."
+    IDS_PROGRESS_POSTINSTALL
+                            "Uruchamianie..."
+    IDS_PROGRESS_SOLVING    "Rozwiązywanie zależności..."
+    IDS_ACTION_DEFAULT      "Domyślnie"
+    IDS_ACTION_INSTALL      "Instaluj"
+    IDS_ACTION_UNINSTALL    "Odinstaluj"
+    IDS_ACTION_SKIP         "Pomiń"
+    IDS_ACTION_KEEP         "Zachowaj"
+    IDS_ACTION_REINSTALL    "Zainstaluj ponownie"
+    IDS_ACTION_RETRIEVE     "Odzyskiwanie"
+    IDS_ACTION_UNKNOWN      "Nieznany"
+    IDS_ACTION_SOURCE       "Źródło"
+    IDS_VIEW_FULL           "Pełny"
+    IDS_VIEW_PENDING        "OczekujÄ…ce"
+    IDS_VIEW_UPTODATE       "Aktualne"
+    IDS_VIEW_NOTINSTALLED   "Nie zainstalowany"
+    IDS_VIEW_PICKED         "Wybrany"
+    IDS_VIEW_REMOVABLE      "Usuwany"
+    IDS_VIEW_UNNEEDED       "Niepotrzebne"
+    IDS_VIEW_CATEGORY       "Kategoria"
+    IDS_COLUMN_PACKAGE      "Pakiet"
+    IDS_COLUMN_CURRENT      "Aktualny"
+    IDS_COLUMN_NEW          "Nowy"
+    IDS_COLUMN_SOURCE       "Src?"
+    IDS_COLUMN_CATEGORIES   "Kategorie"
+    IDS_COLUMN_SIZE         "Rozmiar"
+    IDS_COLUMN_DESCR        "Opis"
+    IDS_MBOX_CAPTION        "Konfiguracja Cygwin"
+    IDS_EXTRACTION_FAILED   "Nie można wyodrębnić /%s -- uszkodzonego pakietu?"
+    IDS_EXTRACTION_INUSE    "Nie można wyodrębnić /%s -- błąd podczas zapisywania pliku\n\nPlik jest używany lub wystąpił inny błąd.\n\nZatrzymaj wszystkie procesy Cygwin i wybierz ""Ponów próbę"" lub wybierz ""Kontynuuj"", aby kontynuować (plik zostanie zaktualizowany po ponownym uruchomieniu).\n"
+    IDS_INSTALL_OLD_CYGWIN  "Znaleziono starą wersję cygwin1.dll tutaj:\n%s\nUsunąć?"
+    IDS_INSTALL_DELETE_OLD_CYGWIN_FAILED
+                            "Nie można usunąć pliku %s.\nCzy biblioteka DLL jest używana przez inną aplikację?\nPowinieneś jak najszybciej usunąć starą wersję cygwin1.dll."
+    IDS_SHELLLINK_FAILED    "CoCreateInstance nie powiodło się z powodu błędu 0x%x.\nInstalator nie będzie mógł tworzyć ikon Cygwin w menu Start ani na pulpicie."
+    IDS_UNSUPPORTED_WINDOWS_VERSION
+                            "Cygwin nie jest obsługiwany w tej wersji systemu Windows"
+    IDS_UNSUPPORTED_WINDOWS_ARCH
+                            "Cygwin nie jest obsługiwany w 32-bitowym systemie Windows"
+    IDS_DEPRECATED_WINDOWS_VERSION
+                            "Obsługa Cygwin dla tej wersji systemu Windows jest przestarzała i zostanie usunięta w następnej głównej wersji"
+    IDS_MOUNT_REGISTRY_KEY_FAILED
+                            "Nie można utworzyć klucza rejestru do przechowywania ścieżki instalacji"
+    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_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"
+    IDS_CHOOSER_EMPTY_NO_PACKAGES
+                            "Nie znaleziono pakietów."
+    IDS_CHOOSER_EMPTY_DOWNLOAD
+                            "Nie ma nic do pobrania."
+    IDS_CHOOSER_EMPTY_INSTALL
+                            "Nie trzeba nic instalować ani aktualizować."
+    IDS_ROOT_BROWSE_TITLE   "Wybierz katalog główny instalacji"
+    IDS_LOCALDIR_BROWSE_DOWNLOAD_TITLE
+                            "Wybierz katalog pobierania"
+    IDS_LOCALDIR_BROWSE_PACKAGE_TITLE
+                            "Wybrany lokalny katalog pakietów"
+    IDS_PROGRESS_CHECKING_HASH
+                            "Sprawdzanie %s dla %s"
+    IDS_PROGRESS_DOWNLOADING_FROM
+                            "%s z %s"
+    IDS_CONFIRM_UNINSTALL   "Odinstaluj"
+    IDS_CONFIRM_INSTALL     "Instaluj"
+    IDS_CONFIRM_DOWNLOAD    "Pobierz"
+    IDS_CONFIRM_NOTHING     "Bez zmian"
+    IDS_CONFIRM_AUTO_ADD    "(dodane automatycznie)"
+    IDS_CONFIRM_SOURCE      "(źródło)"
+    IDS_FILE_INUSE_KILL     "&Zabij procesy"
+    IDS_FILE_INUSE_MSG      "Nie można wyodrębnić"
+    IDS_USER_URL_TOOLTIP    "Dodatkowy adres URL witryny, ścieżka lub ścieżka UNC"
+END
+
+//
+// Option Helptext String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_HELPTEXT_ERROR      "BÅ‚Ä…d podczas przetwarzania opcji."
+    IDS_HELPTEXT_HEADER     "Opcje wiersza poleceń:"
+    IDS_HELPTEXT_FOOTER     "Domyślnie pobierane i instalowane są pakiety, chyba że określono to w opcjach --download lub --local-install."
+    IDS_HELPTEXT_ALLOW_TEST "Rozważ wersje pakietu oznaczone jako testowe"
+    IDS_HELPTEXT_ALLOW_UNSUPPORTED_WINDOWS
+                            "Zezwalaj na stare, nieobsługiwane wersje systemu Windows"
+    IDS_HELPTEXT_ARCH       "Architektura do zainstalowania (x86_64 lub x86)"
+    IDS_HELPTEXT_CATEGORIES "Określanie kategorii do zainstalowania"
+    IDS_HELPTEXT_COMPACTOS  "Kompresuj zainstalowane pliki za pomocÄ… Compact OS (xpress4k, xpress8k, xpress16k, lzx)"
+    IDS_HELPTEXT_DELETE_ORPHANS
+                            "Usuń osierocone pakiety"
+    IDS_HELPTEXT_DISABLE_ANTIVIRUS
+                            "Wyłącz znane lub podejrzewane pakiety oprogramowania antywirusowego z błędami podczas wykonywania"
+    IDS_HELPTEXT_DOWNLOAD   "Pobierz pakiety z internetu"
+    IDS_HELPTEXT_FORCE_CURRENT
+                            "Wybierz aktualną wersję dla wszystkich pakietów"
+    IDS_HELPTEXT_HELP       "Drukuj pomoc"
+    IDS_HELPTEXT_INCLUDE_SOURCE
+                            "Automatycznie instaluj źródła dla każdego zainstalowanego pakietu"
+    IDS_HELPTEXT_INI_BASENAME
+                            "Użyj innej nazwy bazowej, np. ""foo"", zamiast ""konfiguracja"""
+    IDS_HELPTEXT_KEEP_UNTRUSTED_KEYS
+                            "Używaj niezaufanych kluczy i zachowaj wszystkie"
+    IDS_HELPTEXT_LANG       "Określ język GUI langid"
+    IDS_HELPTEXT_LOCAL_INSTALL
+                            "Zainstaluj pakiety z katalogu lokalnego"
+    IDS_HELPTEXT_LOCAL_PACKAGE_DIR
+                            "Lokalny katalog pakietów"
+    IDS_HELPTEXT_MIRROR_MODE
+                            "Pomiń sprawdzanie dostępności pakietu podczas instalacji z katalogu lokalnego (wymaga, aby katalog lokalny był czystą kopią lustrzaną!)"
+    IDS_HELPTEXT_NO_ADMIN   "Nie sprawdzaj i nie wymuszaj uruchamiania jako administrator"
+    IDS_HELPTEXT_NO_DESKTOP "Wyłącz tworzenie skrótu na pulpicie"
+    IDS_HELPTEXT_NO_REPLACEONREBOOT
+                            "Wyłącz zastępowanie plików w użyciu przy następnym ponownym uruchomieniu komputera"
+    IDS_HELPTEXT_NO_SHORTCUTS
+                            "Wyłącz tworzenie skrótów na pulpicie i menu Start"
+    IDS_HELPTEXT_NO_STARTMENU
+                            "Wyłącz tworzenie skrótów w menu Start"
+    IDS_HELPTEXT_NO_VERIFY  "Nie weryfikuj podpisów pliku setup.ini"
+    IDS_HELPTEXT_NO_VERSION_CHECK
+                            "Pomiń sprawdzanie, czy dostępna jest nowsza wersja instalacji"
+    IDS_HELPTEXT_NO_WARN_DEPRECATED_WINDOWS
+                            "Nie ostrzegaj o przestarzałych wersjach systemu Windows"
+    IDS_HELPTEXT_NO_WRITE_REGISTRY
+                            "Nie zapisuj głównego katalogu instalacyjnego w rejestrze"
+    IDS_HELPTEXT_OLD_KEYS   "WÅ‚Ä…cz stare klucze cygwin.com"
+    IDS_HELPTEXT_ONLY_SITE  "Nie pobieraj listy serwerów lustrzanych. Używaj tylko witryn określonych za pomocą -s"
+    IDS_HELPTEXT_PACKAGES   "Określ pakiety do zainstalowania"
+    IDS_HELPTEXT_PACKAGE_MANAGER
+                            "Tryb wyboru tylko częściowo nadzorowanego"
+    IDS_HELPTEXT_PROXY      "Serwer proxy HTTP/FTP (host:port)"
+    IDS_HELPTEXT_PRUNE_INSTALL
+                            "Ogranicz instalację tylko do wymaganych pakietów"
+    IDS_HELPTEXT_PUBKEY     "Adres URL lub bezwzględna ścieżka dodatkowego pliku klucza publicznego (format RFC4880)"
+    IDS_HELPTEXT_QUIET_MODE "Tryb instalacji nienadzorowanej"
+    IDS_HELPTEXT_REMOVE_CATEGORIES
+                            "Określ kategorie do odinstalowania"
+    IDS_HELPTEXT_REMOVE_PACKAGES
+                            "Określ pakiety do odinstalowania"
+    IDS_HELPTEXT_ROOT       "Główny katalog instalacyjny"
+    IDS_HELPTEXT_SEXPR_PUBKEY
+                            "Dodatkowy klucz publiczny DSA w formacie s-expr"
+    IDS_HELPTEXT_SITE       "Pobierz adres URL witryny, ścieżkę lub ścieżkę UNC"
+    IDS_HELPTEXT_SYMLINK_TYPE
+                            "Typ dowiÄ…zania symbolicznego (lnk, native, sys, wsl)"
+    IDS_HELPTEXT_UNTRUSTED_KEYS
+                            "Użyj niezaufanych zapisanych dodatkowych kluczy"
+    IDS_HELPTEXT_UPGRADE_ALSO
+                            "Zaktualizuj również zainstalowane pakiety"
+    IDS_HELPTEXT_USER_AGENT "Ciąg agenta użytkownika dla żądań HTTP"
+    IDS_HELPTEXT_VERBOSE    "Pełne dane wyjściowe"
+    IDS_HELPTEXT_VERSION    "Pokaż wersję"
+    IDS_HELPTEXT_WAIT       "Po podniesieniu uprawnień należy poczekać na podniesienie uprawnień procesu potomnego"
+END
diff --git a/res/tr/res.rc b/res/tr/res.rc
index ef411049..6178a61f 100644
--- a/res/tr/res.rc
+++ b/res/tr/res.rc
@@ -44,8 +44,8 @@ BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     GROUPBOX        "Yerel Paket Dizini",IDC_LOCALDIR_GRP,5,35,330,35
-    EDITTEXT        IDC_LOCAL_DIR,13,47,270,14,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&Göz at...",IDC_LOCAL_DIR_BROWSE,285,47,44,14,WS_TABSTOP
+    EDITTEXT        IDC_LOCAL_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Göz at...",IDC_LOCAL_DIR_BROWSE,277,47,52,14,WS_TABSTOP
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -58,8 +58,8 @@ BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     GROUPBOX        "Kök Dizin",IDC_ROOTDIR_GRP,5,35,330,35
-    EDITTEXT        IDC_ROOT_DIR,13,47,270,14,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&Göz at...",IDC_ROOT_BROWSE,285,47,44,14,WS_TABSTOP
+    EDITTEXT        IDC_ROOT_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Göz at...",IDC_ROOT_BROWSE,277,47,52,14,WS_TABSTOP
     GROUPBOX        "Şunun İçin Kur",IDC_INSTALLFOR_GRP,5,76,330,101
     CONTROL         "&Tüm Kullanıcılar (TAVSİYE EDİLEN)",IDC_ROOT_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,13,89,130,8
     CONTROL         "Yalnızca &Ben",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,130,130,8
@@ -91,8 +91,8 @@ CAPTION "Cygwin Kurucu - Bağlantı Türünü Seç"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "&Sistem Vekil Ayarlarını Kullan",IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
-    CONTROL         "&Direct Bağlantı",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
-    CONTROL         "HTTP/FTP &Vekili Kullan:",IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,88,10
+    CONTROL         "&Direct Bağlantı",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
+    CONTROL         "HTTP/FTP &Vekili Kullan:",IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,185,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP
     EDITTEXT        IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL | WS_DISABLED
     GROUPBOX        "",IDC_STATIC,60,95,185,50
@@ -162,12 +162,12 @@ CAPTION "Cygwin Kurucu"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "Cygwin Kurucu Programı",IDC_STATIC_WELCOME_TITLE,115,1,195,24
-    LTEXT           "Bu kurucu program Cygwin ortamının ilk kurulumu ve sonraki tüm güncellemeler için kullanılır. Takip eden sayfalar kurulum boyunca size rehberlik edecektir.\n\nÖntanımlı olarak yalnızca temel bir paket kümesi kurduğumuzu lütfen unutmayın.  Cygwin, çok çeşitli amaçları kapsayan çok sayıda paket sağlar.\n\nGerektiğinde paket eklemek, kaldırmak veya yükseltmek için bu programı istediğiniz zaman çalıştırabilirsiniz.",IDC_SPLASH_TEXT,115,25,195,90
+    LTEXT           "Bu kurucu program Cygwin ortamının ilk kurulumu ve sonraki tüm güncellemeler için kullanılır. Takip eden sayfalar kurulum boyunca size rehberlik edecektir.\n\nÖntanımlı olarak yalnızca temel bir paket kümesi kurduğumuzu lütfen unutmayın.  Cygwin, çok çeşitli amaçları kapsayan çok sayıda paket sağlar.\n\nGerektiğinde paket eklemek, kaldırmak veya yükseltmek için bu programı istediğiniz zaman çalıştırabilirsiniz.",IDC_SPLASH_TEXT,115,25,195,100
     ICON            IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE
     LTEXT           "",IDC_VERSION,115,127,195,10
     LTEXT           "",IDC_SPLASH_COPYR,115,140,195,8
     LTEXT           "",IDC_SPLASH_URL,115,152,90,8
-    LTEXT           "Contribute to translations of this program.",IDC_SPLASH_TRANSLATE,115,164,195,8
+    LTEXT           "Bu programın çevirilerine katkıda bulunun.",IDC_SPLASH_TRANSLATE,115,164,195,8
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -176,8 +176,8 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
 CAPTION "Cygwin Kurucu - Kurulum Durumu ve Simge Oluşturulması"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "&Masaüstü Simgesi Oluştur",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,100,8
-    CONTROL         "&Başlat Menüsüne Simge Ekle",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,100,8
+    CONTROL         "&Masaüstü Simgesi Oluştur",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,110,8
+    CONTROL         "&Başlat Menüsüne Simge Ekle",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,140,8
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     LTEXT           "Cygwin ortamına kolay erişim için birkaç simge oluşturulmasını isteyip istemediğinizi belirtin.",IDC_DESKTOP_HEADER_INSTALL,21,9,239,16,NOT WS_GROUP
@@ -411,7 +411,7 @@ BEGIN
     IDS_UNSUPPORTED_WINDOWS_VERSION
                             "Cygwin bu Windows sürümünde desteklenmiyor"
     IDS_UNSUPPORTED_WINDOWS_ARCH
-                            "Cygwin is not supported on 32-bit Windows"
+                            "Cygwin 32 bit Windows'ta desteklenmiyor"
     IDS_DEPRECATED_WINDOWS_VERSION
                             "Bu Windows sürümü için Cygwin desteği sonlandırıldı ve bir sonraki ana sürümde kaldırılacak"
     IDS_MOUNT_REGISTRY_KEY_FAILED
@@ -446,6 +446,7 @@ BEGIN
     IDS_CONFIRM_SOURCE      "(kaynak)"
     IDS_FILE_INUSE_KILL     "İşlemleri &Sonlandır"
     IDS_FILE_INUSE_MSG      "Çıkarılamıyor"
+    IDS_USER_URL_TOOLTIP    "Ek site URL'si, yol veya UNC yolu"
 END
 
 //
@@ -516,7 +517,7 @@ BEGIN
     IDS_HELPTEXT_ROOT       "Kök kurulum dizini"
     IDS_HELPTEXT_SEXPR_PUBKEY
                             "s-expr biçiminde ek DSA ortak anahtarı"
-    IDS_HELPTEXT_SITE       "Ä°ndirme sitesi URL'si"
+    IDS_HELPTEXT_SITE       "Ä°ndirme sitesi URL'si, yol veya UNC yolu"
     IDS_HELPTEXT_SYMLINK_TYPE
                             "Sembolik bağlantı türü (lnk, yerel, sys, wsl)"
     IDS_HELPTEXT_UNTRUSTED_KEYS
diff --git a/res/zh_Hans/res.rc b/res/zh_Hans/res.rc
index 8abf0149..5bcb1909 100644
--- a/res/zh_Hans/res.rc
+++ b/res/zh_Hans/res.rc
@@ -10,7 +10,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择安装类型"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "从互联网安装\n(下载的文件将保留以备将来重复使用)(&I)",IDC_SOURCE_NETINST,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE | BS_TOP,71,60,200,30
+    CONTROL         "从互联网安装(&I)\n(下载的文件将保留以备将来重复使用)",IDC_SOURCE_NETINST,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE | BS_TOP,71,60,200,30
     CONTROL         "下载而不安装(&D)",IDC_SOURCE_DOWNLOAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,90,200,10
     CONTROL         "从本地目录安装(&L)",IDC_SOURCE_LOCALDIR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,120,200,10
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
@@ -39,13 +39,13 @@ CAPTION "Cygwin 安装程序 - 选择本地软件包目录"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "选择本地软件包目录",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
-    LTEXT           "选择希望安装程序存储其下载的安装文件的目录。 如果该目录尚不存在,则将创建该目录。",IDC_LOCAL_DIR_DOWNLOAD_DESC,21,9,248,16,NOT WS_GROUP
+    LTEXT           "选择希望安装程序存储其下载的安装文件的目录。如果该目录尚不存在,则将创建该目录。",IDC_LOCAL_DIR_DOWNLOAD_DESC,21,9,248,16,NOT WS_GROUP
     LTEXT           "选择安装程序应在其中查找下载的安装文件的目录。",IDC_LOCAL_DIR_INSTALL_DESC,21,9,248,16,NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     GROUPBOX        "本地软件包目录",IDC_LOCALDIR_GRP,5,35,330,35
-    EDITTEXT        IDC_LOCAL_DIR,13,47,270,14,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "浏览(&R)...",IDC_LOCAL_DIR_BROWSE,285,47,44,14,WS_TABSTOP
+    EDITTEXT        IDC_LOCAL_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "浏览(&R)...",IDC_LOCAL_DIR_BROWSE,277,47,52,14,WS_TABSTOP
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -54,17 +54,17 @@ CAPTION "Cygwin 安装程序 - 选择安装目录"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "选择根安装目录",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
-    LTEXT           "选择要安装 Cygwin 的目录。还需要选择几个安装参数。",IDC_ROOTDIR_SUBTEXT,21,9,239,16,NOT WS_GROUP
+    LTEXT           "选择要安装 Cygwin 的目录。以及一些安装参数。",IDC_ROOTDIR_SUBTEXT,21,9,239,16,NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     GROUPBOX        "根目录",IDC_ROOTDIR_GRP,5,35,330,35
-    EDITTEXT        IDC_ROOT_DIR,13,47,270,14,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "浏览(&R)...",IDC_ROOT_BROWSE,285,47,44,14,WS_TABSTOP
+    EDITTEXT        IDC_ROOT_DIR,13,47,262,14,ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON      "浏览(&R)...",IDC_ROOT_BROWSE,277,47,52,14,WS_TABSTOP
     GROUPBOX        "为以下用户安装",IDC_INSTALLFOR_GRP,5,76,330,101
     CONTROL         "所有用户(推荐)(&A)",IDC_ROOT_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,13,89,130,8
     CONTROL         "仅自己(&M)",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,130,130,8
     LTEXT           "Cygwin 将可供系统的所有用户使用。",IDC_ALLUSERS_TEXT,25,101,300,28
-    LTEXT           "Cygwin仍将对所有用户可用,但桌面图标,Cygwin菜单条目和重要的安装程序信息仅对当前用户可用。 仅当您缺少管理员权限或有特定需求时,才选择此选项。",IDC_JUSTME_TEXT,25,140,300,32
+    LTEXT           "Cygwin 仍将对所有用户可用,但桌面图标,Cygwin 菜单条目和重要的安装程序信息仅对当前用户可用。仅当您缺少管理员权限或有特定需求时,才选择此选项。",IDC_JUSTME_TEXT,25,140,300,32
 END
 
 IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -78,10 +78,10 @@ BEGIN
     LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
     LTEXT           "可用的下载站点:",IDC_STATIC,66,34,183,8,NOT WS_GROUP
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
-    LTEXT           "从此列表中选择一个网站,或将您自己的网站添加到列表中。",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "从此列表中选择一个站点,或将您自己的站点添加到列表中。",IDC_STATIC,21,9,239,16,NOT WS_GROUP
     LTEXT           "选择下载站点",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
     EDITTEXT        IDC_EDIT_USER_URL,65,160,185,14,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "用户网址:",IDC_SITE_USERURL,15,162,45,8,NOT WS_GROUP
+    LTEXT           "用户站点:",IDC_SITE_USERURL,15,162,45,8,NOT WS_GROUP
     PUSHBUTTON      "添加",IDC_BUTTON_ADD_URL,255,160,50,14
 END
 
@@ -91,8 +91,8 @@ CAPTION "Cygwin 安装程序 - 选择连接类型"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "使用系统代理设置(&S)",IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
-    CONTROL         "直接连接(&D)",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
-    CONTROL         "使用 HTTP/FTP 代理(&P):",IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,88,10
+    CONTROL         "直接连接(&D)",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
+    CONTROL         "使用 HTTP/FTP 代理(&P):",IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,185,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP
     EDITTEXT        IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL | WS_DISABLED
     GROUPBOX        "",IDC_STATIC,60,95,185,50
@@ -100,7 +100,7 @@ BEGIN
     RTEXT           "端口(&T)",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
-    LTEXT           "安装程序需要知道您希望它如何连接到互联网。 在下面选择适当的设置。",IDC_STATIC,21,9,239,16,NOT WS_GROUP
+    LTEXT           "安装程序需要知道您希望它如何连接到互联网。请在下面选择适当的设置。",IDC_STATIC,21,9,239,16,NOT WS_GROUP
     LTEXT           "选择您的互联网连接",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
 END
 
@@ -117,8 +117,8 @@ BEGIN
     CONTROL         "进度一",IDC_INS_IPROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,115,155,10
     CONTROL         "进度一",IDC_INS_PPROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,95,100,155,10
     LTEXT           "软件包:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
-    LTEXT           "总计:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
-    LTEXT           "磁盘:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
+    LTEXT           "总进度:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
+    LTEXT           "磁盘用量:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     LTEXT           "此页显示下载或安装的进度。",IDC_STATIC,21,9,239,16,NOT WS_GROUP
@@ -137,7 +137,7 @@ BEGIN
     EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT           "需要代理授权",IDC_STATIC,65,10,145,10
     DEFPUSHBUTTON   "确定(&O)",IDOK,100,75,45,15,WS_DISABLED
-    PUSHBUTTON      "取消",IDCANCEL,165,75,45,15
+    PUSHBUTTON      "取消(&C)",IDCANCEL,165,75,45,15
 END
 
 IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
@@ -152,7 +152,7 @@ BEGIN
     EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT           "需要服务器授权",IDC_STATIC,65,10,145,10
     DEFPUSHBUTTON   "确定(&O)",IDOK,100,75,45,15,WS_DISABLED
-    PUSHBUTTON      "取消",IDCANCEL,165,75,45,15
+    PUSHBUTTON      "取消(&C)",IDCANCEL,165,75,45,15
 END
 
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -161,13 +161,13 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
 CAPTION "Cygwin 安装程序"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Cygwin 网络版安装程序",IDC_STATIC_WELCOME_TITLE,115,1,195,24
-    LTEXT           "此安装程序用于 Cygwin 环境的初始安装以及所有后续更新。以下页面将指导您完成安装。\n\n请注意,默认情况下,我们只安装一组基本的软件包。Cygwin 提供了大量涵盖各种用途的软件包。\n\n您将来可以随时运行此程序,以根据需要添加、删除或升级软件包。\n",IDC_SPLASH_TEXT,115,25,195,90
+    LTEXT           "Cygwin 在线安装程序",IDC_STATIC_WELCOME_TITLE,115,1,195,24
+    LTEXT           "本安装程序用于 Cygwin 环境的初始安装以及所有后续更新。以下页面将指导您完成安装。\n\n请注意,默认情况下,我们只安装一组基本的软件包。Cygwin 提供了大量涵盖各种用途的软件包。\n\n您将来可以随时运行此程序,以根据需要添加、删除或升级软件包。",IDC_SPLASH_TEXT,115,25,195,100
     ICON            IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE
     LTEXT           "",IDC_VERSION,115,127,195,10
     LTEXT           "",IDC_SPLASH_COPYR,115,140,195,8
     LTEXT           "",IDC_SPLASH_URL,115,152,90,8
-    LTEXT           "Contribute to translations of this program.",IDC_SPLASH_TRANSLATE,115,164,195,8
+    LTEXT           "为本程序的翻译工作做出贡献。",IDC_SPLASH_TRANSLATE,115,164,195,8
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -176,8 +176,8 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
 CAPTION "Cygwin 安装程序 - 安装状态和创建图标"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "在桌面上创建图标(&D)",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,100,8
-    CONTROL         "将图标添加到“开始”菜单(&S)",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,100,8
+    CONTROL         "在桌面上创建图标(&D)",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,110,8
+    CONTROL         "将图标添加到“开始”菜单(&S)",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,140,8
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     LTEXT           "告诉安装程序您是否希望它创建一些图标以便于访问 Cygwin 环境。",IDC_DESKTOP_HEADER_INSTALL,21,9,239,16,NOT WS_GROUP
@@ -201,7 +201,7 @@ BEGIN
     EDITTEXT        IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT           "需要 FTP 授权",IDC_STATIC,65,10,145,10
     DEFPUSHBUTTON   "确定(&O)",IDOK,100,75,45,15,WS_DISABLED
-    PUSHBUTTON      "取消",IDCANCEL,165,75,45,15
+    PUSHBUTTON      "取消(&C)",IDCANCEL,165,75,45,15
 END
 
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
@@ -210,7 +210,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
 CAPTION "Cygwin 安装程序 - 选择软件包"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "查看(&V)",IDC_CHOOSE_VIEWCAPTION,SETUP_VIEW_X,33,SETUP_VIEW_W,10
+    LTEXT           "视图(&V)",IDC_CHOOSE_VIEWCAPTION,SETUP_VIEW_X,33,SETUP_VIEW_W,10
     COMBOBOX        IDC_CHOOSE_VIEW,SETUP_VIEWLIST_X,30,SETUP_VIEWLIST_W,84,CBS_DROPDOWNLIST | WS_TABSTOP
     RTEXT           "搜索(&S)",IDC_STATIC,SETUP_SEARCH_X,33,SETUP_SEARCH_W,10,SS_CENTERIMAGE,WS_EX_RIGHT
     CONTROL         "搜索 ",IDC_CHOOSE_DO_SEARCH,"Button",BS_PUSHBUTTON | NOT WS_VISIBLE,SETUP_SEARCH_X,33,SETUP_SEARCH_W,14
@@ -219,7 +219,7 @@ BEGIN
     CONTROL         "保留(&K)",IDC_CHOOSE_KEEP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,SETUP_KEEP_X,30,SETUP_KPCE_W,14
     CONTROL         "最佳(&B)",IDC_CHOOSE_BEST,"Button",BS_AUTORADIOBUTTON,SETUP_BEST_X,30,SETUP_KPCE_W,14
     CONTROL         "同步(&S)",IDC_CHOOSE_SYNC,"Button",BS_AUTORADIOBUTTON,SETUP_SYNC_X,30,SETUP_KPCE_W,14
-    CONTROL         "测试(&T)",IDC_CHOOSE_EXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,SETUP_EXP_X,30,SETUP_KPCE_W,14
+    CONTROL         "测试版(&T)",IDC_CHOOSE_EXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,SETUP_EXP_X,30,SETUP_KPCE_W,14
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     CONTROL         "",IDC_CHOOSE_LIST,WC_LISTVIEW,LVS_NOSORTHEADER | LVS_REPORT | LVS_SINGLESEL | WS_TABSTOP,SETUP_CHOOSE_X,47,SETUP_CHOOSE_W,120,WS_EX_CLIENTEDGE
     CONTROL         "隐藏过时的软件包(&H)",IDC_CHOOSE_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,160,14
@@ -246,12 +246,12 @@ END
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
     WS_SYSMENU
-CAPTION "Cygwin 安装程序 - 查看并确认更改"
+CAPTION "Cygwin 安装程序 - 审查并确认更改"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    LTEXT           "查看并确认更改",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
+    LTEXT           "审查并确认更改",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
     EDITTEXT        IDC_CONFIRM_EDIT,7,41,325,131,WS_VSCROLL | WS_HSCROLL | ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | ES_AUTOVSCROLL
 END
 
@@ -281,7 +281,7 @@ BEGIN
     DEFPUSHBUTTON   "重试(&R)",IDRETRY,45,150,50,15
     PUSHBUTTON      "返回(&B)",IDC_BACK,110,150,50,15
     PUSHBUTTON      "继续(&C)",IDIGNORE,175,150,50,15
-    PUSHBUTTON      "取消",IDABORT,240,150,50,15
+    PUSHBUTTON      "取消(&C)",IDABORT,240,150,50,15
 END
 
 IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
@@ -321,10 +321,10 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_ROOT_SLASH          "警告:我们强烈建议您不要将硬盘驱动器的根目录用作 cygwin 根目录,以防止与其他程序发生冲突。是否继续?"
-    IDS_ROOT_SPACE          "不应选择在目录名称中包含空格的根路径。是否继续?"
+    IDS_ROOT_SLASH          "警告:我们强烈建议您不要将硬盘驱动器的根目录用作 Cygwin 根目录,以防止与其他程序发生冲突。是否继续?"
+    IDS_ROOT_SPACE          "不应在目录名称中包含空格。是否继续?"
     IDS_ERR_OPEN_WRITE      "无法打开 %s 进行写入: %s"
-    IDS_SETUPINI_MISSING    "无法从 %s 获取 <%s>"
+    IDS_SETUPINI_MISSING    "无法获取 %s(从 <%s>)"
     IDS_OLD_SETUPINI        "这个 setup.ini 比你上次安装 cygwin 时使用的旧。是否继续?"
     IDS_NOTHING_INSTALLED   "无需安装"
     IDS_INSTALL_COMPLETE    "安装完成"
@@ -350,16 +350,16 @@ BEGIN
     IDS_TRUSTKEEP_TOOLTIP   "将所有软件包设置为其当前安装的版本。 这相当于告诉安装程序不要对任何软件包进行任何更改。"
     IDS_TRUSTCURR_TOOLTIP   "将所有软件包设置为可用的最佳版本(推荐)。"
     IDS_TRUSTSYNC_TOOLTIP   "将所有软件包设置为软件包存储库中可用的版本,必要时降级。"
-    IDS_TRUSTEXP_TOOLTIP    "启用测试软件包。"
-    IDS_VIEWBUTTON_TOOLTIP  "选择软件包视图。 这决定了下面显示哪些包。\n\n类别:按软件包类别分组。 单击“+”展开。\n\n完整:显示所有软件包。\n\n待定:仅显示即将安装、删除或升级的包。 这告诉您按“下一步”时将发生什么变化。\n\n最新:显示不需要执行任何操作的已安装软件包,因为它们已经处于所需版本。\n\n未安装:显示当前未安装且尚未选择安装的包。\n\n已选择:显示已选择的已安装包,但未作为依赖项安装。\n\n可卸载的:显示已选择且可以安全删除的已安装软件包。 没有其他已安装或选定的软件包依赖于这些软件包。\n\n不需要的:显示现在可以安全删除的自动安装的软件包。 其他已安装或选定的软件包不再依赖于这些软件包。"
+    IDS_TRUSTEXP_TOOLTIP    "启用测试版软件包。"
+    IDS_VIEWBUTTON_TOOLTIP  "选择软件包视图。这决定了下面显示哪些软件包。\n\n类别:按软件包类别分组。单击“+”展开。\n\n完整:显示所有软件包。\n\n待定:仅显示即将安装、删除或升级的包。这告诉您按“下一步”时将发生什么变化。\n\n最新:显示不需要执行任何操作的已安装软件包,因为它们已经处于所需版本。\n\n未安装:显示当前未安装且尚未选择安装的包。\n\n已选择:显示已选择的已安装软件包,但未作为依赖项安装。\n\n可卸载的:显示已选择且可以安全删除的已安装软件包。没有其他已安装或选定的软件包依赖于这些软件包。\n\n不需要的:显示现在可以安全删除的自动安装的软件包。其他已安装或选定的软件包不再依赖于这些软件包。"
     IDS_HIDEOBS_TOOLTIP     "如果选中,安装程序将隐藏名称以“_”开头的类别中的软件包。 此类软件包通常是已删除或重命名的软件包的空占位符,或者是自动处理的基础结构软件包。"
-    IDS_SIG_INVALID         "镜像错误:来自 %s 的 Setup.ini 签名 %s 验证失败。\n可能损坏镜像? Setup.ini 被拒绝。"
+    IDS_SIG_INVALID         "镜像错误:Setup.ini 签名 %s(来自 %s)验证失败。\n镜像可能已损坏? Setup.ini 被拒绝。"
     IDS_CRYPTO_ERROR        "内部错误: gcrypt 库错误 %d %s"
     IDS_SEARCH_TOOLTIP      "在软件包名称中搜索此字符串。"
     IDS_MAYBE_MKDIR         "目录 %s 不存在,是否创建它?"
     IDS_CANT_MKDIR          "无法创建目录 %s,抱歉。(驱动器是已满还是只读?)"
     IDS_NO_LOCALDIR         "找不到本地软件包目录 %s。\n您仍然可以删除已安装的\n软件包,但不会有任何要安装的内容。\n\n点击“确定”,如果这是你想要的\n或“取消”以选择其他目录。"
-    IDS_ELEVATED            "将安装移交给提升的子进程。"
+    IDS_ELEVATED            "将安装移交给提权的子进程。"
     IDS_INSTALLEDB_VERSION  "未知的 INSTALLED.DB 版本"
     IDS_NO_MIRROR_LST       "无法下载镜像站点列表"
     IDS_PROGRESS_PROGRESS   "进度:"
@@ -385,7 +385,7 @@ BEGIN
     IDS_ACTION_REINSTALL    "重新安装"
     IDS_ACTION_RETRIEVE     "检索"
     IDS_ACTION_UNKNOWN      "未知"
-    IDS_ACTION_SOURCE       "源"
+    IDS_ACTION_SOURCE       "源代码"
     IDS_VIEW_FULL           "完整"
     IDS_VIEW_PENDING        "待定"
     IDS_VIEW_UPTODATE       "最新"
@@ -395,15 +395,15 @@ BEGIN
     IDS_VIEW_UNNEEDED       "不需要的"
     IDS_VIEW_CATEGORY       "类别"
     IDS_COLUMN_PACKAGE      "软件包"
-    IDS_COLUMN_CURRENT      "当前"
-    IDS_COLUMN_NEW          "新增"
+    IDS_COLUMN_CURRENT      "当前状态"
+    IDS_COLUMN_NEW          "操作"
     IDS_COLUMN_SOURCE       "源代码?"
     IDS_COLUMN_CATEGORIES   "类别"
     IDS_COLUMN_SIZE         "大小"
     IDS_COLUMN_DESCR        "描述"
     IDS_MBOX_CAPTION        "Cygwin 安装程序"
     IDS_EXTRACTION_FAILED   "无法解压缩 /%s -- 损坏的软件包?"
-    IDS_EXTRACTION_INUSE    "无法解压缩 /%s -- 写入文件时出错\n\n文件正在使用中或发生了其他错误。\n\n请停止所有 Cygwin 进程并选择“重试”,或选择“继续”以继续(文件将在重新启动后更新)。\n"
+    IDS_EXTRACTION_INUSE    "无法解压缩 /%s -- 写入文件时出错\n\n文件正在使用中或发生了其他错误。\n\n请结束所有 Cygwin 进程并选择""重试"",或选择""继续""以继续(文件将在重启后更新)。\n"
     IDS_INSTALL_OLD_CYGWIN  "在这里发现了旧版本的 cygwin1.dll:\n%s\n是否删除?"
     IDS_INSTALL_DELETE_OLD_CYGWIN_FAILED
                             "无法删除文件 %s。\nDLL 是否正由另一个应用程序使用?\n您应该尽早删除旧版本的 cygwin1.dll。"
@@ -411,7 +411,7 @@ BEGIN
     IDS_UNSUPPORTED_WINDOWS_VERSION
                             "Cygwin 在此 Windows 版本上不受支持"
     IDS_UNSUPPORTED_WINDOWS_ARCH
-                            "Cygwin is not supported on 32-bit Windows"
+                            "Cygwin 在 32 位 Windows 上不受支持"
     IDS_DEPRECATED_WINDOWS_VERSION
                             "Cygwin 对此 Windows 版本的支持已被弃用,并将在下一个主要版本中删除"
     IDS_MOUNT_REGISTRY_KEY_FAILED
@@ -421,7 +421,7 @@ BEGIN
                             "警告 - 未解决的问题\n\n如果继续,某些软件包可能无法正常工作。\n\n您确定要继续(不推荐)吗?"
     IDS_MIXED_BITNESS_ERROR "目标 CPU 不匹配\n\n您正在尝试将 %s 位版本的 Cygwin 安装到包含 %s 位版本的 Cygwin 的目录中。 继续这样做会破坏现有安装。\n\n运行 setup-%s.exe 以更新 Cygwin 的现有 %s 位安装,或为 %s 位安装选择其他目录。"
     IDS_GET_SITELIST_ERROR  "无法获取下载站点列表。\n请确保您的网络设置正确,然后重试。"
-    IDS_CONFIRM_EXIT        "是否确实要退出安装程序?任何当前的下载或安装都将中止。"
+    IDS_CONFIRM_EXIT        "是否确实要退出安装程序?任何当前的下载或安装操作都将被中止。"
     IDS_CONTINUE            "继续"
     IDS_CHOOSER_EMPTY_NO_PACKAGES
                             "未发现软件包。"
@@ -435,17 +435,18 @@ BEGIN
     IDS_LOCALDIR_BROWSE_PACKAGE_TITLE
                             "选择本地软件包目录"
     IDS_PROGRESS_CHECKING_HASH
-                            "正在检查 %s 的 %s"
+                            "正在检查 %s(文件:%s)"
     IDS_PROGRESS_DOWNLOADING_FROM
                             "%s 来自 %s"
     IDS_CONFIRM_UNINSTALL   "卸载"
     IDS_CONFIRM_INSTALL     "安装"
     IDS_CONFIRM_DOWNLOAD    "下载"
-    IDS_CONFIRM_NOTHING     "没有变化"
+    IDS_CONFIRM_NOTHING     "不更改"
     IDS_CONFIRM_AUTO_ADD    "(自动添加)"
     IDS_CONFIRM_SOURCE      "(源代码)"
     IDS_FILE_INUSE_KILL     "终止进程(&K)"
     IDS_FILE_INUSE_MSG      "无法解压缩"
+    IDS_USER_URL_TOOLTIP    "其他站点的网址、路径或 UNC 路径"
 END
 
 //
@@ -457,7 +458,7 @@ BEGIN
     IDS_HELPTEXT_ERROR      "选项处理期间出错。"
     IDS_HELPTEXT_HEADER     "命令行选项:"
     IDS_HELPTEXT_FOOTER     "默认设置是下载和安装软件包,除非指定了 --download 或 --local-install。"
-    IDS_HELPTEXT_ALLOW_TEST "考虑标记为测试的软件包版本"
+    IDS_HELPTEXT_ALLOW_TEST "考虑标记为测试版的软件包版本"
     IDS_HELPTEXT_ALLOW_UNSUPPORTED_WINDOWS
                             "允许旧的、不受支持的 Windows 版本"
     IDS_HELPTEXT_ARCH       "要安装的体系结构(x86_64 或 x86)"
@@ -474,10 +475,10 @@ BEGIN
     IDS_HELPTEXT_INCLUDE_SOURCE
                             "为每个安装的软件包自动安装源代码"
     IDS_HELPTEXT_INI_BASENAME
-                            "使用不同的基本名称,例如“foo”,而不是“setup”"
+                            "使用不同的基本名称,例如""foo"",而非""setup"""
     IDS_HELPTEXT_KEEP_UNTRUSTED_KEYS
                             "使用不受信任的密钥并保留所有密钥"
-    IDS_HELPTEXT_LANG       "指定 GUI 语言语言 langid"
+    IDS_HELPTEXT_LANG       "指定 GUI 语言的 langid"
     IDS_HELPTEXT_LOCAL_INSTALL
                             "从本地目录安装软件包"
     IDS_HELPTEXT_LOCAL_PACKAGE_DIR
@@ -516,15 +517,15 @@ BEGIN
     IDS_HELPTEXT_ROOT       "根安装目录"
     IDS_HELPTEXT_SEXPR_PUBKEY
                             "s-expr 格式的额外 DSA 公钥"
-    IDS_HELPTEXT_SITE       "下载网址"
+    IDS_HELPTEXT_SITE       "下载站点的网址、路径或 UNC 路径"
     IDS_HELPTEXT_SYMLINK_TYPE
                             "符号链接类型(lnk,本机,系统,wsl)"
     IDS_HELPTEXT_UNTRUSTED_KEYS
                             "使用不受信任的已保存额外密钥"
     IDS_HELPTEXT_UPGRADE_ALSO
                             "同时升级已安装的软件包"
-    IDS_HELPTEXT_USER_AGENT "用于 HTTP 请求的用户代理字符串"
+    IDS_HELPTEXT_USER_AGENT "用于 HTTP 请求的用户代理(User Agent)字符串"
     IDS_HELPTEXT_VERBOSE    "详细输出"
     IDS_HELPTEXT_VERSION    "显示版本"
-    IDS_HELPTEXT_WAIT       "提升时,等待提升的子进程"
+    IDS_HELPTEXT_WAIT       "在提权时,等待提权的子进程"
 END



More information about the Cygwin-apps-cvs mailing list