[GNUnet-SVN] r4009 - in GNUnet: . doc po src/applications/fs/fsui

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r4009 - in GNUnet: . doc po src/applications/fs/fsui

From:	grothoff
Subject:	[GNUnet-SVN] r4009 - in GNUnet: . doc po src/applications/fs/fsui
Date:	Thu, 21 Dec 2006 18:32:42 -0800 (PST)
Author: grothoff
Date: 2006-12-21 18:32:32 -0800 (Thu, 21 Dec 2006)
New Revision: 4009

Modified:
   GNUnet/ChangeLog
   GNUnet/README
   GNUnet/README.debian
   GNUnet/README.fr
   GNUnet/UPDATING
   GNUnet/configure.ac
   GNUnet/doc/README.mysql
   GNUnet/po/GNUnet.pot
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/rw.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
   GNUnet/src/applications/fs/fsui/downloadtest.c
   GNUnet/src/applications/fs/fsui/serializetest3.c
   GNUnet/src/applications/fs/fsui/serializetest4.c
Log:
updating documentation

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/ChangeLog    2006-12-22 02:32:32 UTC (rev 4009)
@@ -1,3 +1,7 @@
+Thu Dec 21 20:03:07 MST 2006
+       Fixed gnunet-insert "-e" option.  Fixed various
+       crashes in client code.  Improved OS X portability.
+       
 Tue Dec 19 19:03:48 MST 2006
        Allowing GNUnet (without gnunet-setup) to be build
        on systems without guile.

Modified: GNUnet/README
===================================================================
--- GNUnet/README       2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/README       2006-12-22 02:32:32 UTC (rev 4009)
@@ -9,11 +9,12 @@
 currently developed by a worldwide group of independent free software
 developers.  GNUnet is a part of the GNU project (http://www.gnu.org/).
 
-This is a BETA release.  The network has not been tested on a large
-scale yet.  While there are no known significant bugs, we are still
-changing significant aspects of the system in any other version.  Bugs
-are common and the documentation may not be adequate for unexperienced
-users.
+This is a BETA release.  While there are no known significant bugs, we
+are still changing significant aspects of the system in any other
+version.  While we believe that the system is usable, quite a few
+important features -- which would improve performance make the life of
+users easier -- are still missing.  Also, the documentation may not be
+adequate for inexperienced users.
 
 For a longer description of the GNUnet System see our webpages
 http://www.gnu.org/software/gnunet/ and http://gnunet.org/.
@@ -109,11 +110,7 @@
 options can be changed at runtime this way (e.g. to change any port
 number, you must fully restart gnunetd).
 
-In order to use the SMTP transport service, you should read
-http://gnunet.org/smtp.php3 first!  Note that SMTP should never
-be required, it is just a neat technical idea at this point.
 
-
 Usage
 =====
 
@@ -181,8 +178,13 @@
 $ export GNUNET_PREFIX=$SOMEWHERE
 $ make check
 
+If any testcases fail to pass on your system, run "contrib/report.sh"
+and report the output together with information about the failing
+testcase to the Mantis bugtracking system at
+https://gnunet.org/mantis/.
 
 
+
 Stay tuned
 ==========
 

Modified: GNUnet/README.debian
===================================================================
--- GNUnet/README.debian        2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/README.debian        2006-12-22 02:32:32 UTC (rev 4009)
@@ -19,8 +19,8 @@
 libgcrypt11-dev
 libgmp3-dev
 libltdl3-dev
-guile-1.8-dev 
-libextractor-dev
+guile-1.8-dev (etch or higher!)
+libextractor-dev (etch or higher!)
 libcurl3-gnutls-dev
 libsqlite3-dev (recommended)
 libmysqlclient15-dev (optional)

Modified: GNUnet/README.fr
===================================================================
--- GNUnet/README.fr    2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/README.fr    2006-12-22 02:32:32 UTC (rev 4009)
@@ -1,4 +1,5 @@
 THIS TRANSLATION IS OUTDATED.  PLEASE ALSO READ THE ENGLISH VERSION!
+[ if you are able to provide an updated French version, please do! ]
 
                      Bienvenue sous GNUnet
 

Modified: GNUnet/UPDATING
===================================================================
--- GNUnet/UPDATING     2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/UPDATING     2006-12-22 02:32:32 UTC (rev 4009)
@@ -8,6 +8,16 @@
 data-preserving migration may not be possible.  For SVN versions,
 you're on your own.
 
+0.7.1pre2 to 0.7.1
+==================
+
+Run
+
+$ gnunet-update
+
+(as the same user that also runs gnunetd).
+
+
 0.7.1pre1 to 0.7.1pre2
 ======================
 

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/configure.ac 2006-12-22 02:32:32 UTC (rev 4009)
@@ -21,8 +21,8 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.7.1pre2],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.7.1pre2])
+AC_INIT([GNUnet], [0.7.1],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.7.1])
 AM_CONFIG_HEADER([config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: GNUnet/doc/README.mysql
===================================================================
--- GNUnet/doc/README.mysql     2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/doc/README.mysql     2006-12-22 02:32:32 UTC (rev 4009)
@@ -1,7 +1,8 @@
 How to setup the MySQL database for GNUnet.
 
-NOTE: This db module does NOT work with mysql before 4.1 since
-we need prepared statements.
+NOTE: This db module does NOT work with mysql before 4.1 since we need
+prepared statements.  We are generally testing the code against MySQL
+5.0 at this point.
  
 HIGHLIGHTS
 
@@ -61,10 +62,15 @@
      &quot;ln -s /var/run/mysqld/mysqld.sock /tmp/mysql.sock&quot;
      so there may be some additional trouble depending on your mysql setup.]
 
+ 5) If you want to run the testcases, you must create a second
+    database "gnunetcheck" with the same username and password.
+    This database will then be used for testing ("make check").
+
+
 REPAIRING TABLES 
 
 - Its probably healthy to check your tables for inconsistencies
-  every now and then.
+  every now and then, especially after system crashes.
 - If you get odd SEGVs on gnunetd startup, it might be that the mysql
   databases have been corrupted. 
 - The tables can be verified/fixed in two ways;

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/po/GNUnet.pot        2006-12-22 02:32:32 UTC (rev 4009)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-17 20:51-0700\n"
+"POT-Creation-Date: 2006-12-21 20:14-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -202,7 +202,7 @@
 
 #: src/applications/fs/tools/gnunet-search.c:140
 #: src/applications/fs/tools/gnunet-download.c:65
-#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-insert.c:271
 #: src/applications/fs/tools/gnunet-pseudonym.c:71
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
@@ -316,154 +316,162 @@
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:168
+#: src/applications/fs/tools/gnunet-insert.c:161
 #, c-format
+msgid "Keywords for file `%s':\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:170
+msgid "filename"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:173
+msgid "mimetype"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:210
+#, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:180
+#: src/applications/fs/tools/gnunet-insert.c:222
 #, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:191
+#: src/applications/fs/tools/gnunet-insert.c:233
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:202
+#: src/applications/fs/tools/gnunet-insert.c:244
 #, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:207
+#: src/applications/fs/tools/gnunet-insert.c:249
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:216
+#: src/applications/fs/tools/gnunet-insert.c:258
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-insert.c:279
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:282
 msgid ""
 "do not use libextractor to add additional references to directory entries "
 "and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:287
 msgid "Make files available to GNUnet for sharing."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:252
