diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | po/cs.po | 2 | ||||
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/fr.po | 2 | ||||
-rw-r--r-- | po/it.po | 2 | ||||
-rw-r--r-- | po/libgpg-error.pot | 4 | ||||
-rw-r--r-- | po/nl.po | 2 | ||||
-rw-r--r-- | po/pl.po | 128 | ||||
-rw-r--r-- | po/ro.po | 2 | ||||
-rw-r--r-- | po/sv.po | 2 | ||||
-rw-r--r-- | po/vi.po | 2 | ||||
-rw-r--r-- | po/zh_CN.po | 2 | ||||
-rw-r--r-- | src/init.c | 1 | ||||
-rw-r--r-- | src/init.h | 5 | ||||
-rw-r--r-- | src/w32-gettext.c | 23 |
16 files changed, 114 insertions, 72 deletions
@@ -1,3 +1,9 @@ +2010-09-16 Werner Koch <[email protected]> + + * src/w32-gettext.c (module_init): Do not set a constructur if not + build as DLL. + (_gpg_w32__init_gettext_module): New. + 2010-09-16 gettextize <[email protected]> * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17. @@ -1,6 +1,7 @@ Noteworthy changes in version 1.10 ---------------------------------------------- + * Using a static library on W32 does now work. * Interface changes relative to the 1.9 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.7\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2009-06-23 14:10+0200\n" "Last-Translator: Petr Pisar <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error-1.9\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2010-09-16 15:16+0200\n" "Last-Translator: Werner Koch <[email protected]>\n" "Language-Team: none\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.0\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2009-08-20 09:04+0200\n" "Last-Translator: Stephane Roy <[email protected]>\n" "Language-Team: French <[email protected]>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.7\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2009-08-20 09:14+0200\n" "Last-Translator: Francesco Groccia <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" diff --git a/po/libgpg-error.pot b/po/libgpg-error.pot index 81a778b..e178619 100644 --- a/po/libgpg-error.pot +++ b/po/libgpg-error.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: libgpg-error 1.10-svn248\n" +"Project-Id-Version: libgpg-error 1.10-svn249\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.7\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2010-04-30 16:20+0200\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.9\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-07-20 18:05+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2010-08-05 20:05+0200\n" "Last-Translator: Jakub Bogusz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" @@ -836,238 +836,248 @@ msgid "Limit reached" msgstr "Osi�gni�to limit" #: src/err-codes.h:212 +#, fuzzy +msgid "Not initialized" +msgstr "Karta nie zainicjowana" + +#: src/err-codes.h:213 +#, fuzzy +msgid "Missing issuer certificate" +msgstr "Brakuj�cy certyfikat" + +#: src/err-codes.h:214 msgid "Operation not yet finished" msgstr "Operacja jeszcze nie zako�czona" -#: src/err-codes.h:213 +#: src/err-codes.h:215 msgid "Buffer too short" msgstr "Bufor zbyt ma�y" -#: src/err-codes.h:214 +#: src/err-codes.h:216 msgid "Invalid length specifier in S-expression" msgstr "Niepoprawne okre�lenie d�ugo�ci w S-wyra�eniu" -#: src/err-codes.h:215 +#: src/err-codes.h:217 msgid "String too long in S-expression" msgstr "Zbyt d�ugi �a�cuch w S-wyra�eniu" -#: src/err-codes.h:216 +#: src/err-codes.h:218 msgid "Unmatched parentheses in S-expression" msgstr "Niedopasowane nawiasy w S-wyra�eniu" -#: src/err-codes.h:217 +#: src/err-codes.h:219 msgid "S-expression not canonical" msgstr "S-wyra�enie nie kanoniczne" -#: src/err-codes.h:218 +#: src/err-codes.h:220 msgid "Bad character in S-expression" msgstr "B��dny znak w S-wyra�eniu" -#: src/err-codes.h:219 +#: src/err-codes.h:221 msgid "Bad quotation in S-expression" msgstr "B��dne cytowanie w S-wyra�eniu" -#: src/err-codes.h:220 +#: src/err-codes.h:222 msgid "Zero prefix in S-expression" msgstr "Zerowy prefiks w S-wyra�eniu" -#: src/err-codes.h:221 +#: src/err-codes.h:223 msgid "Nested display hints in S-expression" msgstr "Zagnie�d�one podpowiedzi wy�wietlania w S-wyra�eniu" -#: src/err-codes.h:222 +#: src/err-codes.h:224 msgid "Unmatched display hints" msgstr "Niedopasowane podpowiedzi wy�wietlania" -#: src/err-codes.h:223 +#: src/err-codes.h:225 msgid "Unexpected reserved punctuation in S-expression" msgstr "Nieoczekiwany zarezerwowany znak w S-wyra�eniu" -#: src/err-codes.h:224 +#: src/err-codes.h:226 msgid "Bad hexadecimal character in S-expression" msgstr "B��dny znak szesnastkowy w S-wyra�eniu" -#: src/err-codes.h:225 +#: src/err-codes.h:227 msgid "Odd hexadecimal numbers in S-expression" msgstr "Nieparzysta liczba cyfr szesnastkowych w S-wyra�eniu" -#: src/err-codes.h:226 +#: src/err-codes.h:228 msgid "Bad octal character in S-expression" msgstr "B��dny znak �semkowy w S-wyra�eniu" -#: src/err-codes.h:227 +#: src/err-codes.h:229 msgid "General IPC error" msgstr "B��d og�lny IPC" -#: src/err-codes.h:228 +#: src/err-codes.h:230 msgid "IPC accept call failed" msgstr "Wywo�anie accept dla IPC nie powiod�o si�" -#: src/err-codes.h:229 +#: src/err-codes.h:231 msgid "IPC connect call failed" msgstr "Wywo�anie connect dla IPC nie powiod�o si�" -#: src/err-codes.h:230 +#: src/err-codes.h:232 msgid "Invalid IPC response" msgstr "Niepoprawna odpowied� IPC" -#: src/err-codes.h:231 +#: src/err-codes.h:233 msgid "Invalid value passed to IPC" msgstr "Niepoprawna warto�� przekazana do IPC" -#: src/err-codes.h:232 +#: src/err-codes.h:234 msgid "Incomplete line passed to IPC" msgstr "Niekompletna linia przekazana do IPC" -#: src/err-codes.h:233 +#: src/err-codes.h:235 msgid "Line passed to IPC too long" msgstr "Linia przekazana do IPC zbyt d�uga" -#: src/err-codes.h:234 +#: src/err-codes.h:236 msgid "Nested IPC commands" msgstr "Zagnie�d�one polecenia IPC" -#: src/err-codes.h:235 +#: src/err-codes.h:237 msgid "No data callback in IPC" msgstr "Brak wywo�ania zwrotnego dla danych w IPC" -#: src/err-codes.h:236 +#: src/err-codes.h:238 msgid "No inquire callback in IPC" msgstr "Brak wywo�ania wstecznego dla zapyta� w IPC" -#: src/err-codes.h:237 +#: src/err-codes.h:239 msgid "Not an IPC server" msgstr "To nie jest serwer IPC" -#: src/err-codes.h:238 +#: src/err-codes.h:240 msgid "Not an IPC client" msgstr "To nie jest klient IPC" -#: src/err-codes.h:239 +#: src/err-codes.h:241 msgid "Problem starting IPC server" msgstr "Problem z uruchomieniem serwera IPC" -#: src/err-codes.h:240 +#: src/err-codes.h:242 msgid "IPC read error" msgstr "B��d odczytu IPC" -#: src/err-codes.h:241 +#: src/err-codes.h:243 msgid "IPC write error" msgstr "B��d zapisu IPC" -#: src/err-codes.h:242 +#: src/err-codes.h:244 msgid "Too much data for IPC layer" msgstr "Zbyt du�o danych dla warstwy IPC" -#: src/err-codes.h:243 +#: src/err-codes.h:245 msgid "Unexpected IPC command" msgstr "Nieoczekiwane polecenie IPC" -#: src/err-codes.h:244 +#: src/err-codes.h:246 msgid "Unknown IPC command" msgstr "Nieznane polecenie IPC" -#: src/err-codes.h:245 +#: src/err-codes.h:247 msgid "IPC syntax error" msgstr "B��d sk�adni IPC" -#: src/err-codes.h:246 +#: src/err-codes.h:248 msgid "IPC call has been cancelled" msgstr "Wywo�anie IPC zosta�o anulowane" -#: src/err-codes.h:247 +#: src/err-codes.h:249 msgid "No input source for IPC" msgstr "Brak �r�d�a wej�ciowego dla IPC" -#: src/err-codes.h:248 +#: src/err-codes.h:250 msgid "No output source for IPC" msgstr "Brak �r�d�a wyj�ciowego dla IPC" -#: src/err-codes.h:249 +#: src/err-codes.h:251 msgid "IPC parameter error" msgstr "B��d parametru IPC" -#: src/err-codes.h:250 +#: src/err-codes.h:252 msgid "Unknown IPC inquire" msgstr "Nieznane zapytanie IPC" -#: src/err-codes.h:251 +#: src/err-codes.h:253 msgid "User defined error code 1" msgstr "Zdefiniowany przez u�ytkownika kod b��du 1" -#: src/err-codes.h:252 +#: src/err-codes.h:254 msgid "User defined error code 2" msgstr "Zdefiniowany przez u�ytkownika kod b��du 2" -#: src/err-codes.h:253 +#: src/err-codes.h:255 msgid "User defined error code 3" msgstr "Zdefiniowany przez u�ytkownika kod b��du 3" -#: src/err-codes.h:254 +#: src/err-codes.h:256 msgid "User defined error code 4" msgstr "Zdefiniowany przez u�ytkownika kod b��du 4" -#: src/err-codes.h:255 +#: src/err-codes.h:257 msgid "User defined error code 5" msgstr "Zdefiniowany przez u�ytkownika kod b��du 5" -#: src/err-codes.h:256 +#: src/err-codes.h:258 msgid "User defined error code 6" msgstr "Zdefiniowany przez u�ytkownika kod b��du 6" -#: src/err-codes.h:257 +#: src/err-codes.h:259 msgid "User defined error code 7" msgstr "Zdefiniowany przez u�ytkownika kod b��du 7" -#: src/err-codes.h:258 +#: src/err-codes.h:260 msgid "User defined error code 8" msgstr "Zdefiniowany przez u�ytkownika kod b��du 8" -#: src/err-codes.h:259 +#: src/err-codes.h:261 msgid "User defined error code 9" msgstr "Zdefiniowany przez u�ytkownika kod b��du 9" -#: src/err-codes.h:260 +#: src/err-codes.h:262 msgid "User defined error code 10" msgstr "Zdefiniowany przez u�ytkownika kod b��du 10" -#: src/err-codes.h:261 +#: src/err-codes.h:263 msgid "User defined error code 11" msgstr "Zdefiniowany przez u�ytkownika kod b��du 11" -#: src/err-codes.h:262 +#: src/err-codes.h:264 msgid "User defined error code 12" msgstr "Zdefiniowany przez u�ytkownika kod b��du 12" -#: src/err-codes.h:263 +#: src/err-codes.h:265 msgid "User defined error code 13" msgstr "Zdefiniowany przez u�ytkownika kod b��du 13" -#: src/err-codes.h:264 +#: src/err-codes.h:266 msgid "User defined error code 14" msgstr "Zdefiniowany przez u�ytkownika kod b��du 14" -#: src/err-codes.h:265 +#: src/err-codes.h:267 msgid "User defined error code 15" msgstr "Zdefiniowany przez u�ytkownika kod b��du 15" -#: src/err-codes.h:266 +#: src/err-codes.h:268 msgid "User defined error code 16" msgstr "Zdefiniowany przez u�ytkownika kod b��du 16" -#: src/err-codes.h:267 +#: src/err-codes.h:269 msgid "System error w/o errno" msgstr "B��d systemowy bez errno" -#: src/err-codes.h:268 +#: src/err-codes.h:270 msgid "Unknown system error" msgstr "Nieznany b��d systemu" -#: src/err-codes.h:269 +#: src/err-codes.h:271 msgid "End of file" msgstr "Koniec pliku" -#: src/err-codes.h:270 +#: src/err-codes.h:272 msgid "Unknown error code" msgstr "Nieznany kod b��du" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2009-08-20 09:00+0200\n" "Last-Translator: Laurentiu Buzdugan <[email protected]>\n" "Language-Team: Romanian <[email protected]>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.7\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2009-06-25 07:54+0100\n" "Last-Translator: Daniel Nylander <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.7\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2009-09-19 18:34+0930\n" "Last-Translator: Clytie Siddall <[email protected]>\n" "Language-Team: Vietnamese <[email protected]>\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 313fc49..305b815 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libgpg-error 1.7\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-09-16 14:55+0200\n" +"POT-Creation-Date: 2010-09-16 16:34+0200\n" "PO-Revision-Date: 2009-08-19 17:45+0800\n" "Last-Translator: Aron Xu <[email protected]>\n" "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists." @@ -96,6 +96,7 @@ gpg_err_init (void) /* No way to continue - commit suicide. */ abort (); } + _gpg_w32__init_gettext_module (); real_init (); } # endif /*!DLL_EXPORT*/ @@ -60,6 +60,11 @@ struct tls_space_s struct tls_space_s *get_tls (void); +/* Explicit constructor for w32-gettext.c */ +#ifndef DLL_EXPORT +void _gpg_w32__init_gettext_module (void); +#endif + #endif /*HAVE_W32_SYSTEM*/ #endif /*INIT_H*/ diff --git a/src/w32-gettext.c b/src/w32-gettext.c index e67e301..ca4fbbd 100644 --- a/src/w32-gettext.c +++ b/src/w32-gettext.c @@ -1146,13 +1146,32 @@ static char *current_domainname; -/* Constructor for this module. Called from DllMain. */ +/* Constructor for this module. This can only be used if we are a + DLL. IF used as a static lib we can't control the process set; for + example it might be used with a main module which is not build with + mingw and thus does not know how to call the constructors. */ +#ifdef DLL_EXPORT static void module_init (void) __attribute__ ((__constructor__)); +#endif static void module_init (void) { - InitializeCriticalSection (&domainlist_access_cs); + static int init_done; + + if (!init_done) + { + InitializeCriticalSection (&domainlist_access_cs); + init_done = 1; + } +} + +#ifndef DLL_EXPORT +void +_gpg_w32__init_gettext_module (void) +{ + module_init (); } +#endif /* Free the domain data. */ |