[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r946 - GNUnet GNUnet/contrib GNUnet/m4 GNUnet/po GNUnet/src
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r946 - GNUnet GNUnet/contrib GNUnet/m4 GNUnet/po GNUnet/src/applications/advertising GNUnet/src/applications/fs/ecrs GNUnet/src/applications/fs/fsui GNUnet/src/applications/fs/module GNUnet/src/applications/fs/tools GNUnet/src/applications/traffic GNUnet/src/util GNUnet-docs/WWW/papers gnunet-gtk gnunet-gtk/doc gnunet-gtk/m4 gnunet-gtk/po gnunet-gtk/src |
|
Date: |
Wed, 15 Jun 2005 10:19:04 -0700 (PDT) |
Author: grothoff
Date: 2005-06-15 10:15:15 -0700 (Wed, 15 Jun 2005)
New Revision: 946
Added:
GNUnet-docs/WWW/papers/secureindex.pdf
Modified:
GNUnet/INSTALL
GNUnet/configure.ac
GNUnet/contrib/Makefile.am
GNUnet/m4/Makefile.in
GNUnet/mkinstalldirs
GNUnet/po/GNUnet.pot
GNUnet/po/POTFILES.in
GNUnet/po/de.po
GNUnet/po/rw.po
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/fs/ecrs/meta.c
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/fs/tools/gnunet-download.c
GNUnet/src/applications/traffic/traffic.c
GNUnet/src/util/logging.c
GNUnet/todo
gnunet-gtk/INSTALL
gnunet-gtk/TODO
gnunet-gtk/configure.ac
gnunet-gtk/doc/Makefile.am
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/m4/codeset.m4
gnunet-gtk/m4/gettext.m4
gnunet-gtk/m4/glibc21.m4
gnunet-gtk/m4/iconv.m4
gnunet-gtk/m4/intdiv0.m4
gnunet-gtk/m4/intmax.m4
gnunet-gtk/m4/inttypes-pri.m4
gnunet-gtk/m4/inttypes.m4
gnunet-gtk/m4/inttypes_h.m4
gnunet-gtk/m4/lcmessage.m4
gnunet-gtk/m4/lib-ld.m4
gnunet-gtk/m4/lib-link.m4
gnunet-gtk/m4/lib-prefix.m4
gnunet-gtk/m4/longdouble.m4
gnunet-gtk/m4/longlong.m4
gnunet-gtk/m4/nls.m4
gnunet-gtk/m4/po.m4
gnunet-gtk/m4/printf-posix.m4
gnunet-gtk/m4/progtest.m4
gnunet-gtk/m4/signed.m4
gnunet-gtk/m4/size_max.m4
gnunet-gtk/m4/stdint_h.m4
gnunet-gtk/m4/uintmax_t.m4
gnunet-gtk/m4/ulonglong.m4
gnunet-gtk/m4/wchar_t.m4
gnunet-gtk/m4/wint_t.m4
gnunet-gtk/m4/xsize.m4
gnunet-gtk/mkinstalldirs
gnunet-gtk/po/Makefile.in
gnunet-gtk/po/POTFILES
gnunet-gtk/po/POTFILES.in
gnunet-gtk/po/gnunet-gtk.pot
gnunet-gtk/src/download.c
gnunet-gtk/src/download.h
gnunet-gtk/src/fs.c
Log:
update
Modified: GNUnet/INSTALL
===================================================================
--- GNUnet/INSTALL 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/INSTALL 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,16 +1,13 @@
-Installation Instructions
-*************************
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+ These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -70,9 +67,9 @@
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -85,7 +82,7 @@
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
@@ -102,19 +99,19 @@
Installation Names
==================
-By default, `make install' will install the package's files in
+ By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
+options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -125,7 +122,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -140,11 +137,11 @@
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -170,9 +167,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +178,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -189,18 +186,14 @@
./configure CC=/usr/local2/bin/gcc
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/configure.ac 2005-06-15 17:15:15 UTC (rev 946)
@@ -21,8 +21,8 @@
#
#
AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.7.0pre2-svn],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.7.0pre2-svn])
+AC_INIT([GNUnet], [0.7.0pre3],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.7.0pre3])
AM_CONFIG_HEADER([config.h])
AH_TOP([#define _GNU_SOURCE 1])
Modified: GNUnet/contrib/Makefile.am
===================================================================
--- GNUnet/contrib/Makefile.am 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/contrib/Makefile.am 2005-06-15 17:15:15 UTC (rev 946)
@@ -18,4 +18,5 @@
junkinsert.sh \
junklookup.sh \
namespacehelper.sh \
- report.sh
+ report.sh \
+ $(pkgdata_DATA)
Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/m4/Makefile.in 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,7 +33,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
subdir = m4
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
@@ -184,8 +183,6 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -352,7 +349,7 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
Modified: GNUnet/mkinstalldirs
===================================================================
--- GNUnet/mkinstalldirs 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/mkinstalldirs 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2005-02-02.21
+scriptversion=2004-02-15.20
# Original author: Noah Friedman <address@hidden>
# Created: 1993-05-16
@@ -27,7 +27,7 @@
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
- exit $?
+ exit 0
;;
-m) # -m PERM arg
shift
@@ -37,7 +37,7 @@
;;
--version)
echo "$0 $scriptversion"
- exit $?
+ exit 0
;;
--) # stop option processing
shift
Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/po/GNUnet.pot 2005-06-15 17:15:15 UTC (rev 946)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-05-30 22:55-0500\n"
+"POT-Creation-Date: 2005-06-14 18:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -66,8 +66,8 @@
msgid "Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/http.c:1143 src/transports/tcp.c:1092 src/util/tcpio.c:165
-#: src/util/tcpio.c:195
+#: src/transports/http.c:1143 src/transports/tcp.c:1092 src/util/tcpio.c:166
+#: src/util/tcpio.c:196
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr ""
@@ -246,163 +246,155 @@
msgid "Error: can't delete service: %s\n"
msgstr ""
-#: src/conf/gconf_interface.c:123
+#: src/conf/gconf_interface.c:135
msgid "Gtk GNUnet Configurator"
msgstr ""
-#: src/conf/gconf_interface.c:134
+#: src/conf/gconf_interface.c:146
msgid "_File"
msgstr ""
-#: src/conf/gconf_interface.c:141
+#: src/conf/gconf_interface.c:153
msgid "_Load"
msgstr ""
-#: src/conf/gconf_interface.c:144 src/conf/gconf_interface.c:306
+#: src/conf/gconf_interface.c:156 src/conf/gconf_interface.c:323
msgid "Load a config file"
msgstr ""
-#: src/conf/gconf_interface.c:152
+#: src/conf/gconf_interface.c:164
msgid "_Save"
msgstr ""
-#: src/conf/gconf_interface.c:155
+#: src/conf/gconf_interface.c:167
msgid "Save the config in .config"
msgstr ""
-#: src/conf/gconf_interface.c:164
-msgid "Save _as"
-msgstr ""
-
-#: src/conf/gconf_interface.c:167
-msgid "Save the config in a file"
-msgstr ""
-
-#: src/conf/gconf_interface.c:179
+#: src/conf/gconf_interface.c:181
msgid "_Quit"
msgstr ""
-#: src/conf/gconf_interface.c:189
+#: src/conf/gconf_interface.c:191
msgid "_Options"
msgstr ""
-#: src/conf/gconf_interface.c:196
+#: src/conf/gconf_interface.c:198
msgid "Show _name"
msgstr ""
-#: src/conf/gconf_interface.c:199
+#: src/conf/gconf_interface.c:201
msgid "Show name"
msgstr ""
-#: src/conf/gconf_interface.c:201
+#: src/conf/gconf_interface.c:203
msgid "Show _range"
msgstr ""
-#: src/conf/gconf_interface.c:204
+#: src/conf/gconf_interface.c:206
msgid "Show range (Y/M/N)"
msgstr ""
-#: src/conf/gconf_interface.c:206
+#: src/conf/gconf_interface.c:208
msgid "Show _data"
msgstr ""
-#: src/conf/gconf_interface.c:209
+#: src/conf/gconf_interface.c:211
msgid "Show value of the option"
msgstr ""
-#: src/conf/gconf_interface.c:218
+#: src/conf/gconf_interface.c:220
msgid "Show all _options"
msgstr ""
-#: src/conf/gconf_interface.c:221
+#: src/conf/gconf_interface.c:223
msgid "Show all options"
msgstr ""
-#: src/conf/gconf_interface.c:225
+#: src/conf/gconf_interface.c:227
msgid "Show _debug info"
msgstr ""
-#: src/conf/gconf_interface.c:228
+#: src/conf/gconf_interface.c:230
msgid "Show masked options"
msgstr ""
-#: src/conf/gconf_interface.c:231
+#: src/conf/gconf_interface.c:233
msgid "_Help"
msgstr ""
-#: src/conf/gconf_interface.c:238
+#: src/conf/gconf_interface.c:240
msgid "_Introduction"
msgstr ""
-#: src/conf/gconf_interface.c:250
+#: src/conf/gconf_interface.c:252
msgid "_About"
msgstr ""
-#: src/conf/gconf_interface.c:260
+#: src/conf/gconf_interface.c:262
msgid "_License"
msgstr ""
-#: src/conf/gconf_interface.c:280
+#: src/conf/gconf_interface.c:289
msgid "Goes up of one level (single view)"
msgstr ""
-#: src/conf/gconf_interface.c:295
+#: src/conf/gconf_interface.c:303
msgid "Up"
msgstr ""
-#: src/conf/gconf_interface.c:321
+#: src/conf/gconf_interface.c:337
msgid "Load"
msgstr ""
-#: src/conf/gconf_interface.c:328
+#: src/conf/gconf_interface.c:349
msgid "Save a config file"
msgstr ""
-#: src/conf/gconf_interface.c:343
+#: src/conf/gconf_interface.c:363
msgid "Save"
msgstr ""
-#: src/conf/gconf_interface.c:354
+#: src/conf/gconf_interface.c:383
msgid "Single view"
msgstr ""
-#: src/conf/gconf_interface.c:370
+#: src/conf/gconf_interface.c:398
msgid "Single"
msgstr ""
-#: src/conf/gconf_interface.c:376
+#: src/conf/gconf_interface.c:410
msgid "Split view"
msgstr ""
-#: src/conf/gconf_interface.c:393
+#: src/conf/gconf_interface.c:425
msgid "Split"
msgstr ""
-#: src/conf/gconf_interface.c:399
+#: src/conf/gconf_interface.c:437
msgid "Full view"
msgstr ""
-#: src/conf/gconf_interface.c:416
+#: src/conf/gconf_interface.c:452
msgid "Full"
msgstr ""
-#: src/conf/gconf_interface.c:427
+#: src/conf/gconf_interface.c:473
msgid "Collapse the whole tree in the right frame"
msgstr ""
-#: src/conf/gconf_interface.c:443
+#: src/conf/gconf_interface.c:488
msgid "Collapse"
msgstr ""
-#: src/conf/gconf_interface.c:450
+#: src/conf/gconf_interface.c:501
msgid "Expand the whole tree in the right frame"
msgstr ""
-#: src/conf/gconf_interface.c:466
+#: src/conf/gconf_interface.c:515
msgid "Expand"
msgstr ""
-#: src/conf/gconf_interface.c:520
+#: src/conf/gconf_interface.c:569
msgid "Sorry, no help available for this option yet."
msgstr ""
@@ -412,7 +404,7 @@
msgid "GNUnet configuration assistant"
msgstr ""
-#: src/conf/wizard_interface.c:77 src/conf/wizard_curs.c:93
+#: src/conf/wizard_interface.c:77 src/conf/wizard_curs.c:74
msgid ""
"Welcome to GNUnet!\n"
"\n"
@@ -430,13 +422,13 @@
msgstr ""
#: src/conf/wizard_interface.c:106 src/conf/wizard_interface.c:332
-#: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1286
+#: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1284
msgid "Next"
msgstr ""
#: src/conf/wizard_interface.c:127 src/conf/wizard_interface.c:353
#: src/conf/wizard_interface.c:672 src/conf/wizard_interface.c:929
-#: src/conf/wizard_interface.c:1307
+#: src/conf/wizard_interface.c:1305
msgid "Cancel"
msgstr ""
@@ -480,7 +472,7 @@
msgstr ""
#: src/conf/wizard_interface.c:311 src/conf/wizard_interface.c:630
-#: src/conf/wizard_interface.c:887 src/conf/wizard_interface.c:1265
+#: src/conf/wizard_interface.c:887 src/conf/wizard_interface.c:1263
msgid "Back"
msgstr ""
@@ -565,7 +557,7 @@
msgid "Open the enhanced configurator"
msgstr ""
-#: src/conf/wizard_interface.c:861 src/conf/wizard_interface.c:1239
+#: src/conf/wizard_interface.c:861 src/conf/wizard_interface.c:1237
msgid "Other settings"
msgstr ""
@@ -589,11 +581,10 @@
msgid "No"
msgstr ""
-#: src/conf/wizard_interface.c:1075 src/conf/wizard_util.c:165
-#: src/conf/wizard_util.c:173 src/conf/wizard_util.c:176
-#: src/conf/wizard_util.c:190 src/conf/wizard_util.c:218
-#: src/conf/wizard_util.c:224 src/conf/wizard_util.c:359
-#: src/conf/wizard_util.c:377
+#: src/conf/wizard_interface.c:1075 src/conf/wizard_util.c:195
+#: src/conf/wizard_util.c:210 src/conf/wizard_util.c:238
+#: src/conf/wizard_util.c:244 src/conf/wizard_util.c:383
+#: src/conf/wizard_util.c:401
msgid "Error"
msgstr ""
@@ -612,16 +603,19 @@
"For security reasons, it is a good idea to let this setup create a new user "
"account and a new group under which the GNUnet service is started at system "
"startup.\n"
-"You can also specify existing ones.\n"
-"In any case, you should check its permissions to critical files on your "
-"system."
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
msgstr ""
#: src/conf/wizard_interface.c:1209
msgid "Group:"
msgstr ""
-#: src/conf/wizard_interface.c:1231
+#: src/conf/wizard_interface.c:1229
msgid "User account:"
msgstr ""
@@ -630,44 +624,44 @@
msgid "Couldn't find pixmap file: %s"
msgstr ""
-#: src/conf/wizard_curs.c:92 src/conf/wizard_curs.c:106
-#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:194
-#: src/conf/wizard_curs.c:219 src/conf/wizard_curs.c:251
-#: src/conf/wizard_curs.c:276 src/conf/wizard_curs.c:307
-#: src/conf/wizard_curs.c:329 src/conf/wizard_curs.c:357
-#: src/conf/wizard_curs.c:379 src/conf/wizard_curs.c:401
-#: src/conf/wizard_curs.c:428 src/conf/wizard_curs.c:458
-#: src/conf/wizard_curs.c:486
+#: src/conf/wizard_curs.c:73 src/conf/wizard_curs.c:87
+#: src/conf/wizard_curs.c:148 src/conf/wizard_curs.c:175
+#: src/conf/wizard_curs.c:200 src/conf/wizard_curs.c:232
+#: src/conf/wizard_curs.c:257 src/conf/wizard_curs.c:288
+#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:338
+#: src/conf/wizard_curs.c:360 src/conf/wizard_curs.c:382
+#: src/conf/wizard_curs.c:410 src/conf/wizard_curs.c:440
+#: src/conf/wizard_curs.c:475
msgid "GNUnet configuration"
msgstr ""
-#: src/conf/wizard_curs.c:107
+#: src/conf/wizard_curs.c:88
msgid ""
"Choose the network interface that connects your computer to the internet "
"from the list below."
msgstr ""
-#: src/conf/wizard_curs.c:113 src/conf/wizard_curs.c:173
-#: src/conf/wizard_curs.c:224 src/conf/wizard_curs.c:256
-#: src/conf/wizard_curs.c:312
+#: src/conf/wizard_curs.c:94 src/conf/wizard_curs.c:154
+#: src/conf/wizard_curs.c:205 src/conf/wizard_curs.c:237
+#: src/conf/wizard_curs.c:293
msgid "Help"
msgstr ""
-#: src/conf/wizard_curs.c:113
+#: src/conf/wizard_curs.c:94
msgid ""
"The \"Network interface\" is the device that connects your computer to the "
"internet. This is usually a modem, an ISDN card or a network card in case "
"you are using DSL."
msgstr ""
-#: src/conf/wizard_curs.c:167
+#: src/conf/wizard_curs.c:148
msgid ""
"What is this computer's public IP adress or hostname?\n"
"\n"
"If in doubt, leave this empty."
msgstr ""
-#: src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:154
msgid ""
"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -678,7 +672,7 @@
"IP-Address."
msgstr ""
-#: src/conf/wizard_curs.c:194
+#: src/conf/wizard_curs.c:175
msgid ""
"Is this machine behind NAT?\n"
"\n"
@@ -689,11 +683,11 @@
"forwarding\")."
msgstr ""
-#: src/conf/wizard_curs.c:219
+#: src/conf/wizard_curs.c:200
msgid "How much upstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:224
+#: src/conf/wizard_curs.c:205
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
@@ -704,11 +698,11 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:251
+#: src/conf/wizard_curs.c:232
msgid "How much downstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:256
+#: src/conf/wizard_curs.c:237
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
@@ -719,7 +713,7 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:276
+#: src/conf/wizard_curs.c:257
msgid ""
"Share denoted bandwidth with other applications?\n"
"\n"
@@ -732,18 +726,18 @@
"connection whenever your high-speed LAN gets used (e.g. by NFS)."
msgstr ""
-#: src/conf/wizard_curs.c:307
+#: src/conf/wizard_curs.c:288
msgid "How much CPU (in %) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:312
+#: src/conf/wizard_curs.c:293
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
"This is the percentage of processor time GNUnet is allowed to use."
msgstr ""
-#: src/conf/wizard_curs.c:329
+#: src/conf/wizard_curs.c:310
msgid ""
"Store migrated content?\n"
"\n"
@@ -756,7 +750,7 @@
"availability."
msgstr ""
-#: src/conf/wizard_curs.c:357
+#: src/conf/wizard_curs.c:338
msgid ""
"What's the maximum datastore size in MB?\n"
"\n"
@@ -764,7 +758,7 @@
"inserted and migrated content)."
msgstr ""
-#: src/conf/wizard_curs.c:379
+#: src/conf/wizard_curs.c:360
msgid ""
"Do you want to launch GNUnet as a system service?\n"
"\n"
@@ -773,22 +767,23 @@
"launch GNUnet yourself each time you want to use it."
msgstr ""
-#: src/conf/wizard_curs.c:402
+#: src/conf/wizard_curs.c:383
msgid ""
"Define the user owning the GNUnet service.\n"
"\n"
"For security reasons, it is a good idea to let this setup create a new user "
"account under which the GNUnet service is started at system startup.\n"
"\n"
-"You can also specify an already existant user account here.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
"\n"
-"In any case, you should check its permissions to critical files on your "
-"system.\n"
+"Leave the fields empty to run GNUnet with system privileges.\n"
"\n"
"GNUnet user:"
msgstr ""
-#: src/conf/wizard_curs.c:429
+#: src/conf/wizard_curs.c:411
msgid ""
"Define the group owning the GNUnet service.\n"
"\n"
@@ -803,7 +798,7 @@
"GNUnet group:"
msgstr ""
-#: src/conf/wizard_curs.c:458
+#: src/conf/wizard_curs.c:440
msgid ""
"If you are an experienced user, you may want to tweak your GNUnet "
"installation using the enhanced configurator.\n"
@@ -811,60 +806,58 @@
"Do you want to start it after saving your configuration?"
msgstr ""
-#: src/conf/wizard_curs.c:487
+#: src/conf/wizard_curs.c:476
msgid ""
"Cannot save configuration.\n"
"\n"
"Try again?"
msgstr ""
-#: src/conf/wizard_util.c:162
-#, c-format
-msgid "Error: can't open Service Control Manager: %s (%i)\n"
+#: src/conf/wizard_util.c:164 src/conf/wizard_util.c:226
+msgid "Can't open Service Control Manager"
msgstr ""
#: src/conf/wizard_util.c:170
-#, c-format
-msgid "Error: can't create service: %s (#%i)\n"
+msgid "Can't create service"
msgstr ""
-#: src/conf/wizard_util.c:176 src/conf/wizard_util.c:218
+#: src/conf/wizard_util.c:175 src/conf/wizard_util.c:238
msgid "Unknown error"
msgstr ""
-#: src/conf/wizard_util.c:189
-msgid "Cannot write to the regisitry"
+#: src/conf/wizard_util.c:188
+msgid "Error changing the permissions of the GNUnet directory"
msgstr ""
-#: src/conf/wizard_util.c:206
-msgid "Can't open Service Control Manager"
+#: src/conf/wizard_util.c:209
+msgid "Cannot write to the regisitry"
msgstr ""
-#: src/conf/wizard_util.c:210
+#: src/conf/wizard_util.c:230
msgid "Can't access the service"
msgstr ""
-#: src/conf/wizard_util.c:214
+#: src/conf/wizard_util.c:234
msgid "Can't delete the service"
msgstr ""
-#: src/conf/wizard_util.c:358
+#: src/conf/wizard_util.c:382
msgid "This version of Windows does not support multiple users."
msgstr ""
-#: src/conf/wizard_util.c:362
+#: src/conf/wizard_util.c:386
msgid "Error creating user"
msgstr ""
-#: src/conf/wizard_util.c:365
+#: src/conf/wizard_util.c:389
msgid "Error accessing local security policy"
msgstr ""
-#: src/conf/wizard_util.c:368
+#: src/conf/wizard_util.c:392
msgid "Error granting service right to user"
msgstr ""
-#: src/conf/wizard_util.c:371
+#: src/conf/wizard_util.c:395
msgid "Unknown error while creating a new user"
msgstr ""
@@ -938,8 +931,8 @@
#: src/applications/tracekit/gnunet-tracekit.c:87
#: src/applications/tracekit/gnunet-tracekit.c:122
#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-insert.c:280
-#: src/applications/fs/tools/gnunet-insert.c:396
+#: src/applications/fs/tools/gnunet-insert.c:283
+#: src/applications/fs/tools/gnunet-insert.c:399
#: src/applications/fs/tools/gnunet-search.c:156
#: src/applications/fs/tools/gnunet-search.c:172
#: src/applications/fs/tools/gnunet-search.c:193
@@ -963,7 +956,7 @@
#: src/applications/fs/tools/gnunet-pseudonym.c:192
#: src/applications/fs/tools/gnunet-delete.c:111
#: src/applications/fs/tools/gnunet-directory.c:177
-#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:470
#: src/applications/fs/tools/gnunet-search.c:210
#: src/applications/fs/tools/gnunet-download.c:125
#: src/applications/fs/tools/gnunet-unindex.c:139
@@ -1352,8 +1345,8 @@
#: src/applications/sqstore_mysql/mysql.c:924 src/util/symcipher_gcrypt.c:47
#: src/util/symcipher_gcrypt.c:54 src/util/hostkey_gcrypt.c:56
#: src/util/hostkey_gcrypt.c:63 src/util/storage.c:613
-#: src/include/gnunet_util.h:973 src/include/gnunet_util.h:980
-#: src/include/gnunet_util.h:982
+#: src/include/gnunet_util.h:980 src/include/gnunet_util.h:987
+#: src/include/gnunet_util.h:989
#, c-format
msgid "'%s' failed at %s:%d with error: %s\n"
msgstr ""
@@ -2047,27 +2040,27 @@
msgid "# p2p trace replies sent"
msgstr ""
-#: src/applications/gap/gap.c:1856
+#: src/applications/gap/gap.c:1863
msgid ""
"Cover traffic requested but traffic service not loaded. Rejecting request.\n"
msgstr ""
-#: src/applications/gap/gap.c:1867 src/applications/fs/module/fs.c:667
+#: src/applications/gap/gap.c:1874 src/applications/fs/module/fs.c:669
msgid "Failed to get traffic stats.\n"
msgstr ""
-#: src/applications/gap/gap.c:1873 src/applications/gap/gap.c:1878
-#: src/applications/gap/gap.c:1884
+#: src/applications/gap/gap.c:1880 src/applications/gap/gap.c:1885
+#: src/applications/gap/gap.c:1891
msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
msgstr ""
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2102
msgid ""
"Traffic service failed to load; gap cannot ensure cover-traffic "
"availability.\n"
msgstr ""
-#: src/applications/gap/gap.c:2126
+#: src/applications/gap/gap.c:2133
#, c-format
msgid "'%s' registering handlers %d %d\n"
msgstr ""
@@ -2312,139 +2305,139 @@
msgid "File '%s' has URI: %s\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:160
+#: src/applications/fs/tools/gnunet-insert.c:161
#, c-format
msgid ""
"\n"
"Error uploading file: %s\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
msgid "set the desired LEVEL of sender-anonymity"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:181
+#: src/applications/fs/tools/gnunet-insert.c:183
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:184
+#: src/applications/fs/tools/gnunet-insert.c:186
msgid ""
"print list of extracted keywords that would be used, but do not perform "
"upload"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:188
+#: src/applications/fs/tools/gnunet-insert.c:190
msgid ""
"set interval for availability of updates to SECONDS (for namespace "
"insertions only)"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:191
+#: src/applications/fs/tools/gnunet-insert.c:193
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:194
+#: src/applications/fs/tools/gnunet-insert.c:196
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:198
+#: src/applications/fs/tools/gnunet-insert.c:200
msgid "set the meta-data for the given TYPE to the given VALUE"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:200
+#: src/applications/fs/tools/gnunet-insert.c:202
msgid ""
"do not index, perform full insertion (stores entire file in encrypted form "
"in GNUnet database)"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:203
+#: src/applications/fs/tools/gnunet-insert.c:205
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:206
+#: src/applications/fs/tools/gnunet-insert.c:208
msgid "specify the priority of the content"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:208
+#: src/applications/fs/tools/gnunet-insert.c:210
msgid "publish the files under the pseudonym NAME (place file into namespace)"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:210
+#: src/applications/fs/tools/gnunet-insert.c:212
msgid "process directories recursively"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:214
msgid ""
"specifies this as an aperiodic but updated publication (for namespace "
"insertions only)"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:215
+#: src/applications/fs/tools/gnunet-insert.c:217
msgid ""
"set the ID of this version of the publication (for namespace insertions only)"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:220
msgid "specify creation time for SBlock (see man-page for format)"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:220
+#: src/applications/fs/tools/gnunet-insert.c:222
msgid "ID of the previous version of the content (for namespace update only)"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:227
+#: src/applications/fs/tools/gnunet-insert.c:229
msgid "Make files available to GNUnet for sharing."
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:304
+#: src/applications/fs/tools/gnunet-insert.c:307
#, c-format
msgid "You must pass a positive number to the '%s' option.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:475
#: src/applications/fs/tools/gnunet-unindex.c:144
#, c-format
msgid "You must specify a list of files to insert.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:491
+#: src/applications/fs/tools/gnunet-insert.c:479
#, c-format
-msgid "Keywords for file '%s':\n"
+msgid "Only one file or directory can be specified at a time.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:501
+#: src/applications/fs/tools/gnunet-insert.c:483
#, c-format
-msgid "Only one file or directory can be specified at a time.\n"
+msgid "You must specify a file or directory to upload.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:505
+#: src/applications/fs/tools/gnunet-insert.c:532
#, c-format
-msgid "You must specify a file or directory to upload.\n"
+msgid "Keywords for file '%s':\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:548
+#: src/applications/fs/tools/gnunet-insert.c:554
#, c-format
msgid "Could not access namespace '%s' (does not exist?).\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:563
+#: src/applications/fs/tools/gnunet-insert.c:569
#, c-format
msgid "Parsing time failed. Use '%s' format.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:572
-#: src/applications/fs/tools/gnunet-insert.c:576
-#: src/applications/fs/tools/gnunet-insert.c:580
-#: src/applications/fs/tools/gnunet-insert.c:584
-#: src/applications/fs/tools/gnunet-insert.c:589
+#: src/applications/fs/tools/gnunet-insert.c:578
+#: src/applications/fs/tools/gnunet-insert.c:582
+#: src/applications/fs/tools/gnunet-insert.c:586
+#: src/applications/fs/tools/gnunet-insert.c:590
+#: src/applications/fs/tools/gnunet-insert.c:595
#, c-format
msgid "Option '%s' makes no sense without option '%s'.\n"
msgstr ""
@@ -2505,27 +2498,31 @@
#: src/applications/fs/tools/gnunet-download.c:156
#, c-format
-msgid "Download at %16llu out of %16llu bytes (%8.3f kbps)"
+msgid "Download of file '%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-download.c:166
+#: src/applications/fs/tools/gnunet-download.c:168
+#: src/applications/fs/tools/gnunet-download.c:179
#, c-format
msgid "Error downloading: %s\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-download.c:172
+#: src/applications/fs/tools/gnunet-download.c:187
#, c-format
-msgid ""
-"\n"
-"Download of file '%s' comlete. Speed was %8.3f kilobyte per second.\n"
+msgid "Download of file '%s' complete. Speed was %8.3f kilobyte per second.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-download.c:215
+#: src/applications/fs/tools/gnunet-download.c:198
#, c-format
+msgid "Recursive download of directory '%s' at %llu of %llu bytes.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-download.c:236
+#, c-format
msgid "URI '%s' invalid for gnunet-download.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-download.c:266
+#: src/applications/fs/tools/gnunet-download.c:287
#, c-format
msgid "File stored as '%s'.\n"
msgstr ""
@@ -2572,12 +2569,12 @@
"s' under '%s'."
msgstr ""
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:327
#, c-format
msgid "Indexed file disappeared, deleting block for query '%s'\n"
msgstr ""
-#: src/applications/fs/module/ondemand.c:404
+#: src/applications/fs/module/ondemand.c:408
#, c-format
msgid ""
"Because the file '%s' has been unavailable for 3 days it got removed from "
@@ -2585,27 +2582,27 @@
"contains invalid references!"
msgstr ""
-#: src/applications/fs/module/ondemand.c:430
+#: src/applications/fs/module/ondemand.c:434
#, 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:621
+#: src/applications/fs/module/ondemand.c:625
#, c-format
msgid ""
"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:980
+#: src/applications/fs/module/fs.c:998
#, c-format
msgid ""
"You must specify a postive number for '%s' in the configuration in section '%"
"s'.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1019
+#: src/applications/fs/module/fs.c:1039
#, c-format
msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr ""
@@ -2619,15 +2616,15 @@
msgid "AND"
msgstr ""
-#: src/applications/fs/fsui/upload.c:336 src/applications/fs/fsui/upload.c:366
+#: src/applications/fs/fsui/upload.c:349 src/applications/fs/fsui/upload.c:388
msgid "Upload failed.\n"
msgstr ""
-#: src/applications/fs/fsui/upload.c:370
+#: src/applications/fs/fsui/upload.c:395
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
-#: src/applications/fs/fsui/fsui.c:509
+#: src/applications/fs/fsui/fsui.c:542
#, c-format
msgid "FSUI state file '%s' had syntax error at offset %u.\n"
msgstr ""
@@ -2642,10 +2639,14 @@
"schedule.\n"
msgstr ""
-#: src/applications/fs/fsui/download.c:192
+#: src/applications/fs/fsui/download.c:239
msgid "Download aborted."
msgstr ""
+#: src/applications/fs/fsui/download.c:242
+msgid "ECRS download failed (see logs)."
+msgstr ""
+
#: src/applications/fs/fsui/file_info.c:73
msgid "Collecting file identifiers disabled.\n"
msgstr ""
@@ -2662,17 +2663,39 @@
msgid "LOC URI not allowed for search.\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:884
+#: src/applications/fs/ecrs/download.c:889
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:1049
+#: src/applications/fs/ecrs/download.c:1054
#, c-format
msgid "Content '%s' seems to be not available on the network.\n"
msgstr ""
+#: src/applications/fs/ecrs/upload.c:180
+#, c-format
+msgid "Cannot hash '%s'.\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:198
+#, c-format
+msgid "Initialization for indexing file '%s' failed.\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:204
+#, c-format
+msgid ""
+"Indexing file '%s' failed. Check file permissions and consult your GNUnet "
+"server's logs.\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:287
+#, c-format
+msgid "Indexing data failed at position %i.\n"
+msgstr ""
+
#: src/applications/fs/ecrs/meta.c:772
#, c-format
msgid "Renaming of file '%s' to '%s' failed: %s\n"
@@ -2683,7 +2706,7 @@
msgid "Could not rename file '%s' to '%s': file exists\n"
msgstr ""
-#: src/applications/fs/ecrs/namespace.c:45 src/util/state.c:81
+#: src/applications/fs/ecrs/namespace.c:45
#, c-format
msgid ""
"Configuration file must specify a directory for GNUnet to store per-peer "
@@ -2783,12 +2806,12 @@
msgid "Could not resolve name of HTTP proxy '%s'. Trying without a proxy.\n"
msgstr ""
-#: src/applications/traffic/traffic.c:443
+#: src/applications/traffic/traffic.c:445
#, c-format
msgid "# bytes transmitted of type %d"
msgstr ""
-#: src/applications/traffic/traffic.c:463
+#: src/applications/traffic/traffic.c:465
#, c-format
msgid "# bytes received of type %d"
msgstr ""
@@ -3108,7 +3131,7 @@
"entry '%s': %s\n"
msgstr ""
-#: src/server/tcpserver.c:797
+#: src/server/tcpserver.c:798
#, c-format
msgid "%s failed, message type %d already in use.\n"
msgstr ""
@@ -3360,29 +3383,29 @@
"Arguments mandatory for long options are also mandatory for short options.\n"
msgstr ""
-#: src/util/configuration.c:177
+#: src/util/configuration.c:180
#, c-format
msgid "inlining configration file '%s'\n"
msgstr ""
-#: src/util/configuration.c:181
+#: src/util/configuration.c:184
#, c-format
msgid "Could not parse configuration file '%s'.\n"
msgstr ""
-#: src/util/configuration.c:217
+#: src/util/configuration.c:220
#, c-format
msgid "Syntax error in configuration file '%s' at line %d.\n"
msgstr ""
-#: src/util/configuration.c:464
+#: src/util/configuration.c:471
#, c-format
msgid ""
"Configuration file '%s' not found. I will try to create the default "
"configuration file at that location.\n"
msgstr ""
-#: src/util/configuration.c:481
+#: src/util/configuration.c:488
#, c-format
msgid "Cannot open configuration file '%s'\n"
msgstr ""
@@ -3392,11 +3415,18 @@
msgid "libgcrypt has not the expected version (version %s is required).\n"
msgstr ""
-#: src/util/tcpio.c:86 src/util/identity.c:83 src/util/identity.c:123
+#: src/util/tcpio.c:87 src/util/identity.c:83 src/util/identity.c:123
#, c-format
msgid "Could not find IP of host '%s': %s\n"
msgstr ""
+#: src/util/state.c:86
+#, c-format
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
+msgstr ""
+
#: src/util/dso.c:41
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -3452,16 +3482,16 @@
msgid "EVERYTHING"
msgstr ""
-#: src/util/logging.c:239
+#: src/util/logging.c:248
msgid "LOGLEVEL not specified, that is not ok.\n"
msgstr ""
-#: src/util/logging.c:250
+#: src/util/logging.c:259
#, c-format
msgid "Invalid LOGLEVEL '%s' specified.\n"
msgstr ""
-#: src/util/logging.c:355 src/util/logging.c:361
+#: src/util/logging.c:364 src/util/logging.c:370
#, c-format
msgid "Failure at %s:%d.\n"
msgstr ""
@@ -3489,14 +3519,14 @@
"GNUnet will use %u.%u.%u.%u.\n"
msgstr ""
-#: src/util/identity.c:282
+#: src/util/identity.c:297
#, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgid "Could not resolve '%s' to determine our IP address: %s\n"
msgstr ""
-#: src/util/identity.c:300
+#: src/util/identity.c:322
#, c-format
-msgid "Could not resolve '%s' to determine our IP address: %s\n"
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
msgstr ""
#: src/util/identity.c:357 src/util/identity.c:399
@@ -3524,37 +3554,37 @@
"configuration file.\n"
msgstr ""
-#: src/include/gnunet_util.h:140
+#: src/include/gnunet_util.h:147
msgid "print this help"
msgstr ""
-#: src/include/gnunet_util.h:143
+#: src/include/gnunet_util.h:150
msgid "set verbosity to LEVEL"
msgstr ""
-#: src/include/gnunet_util.h:146
+#: src/include/gnunet_util.h:153
msgid "use configuration file FILENAME"
msgstr ""
-#: src/include/gnunet_util.h:149
+#: src/include/gnunet_util.h:156
msgid "specify host on which gnunetd is running"
msgstr ""
-#: src/include/gnunet_util.h:152
+#: src/include/gnunet_util.h:159
msgid "print the version number"
msgstr ""
-#: src/include/gnunet_util.h:155
+#: src/include/gnunet_util.h:162
msgid "be verbose"
msgstr ""
-#: src/include/gnunet_util.h:582 src/include/gnunet_util.h:584
+#: src/include/gnunet_util.h:589 src/include/gnunet_util.h:591
#, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr ""
-#: src/include/gnunet_util.h:989 src/include/gnunet_util.h:991
-#: src/include/gnunet_util.h:998
+#: src/include/gnunet_util.h:996 src/include/gnunet_util.h:998
+#: src/include/gnunet_util.h:1005
#, c-format
msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
msgstr ""
Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/po/POTFILES.in 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,4 +1,3 @@
-libltdl/ltdl.c
src/transports/udp6.c
src/transports/http.c
src/transports/nat.c
@@ -126,6 +125,7 @@
src/applications/fs/ecrs/namespace.c
src/applications/fs/ecrs/ecrstest.c
src/applications/fs/ecrs/ecrs.c
+src/applications/fs/ecrs/metatest2.c
src/applications/fs/ecrs_core.c
src/applications/topology_f2f/topology.c
src/applications/template/template.c
@@ -195,9 +195,7 @@
src/util/identity.c
src/util/generate_gnunetd_conf.c
src/util/generate_gnunet_conf.c
-config.h
-libltdl/ltdl.h
-libltdl/config.h
+src/util/string.c
src/include/gnunet_core.h
src/include/gnunet_dht.h
src/include/gnunet_dht_datastore_memory.h
Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/po/de.po 2005-06-15 17:15:15 UTC (rev 946)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-05-30 22:55-0500\n"
+"POT-Creation-Date: 2005-06-14 18:17-0500\n"
"PO-Revision-Date: 2005-05-11 21:35+0200\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -77,8 +77,8 @@
msgid "Could not determine my public IP address.\n"
msgstr "�ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/http.c:1143 src/transports/tcp.c:1092 src/util/tcpio.c:165
-#: src/util/tcpio.c:195
+#: src/transports/http.c:1143 src/transports/tcp.c:1092 src/util/tcpio.c:166
+#: src/util/tcpio.c:196
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -280,163 +280,155 @@
msgid "Error: can't delete service: %s\n"
msgstr "Fehler: Dienst konnte nicht gel�scht werden: %s\n"
-#: src/conf/gconf_interface.c:123
+#: src/conf/gconf_interface.c:135
msgid "Gtk GNUnet Configurator"
msgstr "Gtk GNUnet Konfigurator"
-#: src/conf/gconf_interface.c:134
+#: src/conf/gconf_interface.c:146
msgid "_File"
msgstr "_Datei"
-#: src/conf/gconf_interface.c:141
+#: src/conf/gconf_interface.c:153
msgid "_Load"
msgstr "_�ffnen"
-#: src/conf/gconf_interface.c:144 src/conf/gconf_interface.c:306
+#: src/conf/gconf_interface.c:156 src/conf/gconf_interface.c:323
msgid "Load a config file"
msgstr "Eine Konfigurationsdatei laden"
-#: src/conf/gconf_interface.c:152
+#: src/conf/gconf_interface.c:164
msgid "_Save"
msgstr "_Speichern"
-#: src/conf/gconf_interface.c:155
+#: src/conf/gconf_interface.c:167
msgid "Save the config in .config"
msgstr "Die Konfiguration in .config speichern"
-#: src/conf/gconf_interface.c:164
-msgid "Save _as"
-msgstr "Speichern _unter"
-
-#: src/conf/gconf_interface.c:167
-msgid "Save the config in a file"
-msgstr "Die Konfiguration in einer Datei speichern"
-
-#: src/conf/gconf_interface.c:179
+#: src/conf/gconf_interface.c:181
msgid "_Quit"
msgstr "_Beenden"
-#: src/conf/gconf_interface.c:189
+#: src/conf/gconf_interface.c:191
msgid "_Options"
msgstr "_Optionen"
-#: src/conf/gconf_interface.c:196
+#: src/conf/gconf_interface.c:198
msgid "Show _name"
msgstr "_Name anzeigen"
-#: src/conf/gconf_interface.c:199
+#: src/conf/gconf_interface.c:201
msgid "Show name"
msgstr "Name anzeigen"
-#: src/conf/gconf_interface.c:201
+#: src/conf/gconf_interface.c:203
msgid "Show _range"
msgstr "_Bereich anzeigen"
-#: src/conf/gconf_interface.c:204
+#: src/conf/gconf_interface.c:206
msgid "Show range (Y/M/N)"
msgstr "Bereich anzeigen (Y/M/N)"
-#: src/conf/gconf_interface.c:206
+#: src/conf/gconf_interface.c:208
msgid "Show _data"
msgstr "_Daten anzeigen"
-#: src/conf/gconf_interface.c:209
+#: src/conf/gconf_interface.c:211
msgid "Show value of the option"
msgstr "Wert der Option anzeigen"
-#: src/conf/gconf_interface.c:218
+#: src/conf/gconf_interface.c:220
msgid "Show all _options"
msgstr "Alle _Optionen anzeigen"
-#: src/conf/gconf_interface.c:221
+#: src/conf/gconf_interface.c:223
msgid "Show all options"
msgstr "Alle Optionen anzeigen"
-#: src/conf/gconf_interface.c:225
+#: src/conf/gconf_interface.c:227
msgid "Show _debug info"
msgstr "_Debug Informationen anzeigen"
-#: src/conf/gconf_interface.c:228
+#: src/conf/gconf_interface.c:230
msgid "Show masked options"
msgstr "Maskierte Optionen anzeigen"
-#: src/conf/gconf_interface.c:231
+#: src/conf/gconf_interface.c:233
msgid "_Help"
msgstr "_Hilfe"
-#: src/conf/gconf_interface.c:238
+#: src/conf/gconf_interface.c:240
msgid "_Introduction"
msgstr "_Einf�hrung"
-#: src/conf/gconf_interface.c:250
+#: src/conf/gconf_interface.c:252
msgid "_About"
msgstr "_�ber"
-#: src/conf/gconf_interface.c:260
+#: src/conf/gconf_interface.c:262
msgid "_License"
msgstr "_Lizenz"
-#: src/conf/gconf_interface.c:280
+#: src/conf/gconf_interface.c:289
msgid "Goes up of one level (single view)"
msgstr "Bewegt sich eine Ebene nach oben (einfache Ansicht)"
-#: src/conf/gconf_interface.c:295
+#: src/conf/gconf_interface.c:303
msgid "Up"
msgstr "Oben"
-#: src/conf/gconf_interface.c:321
+#: src/conf/gconf_interface.c:337
msgid "Load"
msgstr "Laden"
-#: src/conf/gconf_interface.c:328
+#: src/conf/gconf_interface.c:349
msgid "Save a config file"
msgstr "Konfigurationsdatei speichern"
-#: src/conf/gconf_interface.c:343
+#: src/conf/gconf_interface.c:363
msgid "Save"
msgstr "Speichern"
-#: src/conf/gconf_interface.c:354
+#: src/conf/gconf_interface.c:383
msgid "Single view"
msgstr "Einfache Ansicht"
-#: src/conf/gconf_interface.c:370
+#: src/conf/gconf_interface.c:398
msgid "Single"
msgstr "Einfach"
-#: src/conf/gconf_interface.c:376
+#: src/conf/gconf_interface.c:410
msgid "Split view"
msgstr "Geteilte Ansicht"
-#: src/conf/gconf_interface.c:393
+#: src/conf/gconf_interface.c:425
msgid "Split"
msgstr "Geteilt"
-#: src/conf/gconf_interface.c:399
+#: src/conf/gconf_interface.c:437
msgid "Full view"
msgstr "Volle Ansicht"
-#: src/conf/gconf_interface.c:416
+#: src/conf/gconf_interface.c:452
msgid "Full"
msgstr "Voll"
-#: src/conf/gconf_interface.c:427
+#: src/conf/gconf_interface.c:473
msgid "Collapse the whole tree in the right frame"
msgstr "Den gesamten Baum im rechten Frame kollabieren"
-#: src/conf/gconf_interface.c:443
+#: src/conf/gconf_interface.c:488
msgid "Collapse"
msgstr "Kollabieren"
-#: src/conf/gconf_interface.c:450
+#: src/conf/gconf_interface.c:501
msgid "Expand the whole tree in the right frame"
msgstr "Den gesamten Baum im rechten Frame expandieren"
-#: src/conf/gconf_interface.c:466
+#: src/conf/gconf_interface.c:515
msgid "Expand"
msgstr "Expandieren"
-#: src/conf/gconf_interface.c:520
+#: src/conf/gconf_interface.c:569
msgid "Sorry, no help available for this option yet."
msgstr "Sorry, f�r diese Option steht noch keine Hilfe zur Verf�gung"
@@ -446,7 +438,7 @@
msgid "GNUnet configuration assistant"
msgstr "GNUnet Konfigurationsassistent"
-#: src/conf/wizard_interface.c:77 src/conf/wizard_curs.c:93
+#: src/conf/wizard_interface.c:77 src/conf/wizard_curs.c:74
msgid ""
"Welcome to GNUnet!\n"
"\n"
@@ -477,13 +469,13 @@
"das GNUnet-Team"
#: src/conf/wizard_interface.c:106 src/conf/wizard_interface.c:332
-#: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1286
+#: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1284
msgid "Next"
msgstr "Weiter"
#: src/conf/wizard_interface.c:127 src/conf/wizard_interface.c:353
#: src/conf/wizard_interface.c:672 src/conf/wizard_interface.c:929
-#: src/conf/wizard_interface.c:1307
+#: src/conf/wizard_interface.c:1305
msgid "Cancel"
msgstr "Abbrechen"
@@ -549,7 +541,7 @@
msgstr "Netzwerkverbindung"
#: src/conf/wizard_interface.c:311 src/conf/wizard_interface.c:630
-#: src/conf/wizard_interface.c:887 src/conf/wizard_interface.c:1265
+#: src/conf/wizard_interface.c:887 src/conf/wizard_interface.c:1263
msgid "Back"
msgstr "Zur�ck"
@@ -659,7 +651,7 @@
msgid "Open the enhanced configurator"
msgstr "Erweiterten Konfigurator starten"
-#: src/conf/wizard_interface.c:861 src/conf/wizard_interface.c:1239
+#: src/conf/wizard_interface.c:861 src/conf/wizard_interface.c:1237
msgid "Other settings"
msgstr "Weitere Einstellungen"
@@ -683,11 +675,10 @@
msgid "No"
msgstr "Nein"
-#: src/conf/wizard_interface.c:1075 src/conf/wizard_util.c:165
-#: src/conf/wizard_util.c:173 src/conf/wizard_util.c:176
-#: src/conf/wizard_util.c:190 src/conf/wizard_util.c:218
-#: src/conf/wizard_util.c:224 src/conf/wizard_util.c:359
-#: src/conf/wizard_util.c:377
+#: src/conf/wizard_interface.c:1075 src/conf/wizard_util.c:195
+#: src/conf/wizard_util.c:210 src/conf/wizard_util.c:238
+#: src/conf/wizard_util.c:244 src/conf/wizard_util.c:383
+#: src/conf/wizard_util.c:401
msgid "Error"
msgstr "Fehler"
@@ -706,16 +697,19 @@
"For security reasons, it is a good idea to let this setup create a new user "
"account and a new group under which the GNUnet service is started at system "
"startup.\n"
-"You can also specify existing ones.\n"
-"In any case, you should check its permissions to critical files on your "
-"system."
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
msgstr ""
#: src/conf/wizard_interface.c:1209
msgid "Group:"
msgstr ""
-#: src/conf/wizard_interface.c:1231
+#: src/conf/wizard_interface.c:1229
msgid "User account:"
msgstr ""
@@ -724,46 +718,46 @@
msgid "Couldn't find pixmap file: %s"
msgstr "Pixmapdatei %s konnte nicht gefunden werden"
-#: src/conf/wizard_curs.c:92 src/conf/wizard_curs.c:106
-#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:194
-#: src/conf/wizard_curs.c:219 src/conf/wizard_curs.c:251
-#: src/conf/wizard_curs.c:276 src/conf/wizard_curs.c:307
-#: src/conf/wizard_curs.c:329 src/conf/wizard_curs.c:357
-#: src/conf/wizard_curs.c:379 src/conf/wizard_curs.c:401
-#: src/conf/wizard_curs.c:428 src/conf/wizard_curs.c:458
-#: src/conf/wizard_curs.c:486
+#: src/conf/wizard_curs.c:73 src/conf/wizard_curs.c:87
+#: src/conf/wizard_curs.c:148 src/conf/wizard_curs.c:175
+#: src/conf/wizard_curs.c:200 src/conf/wizard_curs.c:232
+#: src/conf/wizard_curs.c:257 src/conf/wizard_curs.c:288
+#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:338
+#: src/conf/wizard_curs.c:360 src/conf/wizard_curs.c:382
+#: src/conf/wizard_curs.c:410 src/conf/wizard_curs.c:440
+#: src/conf/wizard_curs.c:475
#, fuzzy
msgid "GNUnet configuration"
msgstr "GNUnet Konfigurationsassistent"
-#: src/conf/wizard_curs.c:107
+#: src/conf/wizard_curs.c:88
msgid ""
"Choose the network interface that connects your computer to the internet "
"from the list below."
msgstr ""
-#: src/conf/wizard_curs.c:113 src/conf/wizard_curs.c:173
-#: src/conf/wizard_curs.c:224 src/conf/wizard_curs.c:256
-#: src/conf/wizard_curs.c:312
+#: src/conf/wizard_curs.c:94 src/conf/wizard_curs.c:154
+#: src/conf/wizard_curs.c:205 src/conf/wizard_curs.c:237
+#: src/conf/wizard_curs.c:293
#, fuzzy
msgid "Help"
msgstr "_Hilfe"
-#: src/conf/wizard_curs.c:113
+#: src/conf/wizard_curs.c:94
msgid ""
"The \"Network interface\" is the device that connects your computer to the "
"internet. This is usually a modem, an ISDN card or a network card in case "
"you are using DSL."
msgstr ""
-#: src/conf/wizard_curs.c:167
+#: src/conf/wizard_curs.c:148
msgid ""
"What is this computer's public IP adress or hostname?\n"
"\n"
"If in doubt, leave this empty."
msgstr ""
-#: src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:154
msgid ""
"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -774,7 +768,7 @@
"IP-Address."
msgstr ""
-#: src/conf/wizard_curs.c:194
+#: src/conf/wizard_curs.c:175
msgid ""
"Is this machine behind NAT?\n"
"\n"
@@ -785,11 +779,11 @@
"forwarding\")."
msgstr ""
-#: src/conf/wizard_curs.c:219
+#: src/conf/wizard_curs.c:200
msgid "How much upstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:224
+#: src/conf/wizard_curs.c:205
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
@@ -800,12 +794,12 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:251
+#: src/conf/wizard_curs.c:232
#, fuzzy
msgid "How much downstream (Bytes/s) may be used?"
msgstr "Downstream (Bytes/s):"
-#: src/conf/wizard_curs.c:256
+#: src/conf/wizard_curs.c:237
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
@@ -816,7 +810,7 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:276
+#: src/conf/wizard_curs.c:257
msgid ""
"Share denoted bandwidth with other applications?\n"
"\n"
@@ -829,18 +823,18 @@
"connection whenever your high-speed LAN gets used (e.g. by NFS)."
msgstr ""
-#: src/conf/wizard_curs.c:307
+#: src/conf/wizard_curs.c:288
msgid "How much CPU (in %) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:312
+#: src/conf/wizard_curs.c:293
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
"This is the percentage of processor time GNUnet is allowed to use."
msgstr ""
-#: src/conf/wizard_curs.c:329
+#: src/conf/wizard_curs.c:310
#, fuzzy
msgid ""
"Store migrated content?\n"
@@ -869,7 +863,7 @@
"Wenn Sie ein fortgeschrittener Benutzer sind, m�chten Sie vielleicht weitere "
"Feinjustierungen an GNUnet �ber den \"erweiterten Konfigurator\" vornehmen."
-#: src/conf/wizard_curs.c:357
+#: src/conf/wizard_curs.c:338
msgid ""
"What's the maximum datastore size in MB?\n"
"\n"
@@ -877,7 +871,7 @@
"inserted and migrated content)."
msgstr ""
-#: src/conf/wizard_curs.c:379
+#: src/conf/wizard_curs.c:360
msgid ""
"Do you want to launch GNUnet as a system service?\n"
"\n"
@@ -886,22 +880,23 @@
"launch GNUnet yourself each time you want to use it."
msgstr ""
-#: src/conf/wizard_curs.c:402
+#: src/conf/wizard_curs.c:383
msgid ""
"Define the user owning the GNUnet service.\n"
"\n"
"For security reasons, it is a good idea to let this setup create a new user "
"account under which the GNUnet service is started at system startup.\n"
"\n"
-"You can also specify an already existant user account here.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
"\n"
-"In any case, you should check its permissions to critical files on your "
-"system.\n"
+"Leave the fields empty to run GNUnet with system privileges.\n"
"\n"
"GNUnet user:"
msgstr ""
-#: src/conf/wizard_curs.c:429
+#: src/conf/wizard_curs.c:411
msgid ""
"Define the group owning the GNUnet service.\n"
"\n"
@@ -916,7 +911,7 @@
"GNUnet group:"
msgstr ""
-#: src/conf/wizard_curs.c:458
+#: src/conf/wizard_curs.c:440
msgid ""
"If you are an experienced user, you may want to tweak your GNUnet "
"installation using the enhanced configurator.\n"
@@ -924,7 +919,7 @@
"Do you want to start it after saving your configuration?"
msgstr ""
-#: src/conf/wizard_curs.c:487
+#: src/conf/wizard_curs.c:476
#, fuzzy
msgid ""
"Cannot save configuration.\n"
@@ -932,58 +927,57 @@
"Try again?"
msgstr "Konfigurationsdatei '%s' konnte nicht ge�ffnet werden.\n"
-#: src/conf/wizard_util.c:162
-#, fuzzy, c-format
-msgid "Error: can't open Service Control Manager: %s (%i)\n"
+#: src/conf/wizard_util.c:164 src/conf/wizard_util.c:226
+#, fuzzy
+msgid "Can't open Service Control Manager"
msgstr "Fehler: der Dienstemanager konnte nicht ge�ffnet werden: %s\n"
#: src/conf/wizard_util.c:170
-#, fuzzy, c-format
-msgid "Error: can't create service: %s (#%i)\n"
-msgstr "Fehler: Dienst konnte nicht angelegt werden: %s\n"
+#, fuzzy
+msgid "Can't create service"
+msgstr "Fehler: auf den Dienst konnte nicht zugegriffen werden: %s\n"
-#: src/conf/wizard_util.c:176 src/conf/wizard_util.c:218
+#: src/conf/wizard_util.c:175 src/conf/wizard_util.c:238
msgid "Unknown error"
msgstr "Unbekannter Fehler"
-#: src/conf/wizard_util.c:189
+#: src/conf/wizard_util.c:188
+msgid "Error changing the permissions of the GNUnet directory"
+msgstr ""
+
+#: src/conf/wizard_util.c:209
msgid "Cannot write to the regisitry"
msgstr "Konnte nicht in die Registry schreiben"
-#: src/conf/wizard_util.c:206
+#: src/conf/wizard_util.c:230
#, fuzzy
-msgid "Can't open Service Control Manager"
-msgstr "Fehler: der Dienstemanager konnte nicht ge�ffnet werden: %s\n"
-
-#: src/conf/wizard_util.c:210
-#, fuzzy
msgid "Can't access the service"
msgstr "Fehler: auf den Dienst konnte nicht zugegriffen werden: %s\n"
-#: src/conf/wizard_util.c:214
+#: src/conf/wizard_util.c:234
#, fuzzy
msgid "Can't delete the service"
msgstr "Fehler: der Dienst konnte nicht gel�scht werden: %s\n"
-#: src/conf/wizard_util.c:358
+#: src/conf/wizard_util.c:382
#, fuzzy
msgid "This version of Windows does not support multiple users."
msgstr "Diese Version von Windows unterst�tzt keine Dienste.\n"
-#: src/conf/wizard_util.c:362
+#: src/conf/wizard_util.c:386
#, fuzzy
msgid "Error creating user"
msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
-#: src/conf/wizard_util.c:365
+#: src/conf/wizard_util.c:389
msgid "Error accessing local security policy"
msgstr ""
-#: src/conf/wizard_util.c:368
+#: src/conf/wizard_util.c:392
msgid "Error granting service right to user"
msgstr ""
-#: src/conf/wizard_util.c:371
+#: src/conf/wizard_util.c:395
msgid "Unknown error while creating a new user"
msgstr ""
@@ -1059,8 +1053,8 @@
#: src/applications/tracekit/gnunet-tracekit.c:87
#: src/applications/tracekit/gnunet-tracekit.c:122
#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-insert.c:280
-#: src/applications/fs/tools/gnunet-insert.c:396
+#: src/applications/fs/tools/gnunet-insert.c:283
+#: src/applications/fs/tools/gnunet-insert.c:399
#: src/applications/fs/tools/gnunet-search.c:156
#: src/applications/fs/tools/gnunet-search.c:172
#: src/applications/fs/tools/gnunet-search.c:193
@@ -1084,7 +1078,7 @@
#: src/applications/fs/tools/gnunet-pseudonym.c:192
#: src/applications/fs/tools/gnunet-delete.c:111
#: src/applications/fs/tools/gnunet-directory.c:177
-#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:470
#: src/applications/fs/tools/gnunet-search.c:210
#: src/applications/fs/tools/gnunet-download.c:125
#: src/applications/fs/tools/gnunet-unindex.c:139
@@ -1482,8 +1476,8 @@
#: src/applications/sqstore_mysql/mysql.c:924 src/util/symcipher_gcrypt.c:47
#: src/util/symcipher_gcrypt.c:54 src/util/hostkey_gcrypt.c:56
#: src/util/hostkey_gcrypt.c:63 src/util/storage.c:613
-#: src/include/gnunet_util.h:973 src/include/gnunet_util.h:980
-#: src/include/gnunet_util.h:982
+#: src/include/gnunet_util.h:980 src/include/gnunet_util.h:987
+#: src/include/gnunet_util.h:989
#, c-format
msgid "'%s' failed at %s:%d with error: %s\n"
msgstr "'%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -2231,25 +2225,25 @@
msgid "# p2p trace replies sent"
msgstr "# p2p Trace-Antworten gesendet"
-#: src/applications/gap/gap.c:1856
+#: src/applications/gap/gap.c:1863
msgid ""
"Cover traffic requested but traffic service not loaded. Rejecting request.\n"
msgstr ""
"Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
"nicht geladen. Anfrage wird abgelehnt.\n"
-#: src/applications/gap/gap.c:1867 src/applications/fs/module/fs.c:667
+#: src/applications/gap/gap.c:1874 src/applications/fs/module/fs.c:669
msgid "Failed to get traffic stats.\n"
msgstr "Statistiken �ber den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-#: src/applications/gap/gap.c:1873 src/applications/gap/gap.c:1878
-#: src/applications/gap/gap.c:1884
+#: src/applications/gap/gap.c:1880 src/applications/gap/gap.c:1885
+#: src/applications/gap/gap.c:1891
msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
msgstr ""
"Gew�nschter Grad an Anonymit�t kann nicht erreicht werden, Anfrage wird "
"ignoriert.\n"
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2102
msgid ""
"Traffic service failed to load; gap cannot ensure cover-traffic "
"availability.\n"
@@ -2257,7 +2251,7 @@
"Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
"Netzwerkverkehr sicherstellen.\n"
-#: src/applications/gap/gap.c:2126
+#: src/applications/gap/gap.c:2133
#, c-format
msgid "'%s' registering handlers %d %d\n"
msgstr "'%s' registriert Handler %d %d\n"
@@ -2533,7 +2527,7 @@
msgid "File '%s' has URI: %s\n"
msgstr "Datei '%s' hat URI: %s\n"
-#: src/applications/fs/tools/gnunet-insert.c:160
+#: src/applications/fs/tools/gnunet-insert.c:161
#, c-format
msgid ""
"\n"
@@ -2542,11 +2536,11 @@
"\n"
"Fehler beim Uploaden der Datei: %s\n"
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
msgid "set the desired LEVEL of sender-anonymity"
msgstr "Gew�nschten Grad an Sender-Anonymit�t festlegen"
-#: src/applications/fs/tools/gnunet-insert.c:181
+#: src/applications/fs/tools/gnunet-insert.c:183
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"
@@ -2555,7 +2549,7 @@
"anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis "
"erzwingen."
-#: src/applications/fs/tools/gnunet-insert.c:184
+#: src/applications/fs/tools/gnunet-insert.c:186
msgid ""
"print list of extracted keywords that would be used, but do not perform "
"upload"
@@ -2563,7 +2557,7 @@
"Liste der extrahierten Schl�sselworte, die verwendet werden w�rden, "
"ausgeben, aber keinen Upload durchf�hren"
-#: src/applications/fs/tools/gnunet-insert.c:188
+#: src/applications/fs/tools/gnunet-insert.c:190
msgid ""
"set interval for availability of updates to SECONDS (for namespace "
"insertions only)"
@@ -2571,7 +2565,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:191
+#: src/applications/fs/tools/gnunet-insert.c:193
msgid ""
"add an additional keyword for the top-level file or directory (this option "
"can be specified multiple times)"
@@ -2579,7 +2573,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:194
+#: src/applications/fs/tools/gnunet-insert.c:196
msgid ""
"add an additional keyword for all files and directories (this option can be "
"specified multiple times)"
@@ -2587,13 +2581,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:198
+#: src/applications/fs/tools/gnunet-insert.c:200
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:200
+#: src/applications/fs/tools/gnunet-insert.c:202
msgid ""
"do not index, perform full insertion (stores entire file in encrypted form "
"in GNUnet database)"
@@ -2601,7 +2595,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:203
+#: src/applications/fs/tools/gnunet-insert.c:205
msgid ""
"specify ID of an updated version to be published in the future (for "
"namespace insertions only)"
@@ -2609,21 +2603,21 @@
"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:206
+#: src/applications/fs/tools/gnunet-insert.c:208
msgid "specify the priority of the content"
msgstr "Die Priorit�t des Inhalts angeben"
-#: src/applications/fs/tools/gnunet-insert.c:208
+#: src/applications/fs/tools/gnunet-insert.c:210
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:210
+#: src/applications/fs/tools/gnunet-insert.c:212
msgid "process directories recursively"
msgstr "Verzeichnisse rekursiv bearbeiten"
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:214
msgid ""
"specifies this as an aperiodic but updated publication (for namespace "
"insertions only)"
@@ -2631,67 +2625,67 @@
"Dies als unregelm��ige aber aktualisierbare Ver�ffentlichung kennzeichnen "
"(nur f�r das Einf�gen in Namespaces)"
-#: src/applications/fs/tools/gnunet-insert.c:215
+#: src/applications/fs/tools/gnunet-insert.c:217
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:218
+#: src/applications/fs/tools/gnunet-insert.c:220
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:220
+#: src/applications/fs/tools/gnunet-insert.c:222
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:227
+#: src/applications/fs/tools/gnunet-insert.c:229
msgid "Make files available to GNUnet for sharing."
msgstr "Dateien GNUnet zum Filesharing zur Verf�gung stellen."
-#: src/applications/fs/tools/gnunet-insert.c:304
+#: src/applications/fs/tools/gnunet-insert.c:307
#, c-format
msgid "You must pass a positive number to the '%s' option.\n"
msgstr "Sie m�ssen eine positive Zahl zu der Option '%s' �bergeben.\n"
-#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:475
#: src/applications/fs/tools/gnunet-unindex.c:144
#, c-format
msgid "You must specify a list of files to insert.\n"
msgstr "Sie m�ssen eine Liste von Dateien zum Einf�gen angeben.\n"
-#: src/applications/fs/tools/gnunet-insert.c:491
+#: src/applications/fs/tools/gnunet-insert.c:479
#, c-format
-msgid "Keywords for file '%s':\n"
-msgstr "Schl�sselw�rter f�r Datei '%s':\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:501
-#, c-format
msgid "Only one file or directory can be specified at a time.\n"
msgstr "Nur eine Datei oder Verzeichnis kann auf einmal angegeben werden.\n"
-#: src/applications/fs/tools/gnunet-insert.c:505
+#: src/applications/fs/tools/gnunet-insert.c:483
#, c-format
msgid "You must specify a file or directory to upload.\n"
msgstr "Sie m�ssen eine Datei oder Verzeichnis f�r den Upload angeben.\n"
-#: src/applications/fs/tools/gnunet-insert.c:548
+#: src/applications/fs/tools/gnunet-insert.c:532
#, c-format
+msgid "Keywords for file '%s':\n"
+msgstr "Schl�sselw�rter f�r Datei '%s':\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:554
+#, 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:563
+#: src/applications/fs/tools/gnunet-insert.c:569
#, 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:572
-#: src/applications/fs/tools/gnunet-insert.c:576
-#: src/applications/fs/tools/gnunet-insert.c:580
-#: src/applications/fs/tools/gnunet-insert.c:584
-#: src/applications/fs/tools/gnunet-insert.c:589
+#: src/applications/fs/tools/gnunet-insert.c:578
+#: src/applications/fs/tools/gnunet-insert.c:582
+#: src/applications/fs/tools/gnunet-insert.c:586
+#: src/applications/fs/tools/gnunet-insert.c:590
+#: src/applications/fs/tools/gnunet-insert.c:595
#, c-format
msgid "Option '%s' makes no sense without option '%s'.\n"
msgstr "Option '%s' macht keinen Sinn ohne die Option '%s'.\n"
@@ -2753,30 +2747,34 @@
msgstr "Nicht gen�gend Parameter. Sie m�ssen eine GNUnet Datei URI angeben\n"
#: src/applications/fs/tools/gnunet-download.c:156
-#, c-format
-msgid "Download at %16llu out of %16llu bytes (%8.3f kbps)"
+#, fuzzy, c-format
+msgid "Download of file '%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
msgstr "Download bei %16llu von %16llu Bytes (%8.3f kbps)"
-#: src/applications/fs/tools/gnunet-download.c:166
+#: src/applications/fs/tools/gnunet-download.c:168
+#: src/applications/fs/tools/gnunet-download.c:179
#, c-format
msgid "Error downloading: %s\n"
msgstr "Fehler beim Download: %s\n"
-#: src/applications/fs/tools/gnunet-download.c:172
-#, c-format
-msgid ""
-"\n"
-"Download of file '%s' comlete. Speed was %8.3f kilobyte per second.\n"
+#: src/applications/fs/tools/gnunet-download.c:187
+#, fuzzy, c-format
+msgid "Download of file '%s' complete. Speed was %8.3f kilobyte per second.\n"
msgstr ""
"\n"
"Download der Datei '%s' abgeschlossen. Geschwindigkeit war %8.3f KB/s.\n"
-#: src/applications/fs/tools/gnunet-download.c:215
+#: src/applications/fs/tools/gnunet-download.c:198
#, c-format
+msgid "Recursive download of directory '%s' at %llu of %llu bytes.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-download.c:236
+#, c-format
msgid "URI '%s' invalid for gnunet-download.\n"
msgstr "URI '%s' ist ung�ltig f�r gnunet-download.\n"
-#: src/applications/fs/tools/gnunet-download.c:266
+#: src/applications/fs/tools/gnunet-download.c:287
#, c-format
msgid "File stored as '%s'.\n"
msgstr "Datei wurde als '%s' gespeichert.\n"
@@ -2832,13 +2830,13 @@
"Sie m�ssen ein Verzeichnis f�r FS Dateien in der Konfigurationsdatei in der "
"Sektion '%s' unter '%s' angeben."
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:327
#, 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:404
+#: src/applications/fs/module/ondemand.c:408
#, c-format
msgid ""
"Because the file '%s' has been unavailable for 3 days it got removed from "
@@ -2849,7 +2847,7 @@
"aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
"l�schen, da Ihr Index nun ung�ltige Referenzen enth�lt!"
-#: src/applications/fs/module/ondemand.c:430
+#: src/applications/fs/module/ondemand.c:434
#, c-format
msgid ""
"Configuration file must specify directory for storage of FS data in section "
@@ -2858,7 +2856,7 @@
"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:621
+#: src/applications/fs/module/ondemand.c:625
#, c-format
msgid ""
"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
@@ -2866,7 +2864,7 @@
"Deindizierter ODB Block '%s' vom Offset %llu fehlt bereits im "
"Datenspeicher.\n"
-#: src/applications/fs/module/fs.c:980
+#: src/applications/fs/module/fs.c:998
#, c-format
msgid ""
"You must specify a postive number for '%s' in the configuration in section '%"
@@ -2875,7 +2873,7 @@
"Sie m�ssen f�r '%s' in der Sektion '%s' der Konfigurationsdatei eine "
"positive Zahl angeben.\n"
-#: src/applications/fs/module/fs.c:1019
+#: src/applications/fs/module/fs.c:1039
#, fuzzy, c-format
msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr "'%s' registriert Client-Handler %d %d %d %d %d %d %d %d %d %d\n"
@@ -2889,17 +2887,17 @@
msgid "AND"
msgstr "UND"
-#: src/applications/fs/fsui/upload.c:336 src/applications/fs/fsui/upload.c:366
+#: src/applications/fs/fsui/upload.c:349 src/applications/fs/fsui/upload.c:388
msgid "Upload failed.\n"
msgstr "Upload fehlgeschlagen.\n"
-#: src/applications/fs/fsui/upload.c:370
+#: src/applications/fs/fsui/upload.c:395
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
"Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen "
"werden.\n"
-#: src/applications/fs/fsui/fsui.c:509
+#: src/applications/fs/fsui/fsui.c:542
#, c-format
msgid "FSUI state file '%s' had syntax error at offset %u.\n"
msgstr ""
@@ -2917,10 +2915,14 @@
"Ver�ffentlichungsdatum f�r periodisch aktualisierten Inhalt ist mehr als "
"eine Woche fr�her als geplant.\n"
-#: src/applications/fs/fsui/download.c:192
+#: src/applications/fs/fsui/download.c:239
msgid "Download aborted."
msgstr "Download abgebrochen."
+#: src/applications/fs/fsui/download.c:242
+msgid "ECRS download failed (see logs)."
+msgstr ""
+
#: src/applications/fs/fsui/file_info.c:73
msgid "Collecting file identifiers disabled.\n"
msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
@@ -2937,7 +2939,7 @@
msgid "LOC URI not allowed for search.\n"
msgstr "LOC URI ist nicht erlaubt f�r Suchen.\n"
-#: src/applications/fs/ecrs/download.c:884
+#: src/applications/fs/ecrs/download.c:889
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
@@ -2946,11 +2948,33 @@
"Bug oder eine mit b�sen Absichten eingef�gte Datei. Download wurde "
"abgebrochen.\n"
-#: src/applications/fs/ecrs/download.c:1049
+#: src/applications/fs/ecrs/download.c:1054
#, c-format
msgid "Content '%s' seems to be not available on the network.\n"
msgstr "Inhalt '%s' scheint im Netzwerk nicht verf�gbar zu sein.\n"
+#: src/applications/fs/ecrs/upload.c:180
+#, c-format
+msgid "Cannot hash '%s'.\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:198
+#, fuzzy, c-format
+msgid "Initialization for indexing file '%s' failed.\n"
+msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
+
+#: src/applications/fs/ecrs/upload.c:204
+#, c-format
+msgid ""
+"Indexing file '%s' failed. Check file permissions and consult your GNUnet "
+"server's logs.\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:287
+#, c-format
+msgid "Indexing data failed at position %i.\n"
+msgstr ""
+
#: src/applications/fs/ecrs/meta.c:772
#, c-format
msgid "Renaming of file '%s' to '%s' failed: %s\n"
@@ -2962,7 +2986,7 @@
msgstr ""
"Datei '%s' konnte nicht zu '%s' umbenannt werden: Datei existiert bereits\n"
-#: src/applications/fs/ecrs/namespace.c:45 src/util/state.c:81
+#: src/applications/fs/ecrs/namespace.c:45
#, c-format
msgid ""
"Configuration file must specify a directory for GNUnet to store per-peer "
@@ -3072,12 +3096,12 @@
"Der Name des HTTP Proxies '%s' konnte nicht aufgel�st werden. Es wird ohne "
"Proxy versucht.\n"
-#: src/applications/traffic/traffic.c:443
+#: src/applications/traffic/traffic.c:445
#, c-format
msgid "# bytes transmitted of type %d"
msgstr "# Bytes des Typs %d �bertragen"
-#: src/applications/traffic/traffic.c:463
+#: src/applications/traffic/traffic.c:465
#, c-format
msgid "# bytes received of type %d"
msgstr "# Bytes des Typs %d empfangen"
@@ -3425,7 +3449,7 @@
"Besch�digte Netzwerkangabe in der Konfigurationsdatei in Sektion '%s' f�r "
"Eintrag '%s': %s\n"
-#: src/server/tcpserver.c:797
+#: src/server/tcpserver.c:798
#, c-format
msgid "%s failed, message type %d already in use.\n"
msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
@@ -3692,22 +3716,22 @@
"Parameter, die f�r lange Optionen zwingend sind, sind auch f�r kurze "
"Optionen zwingend.\n"
-#: src/util/configuration.c:177
+#: src/util/configuration.c:180
#, c-format
msgid "inlining configration file '%s'\n"
msgstr "Binde Konfigurationsdatei '%s' ein\n"
-#: src/util/configuration.c:181
+#: src/util/configuration.c:184
#, c-format
msgid "Could not parse configuration file '%s'.\n"
msgstr "Konfigurationsdatei '%s' konnte nicht geparst werden.\n"
-#: src/util/configuration.c:217
+#: src/util/configuration.c:220
#, c-format
msgid "Syntax error in configuration file '%s' at line %d.\n"
msgstr "Syntaxfehler in Konfigurationsdatei '%s' in Zeile %d.\n"
-#: src/util/configuration.c:464
+#: src/util/configuration.c:471
#, c-format
msgid ""
"Configuration file '%s' not found. I will try to create the default "
@@ -3716,7 +3740,7 @@
"Konfigurationsdatei '%s' wurde nicht gefunden. Es wird versucht, an dieser "
"Stelle eine Standardkonfigurationsdatei anzulegen.\n"
-#: src/util/configuration.c:481
+#: src/util/configuration.c:488
#, c-format
msgid "Cannot open configuration file '%s'\n"
msgstr "Konfigurationsdatei '%s' konnte nicht ge�ffnet werden.\n"
@@ -3727,11 +3751,20 @@
msgstr ""
"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
-#: src/util/tcpio.c:86 src/util/identity.c:83 src/util/identity.c:123
+#: src/util/tcpio.c:87 src/util/identity.c:83 src/util/identity.c:123
#, c-format
msgid "Could not find IP of host '%s': %s\n"
msgstr "IP des Hosts '%s' konnte nicht ermittelt werden: %s\n"
+#: src/util/state.c:86
+#, fuzzy, c-format
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
+msgstr ""
+"Die Konfigurationsdatei muss unter %s%s ein Verzeichnis f�r GNUnet angeben, "
+"in dem Knotenbezogene Daten gespeichert werden.\n"
+
#: src/util/dso.c:41
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -3788,16 +3821,16 @@
msgid "EVERYTHING"
msgstr "ALLES"
-#: src/util/logging.c:239
+#: src/util/logging.c:248
msgid "LOGLEVEL not specified, that is not ok.\n"
msgstr "LOGLEVEL wurde nicht angegeben, das ist nicht in Ordnung.\n"
-#: src/util/logging.c:250
+#: src/util/logging.c:259
#, c-format
msgid "Invalid LOGLEVEL '%s' specified.\n"
msgstr "Ung�ltiger LOGLEVEL '%s' angegeben.\n"
-#: src/util/logging.c:355 src/util/logging.c:361
+#: src/util/logging.c:364 src/util/logging.c:370
#, c-format
msgid "Failure at %s:%d.\n"
msgstr "Fehler bei %s:%d.\n"
@@ -3831,17 +3864,17 @@
"Es ist mehr als eine IP-Adresse f�r das Ger�t '%s' angegeben.\n"
"GNUnet wird %u.%u.%u.%u. verwenden.\n"
-#: src/util/identity.c:282
+#: src/util/identity.c:297
#, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
-msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
-
-#: src/util/identity.c:300
-#, c-format
msgid "Could not resolve '%s' to determine our IP address: %s\n"
msgstr ""
"'%s' konnte nicht aufgel�st werden, um unsere IP-Adresse zu ermitteln: %s\n"
+#: src/util/identity.c:322
+#, c-format
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
+
#: src/util/identity.c:357 src/util/identity.c:399
#, c-format
msgid "Could not resolve '%s': %s\n"
@@ -3871,40 +3904,54 @@
"IP(v6) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
"der Konfigurationsdatei an.\n"
-#: src/include/gnunet_util.h:140
+#: src/include/gnunet_util.h:147
msgid "print this help"
msgstr "Gibt diese Hilfe aus"
-#: src/include/gnunet_util.h:143
+#: src/include/gnunet_util.h:150
msgid "set verbosity to LEVEL"
msgstr "Umfang der Meldungen auf LEVEL setzen"
-#: src/include/gnunet_util.h:146
+#: src/include/gnunet_util.h:153
msgid "use configuration file FILENAME"
msgstr "Konfigurationsdatei FILENAME verwenden"
-#: src/include/gnunet_util.h:149
+#: src/include/gnunet_util.h:156
msgid "specify host on which gnunetd is running"
msgstr "Gibt an, auf welchem Host gnunetd l�uft"
-#: src/include/gnunet_util.h:152
+#: src/include/gnunet_util.h:159
msgid "print the version number"
msgstr "Versionsnummer ausgeben"
-#: src/include/gnunet_util.h:155
+#: src/include/gnunet_util.h:162
msgid "be verbose"
msgstr "umfangreiche Meldungen ausgeben"
-#: src/include/gnunet_util.h:582 src/include/gnunet_util.h:584
+#: src/include/gnunet_util.h:589 src/include/gnunet_util.h:591
#, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
-#: src/include/gnunet_util.h:989 src/include/gnunet_util.h:991
-#: src/include/gnunet_util.h:998
+#: src/include/gnunet_util.h:996 src/include/gnunet_util.h:998
+#: src/include/gnunet_util.h:1005
#, c-format
msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
msgstr "'%s' schlug bei Datei '%s' fehl. Ort: %s:%d. Fehler: %s\n"
+#~ msgid "Save _as"
+#~ msgstr "Speichern _unter"
+
+#~ msgid "Save the config in a file"
+#~ msgstr "Die Konfiguration in einer Datei speichern"
+
+#, fuzzy
+#~ msgid "Error: can't open Service Control Manager: %s (%i)\n"
+#~ msgstr "Fehler: der Dienstemanager konnte nicht ge�ffnet werden: %s\n"
+
+#, fuzzy
+#~ msgid "Error: can't create service: %s (#%i)\n"
+#~ msgstr "Fehler: Dienst konnte nicht angelegt werden: %s\n"
+
#~ msgid "Failure at at %s:%d.\n"
#~ msgstr "Fehler bei %s:%d.\n"
Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/po/rw.po 2005-06-15 17:15:15 UTC (rev 946)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-05-30 22:55-0500\n"
+"POT-Creation-Date: 2005-06-14 18:17-0500\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"
@@ -99,8 +99,8 @@
msgid "Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/http.c:1143 src/transports/tcp.c:1092 src/util/tcpio.c:165
-#: src/util/tcpio.c:195
+#: src/transports/http.c:1143 src/transports/tcp.c:1092 src/util/tcpio.c:166
+#: src/util/tcpio.c:196
#, fuzzy, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr ""
@@ -368,174 +368,166 @@
msgid "Error: can't delete service: %s\n"
msgstr ""
-#: src/conf/gconf_interface.c:123
+#: src/conf/gconf_interface.c:135
#, fuzzy
msgid "Gtk GNUnet Configurator"
msgstr "A bushyinguro"
-#: src/conf/gconf_interface.c:134
+#: src/conf/gconf_interface.c:146
#, fuzzy
msgid "_File"
msgstr "/Idosiye"
-#: src/conf/gconf_interface.c:141
+#: src/conf/gconf_interface.c:153
msgid "_Load"
msgstr ""
-#: src/conf/gconf_interface.c:144 src/conf/gconf_interface.c:306
+#: src/conf/gconf_interface.c:156 src/conf/gconf_interface.c:323
msgid "Load a config file"
msgstr ""
-#: src/conf/gconf_interface.c:152
+#: src/conf/gconf_interface.c:164
msgid "_Save"
msgstr ""
-#: src/conf/gconf_interface.c:155
+#: src/conf/gconf_interface.c:167
msgid "Save the config in .config"
msgstr ""
-#: src/conf/gconf_interface.c:164
-msgid "Save _as"
-msgstr ""
-
-#: src/conf/gconf_interface.c:167
-msgid "Save the config in a file"
-msgstr ""
-
-#: src/conf/gconf_interface.c:179
+#: src/conf/gconf_interface.c:181
#, fuzzy
msgid "_Quit"
msgstr "/Idosiye"
-#: src/conf/gconf_interface.c:189
+#: src/conf/gconf_interface.c:191
#, fuzzy
msgid "_Options"
msgstr "ibirindiro"
-#: src/conf/gconf_interface.c:196
+#: src/conf/gconf_interface.c:198
msgid "Show _name"
msgstr ""
-#: src/conf/gconf_interface.c:199
+#: src/conf/gconf_interface.c:201
msgid "Show name"
msgstr ""
-#: src/conf/gconf_interface.c:201
+#: src/conf/gconf_interface.c:203
msgid "Show _range"
msgstr ""
-#: src/conf/gconf_interface.c:204
+#: src/conf/gconf_interface.c:206
msgid "Show range (Y/M/N)"
msgstr ""
-#: src/conf/gconf_interface.c:206
+#: src/conf/gconf_interface.c:208
msgid "Show _data"
msgstr ""
-#: src/conf/gconf_interface.c:209
+#: src/conf/gconf_interface.c:211
msgid "Show value of the option"
msgstr ""
-#: src/conf/gconf_interface.c:218
+#: src/conf/gconf_interface.c:220
msgid "Show all _options"
msgstr ""
-#: src/conf/gconf_interface.c:221
+#: src/conf/gconf_interface.c:223
msgid "Show all options"
msgstr ""
-#: src/conf/gconf_interface.c:225
+#: src/conf/gconf_interface.c:227
msgid "Show _debug info"
msgstr ""
-#: src/conf/gconf_interface.c:228
+#: src/conf/gconf_interface.c:230
msgid "Show masked options"
msgstr ""
# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/conf/gconf_interface.c:231
+#: src/conf/gconf_interface.c:233
#, fuzzy
msgid "_Help"
msgstr "/Kugoboka"
-#: src/conf/gconf_interface.c:238
+#: src/conf/gconf_interface.c:240
msgid "_Introduction"
msgstr ""
# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: src/conf/gconf_interface.c:250
+#: src/conf/gconf_interface.c:252
#, fuzzy
msgid "_About"
msgstr "Ibyerekeye"
-#: src/conf/gconf_interface.c:260
+#: src/conf/gconf_interface.c:262
msgid "_License"
msgstr ""
-#: src/conf/gconf_interface.c:280
+#: src/conf/gconf_interface.c:289
msgid "Goes up of one level (single view)"
msgstr ""
-#: src/conf/gconf_interface.c:295
+#: src/conf/gconf_interface.c:303
msgid "Up"
msgstr ""
-#: src/conf/gconf_interface.c:321
+#: src/conf/gconf_interface.c:337
msgid "Load"
msgstr ""
-#: src/conf/gconf_interface.c:328
+#: src/conf/gconf_interface.c:349
msgid "Save a config file"
msgstr ""
-#: src/conf/gconf_interface.c:343
+#: src/conf/gconf_interface.c:363
msgid "Save"
msgstr ""
-#: src/conf/gconf_interface.c:354
+#: src/conf/gconf_interface.c:383
msgid "Single view"
msgstr ""
-#: src/conf/gconf_interface.c:370
+#: src/conf/gconf_interface.c:398
#, fuzzy
msgid "Single"
msgstr "Idosiye "
-#: src/conf/gconf_interface.c:376
+#: src/conf/gconf_interface.c:410
msgid "Split view"
msgstr ""
-#: src/conf/gconf_interface.c:393
+#: src/conf/gconf_interface.c:425
msgid "Split"
msgstr ""
-#: src/conf/gconf_interface.c:399
+#: src/conf/gconf_interface.c:437
#, fuzzy
msgid "Full view"
msgstr "Iyinjizamo"
-#: src/conf/gconf_interface.c:416
+#: src/conf/gconf_interface.c:452
msgid "Full"
msgstr ""
-#: src/conf/gconf_interface.c:427
+#: src/conf/gconf_interface.c:473
msgid "Collapse the whole tree in the right frame"
msgstr ""
-#: src/conf/gconf_interface.c:443
+#: src/conf/gconf_interface.c:488
#, fuzzy
msgid "Collapse"
msgstr "Gufunga"
-#: src/conf/gconf_interface.c:450
+#: src/conf/gconf_interface.c:501
msgid "Expand the whole tree in the right frame"
msgstr ""
-#: src/conf/gconf_interface.c:466
+#: src/conf/gconf_interface.c:515
msgid "Expand"
msgstr ""
-#: src/conf/gconf_interface.c:520
+#: src/conf/gconf_interface.c:569
msgid "Sorry, no help available for this option yet."
msgstr ""
@@ -546,7 +538,7 @@
msgid "GNUnet configuration assistant"
msgstr "A bushyinguro"
-#: src/conf/wizard_interface.c:77 src/conf/wizard_curs.c:93
+#: src/conf/wizard_interface.c:77 src/conf/wizard_curs.c:74
msgid ""
"Welcome to GNUnet!\n"
"\n"
@@ -564,13 +556,13 @@
msgstr ""
#: src/conf/wizard_interface.c:106 src/conf/wizard_interface.c:332
-#: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1286
+#: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1284
msgid "Next"
msgstr ""
#: src/conf/wizard_interface.c:127 src/conf/wizard_interface.c:353
#: src/conf/wizard_interface.c:672 src/conf/wizard_interface.c:929
-#: src/conf/wizard_interface.c:1307
+#: src/conf/wizard_interface.c:1305
msgid "Cancel"
msgstr "Kureka"
@@ -614,7 +606,7 @@
msgstr ""
#: src/conf/wizard_interface.c:311 src/conf/wizard_interface.c:630
-#: src/conf/wizard_interface.c:887 src/conf/wizard_interface.c:1265
+#: src/conf/wizard_interface.c:887 src/conf/wizard_interface.c:1263
msgid "Back"
msgstr ""
@@ -701,7 +693,7 @@
msgid "Open the enhanced configurator"
msgstr "A bushyinguro"
-#: src/conf/wizard_interface.c:861 src/conf/wizard_interface.c:1239
+#: src/conf/wizard_interface.c:861 src/conf/wizard_interface.c:1237
msgid "Other settings"
msgstr ""
@@ -728,11 +720,10 @@
msgid "No"
msgstr "Oya."
-#: src/conf/wizard_interface.c:1075 src/conf/wizard_util.c:165
-#: src/conf/wizard_util.c:173 src/conf/wizard_util.c:176
-#: src/conf/wizard_util.c:190 src/conf/wizard_util.c:218
-#: src/conf/wizard_util.c:224 src/conf/wizard_util.c:359
-#: src/conf/wizard_util.c:377
+#: src/conf/wizard_interface.c:1075 src/conf/wizard_util.c:195
+#: src/conf/wizard_util.c:210 src/conf/wizard_util.c:238
+#: src/conf/wizard_util.c:244 src/conf/wizard_util.c:383
+#: src/conf/wizard_util.c:401
msgid "Error"
msgstr ""
@@ -751,16 +742,19 @@
"For security reasons, it is a good idea to let this setup create a new user "
"account and a new group under which the GNUnet service is started at system "
"startup.\n"
-"You can also specify existing ones.\n"
-"In any case, you should check its permissions to critical files on your "
-"system."
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
msgstr ""
#: src/conf/wizard_interface.c:1209
msgid "Group:"
msgstr ""
-#: src/conf/wizard_interface.c:1231
+#: src/conf/wizard_interface.c:1229
msgid "User account:"
msgstr ""
@@ -769,47 +763,47 @@
msgid "Couldn't find pixmap file: %s"
msgstr ""
-#: src/conf/wizard_curs.c:92 src/conf/wizard_curs.c:106
-#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:194
-#: src/conf/wizard_curs.c:219 src/conf/wizard_curs.c:251
-#: src/conf/wizard_curs.c:276 src/conf/wizard_curs.c:307
-#: src/conf/wizard_curs.c:329 src/conf/wizard_curs.c:357
-#: src/conf/wizard_curs.c:379 src/conf/wizard_curs.c:401
-#: src/conf/wizard_curs.c:428 src/conf/wizard_curs.c:458
-#: src/conf/wizard_curs.c:486
+#: src/conf/wizard_curs.c:73 src/conf/wizard_curs.c:87
+#: src/conf/wizard_curs.c:148 src/conf/wizard_curs.c:175
+#: src/conf/wizard_curs.c:200 src/conf/wizard_curs.c:232
+#: src/conf/wizard_curs.c:257 src/conf/wizard_curs.c:288
+#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:338
+#: src/conf/wizard_curs.c:360 src/conf/wizard_curs.c:382
+#: src/conf/wizard_curs.c:410 src/conf/wizard_curs.c:440
+#: src/conf/wizard_curs.c:475
#, fuzzy
msgid "GNUnet configuration"
msgstr "A bushyinguro"
-#: src/conf/wizard_curs.c:107
+#: src/conf/wizard_curs.c:88
msgid ""
"Choose the network interface that connects your computer to the internet "
"from the list below."
msgstr ""
# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/conf/wizard_curs.c:113 src/conf/wizard_curs.c:173
-#: src/conf/wizard_curs.c:224 src/conf/wizard_curs.c:256
-#: src/conf/wizard_curs.c:312
+#: src/conf/wizard_curs.c:94 src/conf/wizard_curs.c:154
+#: src/conf/wizard_curs.c:205 src/conf/wizard_curs.c:237
+#: src/conf/wizard_curs.c:293
#, fuzzy
msgid "Help"
msgstr "/Kugoboka"
-#: src/conf/wizard_curs.c:113
+#: src/conf/wizard_curs.c:94
msgid ""
"The \"Network interface\" is the device that connects your computer to the "
"internet. This is usually a modem, an ISDN card or a network card in case "
"you are using DSL."
msgstr ""
-#: src/conf/wizard_curs.c:167
+#: src/conf/wizard_curs.c:148
msgid ""
"What is this computer's public IP adress or hostname?\n"
"\n"
"If in doubt, leave this empty."
msgstr ""
-#: src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:154
msgid ""
"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -820,7 +814,7 @@
"IP-Address."
msgstr ""
-#: src/conf/wizard_curs.c:194
+#: src/conf/wizard_curs.c:175
msgid ""
"Is this machine behind NAT?\n"
"\n"
@@ -831,11 +825,11 @@
"forwarding\")."
msgstr ""
-#: src/conf/wizard_curs.c:219
+#: src/conf/wizard_curs.c:200
msgid "How much upstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:224
+#: src/conf/wizard_curs.c:205
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
@@ -846,11 +840,11 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:251
+#: src/conf/wizard_curs.c:232
msgid "How much downstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:256
+#: src/conf/wizard_curs.c:237
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
@@ -861,7 +855,7 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:276
+#: src/conf/wizard_curs.c:257
msgid ""
"Share denoted bandwidth with other applications?\n"
"\n"
@@ -874,18 +868,18 @@
"connection whenever your high-speed LAN gets used (e.g. by NFS)."
msgstr ""
-#: src/conf/wizard_curs.c:307
+#: src/conf/wizard_curs.c:288
msgid "How much CPU (in %) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:312
+#: src/conf/wizard_curs.c:293
msgid ""
"You can limit GNUnet's ressource usage here.\n"
"\n"
"This is the percentage of processor time GNUnet is allowed to use."
msgstr ""
-#: src/conf/wizard_curs.c:329
+#: src/conf/wizard_curs.c:310
msgid ""
"Store migrated content?\n"
"\n"
@@ -898,7 +892,7 @@
"availability."
msgstr ""
-#: src/conf/wizard_curs.c:357
+#: src/conf/wizard_curs.c:338
msgid ""
"What's the maximum datastore size in MB?\n"
"\n"
@@ -906,7 +900,7 @@
"inserted and migrated content)."
msgstr ""
-#: src/conf/wizard_curs.c:379
+#: src/conf/wizard_curs.c:360
msgid ""
"Do you want to launch GNUnet as a system service?\n"
"\n"
@@ -915,22 +909,23 @@
"launch GNUnet yourself each time you want to use it."
msgstr ""
-#: src/conf/wizard_curs.c:402
+#: src/conf/wizard_curs.c:383
msgid ""
"Define the user owning the GNUnet service.\n"
"\n"
"For security reasons, it is a good idea to let this setup create a new user "
"account under which the GNUnet service is started at system startup.\n"
"\n"
-"You can also specify an already existant user account here.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
"\n"
-"In any case, you should check its permissions to critical files on your "
-"system.\n"
+"Leave the fields empty to run GNUnet with system privileges.\n"
"\n"
"GNUnet user:"
msgstr ""
-#: src/conf/wizard_curs.c:429
+#: src/conf/wizard_curs.c:411
msgid ""
"Define the group owning the GNUnet service.\n"
"\n"
@@ -945,7 +940,7 @@
"GNUnet group:"
msgstr ""
-#: src/conf/wizard_curs.c:458
+#: src/conf/wizard_curs.c:440
msgid ""
"If you are an experienced user, you may want to tweak your GNUnet "
"installation using the enhanced configurator.\n"
@@ -953,7 +948,7 @@
"Do you want to start it after saving your configuration?"
msgstr ""
-#: src/conf/wizard_curs.c:487
+#: src/conf/wizard_curs.c:476
#, fuzzy
msgid ""
"Cannot save configuration.\n"
@@ -961,55 +956,53 @@
"Try again?"
msgstr "Gufungura Iboneza IDOSIYE"
-#: src/conf/wizard_util.c:162
-#, c-format
-msgid "Error: can't open Service Control Manager: %s (%i)\n"
+#: src/conf/wizard_util.c:164 src/conf/wizard_util.c:226
+msgid "Can't open Service Control Manager"
msgstr ""
#: src/conf/wizard_util.c:170
-#, c-format
-msgid "Error: can't create service: %s (#%i)\n"
+msgid "Can't create service"
msgstr ""
-#: src/conf/wizard_util.c:176 src/conf/wizard_util.c:218
+#: src/conf/wizard_util.c:175 src/conf/wizard_util.c:238
#, fuzzy
msgid "Unknown error"
msgstr "Verisiyo"
-#: src/conf/wizard_util.c:189
-msgid "Cannot write to the regisitry"
+#: src/conf/wizard_util.c:188
+msgid "Error changing the permissions of the GNUnet directory"
msgstr ""
-#: src/conf/wizard_util.c:206
-msgid "Can't open Service Control Manager"
+#: src/conf/wizard_util.c:209
+msgid "Cannot write to the regisitry"
msgstr ""
-#: src/conf/wizard_util.c:210
+#: src/conf/wizard_util.c:230
msgid "Can't access the service"
msgstr ""
-#: src/conf/wizard_util.c:214
+#: src/conf/wizard_util.c:234
msgid "Can't delete the service"
msgstr ""
-#: src/conf/wizard_util.c:358
+#: src/conf/wizard_util.c:382
msgid "This version of Windows does not support multiple users."
msgstr ""
-#: src/conf/wizard_util.c:362
+#: src/conf/wizard_util.c:386
#, fuzzy
msgid "Error creating user"
msgstr "Ivugurura Verisiyo"
-#: src/conf/wizard_util.c:365
+#: src/conf/wizard_util.c:389
msgid "Error accessing local security policy"
msgstr ""
-#: src/conf/wizard_util.c:368
+#: src/conf/wizard_util.c:392
msgid "Error granting service right to user"
msgstr ""
-#: src/conf/wizard_util.c:371
+#: src/conf/wizard_util.c:395
msgid "Unknown error while creating a new user"
msgstr ""
@@ -1087,8 +1080,8 @@
#: src/applications/tracekit/gnunet-tracekit.c:87
#: src/applications/tracekit/gnunet-tracekit.c:122
#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-insert.c:280
-#: src/applications/fs/tools/gnunet-insert.c:396
+#: src/applications/fs/tools/gnunet-insert.c:283
+#: src/applications/fs/tools/gnunet-insert.c:399
#: src/applications/fs/tools/gnunet-search.c:156
#: src/applications/fs/tools/gnunet-search.c:172
#: src/applications/fs/tools/gnunet-search.c:193
@@ -1112,7 +1105,7 @@
#: src/applications/fs/tools/gnunet-pseudonym.c:192
#: src/applications/fs/tools/gnunet-delete.c:111
#: src/applications/fs/tools/gnunet-directory.c:177
-#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:470
#: src/applications/fs/tools/gnunet-search.c:210
#: src/applications/fs/tools/gnunet-download.c:125
#: src/applications/fs/tools/gnunet-unindex.c:139
@@ -1525,8 +1518,8 @@
#: src/applications/sqstore_mysql/mysql.c:924 src/util/symcipher_gcrypt.c:47
#: src/util/symcipher_gcrypt.c:54 src/util/hostkey_gcrypt.c:56
#: src/util/hostkey_gcrypt.c:63 src/util/storage.c:613
-#: src/include/gnunet_util.h:973 src/include/gnunet_util.h:980
-#: src/include/gnunet_util.h:982
+#: src/include/gnunet_util.h:980 src/include/gnunet_util.h:987
+#: src/include/gnunet_util.h:989
#, fuzzy, c-format
msgid "'%s' failed at %s:%d with error: %s\n"
msgstr "'%s'Byanze ku Na: Ikosa"
@@ -2316,28 +2309,28 @@
msgid "# p2p trace replies sent"
msgstr "#Yoherejwe:"
-#: src/applications/gap/gap.c:1856
+#: src/applications/gap/gap.c:1863
msgid ""
"Cover traffic requested but traffic service not loaded. Rejecting request.\n"
msgstr ""
-#: src/applications/gap/gap.c:1867 src/applications/fs/module/fs.c:667
+#: src/applications/gap/gap.c:1874 src/applications/fs/module/fs.c:669
#, fuzzy
msgid "Failed to get traffic stats.\n"
msgstr "Kuri Ikibazo# Ibyerekeye"
-#: src/applications/gap/gap.c:1873 src/applications/gap/gap.c:1878
-#: src/applications/gap/gap.c:1884
+#: src/applications/gap/gap.c:1880 src/applications/gap/gap.c:1885
+#: src/applications/gap/gap.c:1891
msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
msgstr ""
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2102
msgid ""
"Traffic service failed to load; gap cannot ensure cover-traffic "
"availability.\n"
msgstr ""
-#: src/applications/gap/gap.c:2126
+#: src/applications/gap/gap.c:2133
#, c-format
msgid "'%s' registering handlers %d %d\n"
msgstr ""
@@ -2621,26 +2614,26 @@
msgid "File '%s' has URI: %s\n"
msgstr "Idosiye Nka"
-#: src/applications/fs/tools/gnunet-insert.c:160
+#: src/applications/fs/tools/gnunet-insert.c:161
#, c-format
msgid ""
"\n"
"Error uploading file: %s\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
#, fuzzy
msgid "set the desired LEVEL of sender-anonymity"
msgstr "Gushyiraho i Bya Mwakirizi"
-#: src/applications/fs/tools/gnunet-insert.c:181
+#: src/applications/fs/tools/gnunet-insert.c:183
#, 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:184
+#: src/applications/fs/tools/gnunet-insert.c:186
#, fuzzy
msgid ""
"print list of extracted keywords that would be used, but do not perform "
@@ -2649,14 +2642,14 @@
"Gucapa Urutonde Bya Amagambo fatizo OYA Iyinjizamo Cyangwa gushyiraho "
"umugereka"
-#: src/applications/fs/tools/gnunet-insert.c:188
+#: src/applications/fs/tools/gnunet-insert.c:190
#, 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:191
+#: src/applications/fs/tools/gnunet-insert.c:193
#, fuzzy
msgid ""
"add an additional keyword for the top-level file or directory (this option "
@@ -2665,7 +2658,7 @@
"Kongeramo Ijambo- banze kugirango i Hejuru: urwego IDOSIYE Cyangwa "
"bushyinguro iyi Ihitamo Igikubo Times"
-#: src/applications/fs/tools/gnunet-insert.c:194
+#: src/applications/fs/tools/gnunet-insert.c:196
#, fuzzy
msgid ""
"add an additional keyword for all files and directories (this option can be "
@@ -2674,11 +2667,11 @@
"Kongeramo Ijambo- banze kugirango Byose Idosiye Na ububiko bw'amaderese iyi "
"Ihitamo Igikubo Times"
-#: src/applications/fs/tools/gnunet-insert.c:198
+#: src/applications/fs/tools/gnunet-insert.c:200
msgid "set the meta-data for the given TYPE to the given VALUE"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:200
+#: src/applications/fs/tools/gnunet-insert.c:202
#, fuzzy
msgid ""
"do not index, perform full insertion (stores entire file in encrypted form "
@@ -2686,86 +2679,86 @@
msgstr ""
"OYA Umubarendanga Iyinjizamo IDOSIYE in Bishunzwe: Ifishi in Ububikoshingiro"
-#: src/applications/fs/tools/gnunet-insert.c:203
+#: src/applications/fs/tools/gnunet-insert.c:205
#, 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:206
+#: src/applications/fs/tools/gnunet-insert.c:208
#, fuzzy
msgid "specify the priority of the content"
msgstr "i By'ibanze Bya i Ibikubiyemo"
-#: src/applications/fs/tools/gnunet-insert.c:208
+#: src/applications/fs/tools/gnunet-insert.c:210
#, 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:210
+#: src/applications/fs/tools/gnunet-insert.c:212
#, fuzzy
msgid "process directories recursively"
msgstr "ububiko bw'amaderese"
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:214
#, 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:215
+#: src/applications/fs/tools/gnunet-insert.c:217
#, 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:218
+#: src/applications/fs/tools/gnunet-insert.c:220
#, 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:220
+#: src/applications/fs/tools/gnunet-insert.c:222
#, 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:227
+#: src/applications/fs/tools/gnunet-insert.c:229
#, fuzzy
msgid "Make files available to GNUnet for sharing."
msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
-#: src/applications/fs/tools/gnunet-insert.c:304
+#: src/applications/fs/tools/gnunet-insert.c:307
#, fuzzy, c-format
msgid "You must pass a positive number to the '%s' option.\n"
msgstr "a Umubare Kuri i Ihitamo"
-#: src/applications/fs/tools/gnunet-insert.c:472
+#: src/applications/fs/tools/gnunet-insert.c:475
#: src/applications/fs/tools/gnunet-unindex.c:144
#, fuzzy, c-format
msgid "You must specify a list of files to insert.\n"
msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-#: src/applications/fs/tools/gnunet-insert.c:491
-#, fuzzy, c-format
-msgid "Keywords for file '%s':\n"
-msgstr "kugirango IDOSIYE"
-
-#: src/applications/fs/tools/gnunet-insert.c:501
+#: src/applications/fs/tools/gnunet-insert.c:479
#, c-format
msgid "Only one file or directory can be specified at a time.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:505
+#: src/applications/fs/tools/gnunet-insert.c:483
#, fuzzy, c-format
msgid "You must specify a file or directory to upload.\n"
msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-#: src/applications/fs/tools/gnunet-insert.c:548
+#: src/applications/fs/tools/gnunet-insert.c:532
#, fuzzy, c-format
+msgid "Keywords for file '%s':\n"
+msgstr "kugirango IDOSIYE"
+
+#: src/applications/fs/tools/gnunet-insert.c:554
+#, fuzzy, c-format
msgid "Could not access namespace '%s' (does not exist?).\n"
msgstr ""
"Project- Id- Version: basctl\n"
@@ -2777,16 +2770,16 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/applications/fs/tools/gnunet-insert.c:563
+#: src/applications/fs/tools/gnunet-insert.c:569
#, fuzzy, c-format
msgid "Parsing time failed. Use '%s' format.\n"
msgstr "Igihe Byanze Imiterere"
-#: src/applications/fs/tools/gnunet-insert.c:572
-#: src/applications/fs/tools/gnunet-insert.c:576
-#: src/applications/fs/tools/gnunet-insert.c:580
-#: src/applications/fs/tools/gnunet-insert.c:584
-#: src/applications/fs/tools/gnunet-insert.c:589
+#: src/applications/fs/tools/gnunet-insert.c:578
+#: src/applications/fs/tools/gnunet-insert.c:582
+#: src/applications/fs/tools/gnunet-insert.c:586
+#: src/applications/fs/tools/gnunet-insert.c:590
+#: src/applications/fs/tools/gnunet-insert.c:595
#, fuzzy, c-format
msgid "Option '%s' makes no sense without option '%s'.\n"
msgstr "Oya Ihitamo"
@@ -2879,27 +2872,31 @@
#: src/applications/fs/tools/gnunet-download.c:156
#, fuzzy, c-format
-msgid "Download at %16llu out of %16llu bytes (%8.3f kbps)"
+msgid "Download of file '%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
msgstr "ku Inyuma Bya Bayite"
-#: src/applications/fs/tools/gnunet-download.c:166
+#: src/applications/fs/tools/gnunet-download.c:168
+#: src/applications/fs/tools/gnunet-download.c:179
#, c-format
msgid "Error downloading: %s\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-download.c:172
+#: src/applications/fs/tools/gnunet-download.c:187
#, fuzzy, c-format
-msgid ""
-"\n"
-"Download of file '%s' comlete. Speed was %8.3f kilobyte per second.\n"
+msgid "Download of file '%s' complete. Speed was %8.3f kilobyte per second.\n"
msgstr "ISEGONDA"
-#: src/applications/fs/tools/gnunet-download.c:215
+#: src/applications/fs/tools/gnunet-download.c:198
+#, c-format
+msgid "Recursive download of directory '%s' at %llu of %llu bytes.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-download.c:236
#, fuzzy, c-format
msgid "URI '%s' invalid for gnunet-download.\n"
msgstr "Sibyo"
-#: src/applications/fs/tools/gnunet-download.c:266
+#: src/applications/fs/tools/gnunet-download.c:287
#, fuzzy, c-format
msgid "File stored as '%s'.\n"
msgstr "Idosiye Nka"
@@ -2948,12 +2945,12 @@
"s' under '%s'."
msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:327
#, c-format
msgid "Indexed file disappeared, deleting block for query '%s'\n"
msgstr ""
-#: src/applications/fs/module/ondemand.c:404
+#: src/applications/fs/module/ondemand.c:408
#, c-format
msgid ""
"Because the file '%s' has been unavailable for 3 days it got removed from "
@@ -2961,27 +2958,27 @@
"contains invalid references!"
msgstr ""
-#: src/applications/fs/module/ondemand.c:430
+#: src/applications/fs/module/ondemand.c:434
#, 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:621
+#: src/applications/fs/module/ondemand.c:625
#, c-format
msgid ""
"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:980
+#: src/applications/fs/module/fs.c:998
#, fuzzy, c-format
msgid ""
"You must specify a postive number for '%s' in the configuration in section '%"
"s'.\n"
msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
-#: src/applications/fs/module/fs.c:1019
+#: src/applications/fs/module/fs.c:1039
#, c-format
msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr ""
@@ -2996,15 +2993,15 @@
msgid "AND"
msgstr ""
-#: src/applications/fs/fsui/upload.c:336 src/applications/fs/fsui/upload.c:366
+#: src/applications/fs/fsui/upload.c:349 src/applications/fs/fsui/upload.c:388
msgid "Upload failed.\n"
msgstr ""
-#: src/applications/fs/fsui/upload.c:370
+#: src/applications/fs/fsui/upload.c:395
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
-#: src/applications/fs/fsui/fsui.c:509
+#: src/applications/fs/fsui/fsui.c:542
#, c-format
msgid "FSUI state file '%s' had syntax error at offset %u.\n"
msgstr ""
@@ -3019,11 +3016,16 @@
"schedule.\n"
msgstr ""
-#: src/applications/fs/fsui/download.c:192
+#: src/applications/fs/fsui/download.c:239
#, fuzzy
msgid "Download aborted."
msgstr "/Byahiswemo"
+#: src/applications/fs/fsui/download.c:242
+#, fuzzy
+msgid "ECRS download failed (see logs)."
+msgstr "OYA Gufungura IDOSIYE"
+
#: src/applications/fs/fsui/file_info.c:73
msgid "Collecting file identifiers disabled.\n"
msgstr ""
@@ -3041,18 +3043,40 @@
msgid "LOC URI not allowed for search.\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:884
+#: src/applications/fs/ecrs/download.c:889
#, 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:1049
+#: src/applications/fs/ecrs/download.c:1054
#, fuzzy, c-format
msgid "Content '%s' seems to be not available on the network.\n"
msgstr "Kuri OYA Bihari ku i urusobe"
+#: src/applications/fs/ecrs/upload.c:180
+#, fuzzy, c-format
+msgid "Cannot hash '%s'.\n"
+msgstr "Ibirimo"
+
+#: src/applications/fs/ecrs/upload.c:198
+#, fuzzy, c-format
+msgid "Initialization for indexing file '%s' failed.\n"
+msgstr "Bya in IDOSIYE"
+
+#: src/applications/fs/ecrs/upload.c:204
+#, c-format
+msgid ""
+"Indexing file '%s' failed. Check file permissions and consult your GNUnet "
+"server's logs.\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:287
+#, c-format
+msgid "Indexing data failed at position %i.\n"
+msgstr ""
+
#: src/applications/fs/ecrs/meta.c:772
#, fuzzy, c-format
msgid "Renaming of file '%s' to '%s' failed: %s\n"
@@ -3063,7 +3087,7 @@
msgid "Could not rename file '%s' to '%s': file exists\n"
msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
-#: src/applications/fs/ecrs/namespace.c:45 src/util/state.c:81
+#: src/applications/fs/ecrs/namespace.c:45
#, fuzzy, c-format
msgid ""
"Configuration file must specify a directory for GNUnet to store per-peer "
@@ -3165,12 +3189,12 @@
msgid "Could not resolve name of HTTP proxy '%s'. Trying without a proxy.\n"
msgstr "OYA Izina: Bya Porogisi a Porogisi"
-#: src/applications/traffic/traffic.c:443
+#: src/applications/traffic/traffic.c:445
#, fuzzy, c-format
msgid "# bytes transmitted of type %d"
msgstr "#Bayite Bya Ubwoko"
-#: src/applications/traffic/traffic.c:463
+#: src/applications/traffic/traffic.c:465
#, fuzzy, c-format
msgid "# bytes received of type %d"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
@@ -3509,7 +3533,7 @@
"entry '%s': %s\n"
msgstr "urusobe in i Iboneza in Icyiciro kugirango Icyinjijwe"
-#: src/server/tcpserver.c:797
+#: src/server/tcpserver.c:798
#, fuzzy, c-format
msgid "%s failed, message type %d already in use.\n"
msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
@@ -3766,22 +3790,22 @@
"Arguments mandatory for long options are also mandatory for short options.\n"
msgstr "kugirango Amahitamo kugirango Amahitamo"
-#: src/util/configuration.c:177
+#: src/util/configuration.c:180
#, fuzzy, c-format
msgid "inlining configration file '%s'\n"
msgstr "IDOSIYE"
-#: src/util/configuration.c:181
+#: src/util/configuration.c:184
#, fuzzy, c-format
msgid "Could not parse configuration file '%s'.\n"
msgstr "OYA Iboneza IDOSIYE"
-#: src/util/configuration.c:217
+#: src/util/configuration.c:220
#, fuzzy, c-format
msgid "Syntax error in configuration file '%s' at line %d.\n"
msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
-#: src/util/configuration.c:464
+#: src/util/configuration.c:471
#, fuzzy, c-format
msgid ""
"Configuration file '%s' not found. I will try to create the default "
@@ -3789,7 +3813,7 @@
msgstr ""
"IDOSIYE OYA Byabonetse Kuri Kurema i Mburabuzi Iboneza IDOSIYE ku Ahantu"
-#: src/util/configuration.c:481
+#: src/util/configuration.c:488
#, fuzzy, c-format
msgid "Cannot open configuration file '%s'\n"
msgstr "Gufungura Iboneza IDOSIYE"
@@ -3799,11 +3823,18 @@
msgid "libgcrypt has not the expected version (version %s is required).\n"
msgstr "OYA i Ikitezwe: Verisiyo Verisiyo ni Bya ngombwa"
-#: src/util/tcpio.c:86 src/util/identity.c:83 src/util/identity.c:123
+#: src/util/tcpio.c:87 src/util/identity.c:83 src/util/identity.c:123
#, fuzzy, c-format
msgid "Could not find IP of host '%s': %s\n"
msgstr "OYA Gushaka Bya Ubuturo"
+#: src/util/state.c:86
+#, fuzzy, c-format
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
+msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+
#: src/util/dso.c:41
#, fuzzy, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -3859,17 +3890,17 @@
msgid "EVERYTHING"
msgstr ""
-#: src/util/logging.c:239
+#: src/util/logging.c:248
#, fuzzy
msgid "LOGLEVEL not specified, that is not ok.\n"
msgstr "OYA ni OYA YEGO"
-#: src/util/logging.c:250
+#: src/util/logging.c:259
#, c-format
msgid "Invalid LOGLEVEL '%s' specified.\n"
msgstr ""
-#: src/util/logging.c:355 src/util/logging.c:361
+#: src/util/logging.c:364 src/util/logging.c:370
#, fuzzy, c-format
msgid "Failure at %s:%d.\n"
msgstr "ku"
@@ -3919,16 +3950,16 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/util/identity.c:282
+#: src/util/identity.c:297
+#, fuzzy, c-format
+msgid "Could not resolve '%s' to determine our IP address: %s\n"
+msgstr "OYA Kuri Aderesi"
+
+#: src/util/identity.c:322
#, c-format
msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
msgstr ""
-#: src/util/identity.c:300
-#, fuzzy, c-format
-msgid "Could not resolve '%s' to determine our IP address: %s\n"
-msgstr "OYA Kuri Aderesi"
-
#: src/util/identity.c:357 src/util/identity.c:399
#, fuzzy, c-format
msgid "Could not resolve '%s': %s\n"
@@ -3958,42 +3989,42 @@
"configuration file.\n"
msgstr "OYA Gushaka kugirango iyi Ubuturo i in i Iboneza IDOSIYE"
-#: src/include/gnunet_util.h:140
+#: src/include/gnunet_util.h:147
#, fuzzy
msgid "print this help"
msgstr "Gucapa iyi Ifashayobora"
-#: src/include/gnunet_util.h:143
+#: src/include/gnunet_util.h:150
#, fuzzy
msgid "set verbosity to LEVEL"
msgstr "Gushyiraho Kuri"
-#: src/include/gnunet_util.h:146
+#: src/include/gnunet_util.h:153
#, fuzzy
msgid "use configuration file FILENAME"
msgstr "Gukoresha Iboneza IDOSIYE"
-#: src/include/gnunet_util.h:149
+#: src/include/gnunet_util.h:156
#, fuzzy
msgid "specify host on which gnunetd is running"
msgstr "Ubuturo ku ni"
-#: src/include/gnunet_util.h:152
+#: src/include/gnunet_util.h:159
#, fuzzy
msgid "print the version number"
msgstr "Gucapa i Verisiyo Umubare"
-#: src/include/gnunet_util.h:155
+#: src/include/gnunet_util.h:162
msgid "be verbose"
msgstr ""
-#: src/include/gnunet_util.h:582 src/include/gnunet_util.h:584
+#: src/include/gnunet_util.h:589 src/include/gnunet_util.h:591
#, fuzzy, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr "Byanze ku"
-#: src/include/gnunet_util.h:989 src/include/gnunet_util.h:991
-#: src/include/gnunet_util.h:998
+#: src/include/gnunet_util.h:996 src/include/gnunet_util.h:998
+#: src/include/gnunet_util.h:1005
#, fuzzy, c-format
msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
msgstr "'%s'Byanze ku IDOSIYE ku Na: Ikosa"
@@ -4336,12 +4367,6 @@
#~ msgstr "Byakozwe"
#, fuzzy
-#~ msgid ""
-#~ "Could not download file '%s'.\n"
-#~ "Consult logs.\n"
-#~ msgstr "OYA Gufungura IDOSIYE"
-
-#, fuzzy
#~ msgid "filename"
#~ msgstr "Izina ry'idosiye"
@@ -5447,10 +5472,6 @@
#~ msgstr "Ububikoshingiro IDOSIYE Uburebure Kuri"
#, fuzzy
-#~ msgid "Cannot load '%s'.\n"
-#~ msgstr "Ibirimo"
-
-#, fuzzy
#~ msgid "Could not open '%s' database '%s'!\n"
#~ msgstr "OYA Gufungura Ububikoshingiro"
@@ -5722,10 +5743,6 @@
#~ msgstr "OYA Kuri i Bya i Byahiswemo"
#, fuzzy
-#~ msgid "Verification of SBlock in file '%s' failed\n"
-#~ msgstr "Bya in IDOSIYE"
-
-#, fuzzy
#~ msgid "Trying to update nonupdatable SBlock.\n"
#~ msgstr "Kuri Kuvugurura"
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2005-06-14 20:33:39 UTC
(rev 945)
+++ GNUnet/src/applications/advertising/advertising.c 2005-06-15 17:15:15 UTC
(rev 946)
@@ -480,7 +480,7 @@
i = transport->forEach(NULL,
NULL);
- transport->forEach(&broadcastHELOTransport,
+ transport->forEach((TransportCallback)&broadcastHELOTransport,
&i);
}
Modified: GNUnet/src/applications/fs/ecrs/meta.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/meta.c 2005-06-14 20:33:39 UTC (rev
945)
+++ GNUnet/src/applications/fs/ecrs/meta.c 2005-06-15 17:15:15 UTC (rev
946)
@@ -622,13 +622,15 @@
int ECRS_isDirectory(MetaData * md) {
int i;
- for (i=md->itemCount-1;i>=0;i--)
- if ( (md->items[i].type == EXTRACTOR_MIMETYPE) &&
- (0 == strcmp(md->items[i].data,
- GNUNET_DIRECTORY_MIME)) )
- return YES;
- else
- return NO;
+ for (i=md->itemCount-1;i>=0;i--) {
+ if (md->items[i].type == EXTRACTOR_MIMETYPE) {
+ if (0 == strcmp(md->items[i].data,
+ GNUNET_DIRECTORY_MIME))
+ return YES;
+ else
+ return NO;
+ }
+ }
return SYSERR;
}
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2005-06-14 20:33:39 UTC (rev
945)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2005-06-15 17:15:15 UTC (rev
946)
@@ -176,7 +176,9 @@
if (doIndex) {
if (SYSERR == getFileHash(filename,
&fileId)) {
- LOG(LOG_ERROR, _("Cannot hash '%s'.\n"), filename);
+ LOG(LOG_ERROR,
+ _("Cannot hash '%s'.\n"),
+ filename);
releaseClientSocket(sock);
return SYSERR;
}
@@ -189,6 +191,22 @@
start = now;
/* reset the counter since the formula later does not
take the time for getFileHash into account */
+
+ switch (FS_initIndex(sock, &fileId, filename)) {
+ case SYSERR:
+ LOG(LOG_ERROR,
+ _("Initialization for indexing file '%s' failed.\n"),
+ filename);
+ releaseClientSocket(sock);
+ return SYSERR;
+ case NO:
+ LOG(LOG_ERROR,
+ _("Indexing file '%s' failed. Check file permissions and consult "
+ "your GNUnet server's logs.\n"),
+ filename);
+ releaseClientSocket(sock);
+ return SYSERR;
+ }
}
treedepth = computeDepth(filesize);
@@ -202,17 +220,6 @@
return SYSERR;
}
- switch(FS_initIndex(sock, &fileId, filename)) {
- case SYSERR:
- LOG(LOG_ERROR, _("Initialization for indexing file '%s'
failed.\n"), filename);
- return SYSERR;
- case NO:
- LOG(LOG_ERROR,
- _("Indexing file '%s' failed. Check file
permissions and consult "
- "your GNUnet server's logs.\n"), filename);
- return SYSERR;
- }
-
dblock = MALLOC(sizeof(Datastore_Value) + DBLOCK_SIZE + sizeof(DBlock));
dblock->size = htonl(sizeof(Datastore_Value) + DBLOCK_SIZE + sizeof(DBlock));
dblock->anonymityLevel = htonl(anonymityLevel);
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2005-06-14 20:33:39 UTC (rev
945)
+++ GNUnet/src/applications/fs/fsui/download.c 2005-06-15 17:15:15 UTC (rev
946)
@@ -176,12 +176,6 @@
unsigned long long totalBytes;
GNUNET_ASSERT(dl->ctx != NULL);
- root = dl;
- while ( (root->parent != NULL) &&
- (root->parent != &dl->ctx->activeDownloads) ) {
- root = root->parent;
- }
-
GNUNET_ASSERT(dl->filename != NULL);
ret = ECRS_downloadFile(dl->uri,
dl->filename,
@@ -190,11 +184,17 @@
dl,
(ECRS_TestTerminate) &testTerminate,
dl);
- /* MAYBE FIXME: ___ ret == OK possible without download complete or at
- least without downloadProgressCallback called with complete?? __
- (possibly only with resumed download???) */
if (ret == OK)
dl->finished = YES;
+ totalBytes = ECRS_fileSize(dl->uri);
+ root = dl;
+ while ( (root->parent != NULL) &&
+ (root->parent != &dl->ctx->activeDownloads) ) {
+ root = root->parent;
+ root->completed += totalBytes;
+ }
+
+
if ( (ret == OK) &&
(dl->is_recursive) &&
(dl->is_directory) ) {
@@ -213,8 +213,6 @@
"OPEN",
dl->filename);
} else {
- totalBytes = ECRS_fileSize(dl->uri);
-
dirBlock = MMAP(NULL,
totalBytes,
PROT_READ,
@@ -253,8 +251,8 @@
(dl->ctx != NULL) &&
(dl != &dl->ctx->activeDownloads) ) {
event.type = FSUI_download_complete;
- event.data.DownloadProgress.total = root->total;
- event.data.DownloadProgress.completed = root->completed;
+ event.data.DownloadProgress.total = dl->total;
+ event.data.DownloadProgress.completed = dl->completed;
event.data.DownloadProgress.last_offset = 0;
event.data.DownloadProgress.eta = cronTime(NULL);
event.data.DownloadProgress.last_block = NULL;
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2005-06-14 20:33:39 UTC (rev
945)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2005-06-15 17:15:15 UTC (rev
946)
@@ -28,6 +28,8 @@
#include "gnunet_fsui_lib.h"
#include "fsui.h"
+#define FSUI_UDT_FREQUENCY (2 * cronSECONDS)
+
#define READINT(a) \
if (sizeof(int) != READ(fd, &big, sizeof(int))) \
goto ERR; \
@@ -95,9 +97,13 @@
READINT(ret->completedDownloadsCount);
READINT(ret->finished);
READINT(big);
+ if (big > 1024 * 1024)
+ goto ERR;
ret->filename = MALLOC(big+1);
- if (big != READ(fd, ret->filename, big))
+ if (big != READ(fd, ret->filename, big)) {
+ FREE(ret->filename);
goto ERR;
+ }
ret->filename[big] = '\0';
READLONG(ret->total);
READLONG(ret->completed);
@@ -557,7 +563,7 @@
ret->activeDownloadThreads = 0;
addCronJob(&updateDownloadThreads,
0,
- 2 * cronSECONDS,
+ FSUI_UDT_FREQUENCY,
ret);
return ret;
}
@@ -579,11 +585,14 @@
"FSUI shutdown. This may take a while.\n");
FSUI_publishCollectionNow(ctx);
- suspendCron();
+ i = isCronRunning();
+ if (i)
+ suspendCron();
delCronJob(&updateDownloadThreads,
- 5 * cronSECONDS,
+ FSUI_UDT_FREQUENCY,
ctx);
- resumeCron();
+ if (i)
+ resumeCron();
/* first, stop all download threads
by reducing the thread pool size to 0 */
ctx->threadPoolSize = 0;
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2005-06-14 20:33:39 UTC (rev
945)
+++ GNUnet/src/applications/fs/fsui/upload.c 2005-06-15 17:15:15 UTC (rev
946)
@@ -444,7 +444,8 @@
ECRS_freeUri(uri);
FREE(utc->main_filename);
- ECRS_freeMetaData(utc->meta);
+ if (utc->meta != NULL)
+ ECRS_freeMetaData(utc->meta);
if (utc->uri != NULL)
ECRS_freeUri(utc->uri);
if (utc->globalUri != NULL)
@@ -525,7 +526,6 @@
cleanupFSUIThreadList(ctx);
return OK;
}
-
/**
* Start uploading a directory. Note that an upload cannot be stopped
* once started (not necessary anyway), but it can fail. All files
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2005-06-14 20:33:39 UTC (rev
945)
+++ GNUnet/src/applications/fs/module/fs.c 2005-06-15 17:15:15 UTC (rev
946)
@@ -122,10 +122,6 @@
BREAK(); /* value failed verification! */
return SYSERR;
}
-#if EXTRA_CHECKS
- if (closure != NULL)
- return OK; /* was extra-check */
-#endif
dv = MALLOC(size);
dv->size = htonl(size);
@@ -720,12 +716,6 @@
memcpy(&gw[1],
&value[1],
size - sizeof(GapWrapper));
-#if EXTRA_CHECKS
- GNUNET_ASSERT(SYSERR != gapPut("CHECK",
- key,
- &gw->dc,
- 0));
-#endif
if (ggc->resultCallback != NULL)
ret = ggc->resultCallback(key,
&gw->dc,
Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c 2005-06-14 20:33:39 UTC
(rev 945)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c 2005-06-15 17:15:15 UTC
(rev 946)
@@ -153,13 +153,13 @@
if (YES == testConfigurationString("GNUNET-DOWNLOAD",
"VERBOSE",
"YES")) {
- printf(_("Download at %16llu out of %16llu bytes (%8.3f kbps)"),
+ printf(_("Download of file '%s' at %16llu out of %16llu bytes (%8.3f
kbps)\n"),
+ event->data.DownloadProgress.filename,
event->data.DownloadProgress.completed,
event->data.DownloadProgress.total,
(event->data.DownloadProgress.completed/1024.0) /
(((double)(cronTime(NULL)-(event->data.DownloadProgress.start_time
- 1)))
/ (double)cronSECONDS) );
- printf("\r");
}
break;
case FSUI_download_aborted:
@@ -184,7 +184,7 @@
case FSUI_download_complete:
if ( (event->data.DownloadProgress.completed ==
event->data.DownloadProgress.total) ) {
- printf(_("\nDownload of file '%s' complete. Speed was %8.3f kilobyte
per second.\n"),
+ printf(_("Download of file '%s' complete. Speed was %8.3f kilobyte per
second.\n"),
event->data.DownloadProgress.filename,
(event->data.DownloadProgress.completed/1024.0) /
(((double)(cronTime(NULL)-(event->data.DownloadProgress.start_time
- 1)))
@@ -194,6 +194,11 @@
*ok = OK;
SEMAPHORE_UP(signalFinished);
}
+ } else {
+ printf(_("Recursive download of directory '%s' at %llu of %llu
bytes.\n"),
+ event->data.DownloadProgress.filename,
+ event->data.DownloadProgress.completed,
+ event->data.DownloadProgress.total);
}
break;
default:
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2005-06-14 20:33:39 UTC (rev
945)
+++ GNUnet/src/applications/traffic/traffic.c 2005-06-15 17:15:15 UTC (rev
946)
@@ -371,6 +371,8 @@
unsigned int nowUnit;
double totSize;
+ if (timePeriod > HISTORY_SIZE)
+ timePeriod = HISTORY_SIZE;
MUTEX_LOCK(&lock);
if ( (messageType >= max_message_type) ||
(counters[messageType] == NULL) ) {
Modified: GNUnet/src/util/logging.c
===================================================================
--- GNUnet/src/util/logging.c 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/src/util/logging.c 2005-06-15 17:15:15 UTC (rev 946)
@@ -195,7 +195,7 @@
/* Remove slashes */
end = datestr;
- while(c = *end) {
+ while((c = *end)) {
if (c == '\\' || c == '/')
*end = '_';
end++;
Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-06-14 20:33:39 UTC (rev 945)
+++ GNUnet/todo 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,14 +1,13 @@
0.7.0pre3:
-- gnunet-gtk:
- * make directories work [ CG ]
-- FSUI:
- * make (recursive) downloads work (test/debug) [ CG ]
- GAP:
- * fix Nils' assertion failure/bug [ CG ]
+ * fix Nils' assertion failure/bug [Nils, CG cannot reproduce]
- gnunet-setup: [Nils]
* gconfig: fix focus changes
* wizards: restrict user & service creation to platforms
known to be working.
+- Ensure hostlist is working on gnunet.org [ CG ]
+(Note to Nils: AFAIK, the code itself seems to be ready,
+ except for gnunet-setup which is still very unstable for me)
0.7.0 [6'05?] (aka "compatibility? what's that?"):
- Missing Features:
Added: GNUnet-docs/WWW/papers/secureindex.pdf
===================================================================
(Binary files differ)
Property changes on: GNUnet-docs/WWW/papers/secureindex.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: gnunet-gtk/INSTALL
===================================================================
--- gnunet-gtk/INSTALL 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/INSTALL 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,16 +1,13 @@
-Installation Instructions
-*************************
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+ These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -70,9 +67,9 @@
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -85,7 +82,7 @@
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
@@ -102,19 +99,19 @@
Installation Names
==================
-By default, `make install' will install the package's files in
+ By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
+options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -125,7 +122,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -140,11 +137,11 @@
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -170,9 +167,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +178,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -189,18 +186,14 @@
./configure CC=/usr/local2/bin/gcc
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/TODO 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,15 +1,19 @@
-High priority (for 0.7.0pre3):
-* debug
-
Important (for 0.7.0):
-* make use of anonymity level specification widgets (easy):
+* cleanup-code (enum instead of 1,2,3,4; refactor search/download copied code)
[ easy, CG ]
+* make use of anonymity level specification widgets [ easy, CG ]:
- search
- download
- upload
- namespace creation
-* download:
- - allow download canncellation
+* allow user to cancel downloads (may need FSUI API extensions) [ medium, CG ]
+* allow user to clear completed downloads from summary [ easy, CG ]
+* bugs:
- figure out where seemingly spurious "pending" downloads come from
+* search:
+ + update namespace list combo box [ easy, CG ]
+ + support namespace URIs [ easy, CG ]
+
+Less important (but still 0.7.0ish):
* implement advanced FS operations:
- create namespace [ medium ]
- publish to namespace [ medium ]
@@ -17,19 +21,8 @@
- start collection [ medium ]
- stop collection [ easy ]
- create directory from arbitrary mix [ medium ]
-* search:
- + update namespace list combo box [ easy ]
- + support namespace URIs [ easy ]
- + update search summary (new search start, new search result)
-* insertion:
- + support nice progress view for recursive insertions [ medium ] (working
already???)
* highlight completed downloads [ easy ]
* highlight active downloads in search list [ easy ]
-* allow user to cancel downloads [ medium ]
-* allow user to clear completed downloads from summary [ easy ]
-* process download progress events:
- - show contents of directory in associated search view! [ DIFFICULT, CG ]
-* cleanup-code (enum instead of 1,2,3,4) [ easy ]
Later (0.7.1):
* auto-rename downloaded files to better names (user feedback!?) [ medium ]
@@ -46,8 +39,6 @@
gnunet-gtk wishlist (from pre-0.7.0 days):
- #770? (use freedback (LOG) in gnunet-gtk via show-messages)
(is this not working nicely already?)
-- while (!) downloading directory, display already received results
- for download (now supported by libecrs!)
- add option to list all indexed files and perhaps delete from them
(ECRS now supports listing of indexed files!)
- for potentially long clists, add option to specify a string
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/configure.ac 2005-06-15 17:15:15 UTC (rev 946)
@@ -20,8 +20,8 @@
# Process this file with autoconf to produce a configure script.
#
AC_PREREQ(2.57)
-AC_INIT([gnunet-gtk],[0.0.0],address@hidden)
-AM_INIT_AUTOMAKE([gnunet-gtk], [0.0.0])
+AC_INIT([gnunet-gtk],[0.7.0pre3],address@hidden)
+AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.0pre3])
AM_CONFIG_HEADER(config.h)
AH_TOP([#define _GNU_SOURCE 1])
Modified: gnunet-gtk/doc/Makefile.am
===================================================================
--- gnunet-gtk/doc/Makefile.am 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/doc/Makefile.am 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,2 +1,5 @@
man_MANS = \
- gnunet-gtk.1
\ No newline at end of file
+ gnunet-gtk.1
+
+EXTRA_DIST = $(man_MANS)
+
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/gnunet-gtk.glade 2005-06-15 17:15:15 UTC (rev 946)
@@ -755,7 +755,7 @@
<property name="visible">True</property>
<property name="tooltip"
translatable="yes">Cancel the selected download</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-stop</property>
<property name="use_stock">True</property>
<property
name="relief">GTK_RELIEF_NORMAL</property>
<property
name="focus_on_click">True</property>
@@ -896,7 +896,7 @@
<child>
<widget class="GtkLabel" id="statusfstab">
- <property name="label" translatable="yes">S_tatus</property>
+ <property name="label" translatable="yes">Stat_us</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1253,7 +1253,7 @@
<child>
<widget class="GtkLabel" id="methodLabel">
<property name="visible">True</property>
- <property name="label"
translatable="yes">_Method:</property>
+ <property name="label"
translatable="yes">Method:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1333,7 +1333,7 @@
<child>
<widget class="GtkLabel" id="scopeLabel">
<property name="visible">True</property>
- <property name="label"
translatable="yes">Sco_pe:</property>
+ <property name="label"
translatable="yes">Scope:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1645,7 +1645,7 @@
<child>
<widget class="GtkLabel" id="label74">
<property name="visible">True</property>
- <property name="label"
translatable="yes">_Upload</property>
+ <property name="label"
translatable="yes">Up_load</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2250,7 +2250,7 @@
<child>
<widget class="GtkLabel" id="chatNotebookLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Chat</property>
+ <property name="label" translatable="yes">Cha_t</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -3002,7 +3002,7 @@
<child>
<widget class="GtkLabel" id="downloadAnonymityLabel">
<property name="visible">True</property>
- <property name="label"
translatable="yes">_Anonymity:</property>
+ <property name="label"
translatable="yes">Anon_ymity:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3105,7 +3105,7 @@
<child>
<widget class="GtkLabel" id="label76">
<property name="visible">True</property>
- <property name="label"
translatable="yes">_Download</property>
+ <property name="label"
translatable="yes">Down_load</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3234,73 +3234,11 @@
<widget class="GtkButton" id="namespaceInsertButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_namespaceInsertButton_clicked"
object="namespaceContentFrame" last_modification_time="Mon, 23 May 2005
19:00:01 GMT"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox15">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label66">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_Insert</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -3357,7 +3295,7 @@
<child>
<widget class="GtkLabel" id="label67">
<property name="visible">True</property>
- <property name="label"
translatable="yes">_Update</property>
+ <property name="label"
translatable="yes">U_pdate</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3538,7 +3476,7 @@
<child>
<widget class="GtkLabel" id="label69">
<property name="visible">True</property>
- <property name="label"
translatable="yes">Senden</property>
+ <property name="label"
translatable="yes">Sen_d</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4542,4 +4480,43 @@
</child>
</widget>
+<widget class="GtkMenu" id="searchSummaryContextMenu">
+ <property agent="glademm" name="cxx_visibility">public</property>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="close_selected_search">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Close the selected
search</property>
+ <property name="label" translatable="yes">_Close</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_close_selected_search_activate"
last_modification_time="Tue, 14 Jun 2005 23:59:56 GMT"/>
+ <accelerator key="C" modifiers="0" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image18">
+ <property name="visible">True</property>
+ <property name="stock">gtk-close</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkMenu" id="fsAdvancedAvailableContentContextMenu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="clear_known_content">
+ <property name="visible">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_clear_known_content_activate"
last_modification_time="Wed, 15 Jun 2005 00:09:05 GMT"/>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
Modified: gnunet-gtk/m4/codeset.m4
===================================================================
--- gnunet-gtk/m4/codeset.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/codeset.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# codeset.m4 serial AM1 (gettext-0.10.40)
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Modified: gnunet-gtk/m4/gettext.m4
===================================================================
--- gnunet-gtk/m4/gettext.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/gettext.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
-# gettext.m4 serial 28 (gettext-0.13)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# gettext.m4 serial 37 (gettext-0.14.4)
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
@@ -65,8 +63,8 @@
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2],
[need-formatstring-macros], ,
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
])])])])
- define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
- define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
+ define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
AC_REQUIRE([AM_PO_SUBDIRS])dnl
ifelse(gt_included_intl, yes, [
@@ -92,6 +90,9 @@
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+ gt_INTL_MACOSX
+
dnl Set USE_NLS.
AM_NLS
@@ -138,7 +139,7 @@
], [])[extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;],
[bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "",
0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
gt_cv_func_gnugettext_libc=yes,
gt_cv_func_gnugettext_libc=no)])
@@ -172,9 +173,9 @@
#ifdef __cplusplus
"C"
#endif
-const char *_nl_expand_alias ();],
+const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "",
0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
gt_cv_func_gnugettext_libintl=yes,
gt_cv_func_gnugettext_libintl=no)
dnl Now see whether libintl exists and depends on libiconv.
@@ -193,9 +194,9 @@
#ifdef __cplusplus
"C"
#endif
-const char *_nl_expand_alias ();],
+const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "",
0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
[LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext_libintl=yes
@@ -238,6 +239,7 @@
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi
+ CATOBJEXT=
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
dnl Mark actions to use GNU gettext tools.
@@ -245,6 +247,15 @@
fi
])
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Some extra flags are needed during linking.
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
AC_DEFINE(ENABLE_NLS, 1,
@@ -320,6 +331,7 @@
AC_SUBST(GENCAT)
dnl For backward compatibility. Some Makefiles may be using this.
+ INTLOBJS=
if test "$USE_INCLUDED_LIBINTL" = yes; then
INTLOBJS="\$(GETTOBJS)"
fi
@@ -350,6 +362,7 @@
AC_REQUIRE([AM_MKINSTALLDIRS])dnl
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([gt_GLIBC2])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_REQUIRE([AC_ISC_POSIX])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -358,22 +371,23 @@
AC_REQUIRE([AC_C_INLINE])dnl
AC_REQUIRE([AC_TYPE_OFF_T])dnl
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
+ AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
AC_REQUIRE([gt_TYPE_WINT_T])dnl
- AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
AC_REQUIRE([gt_TYPE_INTMAX_T])
AC_REQUIRE([gt_PRINTF_POSIX])
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
AC_REQUIRE([AC_FUNC_MMAP])dnl
- AC_REQUIRE([jm_GLIBC21])dnl
+ AC_REQUIRE([gl_GLIBC21])dnl
AC_REQUIRE([gt_INTDIV0])dnl
- AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+ AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
AC_REQUIRE([gt_INTTYPES_PRI])dnl
AC_REQUIRE([gl_XSIZE])dnl
+ AC_REQUIRE([gt_INTL_MACOSX])dnl
AC_CHECK_TYPE([ptrdiff_t], ,
[AC_DEFINE([ptrdiff_t], [long],
@@ -427,9 +441,13 @@
AM_ICONV
AM_LANGINFO_CODESET
if test $ac_cv_header_locale_h = yes; then
- AM_LC_MESSAGES
+ gt_LC_MESSAGES
fi
+ if test -n "$INTL_MACOSX_LIBS"; then
+ CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ fi
+
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
dnl because plural.y uses bison specific features. It requires at least
dnl bison-1.26 because earlier versions generate a plural.c that doesn't
@@ -463,6 +481,50 @@
])
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+ dnl Check for API introduced in MacOS X 10.2.
+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+ gt_cv_func_CFPreferencesCopyAppValue,
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -framework CoreFoundation"
+ AC_TRY_LINK([#include <CFPreferences.h>],
+ [CFPreferencesCopyAppValue(NULL, NULL)],
+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
+ [gt_cv_func_CFPreferencesCopyAppValue=no])
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
+ fi
+ dnl Check for API introduced in MacOS X 10.3.
+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS
-I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -framework CoreFoundation"
+ AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+ [gt_cv_func_CFLocaleCopyCurrent=yes],
+ [gt_cv_func_CFLocaleCopyCurrent=no])
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework.])
+ fi
+ INTL_MACOSX_LIBS=
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test
$gt_cv_func_CFLocaleCopyCurrent = yes; then
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+ fi
+ AC_SUBST([INTL_MACOSX_LIBS])
+])
+
+
dnl gt_CHECK_DECL(FUNC, INCLUDES)
dnl Check whether a function is declared.
AC_DEFUN([gt_CHECK_DECL],
Modified: gnunet-gtk/m4/glibc21.m4
===================================================================
--- gnunet-gtk/m4/glibc21.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/glibc21.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,15 +1,13 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# glibc21.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
# Test for the GNU C Library, version 2.1 or newer.
# From Bruno Haible.
-AC_DEFUN([jm_GLIBC21],
+AC_DEFUN([gl_GLIBC21],
[
AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
ac_cv_gnu_library_2_1,
Modified: gnunet-gtk/m4/iconv.m4
===================================================================
--- gnunet-gtk/m4/iconv.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/iconv.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# iconv.m4 serial AM4 (gettext-0.11.3)
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Modified: gnunet-gtk/m4/intdiv0.m4
===================================================================
--- gnunet-gtk/m4/intdiv0.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/intdiv0.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# intdiv0.m4 serial 1 (gettext-0.11.3)
dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Modified: gnunet-gtk/m4/intmax.m4
===================================================================
--- gnunet-gtk/m4/intmax.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/intmax.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
-# intmax.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# intmax.m4 serial 2 (gettext-0.14.2)
+dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
dnl Test whether the system has the 'intmax_t' type, but don't attempt to
@@ -12,11 +10,11 @@
AC_DEFUN([gt_TYPE_INTMAX_T],
[
- AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
[AC_TRY_COMPILE([
-#include <stddef.h>
+#include <stddef.h>
#include <stdlib.h>
#if HAVE_STDINT_H_WITH_UINTMAX
#include <stdint.h>
Modified: gnunet-gtk/m4/inttypes-pri.m4
===================================================================
--- gnunet-gtk/m4/inttypes-pri.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/inttypes-pri.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Modified: gnunet-gtk/m4/inttypes.m4
===================================================================
--- gnunet-gtk/m4/inttypes.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/inttypes.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# inttypes.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
Modified: gnunet-gtk/m4/inttypes_h.m4
===================================================================
--- gnunet-gtk/m4/inttypes_h.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/inttypes_h.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,26 +1,24 @@
-# inttypes_h.m4 serial 5 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# inttypes_h.m4 serial 6
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
# doesn't clash with <sys/types.h>, and declares uintmax_t.
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
[
- AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+ AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
[AC_TRY_COMPILE(
[#include <sys/types.h>
#include <inttypes.h>],
[uintmax_t i = (uintmax_t) -1;],
- jm_ac_cv_header_inttypes_h=yes,
- jm_ac_cv_header_inttypes_h=no)])
- if test $jm_ac_cv_header_inttypes_h = yes; then
+ gl_cv_header_inttypes_h=yes,
+ gl_cv_header_inttypes_h=no)])
+ if test $gl_cv_header_inttypes_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
and declares uintmax_t. ])
Modified: gnunet-gtk/m4/lcmessage.m4
===================================================================
--- gnunet-gtk/m4/lcmessage.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/lcmessage.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
-# lcmessage.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lcmessage.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
@@ -20,12 +18,12 @@
# Check whether LC_MESSAGES is available in <locale.h>.
-AC_DEFUN([AM_LC_MESSAGES],
+AC_DEFUN([gt_LC_MESSAGES],
[
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
+ gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
+ if test $gt_cv_val_LC_MESSAGES = yes; then
AC_DEFINE(HAVE_LC_MESSAGES, 1,
[Define if your <locale.h> file defines LC_MESSAGES.])
fi
Modified: gnunet-gtk/m4/lib-ld.m4
===================================================================
--- gnunet-gtk/m4/lib-ld.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/lib-ld.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# lib-ld.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl Subroutines of libtool.m4,
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
Modified: gnunet-gtk/m4/lib-link.m4
===================================================================
--- gnunet-gtk/m4/lib-link.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/lib-link.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,13 +1,13 @@
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-link.m4 serial 6 (gettext-0.14.3)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
+AC_PREREQ(2.50)
+
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@@ -95,6 +95,8 @@
dnl hardcode_direct, hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],
[
+ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
@@ -350,7 +352,7 @@
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
- linux*) haveit=yes;;
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
@@ -399,7 +401,7 @@
if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
- linux*) haveit=yes;;
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
Modified: gnunet-gtk/m4/lib-prefix.m4
===================================================================
--- gnunet-gtk/m4/lib-prefix.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/lib-prefix.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
@@ -71,7 +69,7 @@
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
- linux*) haveit=yes;;
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
Modified: gnunet-gtk/m4/longdouble.m4
===================================================================
--- gnunet-gtk/m4/longdouble.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/longdouble.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# longdouble.m4 serial 1 (gettext-0.12)
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
dnl Test whether the compiler supports the 'long double' type.
Modified: gnunet-gtk/m4/longlong.m4
===================================================================
--- gnunet-gtk/m4/longlong.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/longlong.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,16 +1,14 @@
-# longlong.m4 serial 4
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# longlong.m4 serial 5
+dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
# Define HAVE_LONG_LONG if 'long long' works.
-AC_DEFUN([jm_AC_TYPE_LONG_LONG],
+AC_DEFUN([gl_AC_TYPE_LONG_LONG],
[
AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
[AC_TRY_LINK([long long ll = 1LL; int i = 63;],
Modified: gnunet-gtk/m4/nls.m4
===================================================================
--- gnunet-gtk/m4/nls.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/nls.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
-# nls.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# nls.m4 serial 2 (gettext-0.14.3)
+dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
@@ -19,6 +17,8 @@
dnl Ulrich Drepper <address@hidden>, 1995-2000.
dnl Bruno Haible <address@hidden>, 2000-2003.
+AC_PREREQ(2.50)
+
AC_DEFUN([AM_NLS],
[
AC_MSG_CHECKING([whether NLS is requested])
@@ -32,6 +32,8 @@
AC_DEFUN([AM_MKINSTALLDIRS],
[
+ dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
dnl Try to locate it.
Modified: gnunet-gtk/m4/po.m4
===================================================================
--- gnunet-gtk/m4/po.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/po.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
-# po.m4 serial 3 (gettext-0.14)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# po.m4 serial 7 (gettext-0.14.3)
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
@@ -19,6 +17,8 @@
dnl Ulrich Drepper <address@hidden>, 1995-2000.
dnl Bruno Haible <address@hidden>, 2000-2003.
+AC_PREREQ(2.50)
+
dnl Checks for all prerequisites of the po subdirectory.
AC_DEFUN([AM_PO_SUBDIRS],
[
@@ -34,7 +34,7 @@
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
dnl The second test excludes FreeBSD msgfmt.
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage
>/dev/null; then exit 1; else exit 0; fi)],
:)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
@@ -43,7 +43,7 @@
dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
dnl The second test excludes FreeBSD xgettext.
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address=
/dev/null >/dev/null 2>&1 &&
+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address=
/dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
(if $ac_dir/$ac_word --omit-header --copyright-holder=
--msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then
exit 1; else exit 0; fi)],
:)
dnl Remove leftover from FreeBSD xgettext call.
@@ -51,7 +51,7 @@
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
- [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[
2>&1], :)
dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
dnl Test whether we really found GNU msgfmt.
@@ -106,6 +106,9 @@
/*) top_srcdir="$ac_given_srcdir" ;;
*) top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac
+ # Treat a directory as a PO directory if and only if it has a
+ # POTFILES.in file. This allows packages to have multiple PO
+ # directories under different names or in different locations.
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
rm -f "$ac_dir/POTFILES"
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo
"creating $ac_dir/POTFILES"
@@ -119,7 +122,7 @@
if test -n "$OBSOLETE_ALL_LINGUAS"; then
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in
configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is
obsolete"
fi
- ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//"
"$ac_given_srcdir/$ac_dir/LINGUAS"`
# Hide the ALL_LINGUAS assigment from automake.
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
@@ -298,7 +301,7 @@
fi
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages.
- ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//"
"$ac_given_srcdir/$ac_dir/LINGUAS"`
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
@@ -348,7 +351,7 @@
QMFILES="$QMFILES $srcdirpre$lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
RESOURCESDLLFILES="$RESOURCESDLLFILES
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
@@ -389,7 +392,7 @@
QTCATALOGS="$QTCATALOGS $lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
done
fi
@@ -409,7 +412,7 @@
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
# Add dependencies that cannot be formulated as a simple suffix rule.
for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
cat >> "$ac_file.tmp" <<EOF
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po
-r \$(DOMAIN)"; \
Modified: gnunet-gtk/m4/printf-posix.m4
===================================================================
--- gnunet-gtk/m4/printf-posix.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/printf-posix.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# printf-posix.m4 serial 2 (gettext-0.13.1)
dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
dnl Test whether the printf() function supports POSIX/XSI format strings with
Modified: gnunet-gtk/m4/progtest.m4
===================================================================
--- gnunet-gtk/m4/progtest.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/progtest.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
-# progtest.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
@@ -18,6 +16,8 @@
dnl Authors:
dnl Ulrich Drepper <address@hidden>, 1996.
+AC_PREREQ(2.50)
+
# Search path for a program which passes the given test.
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -67,6 +67,7 @@
test -z "$ac_dir" && ac_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
if [$3]; then
ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
break 2
Modified: gnunet-gtk/m4/signed.m4
===================================================================
--- gnunet-gtk/m4/signed.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/signed.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# signed.m4 serial 1 (gettext-0.10.40)
dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Modified: gnunet-gtk/m4/size_max.m4
===================================================================
--- gnunet-gtk/m4/size_max.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/size_max.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# size_max.m4 serial 2
dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
Modified: gnunet-gtk/m4/stdint_h.m4
===================================================================
--- gnunet-gtk/m4/stdint_h.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/stdint_h.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,26 +1,24 @@
-# stdint_h.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# stdint_h.m4 serial 5
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
# doesn't clash with <sys/types.h>, and declares uintmax_t.
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
+AC_DEFUN([gl_AC_HEADER_STDINT_H],
[
- AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
+ AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
[AC_TRY_COMPILE(
[#include <sys/types.h>
#include <stdint.h>],
[uintmax_t i = (uintmax_t) -1;],
- jm_ac_cv_header_stdint_h=yes,
- jm_ac_cv_header_stdint_h=no)])
- if test $jm_ac_cv_header_stdint_h = yes; then
+ gl_cv_header_stdint_h=yes,
+ gl_cv_header_stdint_h=no)])
+ if test $gl_cv_header_stdint_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
and declares uintmax_t. ])
Modified: gnunet-gtk/m4/uintmax_t.m4
===================================================================
--- gnunet-gtk/m4/uintmax_t.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/uintmax_t.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
-# uintmax_t.m4 serial 7 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# uintmax_t.m4 serial 9
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
@@ -13,12 +11,12 @@
# Define uintmax_t to 'unsigned long' or 'unsigned long long'
# if it is not already defined in <stdint.h> or <inttypes.h>.
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
[
- AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([jm_AC_HEADER_STDINT_H])
- if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h =
no; then
- AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+ if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no;
then
+ AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
test $ac_cv_type_unsigned_long_long = yes \
&& ac_type='unsigned long long' \
|| ac_type='unsigned long'
Modified: gnunet-gtk/m4/ulonglong.m4
===================================================================
--- gnunet-gtk/m4/ulonglong.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/ulonglong.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,16 +1,14 @@
-# ulonglong.m4 serial 3
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# ulonglong.m4 serial 4
+dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Paul Eggert.
# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
[
AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
[AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
Modified: gnunet-gtk/m4/wchar_t.m4
===================================================================
--- gnunet-gtk/m4/wchar_t.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/wchar_t.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# wchar_t.m4 serial 1 (gettext-0.12)
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
dnl Test whether <stddef.h> has the 'wchar_t' type.
Modified: gnunet-gtk/m4/wint_t.m4
===================================================================
--- gnunet-gtk/m4/wint_t.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/wint_t.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,10 +1,8 @@
# wint_t.m4 serial 1 (gettext-0.12)
dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
dnl Test whether <wchar.h> has the 'wint_t' type.
Modified: gnunet-gtk/m4/xsize.m4
===================================================================
--- gnunet-gtk/m4/xsize.m4 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/m4/xsize.m4 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,14 +1,13 @@
-# xsize.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_XSIZE],
[
dnl Prerequisites of lib/xsize.h.
AC_REQUIRE([gl_SIZE_MAX])
+ AC_REQUIRE([AC_C_INLINE])
AC_CHECK_HEADERS(stdint.h)
])
Modified: gnunet-gtk/mkinstalldirs
===================================================================
--- gnunet-gtk/mkinstalldirs 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/mkinstalldirs 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2003-11-08.23
+scriptversion=2004-02-15.20
# Original author: Noah Friedman <address@hidden>
# Created: 1993-05-16
@@ -66,9 +66,15 @@
0) exit 0 ;;
esac
+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error. This is a problem when calling mkinstalldirs
+# from a parallel make. We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
- if mkdir -p -- . 2>/dev/null; then
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
@@ -77,16 +83,17 @@
# directories to create, and then abort because `.' already
# exists.
test -d ./-p && rmdir ./-p
- test -d ./-- && rmdir ./--
+ test -d ./--version && rmdir ./--version
fi
;;
*)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+ test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./-- "./$dirmode";
+ for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
Modified: gnunet-gtk/po/Makefile.in
===================================================================
--- gnunet-gtk/po/Makefile.in 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/po/Makefile.in 2005-06-15 17:15:15 UTC (rev 946)
@@ -11,7 +11,7 @@
# Origin: gettext-0.14.4
PACKAGE = gnunet-gtk
-VERSION = 0.0.0
+VERSION = 0.7.0pre3
PACKAGE_BUGREPORT = address@hidden
SHELL = /bin/sh
Modified: gnunet-gtk/po/POTFILES
===================================================================
--- gnunet-gtk/po/POTFILES 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/po/POTFILES 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,6 +1,8 @@
../src/helper.c \
../src/main.c \
../src/fs.c \
+ ../src/search.c \
../src/daemon.c \
- ../src/search.c \
- ../src/about.c
+ ../src/about.c \
+ ../src/download.c \
+ ../src/upload.c
Modified: gnunet-gtk/po/POTFILES.in
===================================================================
--- gnunet-gtk/po/POTFILES.in 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/po/POTFILES.in 2005-06-15 17:15:15 UTC (rev 946)
@@ -1,6 +1,8 @@
src/helper.c
src/main.c
src/fs.c
+src/search.c
src/daemon.c
-src/search.c
src/about.c
+src/download.c
+src/upload.c
Modified: gnunet-gtk/po/gnunet-gtk.pot
===================================================================
--- gnunet-gtk/po/gnunet-gtk.pot 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/po/gnunet-gtk.pot 2005-06-15 17:15:15 UTC (rev 946)
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <address@hidden>, YEAR.
#
+#: src/search.c:153 src/download.c:122
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-05-30 16:41-0500\n"
+"POT-Creation-Date: 2005-06-14 18:25-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -16,19 +17,19 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/helper.c:201
+#: src/helper.c:207
msgid "Notification"
msgstr ""
-#: src/helper.c:219
+#: src/helper.c:225
msgid "Ok"
msgstr ""
-#: src/helper.c:275
+#: src/helper.c:281
msgid "Messages"
msgstr ""
-#: src/helper.c:308
+#: src/helper.c:314
msgid "Close"
msgstr ""
@@ -40,69 +41,150 @@
msgid "Use --help to get a list of options.\n"
msgstr ""
-#: src/daemon.c:61
+#: src/fs.c:48
+#, c-format
+msgid "Error while searching: %s\n"
+msgstr ""
+
+#: src/fs.c:71
+#, c-format
+msgid "Error while downloading: %s\n"
+msgstr ""
+
+#: src/fs.c:91
+#, c-format
+msgid "Error while uploading: %s\n"
+msgstr ""
+
+#: src/fs.c:96
+msgid "Connected to gnunetd.\n"
+msgstr ""
+
+#: src/fs.c:100
+msgid "Disconnected from gnunetd.\n"
+msgstr ""
+
+#: src/fs.c:105
+#, c-format
+msgid "Unhandled (unknown) FSUI event: %u.\n"
+msgstr ""
+
+#: src/search.c:141 src/download.c:110
+msgid "unknown"
+msgstr ""
+
+#: src/search.c:165 src/download.c:134
+msgid "no name given"
+msgstr ""
+
+#: src/search.c:361 src/download.c:445
+msgid "Name"
+msgstr ""
+
+#: src/search.c:368 src/download.c:453
+msgid "Size"
+msgstr ""
+
+#: src/search.c:375
+msgid "Mime-type"
+msgstr ""
+
+#: src/search.c:382
+msgid "Meta-data"
+msgstr ""
+
+#: src/search.c:389
+msgid "Preview"
+msgstr ""
+
+#: src/search.c:450 src/search.c:570
+msgid "globally"
+msgstr ""
+
+#: src/search.c:695
+msgid "Query"
+msgstr ""
+
+#: src/search.c:702
+msgid "Results"
+msgstr ""
+
+#: src/daemon.c:62
msgid "gnunetd is NOT running.\n"
msgstr ""
-#: src/daemon.c:127
+#: src/daemon.c:128
#, c-format
msgid "Attempted path to '%s' was '%s'.\n"
msgstr ""
-#: src/daemon.c:145
+#: src/daemon.c:146
#, c-format
msgid "Starting gnunetd failed, error code: %d"
msgstr ""
-#: src/daemon.c:151
+#: src/daemon.c:152
msgid "Starting gnunetd failed (core dumped)."
msgstr ""
-#: src/daemon.c:157
+#: src/daemon.c:158
msgid "Starting gnunetd failed (aborted by signal)."
msgstr ""
-#: src/daemon.c:200
+#: src/daemon.c:206
msgid "Launching gnunetd..."
msgstr ""
-#: src/daemon.c:227
+#: src/daemon.c:239
msgid "Error sending shutdown request to gnunetd."
msgstr ""
-#: src/daemon.c:234
+#: src/daemon.c:246
msgid "Error reading shutdown confirmation from gnunetd."
msgstr ""
-#: src/daemon.c:245
+#: src/daemon.c:257
msgid "Terminating gnunetd..."
msgstr ""
-#: src/daemon.c:247
+#: src/daemon.c:259
#, c-format
msgid "gnunetd refused to shut down (error code '%d')."
msgstr ""
-#: src/search.c:137 src/search.c:302
-msgid "globally"
+#: src/download.c:209
+msgid "unnamed"
msgstr ""
-#: src/search.c:202
-msgid "Name"
+#: src/download.c:221
+#, c-format
+msgid ""
+"You must specify a directory in the configuration in section '%s' under '%s'."
msgstr ""
-#: src/search.c:209
-msgid "Size"
+#: src/download.c:236
+#, c-format
+msgid ""
+"File '%s' exists in '%s',\n"
+"will store download under its GNUnet URI '%s' instead.\n"
msgstr ""
-#: src/search.c:216
-msgid "Mime-type"
+#: src/download.c:460 src/upload.c:742
+msgid "URI"
msgstr ""
-#: src/search.c:223
-msgid "Meta-data"
+#: src/upload.c:422
+msgid "Category"
msgstr ""
-#: src/search.c:230
-msgid "Preview"
+#: src/upload.c:429
+msgid "Value"
msgstr ""
+
+#: src/upload.c:445
+msgid "Keyword"
+msgstr ""
+
+#: src/upload.c:734
+msgid "Filename"
+msgstr ""
Modified: gnunet-gtk/src/download.c
===================================================================
--- gnunet-gtk/src/download.c 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/src/download.c 2005-06-15 17:15:15 UTC (rev 946)
@@ -36,12 +36,137 @@
struct ECRS_URI * uri;
char * filename;
GtkTreeRowReference * rr;
+ GtkTreeModel * model;
} DownloadList;
static DownloadList * head;
static GtkTreeStore * summary;
+static int addFilesToDirectory
+ (const ECRS_FileInfo * fi,
+ const HashCode512 * key,
+ void * closure) {
+ struct ECRS_URI * uri = closure;
+ DownloadList * pos;
+
+ pos = head;
+ while (pos != NULL) {
+ if (ECRS_equalsUri(uri,
+ pos->uri))
+ break;
+ pos = pos->next;
+ }
+ if (pos == NULL) {
+ BREAK(); /* odd */
+ } else {
+ GtkTreeIter iter;
+ GtkTreeIter child;
+ int i;
+ unsigned long long size;
+ char * name;
+ char * mime;
+ char * desc;
+ unsigned char * thumb;
+ size_t ts;
+ GdkPixbuf * pixbuf;
+ GdkPixbufLoader * loader;
+ GtkTreePath * path;
+
+ if (! gtk_tree_row_reference_valid(pos->rr))
+ return SYSERR;
+ path = gtk_tree_row_reference_get_path(pos->rr);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(pos->model),
+ &iter,
+ path);
+ for (i=gtk_tree_model_iter_n_children(pos->model,
+ &iter)-1;i>=0;i--) {
+ if (TRUE == gtk_tree_model_iter_nth_child(pos->model,
+ &child,
+ &iter,
+ i)) {
+ struct ECRS_URI * uri;
+ uri = NULL;
+ gtk_tree_model_get(pos->model,
+ &iter,
+ 5, &uri,
+ -1);
+ if ( (uri != NULL) &&
+ (ECRS_equalsUri(uri,
+ fi->uri)) )
+ return OK;
+ }
+ }
+ gtk_tree_store_append(GTK_TREE_STORE(pos->model),
+ &child,
+ &iter);
+
+ /* FIXME: this code is identical to some
+ code in search.c -- refactor into one
+ function (on model, iter and fi) */
+ mime = ECRS_getFromMetaData(fi->meta,
+ EXTRACTOR_MIMETYPE);
+ if (mime == NULL)
+ mime = STRDUP(_("unknown"));
+ desc = ECRS_getFirstFromMetaData(fi->meta,
+ EXTRACTOR_DESCRIPTION,
+ EXTRACTOR_GENRE,
+ EXTRACTOR_ALBUM,
+ EXTRACTOR_COMMENT,
+ EXTRACTOR_SUBJECT,
+ EXTRACTOR_FORMAT,
+ EXTRACTOR_SIZE,
+ EXTRACTOR_KEYWORDS,
+ -1);
+ if (desc == NULL)
+ desc = STRDUP(_(""));
+ name = ECRS_getFirstFromMetaData(fi->meta,
+ EXTRACTOR_FILENAME,
+ EXTRACTOR_TITLE,
+ EXTRACTOR_ARTIST,
+ EXTRACTOR_AUTHOR,
+ EXTRACTOR_PUBLISHER,
+ EXTRACTOR_CREATOR,
+ EXTRACTOR_PRODUCER,
+ EXTRACTOR_UNKNOWN,
+ -1);
+ if (name == NULL)
+ name = STRDUP(_("no name given"));
+ size = ECRS_fileSize(fi->uri);
+ thumb = NULL;
+ ts = ECRS_getThumbnailFromMetaData(fi->meta,
+ &thumb);
+ if (ts != 0) {
+ loader = gdk_pixbuf_loader_new();
+ gdk_pixbuf_loader_write(loader,
+ (const guchar*) thumb,
+ ts,
+ NULL);
+ pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+ gdk_pixbuf_loader_close(loader,
+ NULL);
+ } else {
+ pixbuf = NULL;
+ }
+ gtk_tree_store_set(GTK_TREE_STORE(pos->model),
+ &child,
+ 0, name,
+ 1, size,
+ 2, mime,
+ 3, desc,
+ 4, pixbuf,
+ 5, ECRS_dupUri(fi->uri),
+ 6, ECRS_dupMetaData(fi->meta),
+ 7, NULL, /* internal */
+ -1);
+ FREE(mime);
+ FREE(desc);
+ FREE(name);
+ FREENONNULL(thumb);
+ }
+ return OK;
+}
+
static void initiateDownload(GtkTreeModel *model,
GtkTreePath * path,
GtkTreeIter * iter,
@@ -85,8 +210,11 @@
list = MALLOC(sizeof(DownloadList));
list->next = head;
list->rr = NULL;
- if (ECRS_isDirectory(meta))
+ list->model = NULL;
+ if (ECRS_isDirectory(meta)) {
list->rr = gtk_tree_row_reference_new(model, path);
+ list->model = model;
+ }
list->uri = ECRS_dupUri(uri);
fn = getFileName("FS",
"DOWNLOADDIR",
@@ -160,35 +288,46 @@
/**
*/
void displayDownloadUpdate(const struct ECRS_URI * uri,
- unsigned long long completed) {
+ unsigned long long completed,
+ const char * data,
+ unsigned int size) {
GtkTreeIter iter;
unsigned int val;
unsigned long long total;
struct ECRS_URI * u;
+ struct ECRS_MetaData * meta;
+
- if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
- &iter))
- return;
- do {
-
- gtk_tree_model_get(GTK_TREE_MODEL(summary),
- &iter,
- 1, &total,
- 4, &u,
- -1);
- if (ECRS_equalsUri(u, uri)) {
- if (total != 0)
- val = completed * 100 / total;
- else
- val = 100;
- gtk_tree_store_set(GTK_TREE_STORE(summary),
+ if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
+ &iter)) {
+ do {
+ gtk_tree_model_get(GTK_TREE_MODEL(summary),
&iter,
- 2, val,
- -1);
- break;
- }
- } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
- &iter));
+ 1, &total,
+ 4, &u,
+ -1);
+ if (ECRS_equalsUri(u, uri)) {
+ if (total != 0)
+ val = completed * 100 / total;
+ else
+ val = 100;
+ gtk_tree_store_set(GTK_TREE_STORE(summary),
+ &iter,
+ 2, val,
+ -1);
+ break;
+ }
+ } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
+ &iter));
+ }
+ meta = NULL;
+ ECRS_listDirectory(data,
+ size,
+ &meta,
+ &addFilesToDirectory,
+ (void*)uri);
+ if (meta != NULL)
+ ECRS_freeMetaData(meta);
}
/**
@@ -196,7 +335,20 @@
void displayDownloadComplete(const struct ECRS_URI * uri,
const char * filename) {
char * ren;
+ unsigned long long size;
+ char * data;
+ int fd;
+ struct ECRS_MetaData * meta;
+ DownloadList * pos;
+ pos = head;
+ while (pos != NULL) {
+ if (ECRS_equalsUri(uri,
+ pos->uri))
+ break;
+ pos = pos->next;
+ }
+
ren = ECRS_suggestFilename(filename);
if (ren == NULL)
return;
@@ -207,9 +359,35 @@
}
FREE(ren);
/* fixme: also update download model? */
+ /* update directory view (if applicable!) */
+ if ( (pos != NULL) &&
+ (pos->rr != NULL) ) {
+ size = getFileSize(filename);
+ fd = fileopen(filename, O_RDONLY);
+ data = MMAP(NULL,
+ size,
+ PROT_READ,
+ MAP_SHARED,
+ fd,
+ 0);
+ meta = NULL;
+ if (data != NULL) {
+ ECRS_listDirectory(data,
+ size,
+ &meta,
+ &addFilesToDirectory,
+ (void*)uri);
+ MUNMAP(data, size);
+ }
+ CLOSE(fd);
+ if (meta != NULL)
+ ECRS_freeMetaData(meta);
+ }
+
}
static int addDownloadView(void * cls,
+ const struct FSUI_DownloadList * pos,
const char * filename,
const struct ECRS_URI * uri,
unsigned long long filesize,
@@ -284,6 +462,7 @@
"text", 3,
NULL);
FSUI_listDownloads(ctx,
+ NULL,
&addDownloadView,
NULL);
}
Modified: gnunet-gtk/src/download.h
===================================================================
--- gnunet-gtk/src/download.h 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/src/download.h 2005-06-15 17:15:15 UTC (rev 946)
@@ -33,7 +33,9 @@
/**
*/
void displayDownloadUpdate(const struct ECRS_URI * uri,
- unsigned long long completed);
+ unsigned long long completed,
+ const char * data,
+ unsigned int size);
/**
*/
Modified: gnunet-gtk/src/fs.c
===================================================================
--- gnunet-gtk/src/fs.c 2005-06-14 20:33:39 UTC (rev 945)
+++ gnunet-gtk/src/fs.c 2005-06-15 17:15:15 UTC (rev 946)
@@ -38,35 +38,40 @@
event = (const FSUI_Event *) call->args;
switch (event->type) {
- case search_result:
+ case FSUI_search_result:
displaySearchResult(&event->data.SearchResult.fi,
event->data.SearchResult.searchURI,
NULL);
break;
- case search_error:
+ case FSUI_search_error:
LOG(LOG_ERROR,
_("Error while searching: %s\n"),
event->data.message);
break;
- case download_progress:
+ case FSUI_download_aborted:
+ /* ignore for now */
+ break;
+ case FSUI_download_progress:
displayDownloadUpdate(event->data.DownloadProgress.uri,
- event->data.DownloadProgress.completed);
+ event->data.DownloadProgress.completed,
+ event->data.DownloadProgress.last_block,
+ event->data.DownloadProgress.last_size);
/* FIXME:
if directory, also update search view! */
break;
- case download_complete:
+ case FSUI_download_complete:
displayDownloadComplete(event->data.DownloadProgress.uri,
event->data.DownloadProgress.filename);
/* FIXME:
if directory, also update search view! */
break;
- case download_error:
+ case FSUI_download_error:
BREAK();
LOG(LOG_ERROR,
_("Error while downloading: %s\n"),
event->data.message);
break;
- case upload_progress:
+ case FSUI_upload_progress:
displayUploadUpdate(event->data.UploadProgress.main_filename,
event->data.UploadProgress.filename,
event->data.UploadProgress.completed,
@@ -76,21 +81,21 @@
event->data.UploadProgress.main_completed,
event->data.UploadProgress.main_total);
break;
- case upload_complete:
+ case FSUI_upload_complete:
displayUploadComplete(event->data.UploadComplete.main_filename,
event->data.UploadComplete.filename,
event->data.UploadComplete.uri);
break;
- case upload_error:
+ case FSUI_upload_error:
LOG(LOG_ERROR,
_("Error while uploading: %s\n"),
event->data.message);
break;
- case gnunetd_connected:
+ case FSUI_gnunetd_connected:
LOG(LOG_MESSAGE,
_("Connected to gnunetd.\n"));
break;
- case gnunetd_disconnected:
+ case FSUI_gnunetd_disconnected:
LOG(LOG_MESSAGE,
_("Disconnected from gnunetd.\n"));
break;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r946 - GNUnet GNUnet/contrib GNUnet/m4 GNUnet/po GNUnet/src/applications/advertising GNUnet/src/applications/fs/ecrs GNUnet/src/applications/fs/fsui GNUnet/src/applications/fs/module GNUnet/src/applications/fs/tools GNUnet/src/applications/traffic GNUnet/src/util GNUnet-docs/WWW/papers gnunet-gtk gnunet-gtk/doc gnunet-gtk/m4 gnunet-gtk/po gnunet-gtk/src,
grothoff <=