+#: src/applications/fs/tools/gnunet-insert.c:294
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:298
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:261
+#: src/applications/fs/tools/gnunet-insert.c:303
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:264
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:314
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:275
+#: src/applications/fs/tools/gnunet-insert.c:317
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:278
+#: src/applications/fs/tools/gnunet-insert.c:320
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:282
+#: src/applications/fs/tools/gnunet-insert.c:324
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:286
+#: src/applications/fs/tools/gnunet-insert.c:328
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:331
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:324
+#: src/applications/fs/tools/gnunet-insert.c:366
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:348
+#: src/applications/fs/tools/gnunet-insert.c:425
 #, c-format
-msgid "Keywords for file `%s':\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:374
-#, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:394
+#: src/applications/fs/tools/gnunet-insert.c:445
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:403
-#: src/applications/fs/tools/gnunet-insert.c:409
-#: src/applications/fs/tools/gnunet-insert.c:415
-#: src/applications/fs/tools/gnunet-insert.c:421
-#: src/applications/fs/tools/gnunet-insert.c:427
+#: src/applications/fs/tools/gnunet-insert.c:454
+#: src/applications/fs/tools/gnunet-insert.c:460
+#: src/applications/fs/tools/gnunet-insert.c:466
+#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:478
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -626,8 +634,8 @@
 
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
-#: src/applications/fs/fsui/serializetest2.c:382
-#: src/applications/fs/fsui/searchtest.c:159
+#: src/applications/fs/fsui/serializetest2.c:402
+#: src/applications/fs/fsui/searchtest.c:162
 #: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/fsui/fsuitest.c:193
 msgid "AND"
@@ -643,13 +651,13 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:964
+#: src/applications/fs/ecrs/download.c:967
 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:1149
+#: src/applications/fs/ecrs/download.c:1152
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -733,7 +741,7 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:305
+#: src/applications/fs/ecrs/upload.c:308
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
@@ -759,12 +767,12 @@
 msgid "Failed to create temporary directory."
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:334
+#: src/applications/fs/module/ondemand.c:336
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:432
+#: src/applications/fs/module/ondemand.c:434
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -772,18 +780,18 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:459
+#: src/applications/fs/module/ondemand.c:461
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:516
+#: src/applications/fs/module/ondemand.c:518
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:679
+#: src/applications/fs/module/ondemand.c:681
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2259,11 +2267,11 @@
 msgid "Invalid process priority `%s'\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:404
+#: src/util/os/cpustatus.c:402
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:423
+#: src/util/os/cpustatus.c:421
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
@@ -2272,12 +2280,12 @@
 msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/util/os/statuscalls.c:179 src/util/os/statuscalls.c:257
+#: src/util/os/statuscalls.c:184 src/util/os/statuscalls.c:314
 #, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr ""
 
-#: src/util/os/statuscalls.c:299 src/util/os/statuscalls.c:308
+#: src/util/os/statuscalls.c:356 src/util/os/statuscalls.c:365
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -2361,66 +2369,66 @@
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:121
+#: src/util/error/error.c:125
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:233
+#: src/util/error/error.c:193 src/util/error/error.c:237
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:192 src/util/error/error.c:235
+#: src/util/error/error.c:196 src/util/error/error.c:239
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:239
+#: src/util/error/error.c:199 src/util/error/error.c:243
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:198 src/util/error/error.c:241
+#: src/util/error/error.c:202 src/util/error/error.c:245
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:243
+#: src/util/error/error.c:205 src/util/error/error.c:247
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:204 src/util/error/error.c:245
+#: src/util/error/error.c:208 src/util/error/error.c:249
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:247
+#: src/util/error/error.c:211 src/util/error/error.c:251
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:210 src/util/error/error.c:249
+#: src/util/error/error.c:214 src/util/error/error.c:253
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:213 src/util/error/error.c:251
+#: src/util/error/error.c:217 src/util/error/error.c:255
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:216 src/util/error/error.c:253
+#: src/util/error/error.c:220 src/util/error/error.c:257
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:219 src/util/error/error.c:255
+#: src/util/error/error.c:223 src/util/error/error.c:259
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:222
+#: src/util/error/error.c:226
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:237
+#: src/util/error/error.c:241
 msgid "INFO"
 msgstr ""
 
-#: src/util/error/error.c:256
+#: src/util/error/error.c:260
 msgid "NOTHING"
 msgstr ""
 
@@ -2585,12 +2593,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
+#: src/util/network_client/tcpio.c:257 src/util/network_client/tcpio.c:287
 #, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:428
+#: src/util/network_client/tcpio.c:443
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr ""

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/po/de.po     2006-12-22 02:32:32 UTC (rev 4009)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-17 20:51-0700\n"
+"POT-Creation-Date: 2006-12-21 20:14-0700\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -215,7 +215,7 @@
 
 #: src/applications/fs/tools/gnunet-search.c:140
 #: src/applications/fs/tools/gnunet-download.c:65
-#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-insert.c:271
 #: src/applications/fs/tools/gnunet-pseudonym.c:71
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
@@ -342,24 +342,37 @@
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:168
+#: src/applications/fs/tools/gnunet-insert.c:161
 #, c-format
+msgid "Keywords for file `%s':\n"
+msgstr "Schlüsselwörter für Datei `%s':\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:170
+msgid "filename"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:173
+msgid "mimetype"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:210
+#, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 "%16llu von %16llu Bytes eingefügt (geschätzte %6s bis Fertigstellung) - %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:180
+#: src/applications/fs/tools/gnunet-insert.c:222
 #, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Upload von `%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f KB/s).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:191
+#: src/applications/fs/tools/gnunet-insert.c:233
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:202
+#: src/applications/fs/tools/gnunet-insert.c:244
 #, c-format
 msgid ""
 "\n"
@@ -368,7 +381,7 @@
 "\n"
 "Upload abgebrochen.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:207
+#: src/applications/fs/tools/gnunet-insert.c:249
 #, c-format
 msgid ""
 "\n"
@@ -377,14 +390,14 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:216
+#: src/applications/fs/tools/gnunet-insert.c:258
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
@@ -393,11 +406,11 @@
 "anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis "
 "erzwingen."
 
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-insert.c:279
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:282
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -406,7 +419,7 @@
 "benutze libextractor um weitere direkte Referenzen zu Dateien in "
 "Verzeichnissen zu erzeugen"
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -414,11 +427,11 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:287
 msgid "Make files available to GNUnet for sharing."
 msgstr "Dateien GNUnet zum Filesharing zur Verfügung stellen."
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
@@ -426,7 +439,7 @@
 "Intervall der Verfügbarkeit von Updates auf SECONDS setzen (nur für das "
 "Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:252
+#: src/applications/fs/tools/gnunet-insert.c:294
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -434,7 +447,7 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:298
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -442,13 +455,13 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/applications/fs/tools/gnunet-insert.c:261
+#: src/applications/fs/tools/gnunet-insert.c:303
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/applications/fs/tools/gnunet-insert.c:264
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -456,7 +469,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -464,17 +477,17 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:314
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/applications/fs/tools/gnunet-insert.c:275
+#: src/applications/fs/tools/gnunet-insert.c:317
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/applications/fs/tools/gnunet-insert.c:278
+#: src/applications/fs/tools/gnunet-insert.c:320
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -482,47 +495,42 @@
 "Dies als unregelmäßige aber aktualisierbare Veröffentlichung kennzeichnen "
 "(nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:282
+#: src/applications/fs/tools/gnunet-insert.c:324
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:286
+#: src/applications/fs/tools/gnunet-insert.c:328
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "Erstellungszeit für den SBLOCK angeben (s. Manpage zum Format)"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:331
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "ID der vorherigen Version des Inhalts (nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:324
+#: src/applications/fs/tools/gnunet-insert.c:366
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:348
+#: src/applications/fs/tools/gnunet-insert.c:425
 #, c-format
