Write the language code into the Registry.
authorWerner Koch <wk@gnupg.org>
Tue, 25 Mar 2008 13:19:23 +0000 (13:19 +0000)
committerWerner Koch <wk@gnupg.org>
Tue, 25 Mar 2008 13:19:23 +0000 (13:19 +0000)
ChangeLog
po/ar.po
po/de.po
po/es.po
po/fr.po
po/ru.po
src/inst-gnupg.nsi
src/inst-gnupg2.nsi

index 795885b..f7afc16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-25  Werner Koch  <wk@g10code.com>
+
+       * src/inst-gnupg.nsi: Write the language code for use by gettext
+       into the Registry.
+
 2008-03-25  Marcus Brinkmann  <marcus@g10code.de>
 
        * packages/packages.current: Update libassuan.
index 2991419..3ab045a 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gpg4Win\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-03-21 15:32+0100\n"
+"POT-Creation-Date: 2008-03-25 12:42+0100\n"
 "PO-Revision-Date: 2008-03-11 23:52+0200\n"
 "Last-Translator: Ahmad Gharbeia <ahmad@gharbeia.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
index ae9eb64..11ee750 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpg4win 1.1.1-svn417\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-03-21 15:32+0100\n"
+"POT-Creation-Date: 2008-03-25 12:42+0100\n"
 "PO-Revision-Date: 2008-02-28 11:40+0100\n"
 "Last-Translator: Marcus Brinkmann <mb@g10code.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
index 01ca30e..2059e53 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpg4win 1.1.1-svn417\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-03-21 15:32+0100\n"
+"POT-Creation-Date: 2008-03-25 12:42+0100\n"
 "PO-Revision-Date: 2008-01-30 17:07+0100\n"
 "Last-Translator: Diego Escalante Urrelo <diegoe@gnome.org>\n"
 "Language-Team: Spanish <diegoe@gnome.org>\n"
index 259bbf7..b24129e 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ngoinabox\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-03-21 15:32+0100\n"
+"POT-Creation-Date: 2008-03-25 12:42+0100\n"
 "PO-Revision-Date: 2008-03-10 16:46+0100\n"
 "Last-Translator: Fabian Rodriguez <magicfab@member.fsf.org>\n"
 "Language-Team: FRENCH <aep.lists@it46.se>\n"
index 5ea157d..d8feff7 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gpg4Win Installer\n"
 "Report-Msgid-Bugs-To: gpg4win-devel@wald.intevation.org\n"
-"POT-Creation-Date: 2008-03-21 15:32+0100\n"
+"POT-Creation-Date: 2008-03-25 12:42+0100\n"
 "PO-Revision-Date: 2008-03-20 23:50+0300\n"
 "Last-Translator: Sergei Smirnov <moscow@hro.org>\n"
 "Language-Team: Human Rights Network <moscow@hro.org>\n"
index ff38f98..f3878df 100644 (file)
@@ -81,6 +81,16 @@ ${MementoSection} "GnuPG" SEC_gnupg
 
   WriteRegStr HKLM "Software\GNU\GnuPG" "Install Directory" $INSTDIR
 
+  # To allow setting the language on a per user base we can't use the
+  # the installer language but need to resort to a Registry entry.  We
+  # put the language into HKLM so that the user can override it using
+  # a HKCU entry or the LANGUAGE envvar.  Probably Windows has a
+  # scheme to do this using a Windows specific API but that was not
+  # known at the time we invented our simple-gettext scheme for a
+  # command line utility.  A GUI frontend may want to synchronize the
+  # HKCU entry with whatever Windows uses for the local language.
+  WriteRegStr HKLM "Software\GNU\GnuPG" "Lang" "$(T_LangCode)"
+
   # This old key is required for GPGee.  Please do not use in new
   # applications.
   # Note: We don't use it anymore so that gpgme decides what gpg to use
index 52ddb00..ebc1e38 100644 (file)
@@ -76,7 +76,8 @@ ${MementoSection} "GnuPG2" SEC_gnupg2
 
   # Install the language files for gpg.  Note that the PO files are
   # required to be UTF-8 encoded and that the post-install macro in
-  # Makefile.am needs to build them.
+  # Makefile.am needs to build them.  The language used is selected by
+  # using a Registry entry; see ints-gnupg.nsi.
   SetOutPath "$INSTDIR\gnupg2.nls"
   File /nonfatal "${prefix}/share/gnupg/*.mo"