[Gpg4win-commits] r699 - in trunk: . po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jan 30 17:33:09 CET 2008
Author: marcus
Date: 2008-01-30 17:33:09 +0100 (Wed, 30 Jan 2008)
New Revision: 699
Modified:
trunk/ChangeLog
trunk/po/de.po
trunk/src/gpg4win-src.nsi
trunk/src/gpg4win.nsi
trunk/src/installer.nsi
Log:
2008-01-30 Marcus Brinkmann <marcus at g10code.de>
* src/gpg4win.nsi (ABOUT_STR): Split up the string into several.
(T_AboutGpg4win): Shorten it accordingly.
(T_AboutGpg4winVersion, T_AboutGpg4winFileVersion)
(T_AboutGpg4winReleaseDate): New translation strings.
* src/gpg4win-src.nsi: Split up the string into several.
(T_AboutGpg4winSrc): Shorten it accordingly.
(T_AboutGpg4winSrcVersion, T_AboutGpg4winSrcFileVersion)
(T_AboutGpg4winSrcReleaseDate): New translation strings.
* src/installer.nsi: Quote welcome title and about string.
* po/de.po: Update.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-30 15:03:57 UTC (rev 698)
+++ trunk/ChangeLog 2008-01-30 16:33:09 UTC (rev 699)
@@ -1,5 +1,16 @@
2008-01-30 Marcus Brinkmann <marcus at g10code.de>
+ * src/gpg4win.nsi (ABOUT_STR): Split up the string into several.
+ (T_AboutGpg4win): Shorten it accordingly.
+ (T_AboutGpg4winVersion, T_AboutGpg4winFileVersion)
+ (T_AboutGpg4winReleaseDate): New translation strings.
+ * src/gpg4win-src.nsi: Split up the string into several.
+ (T_AboutGpg4winSrc): Shorten it accordingly.
+ (T_AboutGpg4winSrcVersion, T_AboutGpg4winSrcFileVersion)
+ (T_AboutGpg4winSrcReleaseDate): New translation strings.
+ * src/installer.nsi: Quote welcome title and about string.
+ * po/de.po: Update.
+
* packages/packages.current: Update gpgme.
2008-01-30 Werner Koch <wk at g10code.com>
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-01-30 15:03:57 UTC (rev 698)
+++ trunk/po/de.po 2008-01-30 16:33:09 UTC (rev 699)
@@ -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: 2008-01-30 14:26+0100\n"
-"PO-Revision-Date: 2008-01-30 14:28+0100\n"
+"POT-Creation-Date: 2008-01-30 17:03+0100\n"
+"PO-Revision-Date: 2008-01-30 17:07+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,50 +20,68 @@
msgid "An instance of this installer is already running."
msgstr "Ein Exemplar dieses Installers läuft bereits."
-#: src/gpg4win.nsi:133
+#: src/gpg4win.nsi:138
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Willkommen bei der Installation der Gpg4win Quellen"
-#: src/gpg4win.nsi:138
+#: src/gpg4win.nsi:142
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. ${DOSLF}${DOSLF}$_CLICK ${DOSLF}"
-"${DOSLF}${DOSLF}${DOSLF}${DOSLF}This is Gpg4win version ${VERSION}${DOSLF} "
-"file version ${PROD_VERSION}${DOSLF}${DOSLF} release date ${_BUILD_ISODATE}"
+"Internet standard as described in RFC2440."
msgstr ""
-"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation\n"
-"sowie zum sicheren Speichern von Daten. ${DOSLF}${DOSLF}$_CLICK ${DOSLF}\n"
-"${DOSLF}${DOSLF}${DOSLF}${DOSLF}Dies ist Gpg4win Version ${VERSION}"
-"${DOSLF} \n"
-"Dateiversion ${PROD_VERSION}${DOSLF}\n"
-"Releasedatum ${_BUILD_ISODATE}"
+"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation sowie "
+"zum sicheren Speichern von Daten."
-#: src/gpg4win-src.nsi:71
+#: src/gpg4win.nsi:148
+msgctxt "T_AboutGpg4winVersion"
+msgid "This is Gpg4win version ${VERSION}"
+msgstr "Dies ist Gpg4win Version ${VERSION}"
+
+#: src/gpg4win.nsi:151
+msgctxt "T_AboutGpg4winFileVersion"
+msgid "file version ${PROD_VERSION}"
+msgstr "Dateiversion ${PROD_VERSION}"
+
+#: src/gpg4win.nsi:154
+msgctxt "T_AboutGpg4winReleaseDate"
+msgid "release date ${_BUILD_ISODATE}"
+msgstr "Releasedatum ${_BUILD_ISODATE}"
+
+#: src/gpg4win-src.nsi:76
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
+#: src/gpg4win-src.nsi:80
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. ${DOSLF}${DOSLF}$_CLICK ${DOSLF}"
-"${DOSLF}${DOSLF}${DOSLF}${DOSLF}This is Gpg4win version ${VERSION}${DOSLF} "
-"file version ${PROD_VERSION}${DOSLF}${DOSLF} release date ${_BUILD_ISODATE}"
+"Internet standard as described in RFC2440."
msgstr ""
-"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation\n"
-"sowie zum sicheren Speichern von Daten. ${DOSLF}${DOSLF}$_CLICK ${DOSLF}\n"
-"${DOSLF}${DOSLF}${DOSLF}${DOSLF}Dies ist Gpg4win Version ${VERSION}"
-"${DOSLF} \n"
-"Dateiversion ${PROD_VERSION}${DOSLF}\n"
-"Releasedatum ${_BUILD_ISODATE}"
+"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation sowie "
+"zum sicheren Speichern von Daten."
+#: src/gpg4win-src.nsi:86
+msgctxt "T_AboutGpg4winSrcVersion"
+msgid "This is Gpg4win version ${VERSION}"
+msgstr "Dies ist Gpg4win Version ${VERSION}"
+
+#: src/gpg4win-src.nsi:89
+msgctxt "T_AboutGpg4winSrcFileVersion"
+msgid "file version ${PROD_VERSION}"
+msgstr "Dateiversion ${PROD_VERSION}"
+
+#: src/gpg4win-src.nsi:92
+msgctxt "T_AboutGpg4winSrcReleaseDate"
+msgid "release date ${_BUILD_ISODATE}"
+msgstr "Releasedatum ${_BUILD_ISODATE}"
+
#: src/installer.nsi:206
msgctxt "T_LangCode"
msgid "en"
@@ -526,31 +544,3 @@
"Das Schlüsselverwaltungsprogramm Windows Privacy Tray aufrufen. Dies ist "
"ein vielseitiges Programm zur Schlüsselverwaltung und Verschlüsselung. Es "
"installiert sich in die Startleiste."
-
-#~ 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. \r\n"
-#~ "\r\n"
-#~ "$_CLICK \r\n"
-#~ "\r\n"
-#~ "\r\n"
-#~ "\r\n"
-#~ "\r\n"
-#~ "Dies ist Gpg4win Version ${VERSION}\r\n"
-#~ "Dateiversion ${PROD_VERSION}\r\n"
-#~ "Releasedatum ${_BUILD_ISODATE}"
Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi 2008-01-30 15:03:57 UTC (rev 698)
+++ trunk/src/gpg4win-src.nsi 2008-01-30 16:33:09 UTC (rev 699)
@@ -44,8 +44,13 @@
!define INSTALL_DIR "GnuPG\Source"
!define WELCOME_TITLE_STR "$(T_WelcomeTitleGpg4winSrc)"
-!define ABOUT_STR "$(T_AboutGpg4winSrc)"
+!define ABOUT_STR "$(T_AboutGpg4winSrc) \
+ \r\n\r\n$_CLICK \r\n\r\n\r\n\r\n\r\n \
+ $(T_AboutGpg4winSrcVersion) \r\n \
+ $(T_AboutGpg4winSrcFileVersion) ${PROD_VERSION} \r\n\r\n \
+ $(T_AboutGpg4winSrcReleaseDate) ${_BUILD_ISODATE}"
+
# The copyright license of the package. Define only one of these.
!define LICENSE_GPL
# !define LICENSE_LGPL
@@ -76,13 +81,17 @@
"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. \
- ${DOSLF}${DOSLF}$_CLICK \
- ${DOSLF}${DOSLF}${DOSLF}${DOSLF}${DOSLF}This is Gpg4win version ${VERSION}${DOSLF} \
- file version ${PROD_VERSION}${DOSLF}${DOSLF} \
- release date ${_BUILD_ISODATE}"
+ with the proposed OpenPGP Internet standard as described in RFC2440."
+LangString T_AboutGpg4winSrcVersion ${LANG_ENGLISH} \
+ "This is Gpg4win version ${VERSION}"
+LangString T_AboutGpg4winSrcFileVersion ${LANG_ENGLISH} \
+ "file version ${PROD_VERSION}"
+
+LangString T_AboutGpg4winSrcReleaseDate ${LANG_ENGLISH} \
+ "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-30 15:03:57 UTC (rev 698)
+++ trunk/src/gpg4win.nsi 2008-01-30 16:33:09 UTC (rev 699)
@@ -89,8 +89,13 @@
!define INSTALL_DIR "GnuPG"
!define WELCOME_TITLE_STR "$(T_WelcomeTitleGpg4win)"
-!define ABOUT_STR "$(T_AboutGpg4win)"
+!define ABOUT_STR "$(T_AboutGpg4win) \
+ \r\n\r\n$_CLICK \r\n\r\n\r\n\r\n\r\n \
+ $(T_AboutGpg4winVersion) \r\n \
+ file version ${PROD_VERSION} \r\n\r\n \
+ release date ${_BUILD_ISODATE}"
+
# The copyright license of the package. Define only one of these.
!define LICENSE_GPL
# !define LICENSE_LGPL
@@ -134,17 +139,21 @@
"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. \
- ${DOSLF}${DOSLF}$_CLICK \
- ${DOSLF}${DOSLF}${DOSLF}${DOSLF}${DOSLF}This is Gpg4win version ${VERSION}${DOSLF} \
- file version ${PROD_VERSION}${DOSLF}${DOSLF} \
- release date ${_BUILD_ISODATE}"
+ with the proposed OpenPGP Internet standard as described in RFC2440."
+LangString T_AboutGpg4winVersion ${LANG_ENGLISH} \
+ "This is Gpg4win version ${VERSION}"
+
+LangString T_AboutGpg4winFileVersion ${LANG_ENGLISH} \
+ "file version ${PROD_VERSION}"
+
+LangString T_AboutGpg4winReleaseDate ${LANG_ENGLISH} \
+ "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-30 15:03:57 UTC (rev 698)
+++ trunk/src/installer.nsi 2008-01-30 16:33:09 UTC (rev 699)
@@ -124,8 +124,8 @@
# The list of wizard pages.
-!define MUI_WELCOMEPAGE_TITLE ${WELCOME_TITLE_STR}
-!define MUI_WELCOMEPAGE_TEXT ${ABOUT_STR}
+!define MUI_WELCOMEPAGE_TITLE "${WELCOME_TITLE_STR}"
+!define MUI_WELCOMEPAGE_TEXT "${ABOUT_STR}"
!insertmacro MUI_PAGE_WELCOME
More information about the Gpg4win-commits
mailing list