-msgid "Keywords for file `%s':\n"
-msgstr "Schlüsselwörter für Datei `%s':\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:374
-#, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Konnte nicht auf den Namespace `%s' zugreifen (existiert nicht?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:394
+#: src/applications/fs/tools/gnunet-insert.c:445
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Das Parsen der Zeit schlug fehl. Verwenden Sie das `%s' Format.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:403
-#: src/applications/fs/tools/gnunet-insert.c:409
-#: src/applications/fs/tools/gnunet-insert.c:415
-#: src/applications/fs/tools/gnunet-insert.c:421
-#: src/applications/fs/tools/gnunet-insert.c:427
+#: src/applications/fs/tools/gnunet-insert.c:454
+#: src/applications/fs/tools/gnunet-insert.c:460
+#: src/applications/fs/tools/gnunet-insert.c:466
+#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:478
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -700,8 +708,8 @@
 
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
-#: src/applications/fs/fsui/serializetest2.c:382
-#: src/applications/fs/fsui/searchtest.c:159
+#: src/applications/fs/fsui/serializetest2.c:402
+#: src/applications/fs/fsui/searchtest.c:162
 #: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/fsui/fsuitest.c:193
 msgid "AND"
@@ -717,7 +725,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Write(%d, %p, %d) schlug fehl: %s\n"
 
-#: src/applications/fs/ecrs/download.c:964
+#: src/applications/fs/ecrs/download.c:967
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -726,7 +734,7 @@
 "Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
 "abgebrochen.\n"
 
-#: src/applications/fs/ecrs/download.c:1149
+#: src/applications/fs/ecrs/download.c:1152
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -814,7 +822,7 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/applications/fs/ecrs/upload.c:305
+#: src/applications/fs/ecrs/upload.c:308
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
@@ -841,13 +849,13 @@
 msgid "Failed to create temporary directory."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/fs/module/ondemand.c:334
+#: src/applications/fs/module/ondemand.c:336
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 "Indizierte Datei ist verschwunden, Block für Anfrage `%s' wird gelöscht\n"
 
-#: src/applications/fs/module/ondemand.c:432
+#: src/applications/fs/module/ondemand.c:434
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -858,7 +866,7 @@
 "aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
 "löschen, da Ihr Index nun ungültige Referenzen enthält!\n"
 
-#: src/applications/fs/module/ondemand.c:459
+#: src/applications/fs/module/ondemand.c:461
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -867,11 +875,11 @@
 "Die Konfigurationsdatei muss ein Verzeichnis für die Speicherung von FS "
 "Daten in der Sektion `%s' unter `%s' angeben.\n"
 
-#: src/applications/fs/module/ondemand.c:516
+#: src/applications/fs/module/ondemand.c:518
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:679
+#: src/applications/fs/module/ondemand.c:681
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2412,11 +2420,11 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/util/os/cpustatus.c:404
+#: src/util/os/cpustatus.c:402
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Windows NT).\n"
 
-#: src/util/os/cpustatus.c:423
+#: src/util/os/cpustatus.c:421
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Win 9x).\n"
 
@@ -2425,12 +2433,12 @@
 msgid "Can't create semaphore: %i"
 msgstr "Semaphore konnte nicht angelegt werden: %i"
 
-#: src/util/os/statuscalls.c:179 src/util/os/statuscalls.c:257
+#: src/util/os/statuscalls.c:184 src/util/os/statuscalls.c:314
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/os/statuscalls.c:299 src/util/os/statuscalls.c:308
+#: src/util/os/statuscalls.c:356 src/util/os/statuscalls.c:365
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -2519,66 +2527,66 @@
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:121
+#: src/util/error/error.c:125
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:233
+#: src/util/error/error.c:193 src/util/error/error.c:237
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/error/error.c:192 src/util/error/error.c:235
+#: src/util/error/error.c:196 src/util/error/error.c:239
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:239
+#: src/util/error/error.c:199 src/util/error/error.c:243
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/error/error.c:198 src/util/error/error.c:241
+#: src/util/error/error.c:202 src/util/error/error.c:245
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/error/error.c:201 src/util/error/error.c:243
+#: src/util/error/error.c:205 src/util/error/error.c:247
 msgid "FATAL"
 msgstr "SCHWERWIEGEND"
 
-#: src/util/error/error.c:204 src/util/error/error.c:245
+#: src/util/error/error.c:208 src/util/error/error.c:249
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:247
+#: src/util/error/error.c:211 src/util/error/error.c:251
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:210 src/util/error/error.c:249
+#: src/util/error/error.c:214 src/util/error/error.c:253
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:213 src/util/error/error.c:251
+#: src/util/error/error.c:217 src/util/error/error.c:255
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:216 src/util/error/error.c:253
+#: src/util/error/error.c:220 src/util/error/error.c:257
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:219 src/util/error/error.c:255
+#: src/util/error/error.c:223 src/util/error/error.c:259
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:222
+#: src/util/error/error.c:226
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:237
+#: src/util/error/error.c:241
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:256
+#: src/util/error/error.c:260
 msgid "NOTHING"
 msgstr "NICHTS"
 
@@ -2745,12 +2753,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
+#: src/util/network_client/tcpio.c:257 src/util/network_client/tcpio.c:287
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/util/network_client/tcpio.c:428
+#: src/util/network_client/tcpio.c:443
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/po/es.po     2006-12-22 02:32:32 UTC (rev 4009)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-17 20:51-0700\n"
+"POT-Creation-Date: 2006-12-21 20:14-0700\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -213,7 +213,7 @@
 
 #: src/applications/fs/tools/gnunet-search.c:140
 #: src/applications/fs/tools/gnunet-download.c:65
-#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-insert.c:271
 #: src/applications/fs/tools/gnunet-pseudonym.c:71
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
@@ -342,30 +342,43 @@
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:168
+#: src/applications/fs/tools/gnunet-insert.c:161
+#, c-format
+msgid "Keywords for file `%s':\n"
+msgstr "Claves para los ficheros '%s':\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:170
+msgid "filename"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:173
+msgid "mimetype"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:210
 #, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu de %16llu bytes insertados (%s estimado para completar)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:180
