[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r2528 - in GNUnet: . po src/applications/datastore src/appl
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r2528 - in GNUnet: . po src/applications/datastore src/applications/fs/module src/applications/gap src/include |
|
Date: |
Thu, 16 Mar 2006 18:22:24 -0800 (PST) |
Author: grothoff
Date: 2006-03-16 18:22:16 -0800 (Thu, 16 Mar 2006)
New Revision: 2528
Modified:
GNUnet/ltmain.sh
GNUnet/po/GNUnet.pot
GNUnet/po/de.po
GNUnet/po/rw.po
GNUnet/po/sv.po
GNUnet/po/vi.po
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/gap/gap.c
GNUnet/src/include/gnunet_blockstore.h
GNUnet/src/include/gnunet_datastore_service.h
Log:
big gap fix
Modified: GNUnet/ltmain.sh
===================================================================
--- GNUnet/ltmain.sh 2006-03-17 00:34:02 UTC (rev 2527)
+++ GNUnet/ltmain.sh 2006-03-17 02:22:16 UTC (rev 2528)
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-2"
+VERSION="1.5.22 Debian 1.5.22-4"
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
# See if we are running on zsh, and set the options which allow our
Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot 2006-03-17 00:34:02 UTC (rev 2527)
+++ GNUnet/po/GNUnet.pot 2006-03-17 02:22:16 UTC (rev 2528)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-01-18 17:21-0800\n"
+"POT-Creation-Date: 2006-03-15 23:35-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -98,7 +98,7 @@
msgid "`%s' failed at %s:%d with error: `%s'.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:133
+#: src/applications/bootstrap_http/http.c:132
#, c-format
msgid "Could not download list of peer contacts, host `%s' unknown.\n"
msgstr ""
@@ -124,7 +124,7 @@
msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
msgstr ""
-#: src/applications/bootstrap_http/http.c:354
+#: src/applications/bootstrap_http/http.c:355
msgid "# hellos downloaded via http"
msgstr ""
@@ -166,7 +166,7 @@
#: src/applications/dht/tools/dht-join.c:108
#: src/applications/dht/tools/dht-query.c:99
#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:184
+#: src/applications/fs/tools/gnunet-directory.c:195
#: src/applications/fs/tools/gnunet-download.c:130
#: src/applications/fs/tools/gnunet-insert.c:519
#: src/applications/fs/tools/gnunet-pseudonym.c:232
@@ -528,25 +528,26 @@
msgid "`%s' registering handler %d\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:121
+#: src/applications/fs/ecrs/download.c:125
#, c-format
msgid "Could not unlink temporary file `%s': %s\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:249
+#: src/applications/fs/ecrs/download.c:257
#, c-format
msgid "Write(%d, %p, %d) failed: %s\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:910
+#: src/applications/fs/ecrs/download.c:917
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:1081
+#: src/applications/fs/ecrs/download.c:1091
#, c-format
-msgid "Content `%s' seems to be not available on the network.\n"
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
msgstr ""
#: src/applications/fs/ecrs/meta.c:835
@@ -632,11 +633,11 @@
msgid "Indexing data failed at position %i.\n"
msgstr ""
-#: src/applications/fs/fsui/download.c:267
+#: src/applications/fs/fsui/download.c:289
msgid "Download aborted."
msgstr ""
-#: src/applications/fs/fsui/download.c:270
+#: src/applications/fs/fsui/download.c:292
msgid "ECRS download failed (see logs)."
msgstr ""
@@ -685,30 +686,34 @@
msgid "Unindex failed."
msgstr ""
-#: src/applications/fs/fsui/upload.c:383 src/applications/fs/fsui/upload.c:420
+#: src/applications/fs/fsui/upload.c:402 src/applications/fs/fsui/upload.c:439
msgid "Upload failed.\n"
msgstr ""
-#: src/applications/fs/fsui/upload.c:427
+#: src/applications/fs/fsui/upload.c:446
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1079
+#: src/applications/fs/module/fs.c:1085
#, c-format
msgid ""
"You must specify a postive number for `%s' in the configuration in section `%"
"s'.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1121
+#: src/applications/fs/module/fs.c:1127
#, c-format
msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1158
+#: src/applications/fs/module/fs.c:1164
msgid "enables (anonymous) file-sharing"
msgstr ""
+#: src/applications/fs/module/migration.c:203
+msgid "# blocks migrated"
+msgstr ""
+
#: src/applications/fs/module/ondemand.c:308
#, c-format
msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -735,7 +740,7 @@
"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
msgstr ""
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1960
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1991
msgid "Failed to get traffic stats.\n"
msgstr ""
@@ -775,37 +780,37 @@
msgid "=\tError reading directory.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:105
+#: src/applications/fs/tools/gnunet-directory.c:116
#, c-format
msgid "File format error (not a GNUnet directory?)\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:107
+#: src/applications/fs/tools/gnunet-directory.c:118
#, c-format
msgid "%d files found in directory.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:136
msgid "remove all entries from the directory database and stop tracking URIs"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:138
msgid "list entries from the directory database"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:130
+#: src/applications/fs/tools/gnunet-directory.c:141
msgid "start tracking entries for the directory database"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:145
msgid "gnunet-directory [OPTIONS] [FILENAMES]"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:135
+#: src/applications/fs/tools/gnunet-directory.c:146
msgid "Perform directory related operations."
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:200
+#: src/applications/fs/tools/gnunet-directory.c:211
#, c-format
msgid "Listed %d matching entries.\n"
msgstr ""
@@ -1244,23 +1249,23 @@
msgid "`%s' failed. Is `%s' a file?\n"
msgstr ""
-#: src/applications/gap/gap.c:1949
+#: src/applications/gap/gap.c:1980
msgid ""
"Cover traffic requested but traffic service not loaded. Rejecting request.\n"
msgstr ""
-#: src/applications/gap/gap.c:1966 src/applications/gap/gap.c:1971
-#: src/applications/gap/gap.c:1977
+#: src/applications/gap/gap.c:1997 src/applications/gap/gap.c:2002
+#: src/applications/gap/gap.c:2008
msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
msgstr ""
-#: src/applications/gap/gap.c:2233
+#: src/applications/gap/gap.c:2264
msgid ""
"Traffic service failed to load; gap cannot ensure cover-traffic "
"availability.\n"
msgstr ""
-#: src/applications/gap/gap.c:2264
+#: src/applications/gap/gap.c:2295
#, c-format
msgid "`%s' registering handlers %d %d\n"
msgstr ""
@@ -1524,7 +1529,7 @@
msgstr ""
#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_sqlite/sqlite.c:1071
msgid "# Bytes in datastore"
msgstr ""
@@ -1540,7 +1545,7 @@
msgstr ""
#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:258
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
msgid "Could not initialize libgnunetutil!\n"
msgstr ""
@@ -1553,7 +1558,7 @@
msgid "sqlite datastore"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/sqstore_sqlite/sqlite.c:1034
#, c-format
msgid ""
"Configuration file must specify directory for storing FS data in section `%"
@@ -1914,7 +1919,7 @@
msgid "No testbed URL given, not registered.\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
+#: src/applications/testbed/testbed.c:1055 src/transports/http.c:1455
#, c-format
msgid "Could not resolve name of HTTP proxy `%s'.\n"
msgstr ""
@@ -1929,21 +1934,21 @@
msgid "Could not register testbed, host `%s' unknown\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1177
+#: src/applications/testbed/testbed.c:1178
#, c-format
msgid "Failed to send HTTP request to host `%s': %s\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1230
+#: src/applications/testbed/testbed.c:1231
#, c-format
msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1269
+#: src/applications/testbed/testbed.c:1270
msgid "Exit register (error: no http response read).\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1358
msgid "allows construction of a P2P-testbed (incomplete)"
msgstr ""
@@ -2890,41 +2895,41 @@
msgid "Message details: %u: length %d, priority: %d\n"
msgstr ""
-#: src/server/connection.c:2303
+#: src/server/connection.c:2331
#, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr ""
-#: src/server/connection.c:2385
+#: src/server/connection.c:2413
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr ""
-#: src/server/connection.c:2401
+#: src/server/connection.c:2429
msgid "Message received more than one day old. Dropped.\n"
msgstr ""
-#: src/server/connection.c:2795
+#: src/server/connection.c:2823
msgid "# outgoing messages dropped"
msgstr ""
-#: src/server/connection.c:2797
+#: src/server/connection.c:2825
msgid "# bytes of outgoing messages dropped"
msgstr ""
-#: src/server/connection.c:2799
+#: src/server/connection.c:2827
msgid "# connections closed (HANGUP sent)"
msgstr ""
-#: src/server/connection.c:2801
+#: src/server/connection.c:2829
msgid "# bytes encrypted"
msgstr ""
-#: src/server/connection.c:2803
+#: src/server/connection.c:2831
msgid "# bytes decrypted"
msgstr ""
-#: src/server/connection.c:2805
+#: src/server/connection.c:2833
msgid "# bytes noise sent"
msgstr ""
@@ -3235,12 +3240,12 @@
msgid "%s failed, message type %d already in use.\n"
msgstr ""
-#: src/transports/ip6.c:60 src/transports/ip.c:67 src/util/tcpio.c:87
+#: src/transports/ip6.c:60 src/util/configuration.c:925
#, c-format
msgid "Could not find IP of host `%s': %s\n"
msgstr ""
-#: src/transports/ip6.c:100 src/transports/ip.c:310
+#: src/transports/ip6.c:100
#, c-format
msgid "Could not resolve `%s': %s\n"
msgstr ""
@@ -3262,82 +3267,82 @@
msgid "HTTP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/http.c:1175 src/transports/tcp.c:1150 src/util/tcpio.c:166
-#: src/util/tcpio.c:196
+#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
+#: src/util/tcpio.c:188
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr ""
-#: src/transports/http.c:1331
+#: src/transports/http.c:1333
#, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
msgstr ""
-#: src/transports/http.c:1474
+#: src/transports/http.c:1478
msgid "# bytes received via HTTP"
msgstr ""
-#: src/transports/http.c:1476
+#: src/transports/http.c:1480
msgid "# bytes sent via HTTP"
msgstr ""
-#: src/transports/http.c:1478
+#: src/transports/http.c:1482
msgid "# bytes dropped by HTTP (outgoing)"
msgstr ""
-#: src/transports/smtp.c:296
+#: src/transports/smtp.c:297
#, c-format
msgid "Could not resolve name of SMTP server `%s': %s"
msgstr ""
-#: src/transports/smtp.c:415 src/transports/smtp.c:876
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
#, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section `%s' "
"under `%s'.\n"
msgstr ""
-#: src/transports/smtp.c:488
+#: src/transports/smtp.c:489
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr ""
-#: src/transports/smtp.c:583
+#: src/transports/smtp.c:584
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr ""
-#: src/transports/smtp.c:590
+#: src/transports/smtp.c:591
#, c-format
msgid "SMTP filter string to long, capped to `%s'\n"
msgstr ""
-#: src/transports/smtp.c:763
+#: src/transports/smtp.c:764
#, c-format
msgid "Sending E-mail to `%s' failed.\n"
msgstr ""
-#: src/transports/smtp.c:814
+#: src/transports/smtp.c:815
#, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr ""
-#: src/transports/smtp.c:837
+#: src/transports/smtp.c:838
#, c-format
msgid ""
"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
msgstr ""
-#: src/transports/smtp.c:843
+#: src/transports/smtp.c:844
#, c-format
msgid "Failed to send `%s' request to SMTP server.\n"
msgstr ""
-#: src/transports/smtp.c:902
+#: src/transports/smtp.c:903
#, c-format
msgid "%.*s filter %s (SMTP)"
msgstr ""
-#: src/transports/smtp.c:931 src/transports/udp.c:706
+#: src/transports/smtp.c:932 src/transports/udp.c:708
#: src/transports/udp6.c:680
#, c-format
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
@@ -3429,57 +3434,57 @@
msgid "UDP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/udp.c:535
+#: src/transports/udp.c:537
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
-#: src/transports/udp.c:691
+#: src/transports/udp.c:693
msgid "# bytes received via UDP"
msgstr ""
-#: src/transports/udp.c:693
+#: src/transports/udp.c:695
msgid "# bytes sent via UDP"
msgstr ""
-#: src/transports/udp.c:695
+#: src/transports/udp.c:697
msgid "# bytes dropped by UDP (outgoing)"
msgstr ""
-#: src/transports/ip.c:142
+#: src/transports/ip.c:124
#, c-format
msgid ""
"Could not find interface `%s' in `%s', trying to find another interface.\n"
msgstr ""
-#: src/transports/ip.c:167
+#: src/transports/ip.c:149
#, c-format
msgid "Could not obtain IP for interface `%s' using `%s'.\n"
msgstr ""
-#: src/transports/ip.c:211
+#: src/transports/ip.c:193
#, c-format
msgid "Could not find an IP address for interface `%s'.\n"
msgstr ""
-#: src/transports/ip.c:221
+#: src/transports/ip.c:203
#, c-format
msgid ""
"There is more than one IP address specified for interface `%s'.\n"
"GNUnet will use %u.%u.%u.%u.\n"
msgstr ""
-#: src/transports/ip.c:242
+#: src/transports/ip.c:224
#, c-format
msgid "Could not resolve `%s' to determine our IP address: %s\n"
msgstr ""
-#: src/transports/ip.c:275
+#: src/transports/ip.c:256
#, c-format
msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
msgstr ""
-#: src/transports/ip.c:345
+#: src/transports/ip.c:306
msgid "Failed to obtain my (external) IP address!\n"
msgstr ""
Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po 2006-03-17 00:34:02 UTC (rev 2527)
+++ GNUnet/po/de.po 2006-03-17 02:22:16 UTC (rev 2528)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-01-18 17:21-0800\n"
+"POT-Creation-Date: 2006-03-15 23:35-0800\n"
"PO-Revision-Date: 2005-12-24 02:16+0100\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -106,7 +106,7 @@
msgid "`%s' failed at %s:%d with error: `%s'.\n"
msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-#: src/applications/bootstrap_http/http.c:133
+#: src/applications/bootstrap_http/http.c:132
#, c-format
msgid "Could not download list of peer contacts, host `%s' unknown.\n"
msgstr ""
@@ -136,7 +136,7 @@
"Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden. Es wird ohne "
"Proxy versucht.\n"
-#: src/applications/bootstrap_http/http.c:354
+#: src/applications/bootstrap_http/http.c:355
msgid "# hellos downloaded via http"
msgstr "# Hellos per HTTP heruntergeladen"
@@ -178,7 +178,7 @@
#: src/applications/dht/tools/dht-join.c:108
#: src/applications/dht/tools/dht-query.c:99
#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:184
+#: src/applications/fs/tools/gnunet-directory.c:195
#: src/applications/fs/tools/gnunet-download.c:130
#: src/applications/fs/tools/gnunet-insert.c:519
#: src/applications/fs/tools/gnunet-pseudonym.c:232
@@ -545,17 +545,17 @@
msgid "`%s' registering handler %d\n"
msgstr "`%s' registriert Handler %d\n"
-#: src/applications/fs/ecrs/download.c:121
+#: src/applications/fs/ecrs/download.c:125
#, c-format
msgid "Could not unlink temporary file `%s': %s\n"
msgstr "Temporäre Datei `%s' konnte nicht gelöscht werden: %s\n"
-#: src/applications/fs/ecrs/download.c:249
+#: src/applications/fs/ecrs/download.c:257
#, c-format
msgid "Write(%d, %p, %d) failed: %s\n"
msgstr "Write(%d, %p, %d) schlug fehl: %s\n"
-#: src/applications/fs/ecrs/download.c:910
+#: src/applications/fs/ecrs/download.c:917
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
@@ -564,9 +564,10 @@
"Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
"abgebrochen.\n"
-#: src/applications/fs/ecrs/download.c:1081
-#, c-format
-msgid "Content `%s' seems to be not available on the network.\n"
+#: src/applications/fs/ecrs/download.c:1091
+#, fuzzy, c-format
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
msgstr "Inhalt `%s' scheint im Netzwerk nicht verfügbar zu sein.\n"
#: src/applications/fs/ecrs/meta.c:835
@@ -657,11 +658,11 @@
msgid "Indexing data failed at position %i.\n"
msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
-#: src/applications/fs/fsui/download.c:267
+#: src/applications/fs/fsui/download.c:289
msgid "Download aborted."
msgstr "Download abgebrochen."
-#: src/applications/fs/fsui/download.c:270
+#: src/applications/fs/fsui/download.c:292
msgid "ECRS download failed (see logs)."
msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
@@ -713,17 +714,17 @@
msgid "Unindex failed."
msgstr "Deindizierung schlug fehl."
-#: src/applications/fs/fsui/upload.c:383 src/applications/fs/fsui/upload.c:420
+#: src/applications/fs/fsui/upload.c:402 src/applications/fs/fsui/upload.c:439
msgid "Upload failed.\n"
msgstr "Upload fehlgeschlagen.\n"
-#: src/applications/fs/fsui/upload.c:427
+#: src/applications/fs/fsui/upload.c:446
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
"Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen "
"werden.\n"
-#: src/applications/fs/module/fs.c:1079
+#: src/applications/fs/module/fs.c:1085
#, c-format
msgid ""
"You must specify a postive number for `%s' in the configuration in section `%"
@@ -732,15 +733,19 @@
"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
"positive Zahl angeben.\n"
-#: src/applications/fs/module/fs.c:1121
+#: src/applications/fs/module/fs.c:1127
#, c-format
msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
-#: src/applications/fs/module/fs.c:1158
+#: src/applications/fs/module/fs.c:1164
msgid "enables (anonymous) file-sharing"
msgstr "Ermöglicht (anonymes) Filesharing"
+#: src/applications/fs/module/migration.c:203
+msgid "# blocks migrated"
+msgstr ""
+
#: src/applications/fs/module/ondemand.c:308
#, c-format
msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -775,7 +780,7 @@
"Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
"Datenspeicher.\n"
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1960
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1991
msgid "Failed to get traffic stats.\n"
msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
@@ -820,39 +825,39 @@
msgid "=\tError reading directory.\n"
msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
-#: src/applications/fs/tools/gnunet-directory.c:105
+#: src/applications/fs/tools/gnunet-directory.c:116
#, c-format
msgid "File format error (not a GNUnet directory?)\n"
msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-#: src/applications/fs/tools/gnunet-directory.c:107
+#: src/applications/fs/tools/gnunet-directory.c:118
#, c-format
msgid "%d files found in directory.\n"
msgstr "%d Dateien im Verzeichnis gefunden.\n"
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:136
msgid "remove all entries from the directory database and stop tracking URIs"
msgstr ""
"Alle Einträge aus der Verzeichnis Datenbank löschen und das Verfolgen von "
"URIs abbrechen"
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:138
msgid "list entries from the directory database"
msgstr "Einträge aus der Verzeichnis Datenbank auflisten"
-#: src/applications/fs/tools/gnunet-directory.c:130
+#: src/applications/fs/tools/gnunet-directory.c:141
msgid "start tracking entries for the directory database"
msgstr "Anfangen, Einträge für die Verzeichnis Datenbank zu verfolgen"
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:145
msgid "gnunet-directory [OPTIONS] [FILENAMES]"
msgstr "gnunet-directory [OPTIONEN] [DATEINAMEN]"
-#: src/applications/fs/tools/gnunet-directory.c:135
+#: src/applications/fs/tools/gnunet-directory.c:146
msgid "Perform directory related operations."
msgstr "Verzeichnisbezogene Operationen durchführen."
-#: src/applications/fs/tools/gnunet-directory.c:200
+#: src/applications/fs/tools/gnunet-directory.c:211
#, c-format
msgid "Listed %d matching entries.\n"
msgstr "%d übereinstimmende Einträge aufgelistet.\n"
@@ -1355,21 +1360,21 @@
msgid "`%s' failed. Is `%s' a file?\n"
msgstr "`%s' schlug fehl. Ist `%s' eine Datei?\n"
-#: src/applications/gap/gap.c:1949
+#: src/applications/gap/gap.c:1980
msgid ""
"Cover traffic requested but traffic service not loaded. Rejecting request.\n"
msgstr ""
"Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
"nicht geladen. Anfrage wird abgelehnt.\n"
-#: src/applications/gap/gap.c:1966 src/applications/gap/gap.c:1971
-#: src/applications/gap/gap.c:1977
+#: src/applications/gap/gap.c:1997 src/applications/gap/gap.c:2002
+#: src/applications/gap/gap.c:2008
msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
msgstr ""
"Gewünschter Grad an Anonymität kann nicht erreicht werden, Anfrage wird "
"ignoriert.\n"
-#: src/applications/gap/gap.c:2233
+#: src/applications/gap/gap.c:2264
msgid ""
"Traffic service failed to load; gap cannot ensure cover-traffic "
"availability.\n"
@@ -1377,7 +1382,7 @@
"Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
"Netzwerkverkehr sicherstellen.\n"
-#: src/applications/gap/gap.c:2264
+#: src/applications/gap/gap.c:2295
#, c-format
msgid "`%s' registering handlers %d %d\n"
msgstr "`%s' registriert Handler %d %d\n"
@@ -1662,7 +1667,7 @@
msgstr "Abfrage `%s' hatte keine Ergebnisse.\n"
#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_sqlite/sqlite.c:1071
msgid "# Bytes in datastore"
msgstr "# Bytes in der Datenbank"
@@ -1680,7 +1685,7 @@
"richtig eingerichtet ist!\n"
#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:258
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
msgid "Could not initialize libgnunetutil!\n"
msgstr "Konnte libgnunetutil nicht initialisieren!\n"
@@ -1693,7 +1698,7 @@
msgid "sqlite datastore"
msgstr "sqlite Datenspeicher"
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/sqstore_sqlite/sqlite.c:1034
#, c-format
msgid ""
"Configuration file must specify directory for storing FS data in section `%"
@@ -2070,7 +2075,7 @@
msgstr ""
"Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
+#: src/applications/testbed/testbed.c:1055 src/transports/http.c:1455
#, c-format
msgid "Could not resolve name of HTTP proxy `%s'.\n"
msgstr "Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden.\n"
@@ -2088,21 +2093,21 @@
msgstr ""
"Testbed konnte nicht registriert werden, Host `%s' ist nicht bekannt.\n"
-#: src/applications/testbed/testbed.c:1177
+#: src/applications/testbed/testbed.c:1178
#, c-format
msgid "Failed to send HTTP request to host `%s': %s\n"
msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
-#: src/applications/testbed/testbed.c:1230
+#: src/applications/testbed/testbed.c:1231
#, c-format
msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
msgstr "Fehler beim Senden der HTTP Anfrage `%s' an Host `%s': %s\n"
-#: src/applications/testbed/testbed.c:1269
+#: src/applications/testbed/testbed.c:1270
msgid "Exit register (error: no http response read).\n"
msgstr "Abbruch der Registrierung (Fehler: keine HTTP Antwort gelesen).\n"
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1358
msgid "allows construction of a P2P-testbed (incomplete)"
msgstr "Ermöglicht die Konstruktion einer P2P-Testumgebung (inkomplett)"
@@ -3259,42 +3264,42 @@
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
-#: src/server/connection.c:2303
+#: src/server/connection.c:2331
#, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
-#: src/server/connection.c:2385
+#: src/server/connection.c:2413
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr "Ungültige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
-#: src/server/connection.c:2401
+#: src/server/connection.c:2429
msgid "Message received more than one day old. Dropped.\n"
msgstr ""
"Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
-#: src/server/connection.c:2795
+#: src/server/connection.c:2823
msgid "# outgoing messages dropped"
msgstr "# ausgehender Nachrichten verworfen"
-#: src/server/connection.c:2797
+#: src/server/connection.c:2825
msgid "# bytes of outgoing messages dropped"
msgstr "# Bytes ausgehender Nachrichten verworfen"
-#: src/server/connection.c:2799
+#: src/server/connection.c:2827
msgid "# connections closed (HANGUP sent)"
msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
-#: src/server/connection.c:2801
+#: src/server/connection.c:2829
msgid "# bytes encrypted"
msgstr "# Bytes verschlüsselt"
-#: src/server/connection.c:2803
+#: src/server/connection.c:2831
msgid "# bytes decrypted"
msgstr "# Bytes entschlüsselt"
-#: src/server/connection.c:2805
+#: src/server/connection.c:2833
msgid "# bytes noise sent"
msgstr "# Bytes Rauschen gesendet"
@@ -3630,12 +3635,12 @@
msgid "%s failed, message type %d already in use.\n"
msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
-#: src/transports/ip6.c:60 src/transports/ip.c:67 src/util/tcpio.c:87
+#: src/transports/ip6.c:60 src/util/configuration.c:925
#, c-format
msgid "Could not find IP of host `%s': %s\n"
msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
-#: src/transports/ip6.c:100 src/transports/ip.c:310
+#: src/transports/ip6.c:100
#, c-format
msgid "Could not resolve `%s': %s\n"
msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
@@ -3660,13 +3665,13 @@
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/http.c:1175 src/transports/tcp.c:1150 src/util/tcpio.c:166
-#: src/util/tcpio.c:196
+#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
+#: src/util/tcpio.c:188
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-#: src/transports/http.c:1331
+#: src/transports/http.c:1333
#, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
@@ -3674,24 +3679,24 @@
"HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport Dienst "
"wurde nicht gestartet.\n"
-#: src/transports/http.c:1474
+#: src/transports/http.c:1478
msgid "# bytes received via HTTP"
msgstr "# Bytes empfangen über HTTP"
-#: src/transports/http.c:1476
+#: src/transports/http.c:1480
msgid "# bytes sent via HTTP"
msgstr "# Bytes gesendet über HTTP"
-#: src/transports/http.c:1478
+#: src/transports/http.c:1482
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# Bytes verworfen von HTTP"
-#: src/transports/smtp.c:296
+#: src/transports/smtp.c:297
#, c-format
msgid "Could not resolve name of SMTP server `%s': %s"
msgstr "Der Name des SMTP servers `%s' konnte nicht aufgelöst werden: %s"
-#: src/transports/smtp.c:415 src/transports/smtp.c:876
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
#, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -3700,33 +3705,33 @@
"Für den SMTP Transport müssen Sie den Namen einer Pipe in Sektion `%s', "
"Eintrag `%s' eintragen.\n"
-#: src/transports/smtp.c:488
+#: src/transports/smtp.c:489
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr ""
"Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
-#: src/transports/smtp.c:583
+#: src/transports/smtp.c:584
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr ""
"Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
"werden.\n"
-#: src/transports/smtp.c:590
+#: src/transports/smtp.c:591
#, c-format
msgid "SMTP filter string to long, capped to `%s'\n"
msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
-#: src/transports/smtp.c:763
+#: src/transports/smtp.c:764
#, c-format
msgid "Sending E-mail to `%s' failed.\n"
msgstr "Das Senden einer E-Mail an `%s' schlug fehl.\n"
-#: src/transports/smtp.c:814
+#: src/transports/smtp.c:815
#, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr "Der SMTP server sendete eine unerwartete Antwort bei %s:%d.\n"
-#: src/transports/smtp.c:837
+#: src/transports/smtp.c:838
#, c-format
msgid ""
"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
@@ -3734,17 +3739,17 @@
"SMTP Server antwortete nicht mit einem 250 Bestätigungscode auf eine `%s' "
"Anfrage.\n"
-#: src/transports/smtp.c:843
+#: src/transports/smtp.c:844
#, c-format
msgid "Failed to send `%s' request to SMTP server.\n"
msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-#: src/transports/smtp.c:902
+#: src/transports/smtp.c:903
#, c-format
msgid "%.*s filter %s (SMTP)"
msgstr "%.*s filter %s (SMTP)"
-#: src/transports/smtp.c:931 src/transports/udp.c:706
+#: src/transports/smtp.c:932 src/transports/udp.c:708
#: src/transports/udp6.c:680
#, c-format
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
@@ -3853,26 +3858,26 @@
msgid "UDP: Could not determine my public IP address.\n"
msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/udp.c:535
+#: src/transports/udp.c:537
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
"Eine Nachricht der Größe %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
"werden: %s\n"
-#: src/transports/udp.c:691
+#: src/transports/udp.c:693
msgid "# bytes received via UDP"
msgstr "# Bytes empfangen über UDP"
-#: src/transports/udp.c:693
+#: src/transports/udp.c:695
msgid "# bytes sent via UDP"
msgstr "# Bytes gesendet über UDP"
-#: src/transports/udp.c:695
+#: src/transports/udp.c:697
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# Bytes verworfen von UDP (outgoing)"
-#: src/transports/ip.c:142
+#: src/transports/ip.c:124
#, c-format
msgid ""
"Could not find interface `%s' in `%s', trying to find another interface.\n"
@@ -3880,19 +3885,19 @@
"Gerät `%s' konnte in `%s' nicht gefunden werden, es wird versucht, ein "
"anderes Gerät zu finden.\n"
-#: src/transports/ip.c:167
+#: src/transports/ip.c:149
#, c-format
msgid "Could not obtain IP for interface `%s' using `%s'.\n"
msgstr ""
"Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
"werden.\n"
-#: src/transports/ip.c:211
+#: src/transports/ip.c:193
#, c-format
msgid "Could not find an IP address for interface `%s'.\n"
msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
-#: src/transports/ip.c:221
+#: src/transports/ip.c:203
#, c-format
msgid ""
"There is more than one IP address specified for interface `%s'.\n"
@@ -3901,18 +3906,18 @@
"Es ist mehr als eine IP-Adresse für das Gerät `%s' angegeben.\n"
"GNUnet wird %u.%u.%u.%u. verwenden.\n"
-#: src/transports/ip.c:242
+#: src/transports/ip.c:224
#, c-format
msgid "Could not resolve `%s' to determine our IP address: %s\n"
msgstr ""
"`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
-#: src/transports/ip.c:275
+#: src/transports/ip.c:256
#, c-format
msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
-#: src/transports/ip.c:345
+#: src/transports/ip.c:306
msgid "Failed to obtain my (external) IP address!\n"
msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po 2006-03-17 00:34:02 UTC (rev 2527)
+++ GNUnet/po/rw.po 2006-03-17 02:22:16 UTC (rev 2528)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-01-18 17:21-0800\n"
+"POT-Creation-Date: 2006-03-15 23:35-0800\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <address@hidden>\n"
"Language-Team: Kinyarwanda <address@hidden>\n"
@@ -111,7 +111,7 @@
msgid "`%s' failed at %s:%d with error: `%s'.\n"
msgstr "`%s'Byanze ku Na: Ikosa"
-#: src/applications/bootstrap_http/http.c:133
+#: src/applications/bootstrap_http/http.c:132
#, fuzzy, c-format
msgid "Could not download list of peer contacts, host `%s' unknown.\n"
msgstr "OYA Gufungura Urutonde Bya Aho kubariza Ubuturo Kitazwi"
@@ -137,7 +137,7 @@
msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
msgstr "OYA Izina: Bya Porogisi a Porogisi"
-#: src/applications/bootstrap_http/http.c:354
+#: src/applications/bootstrap_http/http.c:355
#, fuzzy
msgid "# hellos downloaded via http"
msgstr "#KB Yimuwe ku"
@@ -185,7 +185,7 @@
#: src/applications/dht/tools/dht-join.c:108
#: src/applications/dht/tools/dht-query.c:99
#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:184
+#: src/applications/fs/tools/gnunet-directory.c:195
#: src/applications/fs/tools/gnunet-download.c:130
#: src/applications/fs/tools/gnunet-insert.c:519
#: src/applications/fs/tools/gnunet-pseudonym.c:232
@@ -564,26 +564,27 @@
msgid "`%s' registering handler %d\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:121
+#: src/applications/fs/ecrs/download.c:125
#, fuzzy, c-format
msgid "Could not unlink temporary file `%s': %s\n"
msgstr "OYA Kwandika Kuri IDOSIYE"
-#: src/applications/fs/ecrs/download.c:249
+#: src/applications/fs/ecrs/download.c:257
#, fuzzy, c-format
msgid "Write(%d, %p, %d) failed: %s\n"
msgstr "`%s'%sByanze"
-#: src/applications/fs/ecrs/download.c:910
+#: src/applications/fs/ecrs/download.c:917
#, fuzzy
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
msgstr "Ibikubiyemo OYA BIHUYE Urufunguzo ni a Cyangwa a Byinjijwemo IDOSIYE"
-#: src/applications/fs/ecrs/download.c:1081
+#: src/applications/fs/ecrs/download.c:1091
#, fuzzy, c-format
-msgid "Content `%s' seems to be not available on the network.\n"
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
msgstr "Kuri OYA Bihari ku i urusobe"
#: src/applications/fs/ecrs/meta.c:835
@@ -670,12 +671,12 @@
msgid "Indexing data failed at position %i.\n"
msgstr ""
-#: src/applications/fs/fsui/download.c:267
+#: src/applications/fs/fsui/download.c:289
#, fuzzy
msgid "Download aborted."
msgstr "/Byahiswemo"
-#: src/applications/fs/fsui/download.c:270
+#: src/applications/fs/fsui/download.c:292
#, fuzzy
msgid "ECRS download failed (see logs)."
msgstr "OYA Gufungura IDOSIYE"
@@ -727,30 +728,34 @@
msgid "Unindex failed."
msgstr "/Idosiye IDOSIYE"
-#: src/applications/fs/fsui/upload.c:383 src/applications/fs/fsui/upload.c:420
+#: src/applications/fs/fsui/upload.c:402 src/applications/fs/fsui/upload.c:439
msgid "Upload failed.\n"
msgstr ""
-#: src/applications/fs/fsui/upload.c:427
+#: src/applications/fs/fsui/upload.c:446
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1079
+#: src/applications/fs/module/fs.c:1085
#, fuzzy, c-format
msgid ""
"You must specify a postive number for `%s' in the configuration in section `%"
"s'.\n"
msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
-#: src/applications/fs/module/fs.c:1121
+#: src/applications/fs/module/fs.c:1127
#, c-format
msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1158
+#: src/applications/fs/module/fs.c:1164
msgid "enables (anonymous) file-sharing"
msgstr ""
+#: src/applications/fs/module/migration.c:203
+msgid "# blocks migrated"
+msgstr ""
+
#: src/applications/fs/module/ondemand.c:308
#, c-format
msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -777,7 +782,7 @@
"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
msgstr ""
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1960
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1991
#, fuzzy
msgid "Failed to get traffic stats.\n"
msgstr "Kuri Ikibazo# Ibyerekeye"
@@ -821,41 +826,41 @@
msgid "=\tError reading directory.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:105
+#: src/applications/fs/tools/gnunet-directory.c:116
#, fuzzy, c-format
msgid "File format error (not a GNUnet directory?)\n"
msgstr "IDOSIYE Cyangwa Sibyo Imiterere kugirango bushyinguro"
-#: src/applications/fs/tools/gnunet-directory.c:107
+#: src/applications/fs/tools/gnunet-directory.c:118
#, fuzzy, c-format
msgid "%d files found in directory.\n"
msgstr "IDOSIYE Kuri bushyinguro"
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:136
#, fuzzy
msgid "remove all entries from the directory database and stop tracking URIs"
msgstr "Gukuraho... Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:138
#, fuzzy
msgid "list entries from the directory database"
msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
-#: src/applications/fs/tools/gnunet-directory.c:130
+#: src/applications/fs/tools/gnunet-directory.c:141
#, fuzzy
msgid "start tracking entries for the directory database"
msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:145
msgid "gnunet-directory [OPTIONS] [FILENAMES]"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:135
+#: src/applications/fs/tools/gnunet-directory.c:146
#, fuzzy
msgid "Perform directory related operations."
msgstr "bushyinguro Ibikorwa:"
-#: src/applications/fs/tools/gnunet-directory.c:200
+#: src/applications/fs/tools/gnunet-directory.c:211
#, fuzzy, c-format
msgid "Listed %d matching entries.\n"
msgstr "Ibyinjijwe"
@@ -1401,23 +1406,23 @@
msgid "`%s' failed. Is `%s' a file?\n"
msgstr "`%s'ntabwo ari idosiye"
-#: src/applications/gap/gap.c:1949
+#: src/applications/gap/gap.c:1980
msgid ""
"Cover traffic requested but traffic service not loaded. Rejecting request.\n"
msgstr ""
-#: src/applications/gap/gap.c:1966 src/applications/gap/gap.c:1971
-#: src/applications/gap/gap.c:1977
+#: src/applications/gap/gap.c:1997 src/applications/gap/gap.c:2002
+#: src/applications/gap/gap.c:2008
msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
msgstr ""
-#: src/applications/gap/gap.c:2233
+#: src/applications/gap/gap.c:2264
msgid ""
"Traffic service failed to load; gap cannot ensure cover-traffic "
"availability.\n"
msgstr ""
-#: src/applications/gap/gap.c:2264
+#: src/applications/gap/gap.c:2295
#, c-format
msgid "`%s' registering handlers %d %d\n"
msgstr ""
@@ -1697,7 +1702,7 @@
msgstr "Oya Ibisubizo ku"
#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_sqlite/sqlite.c:1071
#, fuzzy
msgid "# Bytes in datastore"
msgstr "#Bayite Bya BYAKIRIWE"
@@ -1714,7 +1719,7 @@
msgstr ""
#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:258
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
#, fuzzy
msgid "Could not initialize libgnunetutil!\n"
msgstr "OYA gutangiza Modire"
@@ -1730,7 +1735,7 @@
msgid "sqlite datastore"
msgstr "#Bayite Bya BYAKIRIWE"
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/sqstore_sqlite/sqlite.c:1034
#, fuzzy, c-format
msgid ""
"Configuration file must specify directory for storing FS data in section `%"
@@ -2167,7 +2172,7 @@
msgid "No testbed URL given, not registered.\n"
msgstr "OYA"
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
+#: src/applications/testbed/testbed.c:1055 src/transports/http.c:1455
#, fuzzy, c-format
msgid "Could not resolve name of HTTP proxy `%s'.\n"
msgstr "OYA Izina: Bya Porogisi"
@@ -2182,22 +2187,22 @@
msgid "Could not register testbed, host `%s' unknown\n"
msgstr "OYA Kwiyandikisha Ubuturo"
-#: src/applications/testbed/testbed.c:1177
+#: src/applications/testbed/testbed.c:1178
#, fuzzy, c-format
msgid "Failed to send HTTP request to host `%s': %s\n"
msgstr "Kuri Kohereza Kubaza... Kuri Ubuturo"
-#: src/applications/testbed/testbed.c:1230
+#: src/applications/testbed/testbed.c:1231
#, fuzzy, c-format
msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
msgstr "Kohereza Kubaza... Kuri Ubuturo"
-#: src/applications/testbed/testbed.c:1269
+#: src/applications/testbed/testbed.c:1270
#, fuzzy
msgid "Exit register (error: no http response read).\n"
msgstr "Kwiyandikisha Ikosa Oya HTTP Gusoma"
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1358
msgid "allows construction of a P2P-testbed (incomplete)"
msgstr ""
@@ -3179,46 +3184,46 @@
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Birambuye Uburebure By'ibanze"
-#: src/server/connection.c:2303
+#: src/server/connection.c:2331
#, fuzzy, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Bivuye Sibyo Imiterere"
-#: src/server/connection.c:2385
+#: src/server/connection.c:2413
#, fuzzy, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr "Umubare Bya"
-#: src/server/connection.c:2401
+#: src/server/connection.c:2429
#, fuzzy
msgid "Message received more than one day old. Dropped.\n"
msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
-#: src/server/connection.c:2795
+#: src/server/connection.c:2823
#, fuzzy
msgid "# outgoing messages dropped"
msgstr "#Ubutumwa"
-#: src/server/connection.c:2797
+#: src/server/connection.c:2825
#, fuzzy
msgid "# bytes of outgoing messages dropped"
msgstr "#Bayite Bya BYAKIRIWE"
-#: src/server/connection.c:2799
+#: src/server/connection.c:2827
msgid "# connections closed (HANGUP sent)"
msgstr ""
-#: src/server/connection.c:2801
+#: src/server/connection.c:2829
#, fuzzy
msgid "# bytes encrypted"
msgstr "#Bayite"
-#: src/server/connection.c:2803
+#: src/server/connection.c:2831
#, fuzzy
msgid "# bytes decrypted"
msgstr "#Bayite"
-#: src/server/connection.c:2805
+#: src/server/connection.c:2833
#, fuzzy
msgid "# bytes noise sent"
msgstr "#Bayite Bya BYAKIRIWE"
@@ -3547,12 +3552,12 @@
msgid "%s failed, message type %d already in use.\n"
msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
-#: src/transports/ip6.c:60 src/transports/ip.c:67 src/util/tcpio.c:87
+#: src/transports/ip6.c:60 src/util/configuration.c:925
#, fuzzy, c-format
msgid "Could not find IP of host `%s': %s\n"
msgstr "OYA Gushaka Bya Ubuturo"
-#: src/transports/ip6.c:100 src/transports/ip.c:310
+#: src/transports/ip6.c:100
#, fuzzy, c-format
msgid "Could not resolve `%s': %s\n"
msgstr "OYA"
@@ -3599,8 +3604,8 @@
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/http.c:1175 src/transports/tcp.c:1150 src/util/tcpio.c:166
-#: src/util/tcpio.c:196
+#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
+#: src/util/tcpio.c:188
#, fuzzy, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr ""
@@ -3620,75 +3625,75 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/http.c:1331
+#: src/transports/http.c:1333
#, fuzzy, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
msgstr "OYA i Kuri Umuyoboro Serivisi"
-#: src/transports/http.c:1474
+#: src/transports/http.c:1478
#, fuzzy
msgid "# bytes received via HTTP"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-#: src/transports/http.c:1476
+#: src/transports/http.c:1480
#, fuzzy
msgid "# bytes sent via HTTP"
msgstr "#Bayite Yoherejwe:"
-#: src/transports/http.c:1478
+#: src/transports/http.c:1482
msgid "# bytes dropped by HTTP (outgoing)"
msgstr ""
-#: src/transports/smtp.c:296
+#: src/transports/smtp.c:297
#, fuzzy, c-format
msgid "Could not resolve name of SMTP server `%s': %s"
msgstr "OYA Izina: Bya Seriveri"
-#: src/transports/smtp.c:415 src/transports/smtp.c:876
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
#, fuzzy, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section `%s' "
"under `%s'.\n"
msgstr "i Izina: Bya a kugirango i in Icyiciro"
-#: src/transports/smtp.c:488
+#: src/transports/smtp.c:489
#, fuzzy
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr "Ubutumwa Biturutse Ingano"
-#: src/transports/smtp.c:583
+#: src/transports/smtp.c:584
#, fuzzy
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
-#: src/transports/smtp.c:590
+#: src/transports/smtp.c:591
#, fuzzy, c-format
msgid "SMTP filter string to long, capped to `%s'\n"
msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
-#: src/transports/smtp.c:763
+#: src/transports/smtp.c:764
#, fuzzy, c-format
msgid "Sending E-mail to `%s' failed.\n"
msgstr "E Ubutumwa Kuri Byanze"
-#: src/transports/smtp.c:814
+#: src/transports/smtp.c:815
#, fuzzy, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr "Seriveri Kohereza ku"
-#: src/transports/smtp.c:837
+#: src/transports/smtp.c:838
#, fuzzy, c-format
msgid ""
"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
msgstr "OYA Kohereza Iyemeza kugirango Kubaza..."
-#: src/transports/smtp.c:843
+#: src/transports/smtp.c:844
#, fuzzy, c-format
msgid "Failed to send `%s' request to SMTP server.\n"
msgstr "Kuri Kohereza Ubutumwa Kuri"
-#: src/transports/smtp.c:902
+#: src/transports/smtp.c:903
#, fuzzy, c-format
msgid "%.*s filter %s (SMTP)"
msgstr ""
@@ -3701,7 +3706,7 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/smtp.c:931 src/transports/udp.c:706
+#: src/transports/smtp.c:932 src/transports/udp.c:708
#: src/transports/udp6.c:680
#, fuzzy, c-format
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
@@ -3830,7 +3835,7 @@
msgid "UDP: Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/udp.c:535
+#: src/transports/udp.c:537
#, fuzzy, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
@@ -3850,37 +3855,37 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/udp.c:691
+#: src/transports/udp.c:693
#, fuzzy
msgid "# bytes received via UDP"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-#: src/transports/udp.c:693
+#: src/transports/udp.c:695
#, fuzzy
msgid "# bytes sent via UDP"
msgstr "#Bayite Yoherejwe:"
-#: src/transports/udp.c:695
+#: src/transports/udp.c:697
msgid "# bytes dropped by UDP (outgoing)"
msgstr ""
-#: src/transports/ip.c:142
+#: src/transports/ip.c:124
#, fuzzy, c-format
msgid ""
"Could not find interface `%s' in `%s', trying to find another interface.\n"
msgstr "OYA Gushaka in Kuri Gushaka"
-#: src/transports/ip.c:167
+#: src/transports/ip.c:149
#, fuzzy, c-format
msgid "Could not obtain IP for interface `%s' using `%s'.\n"
msgstr "OYA kugirango ikoresha"
-#: src/transports/ip.c:211
+#: src/transports/ip.c:193
#, fuzzy, c-format
msgid "Could not find an IP address for interface `%s'.\n"
msgstr "OYA Gushaka Aderesi kugirango"
-#: src/transports/ip.c:221
+#: src/transports/ip.c:203
#, fuzzy, c-format
msgid ""
"There is more than one IP address specified for interface `%s'.\n"
@@ -3909,17 +3914,17 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/ip.c:242
+#: src/transports/ip.c:224
#, fuzzy, c-format
msgid "Could not resolve `%s' to determine our IP address: %s\n"
msgstr "OYA Kuri Aderesi"
-#: src/transports/ip.c:275
+#: src/transports/ip.c:256
#, c-format
msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
msgstr ""
-#: src/transports/ip.c:345
+#: src/transports/ip.c:306
msgid "Failed to obtain my (external) IP address!\n"
msgstr ""
Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po 2006-03-17 00:34:02 UTC (rev 2527)
+++ GNUnet/po/sv.po 2006-03-17 02:22:16 UTC (rev 2528)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-01-18 17:21-0800\n"
+"POT-Creation-Date: 2006-03-15 23:35-0800\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -97,7 +97,7 @@
msgid "`%s' failed at %s:%d with error: `%s'.\n"
msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-#: src/applications/bootstrap_http/http.c:133
+#: src/applications/bootstrap_http/http.c:132
#, c-format
msgid "Could not download list of peer contacts, host `%s' unknown.\n"
msgstr ""
@@ -123,7 +123,7 @@
msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\". Försöker utan proxy.\n"
-#: src/applications/bootstrap_http/http.c:354
+#: src/applications/bootstrap_http/http.c:355
msgid "# hellos downloaded via http"
msgstr ""
@@ -165,7 +165,7 @@
#: src/applications/dht/tools/dht-join.c:108
#: src/applications/dht/tools/dht-query.c:99
#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:184
+#: src/applications/fs/tools/gnunet-directory.c:195
#: src/applications/fs/tools/gnunet-download.c:130
#: src/applications/fs/tools/gnunet-insert.c:519
#: src/applications/fs/tools/gnunet-pseudonym.c:232
@@ -527,17 +527,17 @@
msgid "`%s' registering handler %d\n"
msgstr "\"%s\" registrerar handtag %d\n"
-#: src/applications/fs/ecrs/download.c:121
+#: src/applications/fs/ecrs/download.c:125
#, c-format
msgid "Could not unlink temporary file `%s': %s\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:249
+#: src/applications/fs/ecrs/download.c:257
#, c-format
msgid "Write(%d, %p, %d) failed: %s\n"
msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
-#: src/applications/fs/ecrs/download.c:910
+#: src/applications/fs/ecrs/download.c:917
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
@@ -545,9 +545,10 @@
"Dekrypterat innehåll stämmer inte med nyckeln. Det är antingen ett fel eller "
"en fil inlagd med onda avsikter. Hämtning avbruten.\n"
-#: src/applications/fs/ecrs/download.c:1081
+#: src/applications/fs/ecrs/download.c:1091
#, c-format
-msgid "Content `%s' seems to be not available on the network.\n"
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
msgstr ""
#: src/applications/fs/ecrs/meta.c:835
@@ -633,11 +634,11 @@
msgid "Indexing data failed at position %i.\n"
msgstr "Indexering av data misslyckades vid position %i.\n"
-#: src/applications/fs/fsui/download.c:267
+#: src/applications/fs/fsui/download.c:289
msgid "Download aborted."
msgstr "Nedladdning avbruten."
-#: src/applications/fs/fsui/download.c:270
+#: src/applications/fs/fsui/download.c:292
msgid "ECRS download failed (see logs)."
msgstr ""
@@ -686,15 +687,15 @@
msgid "Unindex failed."
msgstr "Avindexering misslyckades."
-#: src/applications/fs/fsui/upload.c:383 src/applications/fs/fsui/upload.c:420
+#: src/applications/fs/fsui/upload.c:402 src/applications/fs/fsui/upload.c:439
msgid "Upload failed.\n"
msgstr "Uppladdning misslyckades.\n"
-#: src/applications/fs/fsui/upload.c:427
+#: src/applications/fs/fsui/upload.c:446
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1079
+#: src/applications/fs/module/fs.c:1085
#, c-format
msgid ""
"You must specify a postive number for `%s' in the configuration in section `%"
@@ -703,15 +704,19 @@
"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
"\".\n"
-#: src/applications/fs/module/fs.c:1121
+#: src/applications/fs/module/fs.c:1127
#, c-format
msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1158
+#: src/applications/fs/module/fs.c:1164
msgid "enables (anonymous) file-sharing"
msgstr "aktiverar (anonym) fildelning"
+#: src/applications/fs/module/migration.c:203
+msgid "# blocks migrated"
+msgstr ""
+
#: src/applications/fs/module/ondemand.c:308
#, c-format
msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -738,7 +743,7 @@
"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
msgstr ""
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1960
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1991
msgid "Failed to get traffic stats.\n"
msgstr ""
@@ -781,37 +786,37 @@
msgid "=\tError reading directory.\n"
msgstr "=\tFel vid läsning av katalog.\n"
-#: src/applications/fs/tools/gnunet-directory.c:105
+#: src/applications/fs/tools/gnunet-directory.c:116
#, c-format
msgid "File format error (not a GNUnet directory?)\n"
msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
-#: src/applications/fs/tools/gnunet-directory.c:107
+#: src/applications/fs/tools/gnunet-directory.c:118
#, c-format
msgid "%d files found in directory.\n"
msgstr "%d filer hittades i katalog.\n"
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:136
msgid "remove all entries from the directory database and stop tracking URIs"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:138
msgid "list entries from the directory database"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:130
+#: src/applications/fs/tools/gnunet-directory.c:141
msgid "start tracking entries for the directory database"
msgstr ""
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:145
msgid "gnunet-directory [OPTIONS] [FILENAMES]"
msgstr "gnunet-directory [FLAGGOR] [FILNAMN]"
-#: src/applications/fs/tools/gnunet-directory.c:135
+#: src/applications/fs/tools/gnunet-directory.c:146
msgid "Perform directory related operations."
msgstr "Genomför katalogrelaterade operationer."
-#: src/applications/fs/tools/gnunet-directory.c:200
+#: src/applications/fs/tools/gnunet-directory.c:211
#, c-format
msgid "Listed %d matching entries.\n"
msgstr "Listade %d matchande poster.\n"
@@ -1270,23 +1275,23 @@
msgid "`%s' failed. Is `%s' a file?\n"
msgstr "\"%s\" misslyckades. Är \"%s\" en fil?\n"
-#: src/applications/gap/gap.c:1949
+#: src/applications/gap/gap.c:1980
msgid ""
"Cover traffic requested but traffic service not loaded. Rejecting request.\n"
msgstr ""
-#: src/applications/gap/gap.c:1966 src/applications/gap/gap.c:1971
-#: src/applications/gap/gap.c:1977
+#: src/applications/gap/gap.c:1997 src/applications/gap/gap.c:2002
+#: src/applications/gap/gap.c:2008
msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
msgstr ""
-#: src/applications/gap/gap.c:2233
+#: src/applications/gap/gap.c:2264
msgid ""
"Traffic service failed to load; gap cannot ensure cover-traffic "
"availability.\n"
msgstr ""
-#: src/applications/gap/gap.c:2264
+#: src/applications/gap/gap.c:2295
#, c-format
msgid "`%s' registering handlers %d %d\n"
msgstr "\"%s\" registrerar handtag %d %d\n"
@@ -1554,7 +1559,7 @@
msgstr ""
#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_sqlite/sqlite.c:1071
msgid "# Bytes in datastore"
msgstr ""
@@ -1570,7 +1575,7 @@
msgstr ""
#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:258
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
msgid "Could not initialize libgnunetutil!\n"
msgstr "Kunde inte initiera libgnunetutil!\n"
@@ -1583,7 +1588,7 @@
msgid "sqlite datastore"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/sqstore_sqlite/sqlite.c:1034
#, c-format
msgid ""
"Configuration file must specify directory for storing FS data in section `%"
@@ -1944,7 +1949,7 @@
msgid "No testbed URL given, not registered.\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
+#: src/applications/testbed/testbed.c:1055 src/transports/http.c:1455
#, c-format
msgid "Could not resolve name of HTTP proxy `%s'.\n"
msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\".\n"
@@ -1959,21 +1964,21 @@
msgid "Could not register testbed, host `%s' unknown\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1177
+#: src/applications/testbed/testbed.c:1178
#, c-format
msgid "Failed to send HTTP request to host `%s': %s\n"
msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/applications/testbed/testbed.c:1230
+#: src/applications/testbed/testbed.c:1231
#, c-format
msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
msgstr "Misslyckades att skicka HTTP-begäran \"%s\" till värd \"%s\": %s\n"
-#: src/applications/testbed/testbed.c:1269
+#: src/applications/testbed/testbed.c:1270
msgid "Exit register (error: no http response read).\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1358
msgid "allows construction of a P2P-testbed (incomplete)"
msgstr ""
@@ -2953,41 +2958,41 @@
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
-#: src/server/connection.c:2303
+#: src/server/connection.c:2331
#, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
-#: src/server/connection.c:2385
+#: src/server/connection.c:2413
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr ""
-#: src/server/connection.c:2401
+#: src/server/connection.c:2429
msgid "Message received more than one day old. Dropped.\n"
msgstr ""
-#: src/server/connection.c:2795
+#: src/server/connection.c:2823
msgid "# outgoing messages dropped"
msgstr ""
-#: src/server/connection.c:2797
+#: src/server/connection.c:2825
msgid "# bytes of outgoing messages dropped"
msgstr ""
-#: src/server/connection.c:2799
+#: src/server/connection.c:2827
msgid "# connections closed (HANGUP sent)"
msgstr ""
-#: src/server/connection.c:2801
+#: src/server/connection.c:2829
msgid "# bytes encrypted"
msgstr "# byte krypterade"
-#: src/server/connection.c:2803
+#: src/server/connection.c:2831
msgid "# bytes decrypted"
msgstr "# byte dekrypterade"
-#: src/server/connection.c:2805
+#: src/server/connection.c:2833
msgid "# bytes noise sent"
msgstr ""
@@ -3305,12 +3310,12 @@
msgid "%s failed, message type %d already in use.\n"
msgstr ""
-#: src/transports/ip6.c:60 src/transports/ip.c:67 src/util/tcpio.c:87
+#: src/transports/ip6.c:60 src/util/configuration.c:925
#, c-format
msgid "Could not find IP of host `%s': %s\n"
msgstr ""
-#: src/transports/ip6.c:100 src/transports/ip.c:310
+#: src/transports/ip6.c:100
#, c-format
msgid "Could not resolve `%s': %s\n"
msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -3332,36 +3337,36 @@
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
-#: src/transports/http.c:1175 src/transports/tcp.c:1150 src/util/tcpio.c:166
-#: src/util/tcpio.c:196
+#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
+#: src/util/tcpio.c:188
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-#: src/transports/http.c:1331
+#: src/transports/http.c:1333
#, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
msgstr ""
-#: src/transports/http.c:1474
+#: src/transports/http.c:1478
msgid "# bytes received via HTTP"
msgstr "# byte mottagna via HTTP"
-#: src/transports/http.c:1476
+#: src/transports/http.c:1480
msgid "# bytes sent via HTTP"
msgstr "# byte skickade via HTTP"
-#: src/transports/http.c:1478
+#: src/transports/http.c:1482
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# byte kastade via HTTP (utgående)"
-#: src/transports/smtp.c:296
+#: src/transports/smtp.c:297
#, c-format
msgid "Could not resolve name of SMTP server `%s': %s"
msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
-#: src/transports/smtp.c:415 src/transports/smtp.c:876
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
#, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -3370,47 +3375,47 @@
"Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" under "
"\"%s\".\n"
-#: src/transports/smtp.c:488
+#: src/transports/smtp.c:489
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr ""
-#: src/transports/smtp.c:583
+#: src/transports/smtp.c:584
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr ""
# capped är inte ett bra ord IMHO
-#: src/transports/smtp.c:590
+#: src/transports/smtp.c:591
#, c-format
msgid "SMTP filter string to long, capped to `%s'\n"
msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
-#: src/transports/smtp.c:763
+#: src/transports/smtp.c:764
#, c-format
msgid "Sending E-mail to `%s' failed.\n"
msgstr "Sändning av e-post till \"%s\" misslyckades.\n"
-#: src/transports/smtp.c:814
+#: src/transports/smtp.c:815
#, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr ""
-#: src/transports/smtp.c:837
+#: src/transports/smtp.c:838
#, c-format
msgid ""
"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
msgstr ""
-#: src/transports/smtp.c:843
+#: src/transports/smtp.c:844
#, c-format
msgid "Failed to send `%s' request to SMTP server.\n"
msgstr ""
-#: src/transports/smtp.c:902
+#: src/transports/smtp.c:903
#, c-format
msgid "%.*s filter %s (SMTP)"
msgstr "%.*s filter %s (SMTP)"
-#: src/transports/smtp.c:931 src/transports/udp.c:706
+#: src/transports/smtp.c:932 src/transports/udp.c:708
#: src/transports/udp6.c:680
#, c-format
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
@@ -3502,57 +3507,57 @@
msgid "UDP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/udp.c:535
+#: src/transports/udp.c:537
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
-#: src/transports/udp.c:691
+#: src/transports/udp.c:693
msgid "# bytes received via UDP"
msgstr "# byte mottagna via UDP"
-#: src/transports/udp.c:693
+#: src/transports/udp.c:695
msgid "# bytes sent via UDP"
msgstr "# byte skickade via UDP"
-#: src/transports/udp.c:695
+#: src/transports/udp.c:697
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# byte kastade via UDP (utgående)"
-#: src/transports/ip.c:142
+#: src/transports/ip.c:124
#, c-format
msgid ""
"Could not find interface `%s' in `%s', trying to find another interface.\n"
msgstr ""
-#: src/transports/ip.c:167
+#: src/transports/ip.c:149
#, c-format
msgid "Could not obtain IP for interface `%s' using `%s'.\n"
msgstr ""
-#: src/transports/ip.c:211
+#: src/transports/ip.c:193
#, c-format
msgid "Could not find an IP address for interface `%s'.\n"
msgstr ""
-#: src/transports/ip.c:221
+#: src/transports/ip.c:203
#, c-format
msgid ""
"There is more than one IP address specified for interface `%s'.\n"
"GNUnet will use %u.%u.%u.%u.\n"
msgstr ""
-#: src/transports/ip.c:242
+#: src/transports/ip.c:224
#, c-format
msgid "Could not resolve `%s' to determine our IP address: %s\n"
msgstr ""
-#: src/transports/ip.c:275
+#: src/transports/ip.c:256
#, c-format
msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
msgstr ""
-#: src/transports/ip.c:345
+#: src/transports/ip.c:306
msgid "Failed to obtain my (external) IP address!\n"
msgstr ""
Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po 2006-03-17 00:34:02 UTC (rev 2527)
+++ GNUnet/po/vi.po 2006-03-17 02:22:16 UTC (rev 2528)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-01-18 17:21-0800\n"
+"POT-Creation-Date: 2006-03-15 23:35-0800\n"
"PO-Revision-Date: 2005-07-05 21:18+0400\n"
"Last-Translator: Phan Vinh Thinh <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -102,7 +102,7 @@
msgid "`%s' failed at %s:%d with error: `%s'.\n"
msgstr "'%s' thất bại tại %s:%d với lỗi: '%s'.\n"
-#: src/applications/bootstrap_http/http.c:133
+#: src/applications/bootstrap_http/http.c:132
#, fuzzy, c-format
msgid "Could not download list of peer contacts, host `%s' unknown.\n"
msgstr ""
@@ -129,7 +129,7 @@
msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
msgstr "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng proxy.\n"
-#: src/applications/bootstrap_http/http.c:354
+#: src/applications/bootstrap_http/http.c:355
#, fuzzy
msgid "# hellos downloaded via http"
msgstr "# đã tải xuống HELO qua http"
@@ -172,7 +172,7 @@
#: src/applications/dht/tools/dht-join.c:108
#: src/applications/dht/tools/dht-query.c:99
#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:184
+#: src/applications/fs/tools/gnunet-directory.c:195
#: src/applications/fs/tools/gnunet-download.c:130
#: src/applications/fs/tools/gnunet-insert.c:519
#: src/applications/fs/tools/gnunet-pseudonym.c:232
@@ -535,17 +535,17 @@
msgid "`%s' registering handler %d\n"
msgstr "'%s' đăng ký trình điều khiển %d\n"
-#: src/applications/fs/ecrs/download.c:121
+#: src/applications/fs/ecrs/download.c:125
#, fuzzy, c-format
msgid "Could not unlink temporary file `%s': %s\n"
msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
-#: src/applications/fs/ecrs/download.c:249
+#: src/applications/fs/ecrs/download.c:257
#, fuzzy, c-format
msgid "Write(%d, %p, %d) failed: %s\n"
msgstr "'%s' %s không thành công: %s\n"
-#: src/applications/fs/ecrs/download.c:910
+#: src/applications/fs/ecrs/download.c:917
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
@@ -553,9 +553,10 @@
"Nội dung đã giải mã không tương ứng chìa khóa. Đây là một lỗi bug hoặc một "
"tập tin chèn vào với ý xấu. Dừng tải xuống.\n"
-#: src/applications/fs/ecrs/download.c:1081
+#: src/applications/fs/ecrs/download.c:1091
#, fuzzy, c-format
-msgid "Content `%s' seems to be not available on the network.\n"
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
msgstr "Nội dung '%s' có vẻ không có trên mạng.\n"
#: src/applications/fs/ecrs/meta.c:835
@@ -644,11 +645,11 @@
msgid "Indexing data failed at position %i.\n"
msgstr "Đánh chỉ mục dữ liệu thất bại tại vị trí %i.\n"
-#: src/applications/fs/fsui/download.c:267
+#: src/applications/fs/fsui/download.c:289
msgid "Download aborted."
msgstr "Dừng tải xuống."
-#: src/applications/fs/fsui/download.c:270
+#: src/applications/fs/fsui/download.c:292
msgid "ECRS download failed (see logs)."
msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
@@ -701,15 +702,15 @@
msgid "Unindex failed."
msgstr "Bỏ đánh chỉ mục thất bại.\n"
-#: src/applications/fs/fsui/upload.c:383 src/applications/fs/fsui/upload.c:420
+#: src/applications/fs/fsui/upload.c:402 src/applications/fs/fsui/upload.c:439
msgid "Upload failed.\n"
msgstr "Tải lên thất bại.\n"
-#: src/applications/fs/fsui/upload.c:427
+#: src/applications/fs/fsui/upload.c:446
msgid "Cannot upload directory without using recursion.\n"
msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
-#: src/applications/fs/module/fs.c:1079
+#: src/applications/fs/module/fs.c:1085
#, fuzzy, c-format
msgid ""
"You must specify a postive number for `%s' in the configuration in section `%"
@@ -717,15 +718,19 @@
msgstr ""
"Người dùng phải chỉ ra một số dương cho '%s' trong phần '%s' của cấu hình.\n"
-#: src/applications/fs/module/fs.c:1121
+#: src/applications/fs/module/fs.c:1127
#, fuzzy, c-format
msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
-#: src/applications/fs/module/fs.c:1158
+#: src/applications/fs/module/fs.c:1164
msgid "enables (anonymous) file-sharing"
msgstr ""
+#: src/applications/fs/module/migration.c:203
+msgid "# blocks migrated"
+msgstr ""
+
#: src/applications/fs/module/ondemand.c:308
#, fuzzy, c-format
msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -757,7 +762,7 @@
"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
msgstr "Khối ODB đã bỏ chỉ mục '%s' từ %llu không có trong kho dữ liệu.\n"
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1960
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1991
msgid "Failed to get traffic stats.\n"
msgstr "Lấy các thông tin truyền tải không thành công.\n"
@@ -801,37 +806,37 @@
msgid "=\tError reading directory.\n"
msgstr "=\tLỗi đọc thư mục.\n"
-#: src/applications/fs/tools/gnunet-directory.c:105
+#: src/applications/fs/tools/gnunet-directory.c:116
#, c-format
msgid "File format error (not a GNUnet directory?)\n"
msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
-#: src/applications/fs/tools/gnunet-directory.c:107
+#: src/applications/fs/tools/gnunet-directory.c:118
#, c-format
msgid "%d files found in directory.\n"
msgstr "Tìm thấy %d tập tin trong thư mục.\n"
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:136
msgid "remove all entries from the directory database and stop tracking URIs"
msgstr "xóa bỏ mọi mục từ cơ sở dữ liệu thư mục và dừng theo dấu vết các URI"
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:138
msgid "list entries from the directory database"
msgstr "liệt kê tất cả các mục từ cơ sở dữ liệu thư mục"
-#: src/applications/fs/tools/gnunet-directory.c:130
+#: src/applications/fs/tools/gnunet-directory.c:141
msgid "start tracking entries for the directory database"
msgstr "bắt đầu theo dõi các mục cho cơ sở dữ liệu thư mục"
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:145
msgid "gnunet-directory [OPTIONS] [FILENAMES]"
msgstr "gnunet-directory [TÙYCHỌN] [TÊNTẬPTIN]"
-#: src/applications/fs/tools/gnunet-directory.c:135
+#: src/applications/fs/tools/gnunet-directory.c:146
msgid "Perform directory related operations."
msgstr "Thực hiện các thao tác có liên quan đến thư mục."
-#: src/applications/fs/tools/gnunet-directory.c:200
+#: src/applications/fs/tools/gnunet-directory.c:211
#, c-format
msgid "Listed %d matching entries.\n"
msgstr "Đã liệt kê %d mục tương ứng.\n"
@@ -1311,19 +1316,19 @@
msgid "`%s' failed. Is `%s' a file?\n"
msgstr "'%s' thất bại. '%s' là một tập tin?\n"
-#: src/applications/gap/gap.c:1949
+#: src/applications/gap/gap.c:1980
msgid ""
"Cover traffic requested but traffic service not loaded. Rejecting request.\n"
msgstr ""
"Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải. Đang nhả ra "
"yêu cầu.\n"
-#: src/applications/gap/gap.c:1966 src/applications/gap/gap.c:1971
-#: src/applications/gap/gap.c:1977
+#: src/applications/gap/gap.c:1997 src/applications/gap/gap.c:2002
+#: src/applications/gap/gap.c:2008
msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
msgstr "Không thể thỏa mãn mức độ dấu tên mong muốn, đang lờ đi yêu cầu.\n"
-#: src/applications/gap/gap.c:2233
+#: src/applications/gap/gap.c:2264
msgid ""
"Traffic service failed to load; gap cannot ensure cover-traffic "
"availability.\n"
@@ -1331,7 +1336,7 @@
"Nạp dịch vụ truyền tải không thành công; lỗ hổng không thể chắc chắn khả "
"năng truyền tải.\n"
-#: src/applications/gap/gap.c:2264
+#: src/applications/gap/gap.c:2295
#, fuzzy, c-format
msgid "`%s' registering handlers %d %d\n"
msgstr "'%s' đăng ký trình điều khiển %d %d\n"
@@ -1612,7 +1617,7 @@
msgstr "Câu hỏi '%s' không có kết quả.\n"
#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_sqlite/sqlite.c:1071
msgid "# Bytes in datastore"
msgstr ""
@@ -1628,7 +1633,7 @@
msgstr ""
#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:258
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
msgid "Could not initialize libgnunetutil!\n"
msgstr "Không chạy được libgnunetutil!\n"
@@ -1641,7 +1646,7 @@
msgid "sqlite datastore"
msgstr ""
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/sqstore_sqlite/sqlite.c:1034
#, fuzzy, c-format
msgid ""
"Configuration file must specify directory for storing FS data in section `%"
@@ -2014,7 +2019,7 @@
msgid "No testbed URL given, not registered.\n"
msgstr "Chưa đưa ra URL của testbed, không đăng ký.\n"
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
+#: src/applications/testbed/testbed.c:1055 src/transports/http.c:1455
#, fuzzy, c-format
msgid "Could not resolve name of HTTP proxy `%s'.\n"
msgstr "Không tìm được tên của proxy HTTP '%s'.\n"
@@ -2029,21 +2034,21 @@
msgid "Could not register testbed, host `%s' unknown\n"
msgstr "Không đăng ký được testbed, máy '%s' không rõ\n"
-#: src/applications/testbed/testbed.c:1177
+#: src/applications/testbed/testbed.c:1178
#, fuzzy, c-format
msgid "Failed to send HTTP request to host `%s': %s\n"
msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
-#: src/applications/testbed/testbed.c:1230
+#: src/applications/testbed/testbed.c:1231
#, fuzzy, c-format
msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
msgstr "Gửi yêu cầu HTTP '%s' tới máy '%s' không thành công: %s\n"
-#: src/applications/testbed/testbed.c:1269
+#: src/applications/testbed/testbed.c:1270
msgid "Exit register (error: no http response read).\n"
msgstr "Thoát trình đăng ký (lỗi: không đọc được câu trả lời http).\n"
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1358
msgid "allows construction of a P2P-testbed (incomplete)"
msgstr ""
@@ -3159,43 +3164,43 @@
msgid "Message details: %u: length %d, priority: %d\n"
msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
-#: src/server/connection.c:2303
+#: src/server/connection.c:2331
#, fuzzy, c-format
msgid "Message from `%s' discarded: invalid format.\n"
msgstr "Bỏ đi thông báo từ '%s': định dạng sai.\n"
-#: src/server/connection.c:2385
+#: src/server/connection.c:2413
#, c-format
msgid "Invalid sequence number %u <= %u, dropping message.\n"
msgstr "Số của chuỗi sai %u <= %u, đang bỏ đi thông báo.\n"
-#: src/server/connection.c:2401
+#: src/server/connection.c:2429
msgid "Message received more than one day old. Dropped.\n"
msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
-#: src/server/connection.c:2795
+#: src/server/connection.c:2823
msgid "# outgoing messages dropped"
msgstr "# thông báo đi ra đã loại bỏ"
-#: src/server/connection.c:2797
+#: src/server/connection.c:2825
msgid "# bytes of outgoing messages dropped"
msgstr "# byte của các thông báo đi ra đã loại bỏ"
-#: src/server/connection.c:2799
+#: src/server/connection.c:2827
msgid "# connections closed (HANGUP sent)"
msgstr "# các kết nối đã đóng (gửi HANGUP)"
-#: src/server/connection.c:2801
+#: src/server/connection.c:2829
#, fuzzy
msgid "# bytes encrypted"
msgstr "# byte nhận được của dạng %d"
-#: src/server/connection.c:2803
+#: src/server/connection.c:2831
#, fuzzy
msgid "# bytes decrypted"
msgstr "# byte nhận được của dạng %d"
-#: src/server/connection.c:2805
+#: src/server/connection.c:2833
#, fuzzy
msgid "# bytes noise sent"
msgstr "# byte nhận được do nhiễu đường truyền"
@@ -3522,12 +3527,12 @@
msgid "%s failed, message type %d already in use.\n"
msgstr "%s thất bại, dạng thông báo %d đã sử dụng.\n"
-#: src/transports/ip6.c:60 src/transports/ip.c:67 src/util/tcpio.c:87
+#: src/transports/ip6.c:60 src/util/configuration.c:925
#, fuzzy, c-format
msgid "Could not find IP of host `%s': %s\n"
msgstr "Không tìm thấy IP của máy '%s': %s\n"
-#: src/transports/ip6.c:100 src/transports/ip.c:310
+#: src/transports/ip6.c:100
#, fuzzy, c-format
msgid "Could not resolve `%s': %s\n"
msgstr "Không tìm thấy '%s': %s\n"
@@ -3549,13 +3554,13 @@
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/http.c:1175 src/transports/tcp.c:1150 src/util/tcpio.c:166
-#: src/util/tcpio.c:196
+#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
+#: src/util/tcpio.c:188
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
-#: src/transports/http.c:1331
+#: src/transports/http.c:1333
#, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
@@ -3563,24 +3568,24 @@
"Không kết gắn được trình nghe HTTP tới cổng %d. Dịch vụ truyền tải chưa "
"chạy.\n"
-#: src/transports/http.c:1474
+#: src/transports/http.c:1478
msgid "# bytes received via HTTP"
msgstr "# byte nhận được qua HTTP"
-#: src/transports/http.c:1476
+#: src/transports/http.c:1480
msgid "# bytes sent via HTTP"
msgstr "# byte gửi qua HTTP"
-#: src/transports/http.c:1478
+#: src/transports/http.c:1482
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# byte loại bỏ bởi HTTP (đi ra)"
-#: src/transports/smtp.c:296
+#: src/transports/smtp.c:297
#, fuzzy, c-format
msgid "Could not resolve name of SMTP server `%s': %s"
msgstr "Không tìm thấy tên của máy chủ SMTP '%s': %s"
-#: src/transports/smtp.c:415 src/transports/smtp.c:876
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
#, fuzzy, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -3589,46 +3594,46 @@
"Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần '%s' "
"dưới '%s'.\n"
-#: src/transports/smtp.c:488
+#: src/transports/smtp.c:489
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr "Nhận được thông báo bị hỏng qua SMTP (kích thước không tương ứng).\n"
-#: src/transports/smtp.c:583
+#: src/transports/smtp.c:584
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr "Không chỉ ra đầu lọc cho E-mail, không tạo được quảng cáo SMTP.\n"
-#: src/transports/smtp.c:590
+#: src/transports/smtp.c:591
#, fuzzy, c-format
msgid "SMTP filter string to long, capped to `%s'\n"
msgstr "Đầu lọc SMTP quá dài, đổi thành '%s'\n"
-#: src/transports/smtp.c:763
+#: src/transports/smtp.c:764
#, fuzzy, c-format
msgid "Sending E-mail to `%s' failed.\n"
msgstr "Gửi E-mail tới '%s' thất bại.\n"
-#: src/transports/smtp.c:814
+#: src/transports/smtp.c:815
#, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr "Máy chủ SMTP gửi cầu trả lời không mong đợi tại %s: %d.\n"
-#: src/transports/smtp.c:837
+#: src/transports/smtp.c:838
#, c-format
msgid ""
"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
msgstr ""
-#: src/transports/smtp.c:843
+#: src/transports/smtp.c:844
#, fuzzy, c-format
msgid "Failed to send `%s' request to SMTP server.\n"
msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
-#: src/transports/smtp.c:902
+#: src/transports/smtp.c:903
#, c-format
msgid "%.*s filter %s (SMTP)"
msgstr "%.*s đầu lọc %s (SMTP)"
-#: src/transports/smtp.c:931 src/transports/udp.c:706
+#: src/transports/smtp.c:932 src/transports/udp.c:708
#: src/transports/udp6.c:680
#, fuzzy, c-format
msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
@@ -3727,26 +3732,26 @@
msgid "UDP: Could not determine my public IP address.\n"
msgstr "UDP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/udp.c:535
+#: src/transports/udp.c:537
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
"Gửi thông báo với kích thước %d qua UDP tới %u.%u.%u.%u:%u không thành công: "
"%s\n"
-#: src/transports/udp.c:691
+#: src/transports/udp.c:693
msgid "# bytes received via UDP"
msgstr "# byte nhận được qua UDP"
-#: src/transports/udp.c:693
+#: src/transports/udp.c:695
msgid "# bytes sent via UDP"
msgstr "# byte gửi qua UDP"
-#: src/transports/udp.c:695
+#: src/transports/udp.c:697
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# byte loại bỏ bởi UDP (đi ra)"
-#: src/transports/ip.c:142
+#: src/transports/ip.c:124
#, fuzzy, c-format
msgid ""
"Could not find interface `%s' in `%s', trying to find another interface.\n"
@@ -3754,17 +3759,17 @@
"Không tìm thấy giao diện '%s' trong '%s', đang thử kết gắn tới giao diện "
"khác.\n"
-#: src/transports/ip.c:167
+#: src/transports/ip.c:149
#, fuzzy, c-format
msgid "Could not obtain IP for interface `%s' using `%s'.\n"
msgstr "Không lấy được IP cho giao diện '%s' đang dùng '%s'.\n"
-#: src/transports/ip.c:211
+#: src/transports/ip.c:193
#, fuzzy, c-format
msgid "Could not find an IP address for interface `%s'.\n"
msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
-#: src/transports/ip.c:221
+#: src/transports/ip.c:203
#, fuzzy, c-format
msgid ""
"There is more than one IP address specified for interface `%s'.\n"
@@ -3773,17 +3778,17 @@
"Có vài địa chỉ IP chỉ ra cho giao diện '%s'.\n"
"GNUnet sẽ dùng %u.%u.%u.%u.\n"
-#: src/transports/ip.c:242
+#: src/transports/ip.c:224
#, fuzzy, c-format
msgid "Could not resolve `%s' to determine our IP address: %s\n"
msgstr "Không tìm thấy '%s' để nhận ra địa chỉ IP của chúng ta: %s\n"
-#: src/transports/ip.c:275
+#: src/transports/ip.c:256
#, c-format
msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
msgstr "GNUnet bây giờ sử dụng địa chỉ IP %u.%u.%u.%u.\n"
-#: src/transports/ip.c:345
+#: src/transports/ip.c:306
msgid "Failed to obtain my (external) IP address!\n"
msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2006-03-17 00:34:02 UTC
(rev 2527)
+++ GNUnet/src/applications/datastore/datastore.c 2006-03-17 02:22:16 UTC
(rev 2528)
@@ -73,6 +73,11 @@
return sq->getSize();
}
+static int fastGet(const HashCode512 * query) {
+ return testAvailable(query);
+}
+
+
static int get(const HashCode512 * query,
unsigned int type,
Datum_Iterator iter,
@@ -358,6 +363,7 @@
api.getSize = &getSize;
api.put = &put;
+ api.fast_get = &fastGet;
api.putUpdate = &putUpdate;
api.get = &get;
api.getRandom = &getRandom; /* in prefetch.c */
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2006-03-17 00:34:02 UTC (rev
2527)
+++ GNUnet/src/applications/fs/module/fs.c 2006-03-17 02:22:16 UTC (rev
2528)
@@ -1054,6 +1054,9 @@
return OK;
}
+static int fastGet(const HashCode512 * key) {
+ return datastore->fast_get(key);
+}
/**
* Initialize the FS module. This method name must match
@@ -1109,6 +1112,7 @@
dsGap.put = &gapPut;
dsGap.del = &gapDel;
dsGap.iterate = &gapIterate;
+ dsGap.fast_get = &fastGet;
initQueryManager(capi);
gap->init(&dsGap,
&uniqueReplyIdentifier,
@@ -1120,6 +1124,7 @@
dsDht.put = &gapPut; /* exactly the same method for gap/dht*/
dsDht.del = &gapDel; /* exactly the same method for gap/dht*/
dsDht.iterate = &gapIterate; /* exactly the same method for gap/dht*/
+ dsDht.fast_get = &fastGet;
dht->join(&dsDht, &dht_table);
}
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2006-03-17 00:34:02 UTC (rev 2527)
+++ GNUnet/src/applications/gap/gap.c 2006-03-17 02:22:16 UTC (rev 2528)
@@ -89,6 +89,8 @@
static int stat_routing_no_route_policy;
+static int stat_routing_no_answer_policy;
+
static int stat_routing_local_results;
/**
@@ -1345,7 +1347,9 @@
MUTEX_LOCK(&lookup_exclusion);
i = -1;
if (sender != NULL) {
- if ((policy & QUERY_INDIRECT) > 0) {
+ if ( ( (policy & QUERY_ANSWER) > 0) &&
+ ( ((policy & QUERY_INDIRECT) > 0) ||
+ (bs->fast_get(&query->queries[0])) ) ) {
i = needsForwarding(&query->queries[0],
ttl,
prio,
@@ -1354,9 +1358,13 @@
&doForward);
} else {
isRouted = NO;
- doForward = YES;
- if (stats != NULL)
- stats->change(stat_routing_no_route_policy, 1);
+ doForward = NO;
+ if (stats != NULL) {
+ if ((policy & QUERY_ANSWER) > 0)
+ stats->change(stat_routing_no_route_policy, 1);
+ else
+ stats->change(stat_routing_no_answer_policy, 1);
+ }
}
} else {
addReward(&query->queries[0],
@@ -1980,6 +1988,7 @@
stat_routing_forwards = stats->create(gettext_noop("# gap queries
forwarded (counting each peer)"));
stat_routing_local_results = stats->create(gettext_noop("# gap queries
received with local result"));
stat_routing_totals = stats->create(gettext_noop("# gap total routing
requests received"));
+ stat_routing_no_answer_policy = stats->create(gettext_noop("# gap requests
not answered by policy"));
stat_routing_no_route_policy = stats->create(gettext_noop("# gap requests
not routed by policy"));
stat_routing_slots_used = stats->create(gettext_noop("# gap routing slots
currently in use"));
}
Modified: GNUnet/src/include/gnunet_blockstore.h
===================================================================
--- GNUnet/src/include/gnunet_blockstore.h 2006-03-17 00:34:02 UTC (rev
2527)
+++ GNUnet/src/include/gnunet_blockstore.h 2006-03-17 02:22:16 UTC (rev
2528)
@@ -77,6 +77,11 @@
void * closure;
/**
+ * Do a quick test if we MAY have the content.
+ */
+ int (*fast_get)(const HashCode512 * key);
+
+ /**
* Lookup an item in the datastore.
*
* @param type kind of item to look up
Modified: GNUnet/src/include/gnunet_datastore_service.h
===================================================================
--- GNUnet/src/include/gnunet_datastore_service.h 2006-03-17 00:34:02 UTC
(rev 2527)
+++ GNUnet/src/include/gnunet_datastore_service.h 2006-03-17 02:22:16 UTC
(rev 2528)
@@ -172,6 +172,11 @@
void * closure);
/**
+ * Do a quick test if we MAY have the content.
+ */
+ int (*fast_get)(const HashCode512 * key);
+
+ /**
* Get a random value from the datastore that has
* a key close to the given approx value.
*
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r2528 - in GNUnet: . po src/applications/datastore src/applications/fs/module src/applications/gap src/include,
grothoff <=