[Gpg4win-commits] r682 - in trunk: . po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jan 16 01:12:56 CET 2008
Author: marcus
Date: 2008-01-16 01:12:54 +0100 (Wed, 16 Jan 2008)
New Revision: 682
Modified:
trunk/ChangeLog
trunk/po/ChangeLog
trunk/po/POTFILES.in
trunk/po/de.po
trunk/src/gpg4win-src.nsi
trunk/src/gpg4win.nsi
trunk/src/installer.nsi
Log:
src/
2008-01-16 Marcus Brinkmann <marcus at g10code.de>
* src/installer.nsi (MUI_WELCOME_TITLE, MUI_WELCOMEPAGE_TEXT):
Define to ${WELCOME_TITLE_STR} and ${ABOUT_STR} respectively.
(T_WelcomeTitle, T_About): Remove language strings.
* src/gpg4win.nsi (WELCOME_TITLE_ENGLISH, WELCOME_TITLE_GERMAN)
(ABOUT_GERMAN, ABOUT_ENGLISH): Removed macros.
(WELCOME_TITLE_STR, ABOUT_STR): New macros.
(T_WelcomeTitleGpg4win, T_AboutGpg4win): New language strings.
* src/gpg4win-src.nsi (WELCOME_TITLE_ENGLISH, WELCOME_TITLE_GERMAN)
(ABOUT_GERMAN, ABOUT_ENGLISH): Removed macros.
(WELCOME_TITLE_STR, ABOUT_STR): New macros.
(T_WelcomeTitleGpg4winSrc, T_AboutGpg4winSrc): New language strings.
po/
2008-01-16 Marcus Brinkmann <marcus at g10code.de>
* POTFILES.in: Add src/gpg4win.nsi and src/gpg4win-src.nsi.
* de.po: Updated.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-15 16:54:51 UTC (rev 681)
+++ trunk/ChangeLog 2008-01-16 00:12:54 UTC (rev 682)
@@ -1,3 +1,17 @@
+2008-01-16 Marcus Brinkmann <marcus at g10code.de>
+
+ * src/installer.nsi (MUI_WELCOME_TITLE, MUI_WELCOMEPAGE_TEXT):
+ Define to ${WELCOME_TITLE_STR} and ${ABOUT_STR} respectively.
+ (T_WelcomeTitle, T_About): Remove language strings.
+ * src/gpg4win.nsi (WELCOME_TITLE_ENGLISH, WELCOME_TITLE_GERMAN)
+ (ABOUT_GERMAN, ABOUT_ENGLISH): Removed macros.
+ (WELCOME_TITLE_STR, ABOUT_STR): New macros.
+ (T_WelcomeTitleGpg4win, T_AboutGpg4win): New language strings.
+ * src/gpg4win-src.nsi (WELCOME_TITLE_ENGLISH, WELCOME_TITLE_GERMAN)
+ (ABOUT_GERMAN, ABOUT_ENGLISH): Removed macros.
+ (WELCOME_TITLE_STR, ABOUT_STR): New macros.
+ (T_WelcomeTitleGpg4winSrc, T_AboutGpg4winSrc): New language strings.
+
2008-01-15 Marcus Brinkmann <marcus at g10code.de>
* patches/gnupg-2.0.8/01-agent-call-pinentry.patch: Rename to ...
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2008-01-15 16:54:51 UTC (rev 681)
+++ trunk/po/ChangeLog 2008-01-16 00:12:54 UTC (rev 682)
@@ -1,3 +1,8 @@
+2008-01-16 Marcus Brinkmann <marcus at g10code.de>
+
+ * POTFILES.in: Add src/gpg4win.nsi and src/gpg4win-src.nsi.
+ * de.po: Updated.
+
2007-12-21 Marcus Brinkmann <marcus at g10code.de>
* POTFILES.in: src/Add inst-kleopatra.nsi.
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2008-01-15 16:54:51 UTC (rev 681)
+++ trunk/po/POTFILES.in 2008-01-16 00:12:54 UTC (rev 682)
@@ -1,5 +1,7 @@
# List of source files which contain translatable strings.
src/g4wihelp.nsi
+src/gpg4win.nsi
+src/gpg4win-src.nsi
src/installer.nsi
src/inst-claws-mail.nsi
src/inst-eudoragpg.nsi
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-01-15 16:54:51 UTC (rev 681)
+++ trunk/po/de.po 2008-01-16 00:12:54 UTC (rev 682)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2007-12-21 21:03+0100\n"
-"PO-Revision-Date: 2007-12-21 21:04+0100\n"
+"POT-Creation-Date: 2008-01-16 00:49+0100\n"
+"PO-Revision-Date: 2008-01-16 00:51+0100\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -20,22 +20,68 @@
msgid "An instance of this installer is already running."
msgstr "Ein Exemplar dieses Installers läuft bereits."
-#: src/installer.nsi:201
+#: src/gpg4win.nsi:133
+msgctxt "T_WelcomeTitleGpg4win"
+msgid "Welcome to the installation of Gpg4win"
+msgstr "Willkommen bei der Installation der Gpg4win Quellen"
+
+#: src/gpg4win.nsi:138
+msgctxt "T_AboutGpg4win"
+msgid ""
+"GnuPG is GNU's tool for secure communication and data storage. It can be "
+"used to encrypt data and to create digital signatures. It includes an "
+"advanced key management facility and is compliant with the proposed OpenPGP "
+"Internet standard as described in RFC2440. \r\n"
+"\r\n"
+"$_CLICK \r\n"
+"\r\n"
+"\r\n"
+"\r\n"
+"\r\n"
+"This is Gpg4win version ${VERSION}\r\n"
+" file version ${PROD_VERSION}\r\n"
+" release date ${_BUILD_ISODATE}"
+msgstr ""
+"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation\n"
+"sowie zum sicheren Speichern von Daten. \\r\\n\\r\\n$_CLICK\n"
+"\\r\\n\\r\\n\\r\\n\\r\\n\\r\\nDies ist Gpg4win Version ${VERSION}\\r\\n\\\n"
+"Dateiversion ${PROD_VERSION}\\r\\n Releasedatum ${_BUILD_ISODATE}"
+
+#: src/gpg4win-src.nsi:71
+msgctxt "T_WelcomeTitleGpg4winSrc"
+msgid "Welcome to the installation of the Gpg4win sources"
+msgstr "Willkommen bei der Installation der Gpg4win Quellen"
+
+#: src/gpg4win-src.nsi:75
+msgctxt "T_AboutGpg4winSrc"
+msgid ""
+"GnuPG is GNU's tool for secure communication and data storage. It can be "
+"used to encrypt data and to create digital signatures. It includes an "
+"advanced key management facility and is compliant with the proposed OpenPGP "
+"Internet standard as described in RFC2440. \r\n"
+"\r\n"
+"$_CLICK \r\n"
+"\r\n"
+"\r\n"
+"\r\n"
+"\r\n"
+"This is Gpg4win version ${VERSION}\r\n"
+"file version ${PROD_VERSION}\r\n"
+"release date ${_BUILD_ISODATE}"
+msgstr ""
+"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation\n"
+"sowie zum sicheren Speichern von Daten.\n"
+"\\r\\n\\r\\n$_CLICK\n"
+"\\r\\n\\r\\n\\r\\n\\r\\n\\r\\nDies ist Gpg4win Version ${VERSION}\\r\\n\n"
+"Dateiversion ${PROD_VERSION}\\r\\n\n"
+"Releasedatum ${_BUILD_ISODATE}"
+
+#: src/installer.nsi:202
msgctxt "T_LangCode"
msgid "en"
msgstr "de"
-#: src/installer.nsi:204
-msgctxt "T_WelcomeTitle"
-msgid "${WELCOME_TITLE_ENGLISH}"
-msgstr "${WELCOME_TITLE_GERMAN}"
-
-#: src/installer.nsi:207
-msgctxt "T_About"
-msgid "${ABOUT_ENGLISH}"
-msgstr "${ABOUT_GERMAN}"
-
-#: src/installer.nsi:210
+#: src/installer.nsi:205
msgctxt "T_GPLHeader"
msgid ""
"This software is licensed under the terms of the GNU General Public License "
@@ -44,7 +90,7 @@
"Diese Software ist unter der GNU General Public License (GPL) lizensiert; "
"dies gibt Ihnen die Freiheit, sie zu ändern und weiterzugeben."
-#: src/installer.nsi:215
+#: src/installer.nsi:210
msgctxt "T_GPLShort"
msgid ""
"In short: You are allowed to run this software for any purpose. You may "
@@ -55,80 +101,80 @@
"einzusetzen. Sie können die Software weitergeben, sofern Sie dem Empfänger "
"dieselben Rechte einräumen, die auch Sie erhalten haben."
-#: src/installer.nsi:220
+#: src/installer.nsi:215
msgctxt "T_RunKeyManager"
msgid "Run the key manager"
msgstr "Die Schlüsselverwaltung aufrufen"
-#: src/installer.nsi:223
+#: src/installer.nsi:218
msgctxt "T_MoreInfo"
msgid "Click here for the project's homepage"
msgstr "Hier klicken um zur Homepage des Projekts zu gelangen"
-#: src/installer.nsi:225
+#: src/installer.nsi:220
msgctxt "T_MoreInfoURL"
msgid "http://www.gpg4win.org"
msgstr "http://www.gpg4win.de"
-#: src/installer.nsi:227
+#: src/installer.nsi:222
msgctxt "T_ShowReadme"
msgid "Show the README file"
msgstr "Die README Datei anzeigen"
-#: src/installer.nsi:230
+#: src/installer.nsi:225
msgctxt "T_NoKeyManager"
msgid "No key manager has been installed, thus we can't run one now."
msgstr ""
"Es wurde keine Schlüsselverwaltung installiert. Deswegen kann sie jetzt "
"auch nicht ausgeführt werden."
-#: src/installer.nsi:235
+#: src/installer.nsi:230
msgctxt "DESC_Menu_manuals"
msgid "Documentation"
msgstr "Dokumentation"
-#: src/installer.nsi:239
+#: src/installer.nsi:234
msgctxt "DESC_Desktop_manuals"
msgid "Gpg4win Documentation"
msgstr "Gpg4win Dokumentation"
-#: src/installer.nsi:428
+#: src/installer.nsi:423
msgctxt "T_InstallOptions"
msgid "Install Options"
msgstr "Installationsoptionen"
-#: src/installer.nsi:431
+#: src/installer.nsi:426
msgctxt "T_InstallOptLinks"
msgid "Start links"
msgstr "Startlinks"
-#: src/installer.nsi:433
+#: src/installer.nsi:428
msgctxt "T_InstOptLabelA"
msgid "Please select where Gpg4win shall install links:"
msgstr "Bitte wählen Sie, welche Verknüpfungen angelegt werden sollen:"
-#: src/installer.nsi:436
+#: src/installer.nsi:431
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
msgstr ""
"(In die Schnellstartleiste werden nur Verknüpfungen für Programme angelegt.)"
-#: src/installer.nsi:439
+#: src/installer.nsi:434
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
msgstr "Startmenü"
-#: src/installer.nsi:442
+#: src/installer.nsi:437
msgctxt "T_InstOptFieldB"
msgid "Desktop"
msgstr "Arbeitsfläche"
-#: src/installer.nsi:445
+#: src/installer.nsi:440
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
msgstr "Schnellstartleiste"
-#: src/installer.nsi:451
+#: src/installer.nsi:446
msgctxt "T_FoundExistingVersion"
msgid ""
"Version $R1 has already been installed.\n"
@@ -140,7 +186,7 @@
"(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
"oder dieselbe Version handelt.)"
-#: src/installer.nsi:454
+#: src/installer.nsi:449
msgctxt "T_FoundExistingVersionB"
msgid ""
"A version of Gpg4Win has already been installed on the system. There will be "
@@ -153,7 +199,7 @@
"\n"
"Möchten die die Installation von Gpg4Win fortführen?"
-#: src/installer.nsi:465
+#: src/installer.nsi:460
msgctxt "T_FoundOldSeeManual"
msgid ""
"Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -164,7 +210,7 @@
"überführen. Es wird dringend geraten Gpg4Win nicht zusammen mit diesen "
"anderen Installation zu betreiben."
-#: src/installer.nsi:470
+#: src/installer.nsi:465
msgctxt "T_FoundOldGnuPP"
msgid ""
"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
@@ -187,7 +233,7 @@
"Möchten Sie die Installation von Gpg4win weiter durchführen und sich dann "
"später um die Entfernung von GnuPP kümmern?"
-#: src/installer.nsi:479
+#: src/installer.nsi:474
msgctxt "T_FoundOldGnuPT"
msgid ""
"An installation of GnuPT has been been detected. This may cause problems "
@@ -210,7 +256,7 @@
"\n"
"Möchten Sie die Installation von Gpg4win fortführen?"
-#: src/installer.nsi:486
+#: src/installer.nsi:481
msgctxt "T_FoundOldWinPTSF"
msgid ""
"An old installation of the Sourceforge hosted WinPT has been been detected. "
@@ -235,7 +281,7 @@
"\n"
"Möchten Sie die Installation von Gpg4win trotzdem jetzt weiter durchführen?"
-#: src/installer.nsi:496
+#: src/installer.nsi:491
msgctxt "T_FoundOldGnuPack"
msgid ""
"An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -249,7 +295,7 @@
"\n"
"Die Installation von Gpg4win wird nun abgebrochen!"
-#: src/installer.nsi:505
+#: src/installer.nsi:500
msgctxt "T_AdminNeeded"
msgid ""
"Warning: Administrator permissions required for a successful installation"
@@ -257,7 +303,7 @@
"Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
"benötigt."
-#: src/installer.nsi:509
+#: src/installer.nsi:504
msgctxt "T_CloseOtherApps"
msgid ""
"Please make sure that other applications are not running. In particular you "
@@ -270,12 +316,12 @@
"eine Installation durchzuführen; es ist dann aber u.U. notwendig, das System "
"neu zu starten."
-#: src/installer.nsi:514
+#: src/installer.nsi:509
msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "Ein möglicherweise laufendes WinPT wird jetzt automatisch beendet."
-#: src/installer.nsi:516
+#: src/installer.nsi:511
msgctxt "T_ShuttingDownDirMngr"
msgid "Trying to shutdown a possible running instance of DirMngr."
msgstr "Ein möglicherweise laufender DirMngr wird jetzt automatisch beendet."
@@ -303,7 +349,7 @@
msgstr ""
"EudoraGPG ist ein Plugin zur Verschlüsselung für das Eudora Mailprogramm"
-#: src/inst-gnupg2.nsi:106
+#: src/inst-gnupg2.nsi:110
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard with S/MIME support"
msgstr ""
@@ -311,7 +357,7 @@
"Verschlüsselung mittels S/MIME bereitzustellen. Bitte beachten Sie, daß "
"diese Option noch nicht vollständig unterstützt ist."
-#: src/inst-gnupg.nsi:91
+#: src/inst-gnupg.nsi:95
msgctxt "DESC_SEC_gnupg"
msgid "GNU Privacy Guard"
msgstr ""
@@ -387,12 +433,12 @@
"GnuPG für Outlook (GpgOL) is eine Erweiterung für Outlook 2003, die "
"verwendet wird um Nachrichten mit OpenPGP oder S/MIME zu verschlüsseln."
-#: src/inst-kleopatra.nsi:108
+#: src/inst-kleopatra.nsi:106
msgctxt "DESC_SEC_kleopatra"
msgid "Kleopatra"
msgstr "Kleopatra"
-#: src/inst-kleopatra.nsi:111
+#: src/inst-kleopatra.nsi:109
msgctxt "DESC_Menu_kleopatra"
msgid "Run the Kleopatra key management tool."
msgstr "Das Schlüsselverwaltungsprogramm Kleopatra aufrufen."
Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi 2008-01-15 16:54:51 UTC (rev 681)
+++ trunk/src/gpg4win-src.nsi 2008-01-16 00:12:54 UTC (rev 682)
@@ -43,29 +43,9 @@
!define INSTALL_DIR "GnuPG\Source"
-!define WELCOME_TITLE_ENGLISH \
- "Welcome to the installation of the Gpg4win sources"
-!define WELCOME_TITLE_GERMAN \
- "Willkommen bei der Installation der Gpg4win Quellen"
+!define WELCOME_TITLE_STR "$(T_WelcomeTitleGpg4winSrc)"
+!define ABOUT_STR "$(T_AboutGpg4winSrc)"
-!define ABOUT_ENGLISH \
- "GnuPG is GNU's tool for secure communication and data storage. \
- It can be used to encrypt data and to create digital signatures. \
- It includes an advanced key management facility and is compliant \
- with the proposed OpenPGP Internet standard as described in RFC2440. \
- \r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nThis is Gpg4win version ${VERSION}\r\n\
- file version ${PROD_VERSION}\r\n\
- release date ${_BUILD_ISODATE}"
-!define ABOUT_GERMAN \
- "GnuPG is das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation \
- sowie zum sicheren Speichern von Daten. \
- \r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nDies ist Gpg4win Version ${VERSION}\r\n\
- Dateiversion ${PROD_VERSION}\r\n\
- Releasedatum ${_BUILD_ISODATE}"
-
-
# The copyright license of the package. Define only one of these.
!define LICENSE_GPL
# !define LICENSE_LGPL
@@ -87,6 +67,22 @@
!define SOURCES
!include "inst-sections.nsi"
+# The WelcomeTitle is displayed on the first page.
+LangString T_WelcomeTitleGpg4winSrc ${LANG_ENGLISH} \
+ "Welcome to the installation of the Gpg4win sources"
+
+# The About string as displayed on the first page.
+LangString T_AboutGpg4winSrc ${LANG_ENGLISH} \
+ "GnuPG is GNU's tool for secure communication and data storage. \
+ It can be used to encrypt data and to create digital signatures. \
+ It includes an advanced key management facility and is compliant \
+ with the proposed OpenPGP Internet standard as described in RFC2440. \
+ \r\n\r\n$_CLICK \
+ \r\n\r\n\r\n\r\n\r\nThis is Gpg4win version ${VERSION}\r\n\
+ file version ${PROD_VERSION}\r\n\
+ release date ${_BUILD_ISODATE}"
+
+
# At long last, include all the translations.
!include "../po/catalogs.nsi"
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2008-01-15 16:54:51 UTC (rev 681)
+++ trunk/src/gpg4win.nsi 2008-01-16 00:12:54 UTC (rev 682)
@@ -88,31 +88,9 @@
!define INSTALL_DIR "GnuPG"
-!define WELCOME_TITLE_ENGLISH \
- "Welcome to the installation of Gpg4win"
+!define WELCOME_TITLE_STR "$(T_WelcomeTitleGpg4win)"
+!define ABOUT_STR "$(T_AboutGpg4win)"
-!define WELCOME_TITLE_GERMAN \
- "Willkommen bei der Installation von Gpg4win"
-
-!define ABOUT_ENGLISH \
- "GnuPG is GNU's tool for secure communication and data storage. \
- It can be used to encrypt data and to create digital signatures. \
- It includes an advanced key management facility and is compliant \
- with the proposed OpenPGP Internet standard as described in RFC2440. \
- \r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nThis is Gpg4win version ${VERSION}\r\n\
- file version ${PROD_VERSION}\r\n\
- release date ${_BUILD_ISODATE}"
-!define ABOUT_GERMAN \
- "GnuPG is das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation \
- sowie zum sicheren Speichern von Daten. \
- \r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nDies ist Gpg4win Version ${VERSION}\r\n\
- Dateiversion ${PROD_VERSION}\r\n\
- Releasedatum ${_BUILD_ISODATE}"
-
-
-
# The copyright license of the package. Define only one of these.
!define LICENSE_GPL
# !define LICENSE_LGPL
@@ -150,6 +128,23 @@
!define BINARIES
!include "inst-sections.nsi"
+
+# The WelcomeTitle is displayed on the first page.
+LangString T_WelcomeTitleGpg4win ${LANG_ENGLISH} \
+ "Welcome to the installation of Gpg4win"
+
+# The About string as displayed on the first page.
+# TRANSLATORS: As an exception, this string contains \r\n characters.
+LangString T_AboutGpg4win ${LANG_ENGLISH} \
+ "GnuPG is GNU's tool for secure communication and data storage. \
+ It can be used to encrypt data and to create digital signatures. \
+ It includes an advanced key management facility and is compliant \
+ with the proposed OpenPGP Internet standard as described in RFC2440. \
+ \r\n\r\n$_CLICK \
+ \r\n\r\n\r\n\r\n\r\nThis is Gpg4win version ${VERSION}\r\n \
+ file version ${PROD_VERSION}\r\n \
+ release date ${_BUILD_ISODATE}"
+
# At long last, include all the translations.
!include "../po/catalogs.nsi"
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2008-01-15 16:54:51 UTC (rev 681)
+++ trunk/src/installer.nsi 2008-01-16 00:12:54 UTC (rev 682)
@@ -120,8 +120,9 @@
# The list of wizard pages.
-!define MUI_WELCOMEPAGE_TITLE "$(T_WelcomeTitle)"
-!define MUI_WELCOMEPAGE_TEXT "$(T_About)"
+!define MUI_WELCOMEPAGE_TITLE ${WELCOME_TITLE_STR}
+!define MUI_WELCOMEPAGE_TEXT ${ABOUT_STR}
+
!insertmacro MUI_PAGE_WELCOME
!define MUI_LICENSEPAGE_BUTTON "$(^NextBtn)"
@@ -200,12 +201,6 @@
LangString T_LangCode ${LANG_ENGLISH} "en"
-# The WelcomeTitle is displayed on the first page.
-LangString T_WelcomeTitle ${LANG_ENGLISH} "${WELCOME_TITLE_ENGLISH}"
-
-# The About string as displayed on the first page.
-LangString T_About ${LANG_ENGLISH} "${ABOUT_ENGLISH}"
-
# Startup page
LangString T_GPLHeader ${LANG_ENGLISH} \
"This software is licensed under the terms of the GNU General Public \
More information about the Gpg4win-commits
mailing list