+#: src/applications/fs/tools/gnunet-insert.c:222
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Subida de '%s' completada, %llu bytes tomaron %llu segundos (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:191
+#: src/applications/fs/tools/gnunet-insert.c:233
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:202
+#: src/applications/fs/tools/gnunet-insert.c:244
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Descarga abortada"
 
-#: src/applications/fs/tools/gnunet-insert.c:207
+#: src/applications/fs/tools/gnunet-insert.c:249
 #, c-format
 msgid ""
 "\n"
@@ -374,14 +387,14 @@
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:216
+#: src/applications/fs/tools/gnunet-insert.c:258
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
@@ -389,11 +402,11 @@
 "aunque gnunetd este corriendo en el ordenador local, fuerza la creación de "
 "una copia en vez de hacer un enlace al directorio para compartir de GNUnet"
 
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-insert.c:279
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:282
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -402,7 +415,7 @@
 "usa libextractor para añadir referencias directas adicionales a las entradas "
 "del directorio"
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -410,11 +423,11 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:287
 msgid "Make files available to GNUnet for sharing."
 msgstr "Permite a GNUnet disponer de los ficheros para compartirlos."
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
@@ -422,7 +435,7 @@
 "cambia el intervalo de disponibilidad de las actualizaciones a SEGUNDOS "
 "(para inserciones en el espacio solamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:252
+#: src/applications/fs/tools/gnunet-insert.c:294
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -430,7 +443,7 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:298
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -438,11 +451,11 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:261
+#: src/applications/fs/tools/gnunet-insert.c:303
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
-#: src/applications/fs/tools/gnunet-insert.c:264
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -450,7 +463,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -458,17 +471,17 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:314
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/applications/fs/tools/gnunet-insert.c:275
+#: src/applications/fs/tools/gnunet-insert.c:317
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/applications/fs/tools/gnunet-insert.c:278
+#: src/applications/fs/tools/gnunet-insert.c:320
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -476,50 +489,45 @@
 "especifica esto como una aperiódica pero actualizada publicación (para "
 "inserciones en el espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:282
+#: src/applications/fs/tools/gnunet-insert.c:324
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:286
+#: src/applications/fs/tools/gnunet-insert.c:328
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 "especifica el tiempo para la creación de un Superbloque (vea la página del "
 "manual para el formato)"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:331
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "ID de la versión previa del contenido (para actualizaciones del espacio "
 "únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:324
+#: src/applications/fs/tools/gnunet-insert.c:366
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:348
+#: src/applications/fs/tools/gnunet-insert.c:425
 #, c-format
-msgid "Keywords for file `%s':\n"
-msgstr "Claves para los ficheros '%s':\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:374
-#, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Imposible acceder al espacio '%s' (¿no existe?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:394
+#: src/applications/fs/tools/gnunet-insert.c:445
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Se produjo un fallo al analizar el tiempo. Use el formato '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:403
-#: src/applications/fs/tools/gnunet-insert.c:409
-#: src/applications/fs/tools/gnunet-insert.c:415
-#: src/applications/fs/tools/gnunet-insert.c:421
-#: src/applications/fs/tools/gnunet-insert.c:427
+#: src/applications/fs/tools/gnunet-insert.c:454
+#: src/applications/fs/tools/gnunet-insert.c:460
+#: src/applications/fs/tools/gnunet-insert.c:466
+#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:478
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
@@ -693,8 +701,8 @@
 
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
-#: src/applications/fs/fsui/serializetest2.c:382
-#: src/applications/fs/fsui/searchtest.c:159
+#: src/applications/fs/fsui/serializetest2.c:402
+#: src/applications/fs/fsui/searchtest.c:162
 #: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/fsui/fsuitest.c:193
 msgid "AND"
@@ -710,7 +718,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Escribiendo(%d, %p, %d) se produjo un fallo: %s\n"
 
-#: src/applications/fs/ecrs/download.c:964
+#: src/applications/fs/ecrs/download.c:967
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -718,7 +726,7 @@
 "El contenido desencriptado no encuentra una clave. Esto puede ser un bug o "
 "un fichero introducido maliciosamente. Descarga abortada.\n"
 
-#: src/applications/fs/ecrs/download.c:1149
+#: src/applications/fs/ecrs/download.c:1152
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -808,7 +816,7 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/applications/fs/ecrs/upload.c:305
+#: src/applications/fs/ecrs/upload.c:308
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
@@ -839,13 +847,13 @@
 msgid "Failed to create temporary directory."
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/applications/fs/module/ondemand.c:334
+#: src/applications/fs/module/ondemand.c:336
 #, fuzzy, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 "Fichero indexado desaparecido, borrando el bloque para preguntas '%s'\n"
 
-#: src/applications/fs/module/ondemand.c:432
+#: src/applications/fs/module/ondemand.c:434
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -856,7 +864,7 @@
 "disponible durante tres días.  Por favor, desindexa los ficheros antes de "
 "borrarlos porque eso causa que el índice tenga referencias no válidas.\n"
 
-#: src/applications/fs/module/ondemand.c:459
+#: src/applications/fs/module/ondemand.c:461
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -865,11 +873,11 @@
 "El fichero de configuración debe especificar un directorio para el "
 "almacenamiento de los datos de FS en la sección '%s' bajo '%s'.\n"
 
-#: src/applications/fs/module/ondemand.c:516
+#: src/applications/fs/module/ondemand.c:518
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:679
+#: src/applications/fs/module/ondemand.c:681
 #, fuzzy, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2377,11 +2385,11 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/util/os/cpustatus.c:404
+#: src/util/os/cpustatus.c:402
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:423
+#: src/util/os/cpustatus.c:421
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
@@ -2390,12 +2398,12 @@
 msgid "Can't create semaphore: %i"
 msgstr "Imposible crear un semáforo: %i"
 
-#: src/util/os/statuscalls.c:179 src/util/os/statuscalls.c:257
+#: src/util/os/statuscalls.c:184 src/util/os/statuscalls.c:314
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/os/statuscalls.c:299 src/util/os/statuscalls.c:308
+#: src/util/os/statuscalls.c:356 src/util/os/statuscalls.c:365
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -2481,66 +2489,66 @@
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:121
+#: src/util/error/error.c:125
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:233
+#: src/util/error/error.c:193 src/util/error/error.c:237
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/error/error.c:192 src/util/error/error.c:235
+#: src/util/error/error.c:196 src/util/error/error.c:239
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:239
+#: src/util/error/error.c:199 src/util/error/error.c:243
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/error/error.c:198 src/util/error/error.c:241
+#: src/util/error/error.c:202 src/util/error/error.c:245
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/error/error.c:201 src/util/error/error.c:243
+#: src/util/error/error.c:205 src/util/error/error.c:247
 msgid "FATAL"
 msgstr "FATAL"
 
-#: src/util/error/error.c:204 src/util/error/error.c:245
+#: src/util/error/error.c:208 src/util/error/error.c:249
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:247
+#: src/util/error/error.c:211 src/util/error/error.c:251
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:210 src/util/error/error.c:249
+#: src/util/error/error.c:214 src/util/error/error.c:253
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:213 src/util/error/error.c:251
+#: src/util/error/error.c:217 src/util/error/error.c:255
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:216 src/util/error/error.c:253
+#: src/util/error/error.c:220 src/util/error/error.c:257
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:219 src/util/error/error.c:255
+#: src/util/error/error.c:223 src/util/error/error.c:259
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:222
+#: src/util/error/error.c:226
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:237
+#: src/util/error/error.c:241
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/error/error.c:256
+#: src/util/error/error.c:260
 msgid "NOTHING"
 msgstr "NADA"
 
@@ -2706,12 +2714,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
+#: src/util/network_client/tcpio.c:257 src/util/network_client/tcpio.c:287
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:428
+#: src/util/network_client/tcpio.c:443
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "¡'%s' falló, respuesta no válida!\n"

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/po/rw.po     2006-12-22 02:32:32 UTC (rev 4009)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-17 20:51-0700\n"
+"POT-Creation-Date: 2006-12-21 20:14-0700\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"
@@ -215,7 +215,7 @@
 
 #: src/applications/fs/tools/gnunet-search.c:140
 #: src/applications/fs/tools/gnunet-download.c:65
-#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-insert.c:271
 #: src/applications/fs/tools/gnunet-pseudonym.c:71
 #, fuzzy
 msgid "set the desired LEVEL of sender-anonymity"
@@ -348,60 +348,76 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-insert.c:168
+#: src/applications/fs/tools/gnunet-insert.c:161
+#, fuzzy, c-format
+msgid "Keywords for file `%s':\n"
+msgstr "kugirango IDOSIYE"
+
+#: src/applications/fs/tools/gnunet-insert.c:170
+#, fuzzy
+msgid "filename"
+msgstr "Izina ry'idosiye"
+
+# framework/source\classes\fltdlg.src:DLG_FILTER_SELECT.FT_DLG_MIMETYPE.text
+#: src/applications/fs/tools/gnunet-insert.c:173
+#, fuzzy
+msgid "mimetype"
+msgstr "Ubwoko bwa MIME:"
+
+#: src/applications/fs/tools/gnunet-insert.c:210
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:180
+#: src/applications/fs/tools/gnunet-insert.c:222
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "ku Inyuma Bya Bayite"
 
-#: src/applications/fs/tools/gnunet-insert.c:191
+#: src/applications/fs/tools/gnunet-insert.c:233
 #, fuzzy, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Idosiye Nka"
 
-#: src/applications/fs/tools/gnunet-insert.c:202
+#: src/applications/fs/tools/gnunet-insert.c:244
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "/Byahiswemo"
 
-#: src/applications/fs/tools/gnunet-insert.c:207
+#: src/applications/fs/tools/gnunet-insert.c:249
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:216
+#: src/applications/fs/tools/gnunet-insert.c:258
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr "Ibikubiyemo Ubwoko"
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:275
 #, fuzzy
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
 msgstr "NIBA ni ku i Kurema a Ihuza Bya a Gukoporora in i bushyinguro"
 
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-insert.c:279
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:282
 msgid ""
 "do not use libextractor to add additional references to directory entries "
 "and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:285
 #, fuzzy
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -410,19 +426,19 @@
 "Gucapa Urutonde Bya Amagambo fatizo OYA Iyinjizamo Cyangwa gushyiraho "
 "umugereka"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:287
 #, fuzzy
 msgid "Make files available to GNUnet for sharing."
 msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:290
 #, fuzzy
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr "Gushyiraho Intera kugirango Ukuboneka Bya Kuri kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:252
+#: src/applications/fs/tools/gnunet-insert.c:294
 #, fuzzy
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
@@ -431,7 +447,7 @@
 "Kongeramo Ijambo- banze kugirango i Hejuru: urwego IDOSIYE Cyangwa "
 "bushyinguro iyi Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:298
 #, fuzzy
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
@@ -440,11 +456,11 @@
 "Kongeramo Ijambo- banze kugirango Byose Idosiye Na ububiko bw'amaderese iyi "
 "Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:261
+#: src/applications/fs/tools/gnunet-insert.c:303
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:264
+#: src/applications/fs/tools/gnunet-insert.c:306
 #, fuzzy
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
@@ -452,60 +468,55 @@
 msgstr ""
 "OYA Umubarendanga Iyinjizamo IDOSIYE in Bishunzwe: Ifishi in Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:310
 #, fuzzy
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr "Bya Verisiyo Kuri in i kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:314
 #, fuzzy
 msgid "specify the priority of the content"
 msgstr "i By'ibanze Bya i Ibikubiyemo"
 
-#: src/applications/fs/tools/gnunet-insert.c:275
+#: src/applications/fs/tools/gnunet-insert.c:317
 #, fuzzy
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr "Tangaza i Idosiye i IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-insert.c:278
+#: src/applications/fs/tools/gnunet-insert.c:320
 #, fuzzy
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr "iyi Nka kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:282
+#: src/applications/fs/tools/gnunet-insert.c:324
 #, fuzzy
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr "Gushyiraho i Bya iyi Verisiyo Bya i kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:286
+#: src/applications/fs/tools/gnunet-insert.c:328
 #, fuzzy
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "Igihe kugirango Ipaji kugirango Imiterere"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:331
 #, fuzzy
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "Izina ry'idosiye: Bya i Bya a Ibanjirije Verisiyo Bya i Ibikubiyemo "
 "kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:324
+#: src/applications/fs/tools/gnunet-insert.c:366
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:348
+#: src/applications/fs/tools/gnunet-insert.c:425
 #, fuzzy, c-format
-msgid "Keywords for file `%s':\n"
-msgstr "kugirango IDOSIYE"
-
-#: src/applications/fs/tools/gnunet-insert.c:374
-#, fuzzy, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 "Project- Id- Version: basctl\n"
@@ -517,16 +528,16 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-insert.c:394
+#: src/applications/fs/tools/gnunet-insert.c:445
 #, fuzzy, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Igihe Byanze Imiterere"
 
-#: src/applications/fs/tools/gnunet-insert.c:403
-#: src/applications/fs/tools/gnunet-insert.c:409
-#: src/applications/fs/tools/gnunet-insert.c:415
-#: src/applications/fs/tools/gnunet-insert.c:421
-#: src/applications/fs/tools/gnunet-insert.c:427
+#: src/applications/fs/tools/gnunet-insert.c:454
+#: src/applications/fs/tools/gnunet-insert.c:460
+#: src/applications/fs/tools/gnunet-insert.c:466
+#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:478
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Oya Ihitamo"
@@ -719,8 +730,8 @@
 
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
-#: src/applications/fs/fsui/serializetest2.c:382
-#: src/applications/fs/fsui/searchtest.c:159
+#: src/applications/fs/fsui/serializetest2.c:402
+#: src/applications/fs/fsui/searchtest.c:162
 #: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/fsui/fsuitest.c:193
 msgid "AND"
@@ -736,14 +747,14 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "`%s'%sByanze"
 
-#: src/applications/fs/ecrs/download.c:964
+#: src/applications/fs/ecrs/download.c:967
 #, 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:1149
+#: src/applications/fs/ecrs/download.c:1152
 #, fuzzy, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -828,7 +839,7 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Itangira... Modire Byanze Umukiriya"
 
-#: src/applications/fs/ecrs/upload.c:305
+#: src/applications/fs/ecrs/upload.c:308
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
@@ -857,12 +868,12 @@
 msgid "Failed to create temporary directory."
 msgstr "Kuri Kurema"
 
-#: src/applications/fs/module/ondemand.c:334
+#: src/applications/fs/module/ondemand.c:336
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:432
+#: src/applications/fs/module/ondemand.c:434
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -870,18 +881,18 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:459
+#: src/applications/fs/module/ondemand.c:461
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr "IDOSIYE bushyinguro kugirango Bya Ibyatanzwe in Icyiciro"
 
-#: src/applications/fs/module/ondemand.c:516
+#: src/applications/fs/module/ondemand.c:518
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:679
+#: src/applications/fs/module/ondemand.c:681
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2483,12 +2494,12 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Kuri"
 
-#: src/util/os/cpustatus.c:404
+#: src/util/os/cpustatus.c:402
 #, fuzzy
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Ikibazo# i Ikoresha:"
 
-#: src/util/os/cpustatus.c:423
+#: src/util/os/cpustatus.c:421
 #, fuzzy
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Ikibazo# i Ikoresha:"
@@ -2498,12 +2509,12 @@
 msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/util/os/statuscalls.c:179 src/util/os/statuscalls.c:257
+#: src/util/os/statuscalls.c:184 src/util/os/statuscalls.c:314
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Kuri Ibyatanzwe Bivuye ku"
 
-#: src/util/os/statuscalls.c:299 src/util/os/statuscalls.c:308
+#: src/util/os/statuscalls.c:356 src/util/os/statuscalls.c:365
 #, fuzzy, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -2588,67 +2599,67 @@
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:121
+#: src/util/error/error.c:125
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:233
+#: src/util/error/error.c:193 src/util/error/error.c:237
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:192 src/util/error/error.c:235
+#: src/util/error/error.c:196 src/util/error/error.c:239
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:239
+#: src/util/error/error.c:199 src/util/error/error.c:243
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:198 src/util/error/error.c:241
+#: src/util/error/error.c:202 src/util/error/error.c:245
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:243
+#: src/util/error/error.c:205 src/util/error/error.c:247
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:204 src/util/error/error.c:245
+#: src/util/error/error.c:208 src/util/error/error.c:249
 #, fuzzy
 msgid "USER"
 msgstr "Umubare"
 
-#: src/util/error/error.c:207 src/util/error/error.c:247
+#: src/util/error/error.c:211 src/util/error/error.c:251
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:210 src/util/error/error.c:249
+#: src/util/error/error.c:214 src/util/error/error.c:253
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:213 src/util/error/error.c:251
+#: src/util/error/error.c:217 src/util/error/error.c:255
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:216 src/util/error/error.c:253
+#: src/util/error/error.c:220 src/util/error/error.c:257
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:219 src/util/error/error.c:255
+#: src/util/error/error.c:223 src/util/error/error.c:259
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:222
+#: src/util/error/error.c:226
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:237
+#: src/util/error/error.c:241
 msgid "INFO"
 msgstr ""
 
-#: src/util/error/error.c:256
+#: src/util/error/error.c:260
 msgid "NOTHING"
 msgstr ""
 
@@ -2814,7 +2825,7 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
+#: src/util/network_client/tcpio.c:257 src/util/network_client/tcpio.c:287
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr ""
@@ -2834,7 +2845,7 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/util/network_client/tcpio.c:428
+#: src/util/network_client/tcpio.c:443
 #, fuzzy, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "`%s'Byanze Subiza Sibyo"
@@ -5325,10 +5336,6 @@
 #~ msgid "DONE"
 #~ msgstr "Byakozwe"
 
-#, fuzzy
-#~ msgid "filename"
-#~ msgstr "Izina ry'idosiye"
-
 #~ msgid "size"
 #~ msgstr "ingano"
 
@@ -5756,11 +5763,6 @@
 #~ msgid "Search key identifier:"
 #~ msgstr "Urufunguzo Ikiranga"
 
-# framework/source\classes\fltdlg.src:DLG_FILTER_SELECT.FT_DLG_MIMETYPE.text
-#, fuzzy
-#~ msgid "Mime-type:"
-#~ msgstr "Ubwoko bwa MIME:"
-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/po/sv.po     2006-12-22 02:32:32 UTC (rev 4009)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-17 20:51-0700\n"
+"POT-Creation-Date: 2006-12-21 20:14-0700\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -203,7 +203,7 @@
 
 #: src/applications/fs/tools/gnunet-search.c:140
 #: src/applications/fs/tools/gnunet-download.c:65
-#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-insert.c:271
 #: src/applications/fs/tools/gnunet-pseudonym.c:71
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
@@ -329,30 +329,43 @@
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:168
+#: src/applications/fs/tools/gnunet-insert.c:161
+#, c-format
+msgid "Keywords for file `%s':\n"
+msgstr "Nyckelord för fil \"%s\":\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:170
+msgid "filename"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:173
+msgid "mimetype"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:210
 #, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu av %16llu byte inlagda (uppskattar %s till färdigställd)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:180
+#: src/applications/fs/tools/gnunet-insert.c:222
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:191
+#: src/applications/fs/tools/gnunet-insert.c:233
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:202
+#: src/applications/fs/tools/gnunet-insert.c:244
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Nedladdning avbruten."
 
-#: src/applications/fs/tools/gnunet-insert.c:207
+#: src/applications/fs/tools/gnunet-insert.c:249
 #, c-format
 msgid ""
 "\n"
@@ -361,14 +374,14 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:216
+#: src/applications/fs/tools/gnunet-insert.c:258
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
@@ -376,11 +389,11 @@
 "även om gnunetd körs på den lokala maskinen, tvinga fram skapandet av en "
 "kopia istället för att göra en länk till GNUnets utdelade katalog"
 
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-insert.c:279
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:282
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -389,102 +402,97 @@
 "använd libextractor för att lägga till ytterligare direktreferenser till "
 "katalogposter"
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:287
 msgid "Make files available to GNUnet for sharing."
 msgstr "Gör filer tillgängliga via utdelning till GNUnet."
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:252
+#: src/applications/fs/tools/gnunet-insert.c:294
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:298
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:261
+#: src/applications/fs/tools/gnunet-insert.c:303
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:264
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:314
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/applications/fs/tools/gnunet-insert.c:275
+#: src/applications/fs/tools/gnunet-insert.c:317
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:278
+#: src/applications/fs/tools/gnunet-insert.c:320
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:282
+#: src/applications/fs/tools/gnunet-insert.c:324
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:286
+#: src/applications/fs/tools/gnunet-insert.c:328
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:331
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:324
+#: src/applications/fs/tools/gnunet-insert.c:366
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:348
+#: src/applications/fs/tools/gnunet-insert.c:425
 #, c-format
-msgid "Keywords for file `%s':\n"
-msgstr "Nyckelord för fil \"%s\":\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:374
-#, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:394
+#: src/applications/fs/tools/gnunet-insert.c:445
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:403
-#: src/applications/fs/tools/gnunet-insert.c:409
-#: src/applications/fs/tools/gnunet-insert.c:415
-#: src/applications/fs/tools/gnunet-insert.c:421
-#: src/applications/fs/tools/gnunet-insert.c:427
+#: src/applications/fs/tools/gnunet-insert.c:454
+#: src/applications/fs/tools/gnunet-insert.c:460
+#: src/applications/fs/tools/gnunet-insert.c:466
+#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:478
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -647,8 +655,8 @@
 
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
-#: src/applications/fs/fsui/serializetest2.c:382
-#: src/applications/fs/fsui/searchtest.c:159
+#: src/applications/fs/fsui/serializetest2.c:402
+#: src/applications/fs/fsui/searchtest.c:162
 #: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/fsui/fsuitest.c:193
 msgid "AND"
@@ -664,7 +672,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/download.c:964
+#: src/applications/fs/ecrs/download.c:967
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -672,7 +680,7 @@
 "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:1149
+#: src/applications/fs/ecrs/download.c:1152
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -757,7 +765,7 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/applications/fs/ecrs/upload.c:305
+#: src/applications/fs/ecrs/upload.c:308
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
@@ -785,12 +793,12 @@
 msgid "Failed to create temporary directory."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/applications/fs/module/ondemand.c:334
+#: src/applications/fs/module/ondemand.c:336
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr "Indexerad fil försvann, tar bort block för fråga \"%s\"\n"
 
-#: src/applications/fs/module/ondemand.c:432
+#: src/applications/fs/module/ondemand.c:434
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -798,18 +806,18 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:459
+#: src/applications/fs/module/ondemand.c:461
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:516
+#: src/applications/fs/module/ondemand.c:518
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:679
+#: src/applications/fs/module/ondemand.c:681
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2289,11 +2297,11 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/os/cpustatus.c:404
+#: src/util/os/cpustatus.c:402
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Kan inte fråga efter CPU-användning (Windows NT).\n"
 
-#: src/util/os/cpustatus.c:423
+#: src/util/os/cpustatus.c:421
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Kan inte fråga efter CPU-användning (Win 9x).\n"
 
@@ -2302,12 +2310,12 @@
 msgid "Can't create semaphore: %i"
 msgstr "Kan inte skapa semafor: %i"
 
-#: src/util/os/statuscalls.c:179 src/util/os/statuscalls.c:257
+#: src/util/os/statuscalls.c:184 src/util/os/statuscalls.c:314
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/os/statuscalls.c:299 src/util/os/statuscalls.c:308
+#: src/util/os/statuscalls.c:356 src/util/os/statuscalls.c:365
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -2393,66 +2401,66 @@
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:121
+#: src/util/error/error.c:125
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:233
+#: src/util/error/error.c:193 src/util/error/error.c:237
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/error/error.c:192 src/util/error/error.c:235
+#: src/util/error/error.c:196 src/util/error/error.c:239
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:239
+#: src/util/error/error.c:199 src/util/error/error.c:243
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/error/error.c:198 src/util/error/error.c:241
+#: src/util/error/error.c:202 src/util/error/error.c:245
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/error/error.c:201 src/util/error/error.c:243
+#: src/util/error/error.c:205 src/util/error/error.c:247
 msgid "FATAL"
 msgstr "ÖDESDIGER"
 
-#: src/util/error/error.c:204 src/util/error/error.c:245
+#: src/util/error/error.c:208 src/util/error/error.c:249
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:247
+#: src/util/error/error.c:211 src/util/error/error.c:251
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:210 src/util/error/error.c:249
+#: src/util/error/error.c:214 src/util/error/error.c:253
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:213 src/util/error/error.c:251
+#: src/util/error/error.c:217 src/util/error/error.c:255
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:216 src/util/error/error.c:253
+#: src/util/error/error.c:220 src/util/error/error.c:257
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:219 src/util/error/error.c:255
+#: src/util/error/error.c:223 src/util/error/error.c:259
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:222
+#: src/util/error/error.c:226
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:237
+#: src/util/error/error.c:241
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:256
+#: src/util/error/error.c:260
 msgid "NOTHING"
 msgstr "INGET"
 
@@ -2620,12 +2628,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
+#: src/util/network_client/tcpio.c:257 src/util/network_client/tcpio.c:287
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:428
+#: src/util/network_client/tcpio.c:443
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "\"%s\" misslyckades, svar ogiltigt!\n"

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2006-12-22 02:18:52 UTC (rev 4008)
+++ GNUnet/po/vi.po     2006-12-22 02:32:32 UTC (rev 4009)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-17 20:51-0700\n"
+"POT-Creation-Date: 2006-12-21 20:14-0700\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"
@@ -212,7 +212,7 @@
 
 #: src/applications/fs/tools/gnunet-search.c:140
 #: src/applications/fs/tools/gnunet-download.c:65
-#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-insert.c:271
 #: src/applications/fs/tools/gnunet-pseudonym.c:71
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt LEVEL (CẤPĐỘ) mong muốn của người gửi giấu tên"
@@ -335,29 +335,42 @@
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr "Không truy cập được không gian tên '%s' (đã có rồi?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:168
+#: src/applications/fs/tools/gnunet-insert.c:161
 #, fuzzy, c-format
+msgid "Keywords for file `%s':\n"
+msgstr "Từ khóa cho tập tin '%s':\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:170
+msgid "filename"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:173
+msgid "mimetype"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:210
+#, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "đã chèn %16llu từ %16llu byte (sẽ hoàn thành trong %llu%s giây)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:180
+#: src/applications/fs/tools/gnunet-insert.c:222
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "Hoàn thành tải lên '%s', %llu byte trong %llu giây (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:191
+#: src/applications/fs/tools/gnunet-insert.c:233
 #, fuzzy, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Tập tin '%s' có URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:202
+#: src/applications/fs/tools/gnunet-insert.c:244
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Dừng tải xuống."
 
-#: src/applications/fs/tools/gnunet-insert.c:207
+#: src/applications/fs/tools/gnunet-insert.c:249
 #, c-format
 msgid ""
 "\n"
@@ -366,14 +379,14 @@
 "\n"
 "Lỗi tải lên tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:216
+#: src/applications/fs/tools/gnunet-insert.c:258
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
@@ -381,17 +394,17 @@
 "thậm chí nếu gnunetd đang chạy trên máy nội bộ, bắt buộc tạo một bản sao "
 "thay vì tạo một liên kết đến thư mục chia sẻ của GNUnet"
 
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-insert.c:279
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:282
 msgid ""
 "do not use libextractor to add additional references to directory entries "
 "and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -399,18 +412,18 @@
 "in ra danh sách của các từ khóa đã giải phóng cần sử dụng, nhưng không thực "
 "hiện tải lên"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:287
 msgid "Make files available to GNUnet for sharing."
 msgstr "Cho phép GNUnet chia sẻ các tập tin."
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 "đặt khoảng thời gian cho cập nhật thành GIÂY (chỉ cho sự chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:252
+#: src/applications/fs/tools/gnunet-insert.c:294
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -418,7 +431,7 @@
 "thêm một từ khóa phụ cho tập tin hoặc thư mục cao nhất (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:298
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -426,11 +439,11 @@
 "thêm một từ khóa phụ cho tất cả tập tin và thư mục (có thể chỉ ra tùy chọn "
 "này nhiều lần)"
 
-#: src/applications/fs/tools/gnunet-insert.c:261
+#: src/applications/fs/tools/gnunet-insert.c:303
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt dữ liệu meta cho TYPE đưa ra tới VALUE chỉ ra"
 
-#: src/applications/fs/tools/gnunet-insert.c:264
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -438,7 +451,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -446,17 +459,17 @@
 "chỉ ra ID của một phiên bản đã cập nhật để chia sẻ trong tương lai (chỉ cho "
 "sự chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:314
 msgid "specify the priority of the content"
 msgstr "chỉ ra ưu tiên của nội dung"
 
-#: src/applications/fs/tools/gnunet-insert.c:275
+#: src/applications/fs/tools/gnunet-insert.c:317
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "đưa ra dùng chung các tập tin dưới tên hiệu TÊN (đặt tập tin vào không gian "
 "tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:278
+#: src/applications/fs/tools/gnunet-insert.c:320
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -464,45 +477,40 @@
 "chỉ ra sự chia sẻ này không theo chu kỳ nhưng đã cập nhật (chỉ cho chèn "
 "không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:282
+#: src/applications/fs/tools/gnunet-insert.c:324
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr "đặt ID của phiên bản này của sự chia sẻ (chỉ cho chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:286
+#: src/applications/fs/tools/gnunet-insert.c:328
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "chỉ ra thời gian tạo SBlock (xem trang man để biết định dạng)"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:331
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "ID của phiên bản trước của nội dung (chỉ cho sự cập nhật không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:324
+#: src/applications/fs/tools/gnunet-insert.c:366
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Người dùng phải chỉ ra một  và chỉ một tập tin để bỏ đánh chỉ mục.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:348
+#: src/applications/fs/tools/gnunet-insert.c:425
 #, fuzzy, c-format
-msgid "Keywords for file `%s':\n"
-msgstr "Từ khóa cho tập tin '%s':\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:374
-#, fuzzy, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Không truy cập được không gian tên '%s' (đã có rồi?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:394
+#: src/applications/fs/tools/gnunet-insert.c:445
 #, fuzzy, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Phân tích thời gian thất bại. Hãy dùng định dạng '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:403
-#: src/applications/fs/tools/gnunet-insert.c:409
-#: src/applications/fs/tools/gnunet-insert.c:415
-#: src/applications/fs/tools/gnunet-insert.c:421
-#: src/applications/fs/tools/gnunet-insert.c:427
+#: src/applications/fs/tools/gnunet-insert.c:454
+#: src/applications/fs/tools/gnunet-insert.c:460
+#: src/applications/fs/tools/gnunet-insert.c:466
+#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:478
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'.\n"
@@ -673,8 +681,8 @@
 
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
-#: src/applications/fs/fsui/serializetest2.c:382
-#: src/applications/fs/fsui/searchtest.c:159
+#: src/applications/fs/fsui/serializetest2.c:402
+#: src/applications/fs/fsui/searchtest.c:162
 #: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/fsui/fsuitest.c:193
 msgid "AND"
@@ -690,7 +698,7 @@
 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:964
+#: src/applications/fs/ecrs/download.c:967
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -698,7 +706,7 @@
 "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:1149
+#: src/applications/fs/ecrs/download.c:1152
 #, fuzzy, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -783,7 +791,7 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
 
-#: src/applications/fs/ecrs/upload.c:305
+#: src/applications/fs/ecrs/upload.c:308
 #, c-format
 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"
@@ -812,12 +820,12 @@
 msgid "Failed to create temporary directory."
 msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
 
-#: src/applications/fs/module/ondemand.c:334
+#: src/applications/fs/module/ondemand.c:336
 #, fuzzy, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr "Tập tin đã đánh chỉ mục biến mất, đang xóa khối cho yêu cầu '%s'\n"
 
-#: src/applications/fs/module/ondemand.c:432
+#: src/applications/fs/module/ondemand.c:434
 #, fuzzy, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -828,7 +836,7 @@
 "hãy bỏ chỉ mục các tập tin trước khi xóa chúng vì chỉ mục hiện thời chứa các "
 "liên kết sai!"
 
-#: src/applications/fs/module/ondemand.c:459
+#: src/applications/fs/module/ondemand.c:461
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -837,11 +845,11 @@
 "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu FS trong phần '%s' dưới "
 "'%s'.\n"
 
-#: src/applications/fs/module/ondemand.c:516
+#: src/applications/fs/module/ondemand.c:518
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:679
+#: src/applications/fs/module/ondemand.c:681
 #, fuzzy, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2360,11 +2368,11 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Câu trả lời không đúng tới '%s'.\n"
 
-#: src/util/os/cpustatus.c:404
+#: src/util/os/cpustatus.c:402
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Không hỏi được sự sử dụng CPU (Windows NT).\n"
 
-#: src/util/os/cpustatus.c:423
+#: src/util/os/cpustatus.c:421
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Không hỏi được sự sử dụng CPU (Windows 9x).\n"
 
@@ -2373,12 +2381,12 @@
 msgid "Can't create semaphore: %i"
 msgstr "Không tạo được đèn tín hiệu: %i"
 
-#: src/util/os/statuscalls.c:179 src/util/os/statuscalls.c:257
+#: src/util/os/statuscalls.c:184 src/util/os/statuscalls.c:314
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Thất bại khi phân tích dữ liệu giao diện từ '%s' tại %s:%d.\n"
 
-#: src/util/os/statuscalls.c:299 src/util/os/statuscalls.c:308
+#: src/util/os/statuscalls.c:356 src/util/os/statuscalls.c:365
 #, fuzzy, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -2466,66 +2474,66 @@
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:121
+#: src/util/error/error.c:125
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:233
+#: src/util/error/error.c:193 src/util/error/error.c:237
 msgid "DEBUG"
 msgstr "TÌMLỖI"
 
-#: src/util/error/error.c:192 src/util/error/error.c:235
+#: src/util/error/error.c:196 src/util/error/error.c:239
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:239
+#: src/util/error/error.c:199 src/util/error/error.c:243
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/error/error.c:198 src/util/error/error.c:241
+#: src/util/error/error.c:202 src/util/error/error.c:245
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/error/error.c:201 src/util/error/error.c:243
+#: src/util/error/error.c:205 src/util/error/error.c:247
 msgid "FATAL"
 msgstr "LỖI NẶNG"
 
-#: src/util/error/error.c:204 src/util/error/error.c:245
+#: src/util/error/error.c:208 src/util/error/error.c:249
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:247
+#: src/util/error/error.c:211 src/util/error/error.c:251
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:210 src/util/error/error.c:249
+#: src/util/error/error.c:214 src/util/error/error.c:253
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:213 src/util/error/error.c:251
+#: src/util/error/error.c:217 src/util/error/error.c:255
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:216 src/util/error/error.c:253
+#: src/util/error/error.c:220 src/util/error/error.c:257
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:219 src/util/error/error.c:255
+#: src/util/error/error.c:223 src/util/error/error.c:259
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:222
+#: src/util/error/error.c:226
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:237
+#: src/util/error/error.c:241
 msgid "INFO"
 msgstr "THÔNGTIN"
 
-#: src/util/error/error.c:256
+#: src/util/error/error.c:260
 msgid "NOTHING"
 msgstr "KHÔNGCÓGÌ"
 
@@ -2690,12 +2698,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
+#: src/util/network_client/tcpio.c:257 src/util/network_client/tcpio.c:287
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:428
+#: src/util/network_client/tcpio.c:443
 #, fuzzy, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "'%s' thất bại, câu trả lời sai!\n"

Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c      2006-12-22 02:18:52 UTC 
(rev 4008)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c      2006-12-22 02:32:32 UTC 
(rev 4009)
@@ -393,7 +393,7 @@
     ECRS_freeUri(upURI);
 
 #if START_DAEMON
-  GE_ASSERT(NULL, OK == os_daemon_stop(NULL, daemon));
+  GE_BREAK(NULL, OK == os_daemon_stop(NULL, daemon));
 #endif
   GC_free(cfg);
   return (ok == YES) ? 0 : 1;

Modified: GNUnet/src/applications/fs/fsui/serializetest3.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest3.c    2006-12-22 02:18:52 UTC 
(rev 4008)
+++ GNUnet/src/applications/fs/fsui/serializetest3.c    2006-12-22 02:32:32 UTC 
(rev 4009)
@@ -111,6 +111,7 @@
   case FSUI_search_started:
   case FSUI_search_aborted:
   case FSUI_search_stopped:
+  case FSUI_search_completed:
   case FSUI_unindex_started:
   case FSUI_unindex_stopped:
     break;
@@ -227,8 +228,8 @@
     ECRS_freeUri(uri);
 
 #if START_DAEMON
-  GE_ASSERT(NULL,
-           OK == os_daemon_stop(NULL, daemon));
+  GE_BREAK(NULL,
+          OK == os_daemon_stop(NULL, daemon));
 #endif
   GC_free(cfg);
   if (have_error)

Modified: GNUnet/src/applications/fs/fsui/serializetest4.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest4.c    2006-12-22 02:18:52 UTC 
(rev 4008)
+++ GNUnet/src/applications/fs/fsui/serializetest4.c    2006-12-22 02:32:32 UTC 
(rev 4009)
@@ -429,7 +429,7 @@
     ECRS_freeUri(upURI);
 
 #if START_DAEMON
-  GE_ASSERT(NULL, OK == os_daemon_stop(NULL, daemon));
+  GE_BREAK(NULL, OK == os_daemon_stop(NULL, daemon));
 #endif
   GC_free(cfg);
   if (have_error)
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r4009 - in GNUnet: . doc po src/applications/fs/fsui, grothoff <=
Prev by Date: [GNUnet-SVN] r4008 - GNUnet/src/util/network_client
Next by Date: [GNUnet-SVN] r4010 - GNUnet-docs/WWW/news
Previous by thread: [GNUnet-SVN] r4008 - GNUnet/src/util/network_client
Next by thread: [GNUnet-SVN] r4010 - GNUnet-docs/WWW/news
Index(es):
- Date
- Thread