commit 3e22103e0cecfeb8a03e65733fd0ab5c475a302b
parent fad73f2435336733ae585c7a018df860bec3bdf1
Author: Schanzenbach, Martin <mschanzenbach@posteo.de>
Date: Mon, 21 Nov 2016 20:47:10 +0100
Merge remote-tracking branch 'origin/master' into credentials
Diffstat:
7 files changed, 81 insertions(+), 76 deletions(-)
diff --git a/po/de.po b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.10.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-11-08 13:49+0100\n"
+"POT-Creation-Date: 2016-11-21 18:08+0100\n"
"PO-Revision-Date: 2015-03-08 16:16+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -2697,29 +2697,29 @@ msgstr "# Selbstbekanntmachungen übertragen"
msgid "# fragments retransmitted"
msgstr "# Selbstbekanntmachungen übertragen"
-#: src/fragmentation/fragmentation.c:274
+#: src/fragmentation/fragmentation.c:278
#, fuzzy
msgid "# fragments wrap arounds"
msgstr "# verworfener Nachrichten"
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:325
msgid "# messages fragmented"
msgstr "# fragmentierter Nachrichten"
-#: src/fragmentation/fragmentation.c:327
+#: src/fragmentation/fragmentation.c:331
msgid "# total size of fragmented messages"
msgstr ""
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:455
#, fuzzy
msgid "# fragment acknowledgements received"
msgstr "# Knotenankündigungen empfangen"
-#: src/fragmentation/fragmentation.c:458
+#: src/fragmentation/fragmentation.c:462
msgid "# bits removed from fragmentation ACKs"
msgstr ""
-#: src/fragmentation/fragmentation.c:482
+#: src/fragmentation/fragmentation.c:486
#, fuzzy
msgid "# fragmentation transmissions completed"
msgstr "# Klartext PONG Nachrichten empfangen"
@@ -5724,8 +5724,8 @@ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
#: src/postgres/postgres.c:195
#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+msgid "Unable to connect to Postgres database '%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
#: src/psycstore/gnunet-service-psycstore.c:249
#, fuzzy
@@ -7899,7 +7899,7 @@ msgstr ""
msgid "Metadata `%s' failed to deserialize"
msgstr ""
-#: src/util/client_new.c:863
+#: src/util/client_new.c:864
#, c-format
msgid "Need a non-empty hostname for service `%s'.\n"
msgstr ""
@@ -8912,6 +8912,10 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
#, fuzzy
+#~ msgid "Unable to initialize Postgres: %s\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#, fuzzy
#~ msgid "Configuration for plugin `%s' did not work!\n"
#~ msgstr ""
#~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
diff --git a/po/es.po b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.9.5a\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-11-08 13:49+0100\n"
+"POT-Creation-Date: 2016-11-21 18:08+0100\n"
"PO-Revision-Date: 2013-02-23 17:50+0100\n"
"Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -2789,27 +2789,27 @@ msgstr "# fragmentos transmitidos"
msgid "# fragments retransmitted"
msgstr "# fragmentos retransmitidos"
-#: src/fragmentation/fragmentation.c:274
+#: src/fragmentation/fragmentation.c:278
msgid "# fragments wrap arounds"
msgstr "# encajes de fragmentos"
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:325
msgid "# messages fragmented"
msgstr "# mensajes fragmentados"
-#: src/fragmentation/fragmentation.c:327
+#: src/fragmentation/fragmentation.c:331
msgid "# total size of fragmented messages"
msgstr "# tamaño total de los mensajes fragmentados"
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:455
msgid "# fragment acknowledgements received"
msgstr "# reconocimientos de fragmentos recibidos"
-#: src/fragmentation/fragmentation.c:458
+#: src/fragmentation/fragmentation.c:462
msgid "# bits removed from fragmentation ACKs"
msgstr "# bits eliminados de reconocimientos de fragmentos"
-#: src/fragmentation/fragmentation.c:482
+#: src/fragmentation/fragmentation.c:486
msgid "# fragmentation transmissions completed"
msgstr "# transmisiones de fragmentos completadas"
@@ -5908,8 +5908,8 @@ msgstr "«%s:%s» falló en %s:%d con error: %s"
#: src/postgres/postgres.c:195
#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s\n"
-msgstr "No se pudo inicializar Postgres: %s"
+msgid "Unable to connect to Postgres database '%s': %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
#: src/psycstore/gnunet-service-psycstore.c:249
#, fuzzy
@@ -8188,7 +8188,7 @@ msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
msgid "Metadata `%s' failed to deserialize"
msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
-#: src/util/client_new.c:863
+#: src/util/client_new.c:864
#, c-format
msgid "Need a non-empty hostname for service `%s'.\n"
msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
@@ -9233,6 +9233,10 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
#, fuzzy
+#~ msgid "Unable to initialize Postgres: %s\n"
+#~ msgstr "No se pudo inicializar Postgres: %s"
+
+#, fuzzy
#~ msgid "Configuration for plugin `%s' did not work!\n"
#~ msgstr ""
#~ "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
@@ -11758,10 +11762,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
#~ msgid "Service `%s' stopped\n"
#~ msgstr "Servicio eliminado.\n"
-#, fuzzy
-#~ msgid "Unable to accept connection for service `%s': %s\n"
-#~ msgstr "Imposible guardar el fichero de configuración '%s':"
-
#~ msgid "KiB"
#~ msgstr "KiB"
diff --git a/po/fr.po b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.10.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-11-08 13:49+0100\n"
+"POT-Creation-Date: 2016-11-21 18:08+0100\n"
"PO-Revision-Date: 2015-12-24 01:20+0100\n"
"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -2613,27 +2613,27 @@ msgstr ""
msgid "# fragments retransmitted"
msgstr ""
-#: src/fragmentation/fragmentation.c:274
+#: src/fragmentation/fragmentation.c:278
msgid "# fragments wrap arounds"
msgstr ""
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:325
msgid "# messages fragmented"
msgstr ""
-#: src/fragmentation/fragmentation.c:327
+#: src/fragmentation/fragmentation.c:331
msgid "# total size of fragmented messages"
msgstr ""
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:455
msgid "# fragment acknowledgements received"
msgstr ""
-#: src/fragmentation/fragmentation.c:458
+#: src/fragmentation/fragmentation.c:462
msgid "# bits removed from fragmentation ACKs"
msgstr ""
-#: src/fragmentation/fragmentation.c:482
+#: src/fragmentation/fragmentation.c:486
msgid "# fragmentation transmissions completed"
msgstr ""
@@ -5505,7 +5505,7 @@ msgstr ""
#: src/postgres/postgres.c:195
#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s\n"
+msgid "Unable to connect to Postgres database '%s': %s\n"
msgstr "Résolution de « %s » échouée\n"
#: src/psycstore/gnunet-service-psycstore.c:249
@@ -7594,7 +7594,7 @@ msgstr ""
msgid "Metadata `%s' failed to deserialize"
msgstr ""
-#: src/util/client_new.c:863
+#: src/util/client_new.c:864
#, c-format
msgid "Need a non-empty hostname for service `%s'.\n"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-11-08 13:49+0100\n"
+"POT-Creation-Date: 2016-11-21 18:08+0100\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -2740,28 +2740,28 @@ msgstr "# byte skickade av typen %d"
msgid "# fragments retransmitted"
msgstr "# byte skickade av typen %d"
-#: src/fragmentation/fragmentation.c:274
+#: src/fragmentation/fragmentation.c:278
#, fuzzy
msgid "# fragments wrap arounds"
msgstr "# byte skickade av typen %d"
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:325
msgid "# messages fragmented"
msgstr ""
-#: src/fragmentation/fragmentation.c:327
+#: src/fragmentation/fragmentation.c:331
msgid "# total size of fragmented messages"
msgstr ""
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:455
msgid "# fragment acknowledgements received"
msgstr ""
-#: src/fragmentation/fragmentation.c:458
+#: src/fragmentation/fragmentation.c:462
msgid "# bits removed from fragmentation ACKs"
msgstr ""
-#: src/fragmentation/fragmentation.c:482
+#: src/fragmentation/fragmentation.c:486
#, fuzzy
msgid "# fragmentation transmissions completed"
msgstr "# klartext PONG-meddelanden mottagna"
@@ -5767,8 +5767,8 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
#: src/postgres/postgres.c:195
#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s\n"
-msgstr "Kunde inte initiera SQLite.\n"
+msgid "Unable to connect to Postgres database '%s': %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
#: src/psycstore/gnunet-service-psycstore.c:249
#, fuzzy
@@ -8001,7 +8001,7 @@ msgstr ""
msgid "Metadata `%s' failed to deserialize"
msgstr ""
-#: src/util/client_new.c:863
+#: src/util/client_new.c:864
#, c-format
msgid "Need a non-empty hostname for service `%s'.\n"
msgstr ""
@@ -9016,6 +9016,10 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
#, fuzzy
+#~ msgid "Unable to initialize Postgres: %s\n"
+#~ msgstr "Kunde inte initiera SQLite.\n"
+
+#, fuzzy
#~ msgid "Configuration for plugin `%s' did not work!\n"
#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -10404,10 +10408,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
#~ msgstr "Tjänst borttagen.\n"
#, fuzzy
-#~ msgid "Unable to accept connection for service `%s': %s\n"
-#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#, fuzzy
#~ msgid "Failed to create IPv4 broadcast socket on port %d\n"
#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
diff --git a/po/vi.po b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.8.0a\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-11-08 13:49+0100\n"
+"POT-Creation-Date: 2016-11-21 18:08+0100\n"
"PO-Revision-Date: 2008-09-10 22:05+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -2760,29 +2760,29 @@ msgstr "# Các tự quảng cáo được truyền"
msgid "# fragments retransmitted"
msgstr "# Các tự quảng cáo được truyền"
-#: src/fragmentation/fragmentation.c:274
+#: src/fragmentation/fragmentation.c:278
#, fuzzy
msgid "# fragments wrap arounds"
msgstr "# Các tự quảng cáo được truyền"
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:325
msgid "# messages fragmented"
msgstr "# các thông báo bị tế phân"
-#: src/fragmentation/fragmentation.c:327
+#: src/fragmentation/fragmentation.c:331
msgid "# total size of fragmented messages"
msgstr ""
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:455
#, fuzzy
msgid "# fragment acknowledgements received"
msgstr "# Các quảng cáo đồng đẳng được nhận"
-#: src/fragmentation/fragmentation.c:458
+#: src/fragmentation/fragmentation.c:462
msgid "# bits removed from fragmentation ACKs"
msgstr ""
-#: src/fragmentation/fragmentation.c:482
+#: src/fragmentation/fragmentation.c:486
#, fuzzy
msgid "# fragmentation transmissions completed"
msgstr "# các sự truyền PONG bị lỗi"
@@ -5820,8 +5820,8 @@ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
#: src/postgres/postgres.c:195
#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
+msgid "Unable to connect to Postgres database '%s': %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
#: src/psycstore/gnunet-service-psycstore.c:249
#, fuzzy
@@ -8051,7 +8051,7 @@ msgstr ""
msgid "Metadata `%s' failed to deserialize"
msgstr ""
-#: src/util/client_new.c:863
+#: src/util/client_new.c:864
#, c-format
msgid "Need a non-empty hostname for service `%s'.\n"
msgstr ""
@@ -9067,6 +9067,10 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
#, fuzzy
+#~ msgid "Unable to initialize Postgres: %s\n"
+#~ msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#, fuzzy
#~ msgid "Configuration for plugin `%s' did not work!\n"
#~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
@@ -10690,10 +10694,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
#~ msgid "Service `%s' stopped\n"
#~ msgstr "Dịch vụ đã bị xoá.\n"
-#, fuzzy
-#~ msgid "Unable to accept connection for service `%s': %s\n"
-#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
#~ msgid "KiB"
#~ msgstr "KiB"
diff --git a/po/zh_CN.po b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet-0.8.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-11-08 13:49+0100\n"
+"POT-Creation-Date: 2016-11-21 18:08+0100\n"
"PO-Revision-Date: 2011-07-09 12:12+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -2649,27 +2649,27 @@ msgstr ""
msgid "# fragments retransmitted"
msgstr ""
-#: src/fragmentation/fragmentation.c:274
+#: src/fragmentation/fragmentation.c:278
msgid "# fragments wrap arounds"
msgstr ""
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:325
msgid "# messages fragmented"
msgstr ""
-#: src/fragmentation/fragmentation.c:327
+#: src/fragmentation/fragmentation.c:331
msgid "# total size of fragmented messages"
msgstr ""
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:455
msgid "# fragment acknowledgements received"
msgstr ""
-#: src/fragmentation/fragmentation.c:458
+#: src/fragmentation/fragmentation.c:462
msgid "# bits removed from fragmentation ACKs"
msgstr ""
-#: src/fragmentation/fragmentation.c:482
+#: src/fragmentation/fragmentation.c:486
msgid "# fragmentation transmissions completed"
msgstr ""
@@ -5597,8 +5597,8 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
#: src/postgres/postgres.c:195
#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s\n"
-msgstr "无法初始化 SQLite：%s。\n"
+msgid "Unable to connect to Postgres database '%s': %s\n"
+msgstr "无法保存配置文件“%s”："
#: src/psycstore/gnunet-service-psycstore.c:249
#, fuzzy
@@ -7758,7 +7758,7 @@ msgstr ""
msgid "Metadata `%s' failed to deserialize"
msgstr ""
-#: src/util/client_new.c:863
+#: src/util/client_new.c:864
#, c-format
msgid "Need a non-empty hostname for service `%s'.\n"
msgstr ""
@@ -8757,6 +8757,10 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
msgstr ""
#, fuzzy
+#~ msgid "Unable to initialize Postgres: %s\n"
+#~ msgstr "无法初始化 SQLite：%s。\n"
+
+#, fuzzy
#~ msgid "Configuration for plugin `%s' did not work!\n"
#~ msgstr "配置文件“%s”已写入。\n"
@@ -9663,10 +9667,6 @@ msgstr ""
#~ msgid "Service `%s' stopped\n"
#~ msgstr "服务已删除。\n"
-#, fuzzy
-#~ msgid "Unable to accept connection for service `%s': %s\n"
-#~ msgstr "无法保存配置文件“%s”："
-
#~ msgid "KiB"
#~ msgstr "KiB"
diff --git a/src/postgres/postgres.c b/src/postgres/postgres.c
@@ -192,7 +192,8 @@ GNUNET_POSTGRES_connect (const struct GNUNET_CONFIGURATION_Handle * cfg,
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
"postgres",
- _("Unable to initialize Postgres: %s\n"),
+ _("Unable to connect to Postgres database '%s': %s\n"),
+ conninfo,
PQerrorMessage (dbh));
PQfinish (dbh);
return NULL;
