From: Bruno Haible gettext offers one of these standards. See section 10 The Programmer's View.
+GNU gettext offers one of these standards. See section 10 The Programmer's View.
@@ -557,10 +557,10 @@ contains all original program strings. It has sets of pointers to
exactly where in C sources each string is used. All translations
are set to empty. The letter t in `.pot´ marks this as
a Template PO file, not yet oriented towards any particular language.
-See section 4.1 Invoking the xgettext Program, for more details about how one calls the
+See section 4.1 Invoking the xgettext Program, for more details about how one calls the
xgettext program. If you are really lazy, you might
be interested at working a lot more right away, and preparing the
-whole distribution setup (see section 12 The Maintainer's View). By doing so, you
+whole distribution setup (see section 12 The Maintainer's View). By doing so, you
spare yourself typing the xgettext command, as make
should now generate the proper things automatically for you!
@@ -569,7 +569,7 @@ should now generate the proper things automatically for you!
The first time through, there is no `lang.po´ yet, so the
msgmerge step may be skipped and replaced by a mere copy of
`package.pot´ to `lang.po´, where lang
-represents the target language. See section 5 Creating a New PO File for details.
+represents the target language. See section 5 Creating a New PO File for details.
@@ -577,7 +577,7 @@ Then comes the initial translation of messages. Translation in itself is a whole matter, still exclusively meant for humans, and whose complexity far overwhelms the level of this manual. Nevertheless, a few hints are given in some other chapter of this -manual (see section 11 The Translator's View). You will also find there indications +manual (see section 11 The Translator's View). You will also find there indications about how to contact translating teams, or becoming part of them, for sharing your translating concerns with others who target the same native language. @@ -594,14 +594,14 @@ of PO file format are taken care of for you, but you have to acquire some familiarity with PO mode itself. Besides main PO mode commands (see section 2.3 Main PO mode Commands), you should know how to move between entries (see section 2.4 Entry Positioning), and how to handle untranslated entries -(see section 6.4 Untranslated Entries). +(see section 6.4 Untranslated Entries).
If some common translations have already been saved into a compendium PO file, translators may use PO mode for initializing untranslated entries from the compendium, and also save selected translations into -the compendium, updating it (see section 6.11 Using Translation Compendia). Compendium files +the compendium, updating it (see section 6.11 Using Translation Compendia). Compendium files are meant to be exchanged between members of a given translation team.
@@ -647,8 +647,8 @@ out of recent C sources. The refreshing operation adjusts all references to C source locations for strings, since these strings move as programs are modified. Also,msgmerge comments out as
obsolete, in `lang.po´, those already translated entries
-which are no longer used in the program sources (see section 6.5 Obsolete Entries). It finally discovers new strings and inserts them in
-the resulting PO file as untranslated entries (see section 6.4 Untranslated Entries). See section 6.1 Invoking the msgmerge Program, for more information about what
+which are no longer used in the program sources (see section 6.5 Obsolete Entries). It finally discovers new strings and inserts them in
+the resulting PO file as untranslated entries (see section 6.4 Untranslated Entries). See section 6.1 Invoking the msgmerge Program, for more information about what
msgmerge really does.
@@ -678,7 +678,7 @@ distribution.
Once the PO file is complete and dependable, the msgfmt program
is used for turning the PO file into a machine-oriented format, which
may yield efficient retrieval of translations by the programs of the
-package, whenever needed at runtime (see section 8.3 The Format of GNU MO Files). See section 8.1 Invoking the msgfmt Program, for more information about all modes of execution
+package, whenever needed at runtime (see section 8.3 The Format of GNU MO Files). See section 8.1 Invoking the msgfmt Program, for more information about all modes of execution
for the msgfmt program.
@@ -688,7 +688,7 @@ with the GNU gettext library, usually through the operation of
make, given a suitable `Makefile´ exists for the project,
and the resulting executable is installed somewhere users will find it.
The MO files themselves should also be properly installed. Given the
-appropriate environment variables are set (see section 9.3 Magic for End Users), the
+appropriate environment variables are set (see section 9.3 Magic for End Users), the
program should localize itself automatically, whenever it executes.
diff --git a/gettext-tools/doc/gettext_10.html b/gettext-tools/doc/gettext_10.html
index 3b0d00900..9cbf70737 100644
--- a/gettext-tools/doc/gettext_10.html
+++ b/gettext-tools/doc/gettext_10.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
-
One aim of the current message catalog implementation provided by @@ -28,9 +28,9 @@ later explain our solution of this dilemma. -
catgetscatgets@@ -63,9 +63,9 @@ therefore part of all Unix implementation (implementations, which are -
@@ -78,7 +78,7 @@ for the functions and the needed definitions are in the
-
+
catopen is used like in this:
open.
-
+
This handle is of course used in the catgets function which can
be used like this:
@@ -129,7 +129,7 @@ should better be const char *, but the standard is published in
- + The last of these functions is used and behaves as expected:
@@ -144,9 +144,9 @@ After this nocatgets call using the descriptor is legal anymore.
-catgets Interface?!catgets Interface?!@@ -165,9 +165,9 @@ more easy to manage.
-gettextgettext@@ -182,7 +182,7 @@ The main point about this solution is that it does not follow the method of normal file handling (open-use-close) and that it does not burden the programmer with so many tasks, especially the unique key handling. Of course here also a unique key is needed, but this key is the message -itself (how long or short it is). See section 10.3 Comparing the Two Interfaces for a more +itself (how long or short it is). See section 10.3 Comparing the Two Interfaces for a more detailed comparison of the two methods.
@@ -196,9 +196,9 @@ in using this library will be interested in this description. -@@ -267,11 +267,11 @@ your language.
-@@ -345,9 +345,9 @@ unreliabilities.
-@@ -385,10 +385,10 @@ The value of the locale is determined through
-gettext usesgettext uses@@ -420,7 +420,7 @@ recommended that all msgids be US-ASCII strings.
bind_textdomain_codeset function can be used to specify the
output character set for message catalogs for domain domainname.
The codeset argument must be a valid codeset name which can be used
@@ -452,9 +452,9 @@ global variable errno is set accordingly.
-@@ -574,7 +574,7 @@ purpose.
ngettext function is similar to the gettext function
as it finds the message catalogs in the same way. But it takes two
extra arguments. The msgid1 parameter must contain the singular
@@ -604,7 +604,7 @@ Please note that the numeric value n has to be passed to the
dngettext is similar to the dgettext function in the
way the message catalog is selected. The difference is that it takes
two extra parameter to provide the correct plural form. These two
@@ -615,7 +615,7 @@ parameters are handled in the same way ngettext handles them.
dcngettext is similar to the dcgettext function in the
way the message catalog is selected. The difference is that it takes
two extra parameter to provide the correct plural form. These two
@@ -640,9 +640,9 @@ possibility of extensions to not prevent the use of new languages).
-
-
-
+
+
+
The information about the plural form selection has to be stored in the
header entry of the PO file (the one with the empty msgid string).
The plural form information looks like this:
@@ -668,7 +668,7 @@ value of nplurals.
- + The following rules are known at this point. The language with families are listed. But this does not necessarily mean the information can be generalized for the whole family (as can be easily seen in the table @@ -895,11 +895,11 @@ Slovenian -
gettext in GUI programsgettext in GUI programs@@ -976,7 +976,7 @@ fine:
char * @@ -1051,9 +1051,9 @@ quite some memory and disk space by doing this. -10.2.7 Optimization of the *gettext functions
+10.2.7 Optimization of the *gettext functions
@@ -1106,10 +1106,10 @@ find the result through a single cache lookup.
-10.3 Comparing the Two Interfaces
+10.3 Comparing the Two Interfaces
@@ -1159,7 +1159,7 @@ by#include <libintl.h> @@ -1174,7 +1174,7 @@ can use any that becomes available.- + The same procedure can be done for the
gettext_noopinvocations (see section 3.6 Special Cases of Translatable Strings). One usually definesgettext_noopas a no-op macro. So you should consider the following code for your project: @@ -1253,12 +1253,12 @@ little bit. But it is not impossible to overcome.-
catgetsallows same original entry to have different translations, butgettexthas another, scalable approach for solving ambiguities -of this kind: See section 10.2.2 Solving Ambiguities. +of this kind: See section 10.2.2 Solving Ambiguities.10.4 Using libintl.a in own programs
+10.4 Using libintl.a in own programs
Starting with version 0.9.4 the library
-libintl.hshould be @@ -1269,7 +1269,7 @@ and the library in directories selected using the$(prefix).10.5 Being a
+gettextgrok10.5 Being a
gettextgrokTo fully exploit the functionality of the GNU
gettextlibrary it @@ -1282,7 +1282,7 @@ is a list comments:
dcgettext function as long as no new catalog is loaded. But
if dcgettext is not called the program also cannot find the
-LANGUAGE variable be changed (see section 10.2.7 Optimization of the *gettext functions). A
+LANGUAGE variable be changed (see section 10.2.7 Optimization of the *gettext functions). A
solution for this is very easy. Include the following code in the
language switching function.
@@ -1346,7 +1346,7 @@ language switching function.
}
-
+
The variable _nl_msg_cat_cntr is defined in `loadmsgcat.c´.
You don't need to know what this is for. But it can be used to detect
whether a gettext implementation is GNU gettext and not non-GNU
@@ -1356,11 +1356,11 @@ system's native gettext implementation.
-There are two competing methods for language independent messages: @@ -1392,7 +1392,7 @@ see the Programming for Internationalization FAQ.
-catgetscatgetsThere have been a few discussions of late on the use of @@ -1437,7 +1437,7 @@ of all Unix systems.
-Now it seems kind of wasteful to me to have two different systems @@ -1482,7 +1482,7 @@ the future.
-X/Open agreed very late on the standard form so that many diff --git a/gettext-tools/doc/gettext_11.html b/gettext-tools/doc/gettext_11.html index 31bd0c7e0..9a7f1bc1e 100644 --- a/gettext-tools/doc/gettext_11.html +++ b/gettext-tools/doc/gettext_11.html @@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->-
Free software is going international! The Translation Project is a way @@ -92,7 +92,7 @@ you can work on.
-This is now official, GNU is going international! Here is the @@ -142,7 +142,7 @@ document, please e-mail to `translation@iro.umontreal.ca´.
-Facing this internationalization effort, a few users expressed their @@ -220,7 +220,7 @@ software. -
On a larger scale, the true solution would be to organize some kind of @@ -264,7 +264,7 @@ reaches the Translation Project coordinator. -
I also think GNU will need sooner than it thinks, that someone setup @@ -289,7 +289,7 @@ overwhelming task, the time to put delegations in place.
-I suggest we look for volunteer coordinators/editors for individual @@ -352,7 +352,7 @@ consistent. -
Taking French for example, there are a few sub-cultures around computers @@ -374,7 +374,7 @@ means soon!
-I expect the next big changes after the official release. Please note @@ -411,7 +411,7 @@ this also seems to work). -
If we get any inquiries about GNU gettext, send them on to:
@@ -465,7 +465,7 @@ subscribe as they see fit, as long as each team is represented in it.
There will surely be some discussion about this messages after the @@ -514,7 +514,7 @@ have more information about this.
-A translator sometimes has only a limited amount of time per week to @@ -538,7 +538,7 @@ of messages.
-
+
Here a more details. The GNU libintl library (but not the
corresponding functions in GNU libc) supports an environment variable
GETTEXT_LOG_UNTRANSLATED. The GNU libintl library will
@@ -623,7 +623,7 @@ $ package=/usr/src/gnu/coreutils-4.5.4 # the package where it comes from
She takes the latest copy of `$lang.po´ from the Translation Project, or from the package (in most cases, `$package/po/$lang.po´), or -creates a fresh one if she's the first translator (see section 5 Creating a New PO File). +creates a fresh one if she's the first translator (see section 5 Creating a New PO File). She then uses the following commands to mark the not urgent messages as "obsolete". (This doesn't mean that these messages - translated and untranslated ones - will go away. It simply means that Emacs PO mode diff --git a/gettext-tools/doc/gettext_12.html b/gettext-tools/doc/gettext_12.html index ae467a6bb..482de019f 100644 --- a/gettext-tools/doc/gettext_12.html +++ b/gettext-tools/doc/gettext_12.html @@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->-
The maintainer of a package has many responsibilities. One of them is ensuring that the package will install easily on many platforms, -and that the magic we described earlier (see section 9 The User's View) will work +and that the magic we described earlier (see section 9 The User's View) will work for installers and end users.
@@ -52,7 +52,7 @@ for changes. -
Some free software packages are distributed as tar files which unpack
@@ -85,11 +85,11 @@ use this as an opportunity to unflatten their package structure.
@@ -186,7 +186,7 @@ never try to solve a team's problem on your own.
-gettextize Programgettextize Program
The gettextize program is an interactive tool that helps the
@@ -221,7 +221,7 @@ GNU gettext.
gettextize [ option... ] [ directory ] @@ -255,8 +255,8 @@ and accepts the following options:
gettext code
available on the system, but it might disturb some mechanism the
@@ -267,13 +267,13 @@ maintainer is used to apply to the sources. Because running
gettextize
logs all changes (file additions, modifications and removals) in a
file called `ChangeLog´ in each affected directory.
@@ -292,20 +292,20 @@ file called `ChangeLog´ in each affected directory.
gettextize would normally execute are inhibited and instead only
listed on standard output.
gettextize can not do the
entire job of adapting a package for using GNU gettext. The
amount of remaining work depends on whether the package uses GNU
automake or not. But in any case, the maintainer should still
-read the section section 12.4 Files You Must Create or Alter after invoking gettextize.
+read the section section 12.4 Files You Must Create or Alter after invoking gettextize.
@@ -416,14 +416,14 @@ It is also important to understand that gettextize is not part
of the GNU build system, in the sense that it should not be invoked
automatically, and not be invoked by someone who doesn't assume the
responsibilities of a package maintainer. For the latter purpose, a
-separate tool is provided, see section 12.6.3 Invoking the autopoint Program.
+separate tool is provided, see section 12.6.3 Invoking the autopoint Program.
@@ -438,7 +438,7 @@ changes needed in each.
So, here comes a list of files, each one followed by a description of
all alterations it needs. Many examples are taken out from the GNU
-gettext 0.13.1 distribution itself, or from the GNU
+gettext 0.14 distribution itself, or from the GNU
hello distribution (http://www.franken.de/users/gnu/ke/hello
or http://www.gnu.franken.de/ke/hello/) You may indeed
refer to the source code of the GNU gettext and GNU hello
@@ -449,9 +449,9 @@ gettext functionality.
-
@@ -495,9 +495,9 @@ case of bison), not the generated C file.
@@ -519,7 +519,7 @@ that these languages are currently supported by your package. If you
want to further restrict, at installation time, the set of installed
languages, this should not be done by modifying the `LINGUAS´ file,
but rather by using the LINGUAS environment variable
-(see section 9.2 Magic for Installers).
+(see section 9.2 Magic for Installers).
@@ -544,9 +544,9 @@ directory; they are also installed by running gettextize.
@@ -566,8 +566,8 @@ needing to mess with `po/Makefile.in.in´.
-
-
+
+
GNU gettext comes with a `Rules-quot´ file, containing rules for
building catalogs `en@quot.po´ and `en@boldquot.po´. The
effect of `en@quot.po´ is that people who set their LANGUAGE
@@ -585,7 +585,7 @@ GUI programs. To enable it, similarly add en@boldquot to the
`configure.in´ or `configure.ac´ - this is the source from which
@@ -596,14 +596,14 @@ GUI programs. To enable it, similarly add en@boldquot to the
PACKAGE=gettext -VERSION=0.13.1 +VERSION=0.14 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -614,13 +614,13 @@ or, if you are using GNUautomake, by a line like this:-AM_INIT_AUTOMAKE(gettext, 0.13.1) +AM_INIT_AUTOMAKE(gettext, 0.14)Of course, you replace `gettext´ with the name of your package, -and `0.13.1´ by its version numbers, exactly as they +and `0.14´ by its version numbers, exactly as they should appear in the packagedtarfile name of your distribution -(`gettext-0.13.1.tar.gz´, here). +(`gettext-0.14.tar.gz´, here).
intl/Makefile to the AC_OUTPUT line.
-If you haven't suppressed the `intl/´ subdirectory, @@ -701,9 +701,9 @@ AC_CONFIG_AUX_DIR([subdir]) -
@@ -728,9 +728,9 @@ AC_CONFIG_AUX_DIR([subdir]) -
@@ -786,9 +786,9 @@ piece of m4 code will be the same for all projects using GNU
@@ -802,9 +802,9 @@ independently from the `intl/´ directory.
-@@ -843,7 +843,7 @@ following lines to `config.h.in´: -
Here are a few modifications you need to make to your main, top-level @@ -930,7 +930,7 @@ to `Makefile.am´ are already made by running `gettextize&ac
-Some of the modifications made in the main `Makefile.in´ will @@ -1051,11 +1051,11 @@ dist: Makefile $(DISTFILES) -
@@ -1092,7 +1092,7 @@ to 0 in C preprocessor expressions.
-
+
`gettext.h´ is a convenience header file for conditional use of
`<libintl.h>´, depending on the ENABLE_NLS macro. If
ENABLE_NLS is set, it includes `<libintl.h>´; otherwise it
@@ -1131,9 +1131,9 @@ package that needs it should contain a copy of it on its own.
@@ -1146,10 +1146,10 @@ The primary macro is, of course, AM_GNU_GETTEXT.
-
-
+
The AM_GNU_GETTEXT macro tests for the presence of the GNU gettext
function family in either the C library or a separate libintl
library (shared or static libraries are both supported) or in the package's
@@ -1214,7 +1214,7 @@ The complexities that AM_GNU_GETTEXT deals with are the following:
gettext in the C library, for example
glibc. Some have it in a separate library libintl. GNU libintl
might have been installed as part of the GNU gettext package.
@@ -1250,29 +1250,29 @@ and LTLIBINTL variables.
-
-
+
The AM_GNU_GETTEXT_VERSION macro declares the version number of
the GNU gettext infrastructure that is used by the package.
The use of this macro is optional; only the autopoint program makes
-use of it (see section 12.6 Integrating with CVS).
+use of it (see section 12.6 Integrating with CVS).
-
+
The AM_PO_SUBDIRS macro prepares the `po/´ directories of the
package for building. This macro should be used in internationalized
programs written in other programming languages than C, C++, Objective C,
-for example sh, Python, Lisp. See section 13 Other Programming Languages for a list of programming languages that support localization
+for example sh, Python, Lisp. See section 13 Other Programming Languages for a list of programming languages that support localization
through PO files.
-
+
The AM_ICONV macro tests for the presence of the POSIX/XSI
iconv function family in either the C library or a separate
libiconv library. If found, it sets the am_cv_func_iconv
@@ -1312,7 +1312,7 @@ The complexities that AM_ICONV deals with are the following:
iconv in the C library, for example
glibc. Some have it in a separate library libiconv, for example
OSF/1 or FreeBSD. Regardless of the operating system, GNU libiconv
@@ -1349,7 +1349,7 @@ library support, like SCO.
-
Many projects use CVS for distributed development, version control and
@@ -1360,13 +1360,13 @@ of
In a project development with multiple developers, using CVS, there
should be a single developer who occasionally - when there is desire to
upgrade to a new
There are basically three ways to deal with generated files in the
@@ -1482,7 +1482,7 @@ form
@@ -1494,11 +1494,11 @@ and adds to the package's pre-build script an invocation of
cvs, gettextize, autopoint and a
-12.6.1 Avoiding version mismatch in distributed development
+12.6.1 Avoiding version mismatch in distributed development
gettext version - runs gettextize and
-performs the changes listed in section 12.4 Files You Must Create or Alter, and then commits
+performs the changes listed in section 12.4 Files You Must Create or Alter, and then commits
his changes to the CVS.
12.6.2 Files to put under CVS version control
+12.6.2 Files to put under CVS version control
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.14)
12.6.3 Invoking the
+autopoint Program12.6.3 Invoking the
autopoint Program
autopoint [option]...
@@ -1515,7 +1515,7 @@ this version into the package.
autopoint would normally execute are inhibited and instead only
listed on standard output.
@@ -1541,26 +1541,26 @@ listed on standard output.
-
autopoint supports the GNU gettext versions from 0.10.35 to
-the current one, 0.13.1. In order to apply autopoint to
-a package using a gettext version newer than 0.13.1, you
+the current one, 0.14. In order to apply autopoint to
+a package using a gettext version newer than 0.14, you
need to install this same version of GNU gettext at least.
-
While the presentation of gettext focuses mostly on C and
@@ -23,10 +23,10 @@ approach.
-
@@ -123,7 +123,7 @@ different effects on portability and copyright:
gettext's `intl/´ directory in
-your package, as described in section 12 The Maintainer's View. This allows you to
+your package, as described in section 12 The Maintainer's View. This allows you to
have internationalization on all kinds of platforms. Note that when you
then distribute your package, it legally falls under the GNU General
Public License, and the GNU project will be glad about your contribution
@@ -149,7 +149,7 @@ and plural handling).
-For the programmer, the general procedure is the same as for the C @@ -162,7 +162,7 @@ underlying language runtime.
-The translator works exactly as in the C language case. The only @@ -174,7 +174,7 @@ strings. -
C format strings are described in POSIX (IEEE P1003.1 2001), section
@@ -210,10 +210,29 @@ on this reordering ability: On the few platforms where printf(),
or `libintl.so´ provides replacement functions, and GNU <libintl.h>
activates these replacement functions automatically.
+
+
+
+As a special feature for Farsi (Persian) and maybe Arabic, translators can
+insert an `I´ flag into numeric format directives. For example, the
+translation of "%d" can be "%Id". The effect of this flag,
+on systems with GNU libc, is that in the output, the ASCII digits are
+replaced with the `outdigits´ defined in the LC_CTYPE locale
+facet. On other systems, the gettext function removes this flag,
+so that it has no effect.
+
+
+Note that the programmer should not put this flag into the +untranslated string. (Putting the `I´ format directive flag into an +msgid string would lead to undefined behaviour on platforms without +glibc when NLS is disabled.) +
-
Objective C format strings are like C format strings. They support an
@@ -223,7 +242,7 @@ of type Object *.
Shell format strings, as supported by GNU gettext and the `envsubst´ @@ -245,7 +264,7 @@ a variable reference is ignored.
-Python format strings are described in @@ -259,7 +278,7 @@ Python Library reference /
-Lisp format strings are described in the Common Lisp HyperSpec, @@ -269,7 +288,7 @@ chapter 22.3 Formatted Output,
-Emacs Lisp format strings are documented in the Emacs Lisp reference, @@ -281,7 +300,7 @@ in format strings while FSF Emacs doesn't.
-librep format strings are documented in the librep manual, section @@ -292,7 +311,7 @@ Formatted Output,
-Smalltalk format strings are described in the GNU Smalltalk documentation, @@ -305,7 +324,7 @@ or a nonzero digit (`1´ to `9´).
-Java format strings are described in the JDK documentation for class @@ -317,7 +336,17 @@ See also the ICU documentation
-
+C# format strings are described in the .NET documentation for class
+System.String and in
+http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpguide/html/cpConFormattingOverview.asp.
+
+
awk format strings are described in the gawk documentation, section @@ -327,7 +356,7 @@ Printf,
-Where is this documented? @@ -335,7 +364,7 @@ Where is this documented?
-YCP sformat strings are described in the libycp documentation @@ -346,7 +375,7 @@ or a nonzero digit (`1´ to `9´).
-Tcl format strings are described in the `format.n´ manual page, @@ -355,7 +384,7 @@ Tcl format strings are described in the `format.n´ manual page,
-There are two kinds format strings in Perl: those acceptable to the @@ -379,7 +408,7 @@ of simple identifiers.
-PHP format strings are described in the documentation of the PHP function @@ -389,7 +418,7 @@ PHP format strings are described in the documentation of the PHP function
-These format strings are used inside the GCC sources. In such a format @@ -410,7 +439,7 @@ operator, `V´ denotes a const/volatile qualifier.
-Qt format strings are described in the documentation of the QString class @@ -421,7 +450,7 @@ directive cannot occur more than once in a format string.
-
For the maintainer, the general procedure differs from the C language
@@ -441,7 +470,7 @@ invokes the AM_GNU_GETTEXT autoconf macro via
XGETTEXT_OPTIONS
-variable in `po/Makevars´ (see section 12.4.3 `Makefile´ pieces in `po/´) should be adjusted to
+variable in `po/Makevars´ (see section 12.4.3 `Makefile´ pieces in `po/´) should be adjusted to
match the xgettext options for that particular programming language.
If the package uses more than one programming language with gettext
support, it becomes necessary to change the POT file construction rule
@@ -452,13 +481,13 @@ that language, and to combine the resulting files using msgcat.
-gettext, ngettext programs
eval_gettext, eval_ngettext shell functions
TEXTDOMAIN
TEXTDOMAINDIR
hello-
-13.5.2.1 Preparing Shell Scripts for Internationalization
+13.5.2.1 Preparing Shell Scripts for Internationalization
@@ -636,8 +665,8 @@ Insert the line
near the top of the script. gettext.sh is a shell function library
that provides the functions
-eval_gettext (see section 13.5.2.6 Invoking the eval_gettext function) and
-eval_ngettext (see section 13.5.2.7 Invoking the eval_ngettext function).
+eval_gettext (see section 13.5.2.6 Invoking the eval_gettext function) and
+eval_ngettext (see section 13.5.2.7 Invoking the eval_ngettext function).
You have to ensure that gettext.sh can be found in the PATH.
-
@@ -709,7 +738,7 @@ newline). Similarly, for cases with plural handling, replace a conditional
-
13.5.2.2 Contents of gettext.sh
+13.5.2.2 Contents of gettext.sh
gettext.sh, contained in the run-time package of GNU gettext, provides
@@ -725,20 +754,20 @@ and a newline, without interpreting backslashes in the argument string.
- eval_gettext
-See section 13.5.2.6 Invoking the
eval_gettext function.
+See section 13.5.2.6 Invoking the eval_gettext function.
- eval_ngettext
-See section 13.5.2.7 Invoking the
eval_ngettext function.
+See section 13.5.2.7 Invoking the eval_ngettext function.
gettext programgettext programgettext [option] [[textdomain] msgid] @@ -746,7 +775,7 @@ gettext [option] -s [msgid]...
-
+
The gettext program displays the native language translation of a
textual message.
@@ -761,14 +790,14 @@ textual message.
gettext adds a newline to
the output.
@@ -799,8 +828,8 @@ the output.
ngettext programngettext programngettext [option] [textdomain] msgid msgid-plural count
-
+
The ngettext program displays the native language translation of a
textual message whose grammatical form depends on a number.
@@ -850,14 +879,14 @@ textual message whose grammatical form depends on a number.
TEXTDOMAINDIR.
-envsubst programenvsubst programenvsubst [option] [shell-format]
-
-
-
+
+
+
The envsubst program substitutes the values of environment variables.
envsubst program substitutes the values of environment variable
eval_gettext functioneval_gettext functioneval_gettext msgid
- + This function outputs the native language translation of a textual message, performing dollar-substitution on the result. Note that only shell variables mentioned in msgid will be dollar-substituted in the result. @@ -1009,17 +1038,17 @@ mentioned in msgid will be dollar-substituted in the result.
-eval_ngettext functioneval_ngettext functioneval_ngettext msgid msgid-plural count
- + This function outputs the native language translation of a textual message whose grammatical form depends on a number, performing dollar-substitution on the result. Note that only shell variables mentioned in msgid or @@ -1028,9 +1057,9 @@ on the result. Note that only shell variables mentioned in msgid or
-
@@ -1079,9 +1108,9 @@ that don't have the gettext() function in libc.
hello-
-13.5.5 GNU clisp - Common Lisp
+13.5.5 GNU clisp - Common Lisp
@@ -1228,9 +1257,9 @@ An example is available in the `examples´ directory: hello-
-13.5.6 GNU clisp C sources
+13.5.6 GNU clisp C sources
@@ -1296,9 +1325,9 @@ On platforms without gettext, no translation.
-13.5.7 Emacs Lisp
+13.5.7 Emacs Lisp
@@ -1362,9 +1391,9 @@ Only XEmacs. Without I18N3 defined at build time, no translation.
-13.5.8 librep
+13.5.8 librep
@@ -1432,9 +1461,9 @@ An example is available in the `examples´ directory: hello-
-13.5.9 GNU Smalltalk
+13.5.9 GNU Smalltalk
@@ -1505,9 +1534,9 @@ An example is available in the `examples´ directory:
-13.5.10 Java
+13.5.10 Java
@@ -1641,7 +1670,7 @@ a translation is missing, the msgid argument is returned unchanged.
This has the advantage of having the ngettext function for plural
handling.
-
+
To use this API, one needs the libintl.jar file which is part of
the GNU gettext package and distributed under the LGPL.
@@ -1650,13 +1679,385 @@ the GNU gettext package and distributed under the LGPL.
Three examples, using the second API, are available in the `examples´
directory: hello-java, hello-java-awt, hello-java-swing.
+
+
+Now, to make use of the API and define a shorthand for `getString´,
+there are two idioms that you can choose from:
+
+
+
+
+-
+
+In a unique class of your project, say `Util´, define a static variable
+holding the
ResourceBundle instance:
+
+
+
+public static ResourceBundle myResources =
+ ResourceBundle.getBundle("domain-name");
+
+
+All classes containing internationalized strings then contain
+
+
+
+private static ResourceBundle res = Util.myResources;
+private static String _(String s) { return res.getString(s); }
+
+
+and the shorthand is used like this:
+
+
+
+System.out.println(_("Operation completed."));
+
+
+ -
+
+You add a class with a very short name, say `S´, containing just the
+definition of the resource bundle and of the shorthand:
+
+
+
+public class S {
+ public static ResourceBundle myResources =
+ ResourceBundle.getBundle("domain-name");
+ public static String _(String s) {
+ return myResources.getString(s);
+ }
+}
+
+
+and the shorthand is used like this:
+
+
+
+System.out.println(S._("Operation completed."));
+
+
+
+
+
+Which of the two idioms you choose, will depend on whether copying two lines
+of codes into every class is more acceptable in your project than a class
+with a single-letter name.
+
-13.5.11 GNU awk
+13.5.11 C#
+
+
+- RPMs
+
-
+pnet, pnetlib 0.6.2 or newer, or mono 0.29 or newer
+
+
- File extension
+
-
+
cs
+
+ - String syntax
+
-
+
"abc", @"abc"
+
+ - gettext shorthand
+
-
+_("abc")
+
+
- gettext/ngettext functions
+
-
+
GettextResourceManager.GetString,
+GettextResourceManager.GetPluralString
+
+ - textdomain
+
-
+
new GettextResourceManager(domain)
+
+ - bindtextdomain
+
-
+---, compiled message catalogs are located in subdirectories of the directory
+containing the executable
+
+
- setlocale
+
-
+automatic
+
+
- Prerequisite
+
-
+---
+
+
- Use or emulate GNU gettext
+
-
+---, uses a C# specific message catalog format
+
+
- Extractor
+
-
+
xgettext -k_
+
+ - Formatting with positions
+
-
+
String.Format "{1} {0}"
+
+ - Portability
+
-
+fully portable
+
+
- po-mode marking
+
-
+---
+
+
+
+Before marking strings as internationalizable, uses of the string
+concatenation operator need to be converted to String.Format
+invocations. For example, "file "+filename+" not found" becomes
+String.Format("file {0} not found", filename).
+Only after this is done, can the strings be marked and extracted.
+
+
+
+GNU gettext uses the native C#/.NET internationalization mechanism, namely
+the classes ResourceManager and ResourceSet. Applications
+use the ResourceManager methods to retrieve the native language
+translation of strings. An instance of ResourceSet is the in-memory
+representation of a message catalog file. The ResourceManager loads
+and accesses ResourceSet instances as needed to look up the
+translations.
+
+
+
+There are two formats of ResourceSets that can be directly loaded by
+the C# runtime: .resources files and .dll files.
+
+
+
+
+-
+
+The
.resources format is a binary file usually generated through the
+resgen or monoresgen utility, but which doesn't support plural
+forms. .resources files can also be embedded in .NET .exe files.
+This only affects whether a file system access is performed to load the message
+catalog; it doesn't affect the contents of the message catalog.
+
+ -
+
+On the other hand, the
.dll format is a binary file that is compiled
+from .cs source code and can support plural forms (provided it is
+accessed through the GNU gettext API, see below).
+
+
+
+Note that these .NET .dll and .exe files are not tied to a
+particular platform; their file format and GNU gettext for C# can be used
+on any platform.
+
+
+
+To convert a PO file to a .resources file, the msgfmt program
+can be used with the option `--csharp-resources´. To convert a
+.resources file back to a PO file, the msgunfmt program can be
+used with the option `--csharp-resources´. You can also, in some cases,
+use the resgen program (from the pnet package) or the
+monoresgen program (from the mono/mcs package). These
+programs can also convert a .resources file back to a PO file. But
+beware: as of this writing (January 2004), the monoresgen converter is
+quite buggy and the resgen converter ignores the encoding of the PO
+files.
+
+
+
+To convert a PO file to a .dll file, the msgfmt program can be
+used with the option --csharp. The result will be a .dll file
+containing a subclass of GettextResourceSet, which itself is a subclass
+of ResourceSet. To convert a .dll file containing a
+GettextResourceSet subclass back to a PO file, the msgunfmt
+program can be used with the option --csharp.
+
+
+
+The advantages of the .dll format over the .resources format
+are:
+
+
+
+
+-
+
+Freedom to localize: Users can add their own translations to an application
+after it has been built and distributed. Whereas when the programmer uses
+a
ResourceManager constructor provided by the system, the set of
+.resources files for an application must be specified when the
+application is built and cannot be extended afterwards.
+
+ -
+
+Plural handling: A message catalog in
.dll format supports the plural
+handling function GetPluralString. Whereas .resources files can
+only contain data and only support lookups that depend on a single string.
+
+ -
+
+The
GettextResourceManager that loads the message catalogs in
+.dll format also provides for inheritance on a per-message basis.
+For example, in Austrian (de_AT) locale, translations from the German
+(de) message catalog will be used for messages not found in the
+Austrian message catalog. This has the consequence that the Austrian
+translators need only translate those few messages for which the translation
+into Austrian differs from the German one. Whereas when working with
+.resources files, each message catalog must provide the translations
+of all messages by itself.
+
+ -
+
+The
GettextResourceManager that loads the message catalogs in
+.dll format also provides for a fallback: The English msgid is
+returned when no translation can be found. Whereas when working with
+.resources files, a language-neutral .resources file must
+explicitly be provided as a fallback.
+
+
+
+On the side of the programmatic APIs, the programmer can use either the
+standard ResourceManager API and the GNU GettextResourceManager
+API. The latter is an extension of the former, because
+GettextResourceManager is a subclass of ResourceManager.
+
+
+
+
+-
+
+The
System.Resources.ResourceManager API.
+
+This API works with resources in .resources format.
+
+The creation of the ResourceManager is done through
+
+
+ new ResourceManager(domainname, Assembly.GetExecutingAssembly())
+
+
+
+The GetString function returns a string's translation. Note that this
+function returns null when a translation is missing (i.e. not even found in
+the fallback resource file).
+
+ -
+
+The
GNU.Gettext.GettextResourceManager API.
+
+This API works with resources in .dll format.
+
+Reference documentation is in the
+csharpdoc directory.
+
+The creation of the ResourceManager is done through
+
+
+ new GettextResourceManager(domainname)
+
+
+The GetString function returns a string's translation. Note that when
+a translation is missing, the msgid argument is returned unchanged.
+
+The GetPluralString function returns a string translation with plural
+handling, like the ngettext function in C.
+
+
+To use this API, one needs the GNU.Gettext.dll file which is part of
+the GNU gettext package and distributed under the LGPL.
+
+
+
+You can also mix both approaches: use the
+GNU.Gettext.GettextResourceManager constructor, but otherwise use
+only the ResourceManager type and only the GetString method.
+This is appropriate when you want to profit from the tools for PO files,
+but don't want to change an existing source code that uses
+ResourceManager and don't (yet) need the GetPluralString method.
+
+
+
+Two examples, using the second API, are available in the `examples´
+directory: hello-csharp, hello-csharp-forms.
+
+
+
+Now, to make use of the API and define a shorthand for `GetString´,
+there are two idioms that you can choose from:
+
+
+
+
+-
+
+In a unique class of your project, say `Util´, define a static variable
+holding the
ResourceManager instance:
+
+
+
+public static GettextResourceManager MyResourceManager =
+ new GettextResourceManager("domain-name");
+
+
+All classes containing internationalized strings then contain
+
+
+
+private static GettextResourceManager Res = Util.MyResourceManager;
+private static String _(String s) { return Res.GetString(s); }
+
+
+and the shorthand is used like this:
+
+
+
+Console.WriteLine(_("Operation completed."));
+
+
+ -
+
+You add a class with a very short name, say `S´, containing just the
+definition of the resource manager and of the shorthand:
+
+
+
+public class S {
+ public static GettextResourceManager MyResourceManager =
+ new GettextResourceManager("domain-name");
+ public static String _(String s) {
+ return MyResourceManager.GetString(s);
+ }
+}
+
+
+and the shorthand is used like this:
+
+
+
+Console.WriteLine(S._("Operation completed."));
+
+
+
+
+
+Which of the two idioms you choose, will depend on whether copying two lines
+of codes into every class is more acceptable in your project than a class
+with a single-letter name.
+
+
+
+
+13.5.12 GNU awk
+
@@ -1726,11 +2127,11 @@ An example is available in the `examples´ directory: hello-
-13.5.12 Pascal - Free Pascal Compiler
+13.5.13 Pascal - Free Pascal Compiler
@@ -1807,9 +2208,9 @@ An example is available in the `examples´ directory: hello-
-13.5.13 wxWindows library
+13.5.14 wxWindows library
@@ -1873,10 +2274,10 @@ yes
-13.5.14 YCP - YaST2 scripting language
+13.5.15 YCP - YaST2 scripting language
@@ -1944,10 +2345,10 @@ An example is available in the `examples´ directory: hello-
-13.5.15 Tcl - Tk's scripting language
+13.5.16 Tcl - Tk's scripting language
@@ -2030,9 +2431,9 @@ argument is given.
-13.5.16 Perl
+13.5.17 Perl
@@ -2145,7 +2546,7 @@ An example is available in the `examples´ directory: hello-
@@ -2160,7 +2561,7 @@ worst probably being its imperfectness.
-
13.5.16.1 General Problems Parsing Perl Code
+13.5.17.1 General Problems Parsing Perl Code
It is often heard that only Perl can parse Perl. This is not true.
@@ -2294,9 +2695,9 @@ reformulate your code in a manner less challenging to xgettext.
-13.5.16.2 Which keywords will xgettext look for?
+13.5.17.2 Which keywords will xgettext look for?
@@ -2343,9 +2744,9 @@ The keys of lookups into the hash reference $gettext will be extrac
-
13.5.16.3 How to Extract Hash Keys
+13.5.17.3 How to Extract Hash Keys
@@ -2398,9 +2799,9 @@ are not allowed, regardless of the use utf8 pragma.
-13.5.16.4 What are Strings And Quote-like Expressions?
+13.5.17.4 What are Strings And Quote-like Expressions?
@@ -2498,9 +2899,9 @@ Delimiters that start with a digit are not supported!
-
13.5.16.5 Invalid Uses Of String Interpolation
+13.5.17.5 Invalid Uses Of String Interpolation
@@ -2636,9 +3037,9 @@ well write what you mean.
-13.5.16.6 Valid Uses Of String Interpolation
+13.5.17.6 Valid Uses Of String Interpolation
@@ -2724,9 +3125,9 @@ s/$gettext{"U. S. A."}/$gettext{"U. S. A."} $gettext{"(dial +0)"}/g;
-
13.5.16.7 When To Use Parentheses
+13.5.17.7 When To Use Parentheses
@@ -2770,9 +3171,9 @@ print dngettext 'package', ("one cake", "several cakes", $n), $discarded;
-
13.5.16.8 How To Grok with Long Lines
+13.5.17.8 How To Grok with Long Lines
@@ -2844,9 +3245,9 @@ the resulting POT file.
-13.5.16.9 Bugs, Pitfalls, And Things That Do Not Work
+13.5.17.9 Bugs, Pitfalls, And Things That Do Not Work
@@ -2996,9 +3397,9 @@ get executed. Most of the time you will happily get along with
-13.5.17 PHP Hypertext Preprocessor
+13.5.18 PHP Hypertext Preprocessor
@@ -3067,9 +3468,9 @@ An example is available in the `examples´ directory: hello-
-13.5.18 Pike
+13.5.19 Pike
@@ -3133,9 +3534,9 @@ On platforms without gettext, the functions are not available.
-13.5.19 GNU Compiler Collection sources
+13.5.20 GNU Compiler Collection sources
@@ -3200,7 +3601,7 @@ yes
-13.6 Internationalizable Data
+13.6 Internationalizable Data
Here is a list of other data formats which can be internationalized
@@ -3210,7 +3611,7 @@ using GNU gettext.
-
13.6.1 POT - Portable Object Template
+13.6.1 POT - Portable Object Template
@@ -3229,9 +3630,9 @@ gettext
-13.6.2 Resource String Table
+13.6.2 Resource String Table
@@ -3251,7 +3652,7 @@ fpk
-13.6.3 Glade - GNOME user interface description
+13.6.3 Glade - GNOME user interface description
diff --git a/gettext-tools/doc/gettext_14.html b/gettext-tools/doc/gettext_14.html
index 699215563..8fcf3d146 100644
--- a/gettext-tools/doc/gettext_14.html
+++ b/gettext-tools/doc/gettext_14.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 14 Concluding Remarks
@@ -10,7 +10,7 @@ Go to the first, previous
-
14 Concluding Remarks
+14 Concluding Remarks
We would like to conclude this GNU gettext manual by presenting
@@ -22,9 +22,9 @@ about Native Language Support matters.
-
14.1 History of GNU gettext
+14.1 History of GNU gettext
@@ -124,10 +124,10 @@ manipulating PO files.
-14.2 Related Readings
+14.2 Related Readings
diff --git a/gettext-tools/doc/gettext_15.html b/gettext-tools/doc/gettext_15.html
index 4e167d5d3..f10bfa009 100644
--- a/gettext-tools/doc/gettext_15.html
+++ b/gettext-tools/doc/gettext_15.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - A Language Codes
@@ -10,10 +10,10 @@ Go to the first, previous
-
A Language Codes
+A Language Codes
@@ -36,6 +36,9 @@ Avestan.
- `af´
-
Afrikaans.
+
- `ak´
+
-
+Akan.
- `am´
-
Amharic.
@@ -48,6 +51,9 @@ Arabic.
- `as´
-
Assamese.
+
- `av´
+
-
+Avaric.
- `ay´
-
Aymara.
@@ -69,6 +75,9 @@ Bihari.
- `bi´
-
Bislama.
+
- `bm´
+
-
+Bambara.
- `bn´
-
Bengali; Bangla.
@@ -93,6 +102,9 @@ Chamorro.
- `co´
-
Corsican.
+
- `cr´
+
-
+Cree.
- `cs´
-
Czech.
@@ -111,9 +123,15 @@ Danish.
- `de´
-
German.
+
- `dv´
+
-
+Divehi.
- `dz´
-
Dzongkha; Bhutani.
+
- `ee´
+
-
+'Ew'e.
- `el´
-
Greek.
@@ -135,6 +153,9 @@ Basque.
- `fa´
-
Persian.
+
- `ff´
+
-
+Fulah.
- `fi´
-
Finnish.
@@ -204,6 +225,9 @@ Indonesian (formerly in).
- `ie´
-
Interlingue.
+
- `ig´
+
-
+Igbo.
- `ii´
-
Sichuan Yi.
@@ -231,6 +255,9 @@ Javanese.
- `ka´
-
Georgian.
+
- `kg´
+
-
+Kongo.
- `ki´
-
Kikuyu.
@@ -252,6 +279,9 @@ Kannada.
- `ko´
-
Korean.
+
- `kr´
+
-
+Kanuri.
- `ks´
-
Kashmiri.
@@ -273,6 +303,9 @@ Latin.
- `lb´
-
Letzeburgesch.
+
- `lg´
+
-
+Ganda.
- `li´
-
Limburgish; Limburger; Limburgan.
@@ -285,6 +318,9 @@ Lao; Laotian.
- `lt´
-
Lithuanian.
+
- `lu´
+
-
+Luba-Katanga.
- `lv´
-
Latvian; Lettish.
@@ -357,6 +393,9 @@ Chichewa; Nyanja.
- `oc´
-
Occitan; Provençal.
+
- `oj´
+
-
+Ojibwa.
- `om´
-
(Afan) Oromo.
@@ -507,6 +546,9 @@ Urdu.
- `uz´
-
Uzbek.
+
- `ve´
+
-
+Venda.
- `vi´
-
Vietnamese.
diff --git a/gettext-tools/doc/gettext_16.html b/gettext-tools/doc/gettext_16.html
index 87bed7413..ba2560822 100644
--- a/gettext-tools/doc/gettext_16.html
+++ b/gettext-tools/doc/gettext_16.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - B Country Codes
@@ -10,10 +10,10 @@ Go to the first, previous
-
B Country Codes
+B Country Codes
diff --git a/gettext-tools/doc/gettext_17.html b/gettext-tools/doc/gettext_17.html
index c26afe1b4..71fd0794f 100644
--- a/gettext-tools/doc/gettext_17.html
+++ b/gettext-tools/doc/gettext_17.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - Program Index
@@ -10,7 +10,7 @@ Go to the first, previous
-
Program Index
+Program Index
Jump to:
@@ -28,41 +28,41 @@ Jump to:
a
-- autopoint
+
- autopoint
e
-- envsubst
+
- envsubst
g
-- gettext, gettext
-
- gettextize
+
- gettext, gettext
+
- gettextize
m
-- msgattrib
-
- msgcat
-
- msgcmp
-
- msgcomm
-
- msgconv
-
- msgen
-
- msgexec
-
- msgfilter
-
- msgfmt
-
- msggrep
-
- msginit
-
- msgmerge
-
- msgunfmt
-
- msguniq
+
- msgattrib
+
- msgcat
+
- msgcmp
+
- msgcomm
+
- msgconv
+
- msgen
+
- msgexec
+
- msgfilter
+
- msgfmt
+
- msggrep
+
- msginit
+
- msgmerge
+
- msgunfmt
+
- msguniq
n
-- ngettext, ngettext
+
- ngettext, ngettext
x
-- xgettext
+
- xgettext
diff --git a/gettext-tools/doc/gettext_18.html b/gettext-tools/doc/gettext_18.html
index 85c9efafb..8d8def4d7 100644
--- a/gettext-tools/doc/gettext_18.html
+++ b/gettext-tools/doc/gettext_18.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - Option Index
@@ -10,7 +10,7 @@ Go to the first, previous
-
Option Index
+Option Index
Jump to:
@@ -18,542 +18,546 @@ Jump to:
-
-- --add-comments,
xgettext option
- - --add-location,
msgattrib option
- - --add-location,
msgcat option
- - --add-location,
msgcomm option
- - --add-location,
msgconv option
- - --add-location,
msgen option
- - --add-location,
msgfilter option
- - --add-location,
msggrep option
- - --add-location,
msgmerge option
- - --add-location,
msguniq option
- - --add-location,
xgettext option
- - --alignment,
msgfmt option
- - --backup,
msgmerge option
- - --c++,
xgettext option
- - --check,
msgfmt option
- - --check-accelerators,
msgfmt option
- - --check-compatibility,
msgfmt option
- - --check-domain,
msgfmt option
- - --check-format,
msgfmt option
- - --check-header,
msgfmt option
- - --clear-fuzzy,
msgattrib option
- - --clear-obsolete,
msgattrib option
- - --comment,
msggrep option
- - --compendium,
msgmerge option
- - --copy,
gettextize option
- - --copyright-holder,
xgettext option
- - --debug,
xgettext option
- - --default-domain,
xgettext option
- - --directory,
msgattrib option
- - --directory,
msgcat option
- - --directory,
msgcmp option
- - --directory,
msgcomm option
- - --directory,
msgconv option
- - --directory,
msgen option
- - --directory,
msgexec option
- - --directory,
msgfilter option
- - --directory,
msgfmt option
- - --directory,
msggrep option
- - --directory,
msgmerge option
- - --directory,
msguniq option
- - --directory,
xgettext option
- - --domain,
gettext option
- - --domain,
msggrep option
- - --domain,
ngettext option
- - --dry-run,
autopoint option
- - --dry-run,
gettextize option
- - --exclude-file,
xgettext option
- - --expression,
msgfilter option
- - --extended-regexp,
msggrep option
- - --extract-all,
xgettext option
- - --file,
msgfilter option
- - --file,
msggrep option
- - --files-from,
msgcat option
- - --files-from,
msgcomm option
- - --files-from,
xgettext option
- - --fixed-strings,
msggrep option
- - --flag,
xgettext option
- - --force,
autopoint option
- - --force,
gettextize option
- - --force-po,
msgattrib option
- - --force-po,
msgcat option
- - --force-po,
msgcomm option
- - --force-po,
msgconv option
- - --force-po,
msgen option
- - --force-po,
msgfilter option
- - --force-po,
msggrep option
- - --force-po,
msgmerge option
- - --force-po,
msgunfmt option
- - --force-po,
msguniq option
- - --force-po,
xgettext option
- - --foreign-user,
xgettext option
- - --from-code,
xgettext option
- - --fuzzy,
msgattrib option
- - --help,
autopoint option
- - --help,
envsubst option
- - --help,
gettext option
- - --help,
gettextize option
- - --help,
msgattrib option
- - --help,
msgcat option
- - --help,
msgcmp option
- - --help,
msgcomm option
- - --help,
msgconv option
- - --help,
msgen option
- - --help,
msgexec option
- - --help,
msgfilter option
- - --help,
msgfmt option
- - --help,
msggrep option
- - --help,
msginit option
- - --help,
msgmerge option
- - --help,
msgunfmt option
- - --help,
msguniq option
- - --help,
ngettext option
- - --help,
xgettext option
- - --ignore-case,
msggrep option
- - --ignore-file,
msgattrib option
- - --indent,
msgattrib option
- - --indent,
msgcat option
- - --indent,
msgcomm option
- - --indent,
msgconv option
- - --indent,
msgen option
- - --indent,
msgfilter option
- - --indent,
msggrep option
- - --indent,
msgmerge option
- - --indent,
msgunfmt option
- - --indent,
msguniq option
- - --indent,
xgettext option
- - --input,
msgexec option
- - --input,
msgfilter option
- - --input,
msginit option
- - --intl,
gettextize option
- - --java,
msgfmt option
- - --java,
msgunfmt option
- - --java2,
msgfmt option
- - --join-existing,
xgettext option
- - --keep-header,
msgfilter option
- - --keyword,
xgettext option
- - --language,
xgettext option
- - --less-than,
msgcat option
- - --less-than,
msgcomm option
- - --locale,
msgfmt option, --locale, msgfmt option
- - --locale,
msginit option
- - --locale,
msgunfmt option, --locale, msgunfmt option
- - --location,
msggrep option
- - --more-than,
msgcat option
- - --more-than,
msgcomm option
- - --msgid,
msggrep option
- - --msgid-bugs-address,
xgettext option
- - --msgstr,
msggrep option
- - --msgstr-prefix,
xgettext option
- - --msgstr-suffix,
xgettext option
- - --multi-domain,
msgcmp option
- - --multi-domain,
msgmerge option
- - --no-changelog,
gettextize option
- - --no-fuzzy,
msgattrib option
- - --no-fuzzy-matching,
msgmerge option
- - --no-hash,
msgfmt option
- - --no-location,
msgattrib option
- - --no-location,
msgcat option
- - --no-location,
msgcomm option
- - --no-location,
msgconv option
- - --no-location,
msgen option
- - --no-location,
msgfilter option
- - --no-location,
msggrep option
- - --no-location,
msgmerge option
- - --no-location,
msguniq option
- - --no-location,
xgettext option
- - --no-obsolete,
msgattrib option
- - --no-translator,
msginit option
- - --no-wrap,
msgattrib option
- - --no-wrap,
msgcat option
- - --no-wrap,
msgcomm option
- - --no-wrap,
msgconv option
- - --no-wrap,
msgen option
- - --no-wrap,
msgfilter option
- - --no-wrap,
msggrep option
- - --no-wrap,
msginit option
- - --no-wrap,
msgmerge option
- - --no-wrap,
msgunfmt option
- - --no-wrap,
msguniq option
- - --no-wrap,
xgettext option
- - --obsolete,
msgattrib option
- - --omit-header,
msgcomm option
- - --omit-header,
xgettext option
- - --only-file,
msgattrib option
- - --only-fuzzy,
msgattrib option
- - --only-obsolete,
msgattrib option
- - --output,
xgettext option
- - --output-dir,
xgettext option
- - --output-file,
msgattrib option
- - --output-file,
msgcat option
- - --output-file,
msgcomm option
- - --output-file,
msgconv option
- - --output-file,
msgen option
- - --output-file,
msgfilter option
- - --output-file,
msgfmt option
- - --output-file,
msggrep option
- - --output-file,
msginit option
- - --output-file,
msgmerge option
- - --output-file,
msgunfmt option
- - --output-file,
msguniq option
- - --properties-input,
msgattrib option
- - --properties-input,
msgcat option
- - --properties-input,
msgcmp option
- - --properties-input,
msgcomm option
- - --properties-input,
msgconv option
- - --properties-input,
msgen option
- - --properties-input,
msgexec option
- - --properties-input,
msgfilter option
- - --properties-input,
msgfmt option
- - --properties-input,
msggrep option
- - --properties-input,
msginit option
- - --properties-input,
msgmerge option
- - --properties-input,
msguniq option
- - --properties-output,
msgattrib option
- - --properties-output,
msgcat option
- - --properties-output,
msgcomm option
- - --properties-output,
msgconv option
- - --properties-output,
msgen option
- - --properties-output,
msgfilter option
- - --properties-output,
msggrep option
- - --properties-output,
msginit option
- - --properties-output,
msgmerge option
- - --properties-output,
msgunfmt option
- - --properties-output,
msguniq option
- - --properties-output,
xgettext option
- - --qt,
msgfmt option
- - --qt,
xgettext option
- - --quiet,
msgfilter option
- - --quiet,
msgmerge option
- - --regexp=,
msggrep option
- - --repeated,
msguniq option
- - --resource,
msgfmt option
- - --resource,
msgunfmt option
- - --set-fuzzy,
msgattrib option
- - --set-obsolete,
msgattrib option
- - --silent,
msgfilter option
- - --silent,
msgmerge option
- - --sort-by-file,
msgattrib option
- - --sort-by-file,
msgcat option
- - --sort-by-file,
msgcomm option
- - --sort-by-file,
msgconv option
- - --sort-by-file,
msgen option
- - --sort-by-file,
msgfilter option
- - --sort-by-file,
msggrep option
- - --sort-by-file,
msgmerge option
- - --sort-by-file,
msguniq option
- - --sort-by-file,
xgettext option
- - --sort-output,
msgattrib option
- - --sort-output,
msgcat option
- - --sort-output,
msgcomm option
- - --sort-output,
msgconv option
- - --sort-output,
msgen option
- - --sort-output,
msgfilter option
- - --sort-output,
msggrep option
- - --sort-output,
msgmerge option
- - --sort-output,
msgunfmt option
- - --sort-output,
msguniq option
- - --sort-output,
xgettext option
- - --statistics,
msgfmt option
- - --strict,
msgattrib option
- - --strict,
msgcat option
- - --strict,
msgcomm option
- - --strict,
msgconv option
- - --strict,
msgen option
- - --strict,
msgfilter option
- - --strict,
msgfmt option
- - --strict,
msggrep option
- - --strict,
msgmerge option
- - --strict,
msgunfmt option
- - --strict,
msguniq option
- - --strict,
xgettext option
- - --stringtable-input,
msgattrib option
- - --stringtable-input,
msgcat option
- - --stringtable-input,
msgcmp option
- - --stringtable-input,
msgcomm option
- - --stringtable-input,
msgen option
- - --stringtable-input,
msgexec option
- - --stringtable-input,
msgfilter option
- - --stringtable-input,
msgfmt option
- - --stringtable-input,
msggrep option
- - --stringtable-input,
msginit option
- - --stringtable-input,
msgmerge option
- - --stringtable-input,
msgonv option
- - --stringtable-input,
msguniq option
- - --stringtable-output,
msgattrib option
- - --stringtable-output,
msgcat option
- - --stringtable-output,
msgcomm option
- - --stringtable-output,
msgconv option
- - --stringtable-output,
msgen option
- - --stringtable-output,
msgfilter option
- - --stringtable-output,
msggrep option
- - --stringtable-output,
msginit option
- - --stringtable-output,
msgmerge option
- - --stringtable-output,
msgunfmt option
- - --stringtable-output,
msguniq option
- - --stringtable-output,
xgettext option
- - --suffix,
msgmerge option
- - --tcl,
msgfmt option
- - --tcl,
msgunfmt option
- - --to-code,
msgcat option
- - --to-code,
msgconv option
- - --to-code,
msguniq option
- - --translated,
msgattrib option
- - --trigraphs,
xgettext option
- - --unique,
msgcat option
- - --unique,
msgcomm option
- - --unique,
msguniq option
- - --untranslated,
msgattrib option
- - --update,
msgmerge option
- - --use-first,
msgcat option
- - --use-first,
msguniq option
- - --use-fuzzy,
msgfmt option
- - --variables,
envsubst option
- - --verbose,
msgfmt option
- - --verbose,
msgmerge option
- - --verbose,
msgunfmt option
- - --version,
autopoint option
- - --version,
envsubst option
- - --version,
gettext option
- - --version,
gettextize option
- - --version,
msgattrib option
- - --version,
msgcat option
- - --version,
msgcmp option
- - --version,
msgcomm option
- - --version,
msgconv option
- - --version,
msgen option
- - --version,
msgexec option
- - --version,
msgfilter option
- - --version,
msgfmt option
- - --version,
msggrep option
- - --version,
msginit option
- - --version,
msgmerge option
- - --version,
msgunfmt option
- - --version,
msguniq option
- - --version,
ngettext option
- - --version,
xgettext option
- - --width,
msgattrib option
- - --width,
msgcat option
- - --width,
msgcomm option
- - --width,
msgconv option
- - --width,
msgen option
- - --width,
msgfilter option
- - --width,
msggrep option
- - --width,
msginit option
- - --width,
msgmerge option
- - --width,
msgunfmt option
- - --width,
msguniq option
- - --width,
xgettext option
- - -<,
msgcat option
- - -<,
msgcomm option
- - ->,
msgcat option
- - ->,
msgcomm option
- - -a,
msgfmt option
- - -a,
xgettext option
- - -c,
gettextize option
- - -C,
msgfmt option
- - -c,
msgfmt option
- - -C,
msggrep option
- - -C,
msgmerge option
- - -C,
xgettext option
- - -c,
xgettext option
- - -d,
autopoint option
- - -d,
gettext option
- - -d,
gettextize option
- - -D,
msgattrib option
- - -D,
msgcat option
- - -D,
msgcmp option
- - -D,
msgcomm option
- - -D,
msgconv option
- - -D,
msgen option
- - -D,
msgexec option
- - -D,
msgfilter option
- - -d,
msgfmt option, -d, msgfmt option
- - -D,
msgfmt option
- - -D,
msggrep option
- - -D,
msgmerge option
- - -d,
msgunfmt option
- - -D,
msguniq option
- - -d,
msguniq option
- - -d,
ngettext option
- - -D,
xgettext option
- - -d,
xgettext option
- - -e,
gettext option
- - -E,
gettext option
- - -e,
msgfilter option
- - -E,
msggrep option
- - -e,
msggrep option
- - -e,
ngettext option
- - -E,
ngettext option
- - -f,
autopoint option
- - -f,
gettextize option
- - -F,
msgattrib option
- - -f,
msgcat option
- - -F,
msgcat option
- - -F,
msgcomm option
- - -f,
msgcomm option
- - -F,
msgconv option
- - -F,
msgen option
- - -F,
msgfilter option
- - -f,
msgfilter option
- - -f,
msgfmt option
- - -f,
msggrep option
- - -F,
msggrep option
- - -F,
msgmerge option
- - -F,
msguniq option
- - -F,
xgettext option
- - -f,
xgettext option
- - -h,
envsubst option
- - -h,
gettext option
- - -h,
msgattrib option
- - -h,
msgcat option
- - -h,
msgcmp option
- - -h,
msgcomm option
- - -h,
msgconv option
- - -h,
msgen option
- - -h,
msgexec option
- - -h,
msgfilter option
- - -h,
msgfmt option
- - -h,
msggrep option
- - -h,
msginit option
- - -h,
msgmerge option
- - -h,
msgunfmt option
- - -h,
msguniq option
- - -h,
ngettext option
- - -h,
xgettext option
- - -i,
msgattrib option
- - -i,
msgcat option
- - -i,
msgcomm option
- - -i,
msgconv option
- - -i,
msgen option
- - -i,
msgexec option
- - -i,
msgfilter option
- - -i,
msggrep option
- - -i,
msginit option
- - -i,
msgmerge option
- - -i,
msgunfmt option
- - -i,
msguniq option
- - -i,
xgettext option
- - -j,
msgfmt option
- - -j,
msgunfmt option
- - -j,
xgettext option
- - -K,
msggrep option
- - -k,
xgettext option
- - -l,
msgfmt option, -l, msgfmt option
- - -l,
msginit option
- - -l,
msgunfmt option, -l, msgunfmt option
- - -L,
xgettext option
- - -m,
msgcmp option
- - -M,
msggrep option
- - -m,
msgmerge option
- - -M,
xgettext option
- - -m,
xgettext option
- - -n,
gettext option
- - -n,
msgattrib option
- - -n,
msgcat option
- - -n,
msgcomm option
- - -n,
msgfilter option
- - -N,
msggrep option
- - -N,
msgmerge option
- - -n,
msguniq option
- - -n,
xgettext option
- - -o,
msgattrib option
- - -o,
msgcat option
- - -o,
msgcomm option
- - -o,
msgconv option
- - -o,
msgen option
- - -o,
msgfilter option
- - -o,
msgfmt option
- - -o,
msggrep option
- - -o,
msginit option
- - -o,
msgmerge option
- - -o,
msgunfmt option
- - -o,
msguniq option
- - -o,
xgettext option
- - -P,
msgattrib option
- - -p,
msgattrib option
- - -P,
msgcat option
- - -p,
msgcat option
- - -P,
msgcmp option
- - -P,
msgcomm option
- - -p,
msgcomm option
- - -P,
msgconv option
- - -p,
msgconv option
- - -P,
msgen option
- - -p,
msgen option
- - -P,
msgexec option
- - -P,
msgfilter option
- - -p,
msgfilter option
- - -P,
msgfmt option
- - -p,
msggrep option
- - -P,
msggrep option
- - -P,
msginit option
- - -p,
msginit option
- - -p,
msgmerge option
- - -P,
msgmerge option
- - -p,
msgunfmt option
- - -p,
msguniq option
- - -P,
msguniq option
- - -p,
xgettext option
- - -q,
msgmerge option
- - -r,
msgfmt option
- - -r,
msgunfmt option
- - -s,
msgattrib option
- - -s,
msgcat option
- - -s,
msgcomm option
- - -s,
msgconv option
- - -s,
msgen option
- - -s,
msgfilter option
- - -s,
msgmerge option
- - -s,
msgunfmt option
- - -s,
msguniq option
- - -s,
xgettext option
- - -t,
msgcat option
- - -t,
msgconv option
- - -T,
msggrep option
- - -t,
msguniq option
- - -T,
xgettext option
- - -u,
msgcat option
- - -u,
msgcomm option
- - -U,
msgmerge option
- - -u,
msguniq option
- - -v,
envsubst option
- - -V,
envsubst option
- - -V,
gettext option
- - -V,
msgattrib option
- - -V,
msgcat option
- - -V,
msgcmp option
- - -V,
msgcomm option
- - -V,
msgconv option
- - -V,
msgen option
- - -V,
msgexec option
- - -V,
msgfilter option
- - -V,
msgfmt option
- - -v,
msgfmt option
- - -V,
msggrep option
- - -V,
msginit option
- - -v,
msgmerge option
- - -V,
msgmerge option
- - -v,
msgunfmt option
- - -V,
msgunfmt option
- - -V,
msguniq option
- - -V,
ngettext option
- - -V,
xgettext option
- - -w,
msgattrib option
- - -w,
msgcat option
- - -w,
msgcomm option
- - -w,
msgconv option
- - -w,
msgen option
- - -w,
msgfilter option
- - -w,
msggrep option
- - -w,
msginit option
- - -w,
msgmerge option
- - -w,
msgunfmt option
- - -w,
msguniq option
- - -w,
xgettext option
- - -x,
xgettext option
+ - --add-comments,
xgettext option
+ - --add-location,
msgattrib option
+ - --add-location,
msgcat option
+ - --add-location,
msgcomm option
+ - --add-location,
msgconv option
+ - --add-location,
msgen option
+ - --add-location,
msgfilter option
+ - --add-location,
msggrep option
+ - --add-location,
msgmerge option
+ - --add-location,
msguniq option
+ - --add-location,
xgettext option
+ - --alignment,
msgfmt option
+ - --backup,
msgmerge option
+ - --c++,
xgettext option
+ - --check,
msgfmt option
+ - --check-accelerators,
msgfmt option
+ - --check-compatibility,
msgfmt option
+ - --check-domain,
msgfmt option
+ - --check-format,
msgfmt option
+ - --check-header,
msgfmt option
+ - --clear-fuzzy,
msgattrib option
+ - --clear-obsolete,
msgattrib option
+ - --comment,
msggrep option
+ - --compendium,
msgmerge option
+ - --copy,
gettextize option
+ - --copyright-holder,
xgettext option
+ - --csharp,
msgfmt option
+ - --csharp,
msgunfmt option
+ - --csharp-resources,
msgfmt option
+ - --csharp-resources,
msgunfmt option
+ - --debug,
xgettext option
+ - --default-domain,
xgettext option
+ - --directory,
msgattrib option
+ - --directory,
msgcat option
+ - --directory,
msgcmp option
+ - --directory,
msgcomm option
+ - --directory,
msgconv option
+ - --directory,
msgen option
+ - --directory,
msgexec option
+ - --directory,
msgfilter option
+ - --directory,
msgfmt option
+ - --directory,
msggrep option
+ - --directory,
msgmerge option
+ - --directory,
msguniq option
+ - --directory,
xgettext option
+ - --domain,
gettext option
+ - --domain,
msggrep option
+ - --domain,
ngettext option
+ - --dry-run,
autopoint option
+ - --dry-run,
gettextize option
+ - --exclude-file,
xgettext option
+ - --expression,
msgfilter option
+ - --extended-regexp,
msggrep option
+ - --extract-all,
xgettext option
+ - --file,
msgfilter option
+ - --file,
msggrep option
+ - --files-from,
msgcat option
+ - --files-from,
msgcomm option
+ - --files-from,
xgettext option
+ - --fixed-strings,
msggrep option
+ - --flag,
xgettext option
+ - --force,
autopoint option
+ - --force,
gettextize option
+ - --force-po,
msgattrib option
+ - --force-po,
msgcat option
+ - --force-po,
msgcomm option
+ - --force-po,
msgconv option
+ - --force-po,
msgen option
+ - --force-po,
msgfilter option
+ - --force-po,
msggrep option
+ - --force-po,
msgmerge option
+ - --force-po,
msgunfmt option
+ - --force-po,
msguniq option
+ - --force-po,
xgettext option
+ - --foreign-user,
xgettext option
+ - --from-code,
xgettext option
+ - --fuzzy,
msgattrib option
+ - --help,
autopoint option
+ - --help,
envsubst option
+ - --help,
gettext option
+ - --help,
gettextize option
+ - --help,
msgattrib option
+ - --help,
msgcat option
+ - --help,
msgcmp option
+ - --help,
msgcomm option
+ - --help,
msgconv option
+ - --help,
msgen option
+ - --help,
msgexec option
+ - --help,
msgfilter option
+ - --help,
msgfmt option
+ - --help,
msggrep option
+ - --help,
msginit option
+ - --help,
msgmerge option
+ - --help,
msgunfmt option
+ - --help,
msguniq option
+ - --help,
ngettext option
+ - --help,
xgettext option
+ - --ignore-case,
msggrep option
+ - --ignore-file,
msgattrib option
+ - --indent,
msgattrib option
+ - --indent,
msgcat option
+ - --indent,
msgcomm option
+ - --indent,
msgconv option
+ - --indent,
msgen option
+ - --indent,
msgfilter option
+ - --indent,
msggrep option
+ - --indent,
msgmerge option
+ - --indent,
msgunfmt option
+ - --indent,
msguniq option
+ - --indent,
xgettext option
+ - --input,
msgexec option
+ - --input,
msgfilter option
+ - --input,
msginit option
+ - --intl,
gettextize option
+ - --java,
msgfmt option
+ - --java,
msgunfmt option
+ - --java2,
msgfmt option
+ - --join-existing,
xgettext option
+ - --keep-header,
msgfilter option
+ - --keyword,
xgettext option
+ - --language,
xgettext option
+ - --less-than,
msgcat option
+ - --less-than,
msgcomm option
+ - --locale,
msgfmt option, --locale, msgfmt option, --locale, msgfmt option
+ - --locale,
msginit option
+ - --locale,
msgunfmt option, --locale, msgunfmt option, --locale, msgunfmt option
+ - --location,
msggrep option
+ - --more-than,
msgcat option
+ - --more-than,
msgcomm option
+ - --msgid,
msggrep option
+ - --msgid-bugs-address,
xgettext option
+ - --msgstr,
msggrep option
+ - --msgstr-prefix,
xgettext option
+ - --msgstr-suffix,
xgettext option
+ - --multi-domain,
msgcmp option
+ - --multi-domain,
msgmerge option
+ - --no-changelog,
gettextize option
+ - --no-fuzzy,
msgattrib option
+ - --no-fuzzy-matching,
msgmerge option
+ - --no-hash,
msgfmt option
+ - --no-location,
msgattrib option
+ - --no-location,
msgcat option
+ - --no-location,
msgcomm option
+ - --no-location,
msgconv option
+ - --no-location,
msgen option
+ - --no-location,
msgfilter option
+ - --no-location,
msggrep option
+ - --no-location,
msgmerge option
+ - --no-location,
msguniq option
+ - --no-location,
xgettext option
+ - --no-obsolete,
msgattrib option
+ - --no-translator,
msginit option
+ - --no-wrap,
msgattrib option
+ - --no-wrap,
msgcat option
+ - --no-wrap,
msgcomm option
+ - --no-wrap,
msgconv option
+ - --no-wrap,
msgen option
+ - --no-wrap,
msgfilter option
+ - --no-wrap,
msggrep option
+ - --no-wrap,
msginit option
+ - --no-wrap,
msgmerge option
+ - --no-wrap,
msgunfmt option
+ - --no-wrap,
msguniq option
+ - --no-wrap,
xgettext option
+ - --obsolete,
msgattrib option
+ - --omit-header,
msgcomm option
+ - --omit-header,
xgettext option
+ - --only-file,
msgattrib option
+ - --only-fuzzy,
msgattrib option
+ - --only-obsolete,
msgattrib option
+ - --output,
xgettext option
+ - --output-dir,
xgettext option
+ - --output-file,
msgattrib option
+ - --output-file,
msgcat option
+ - --output-file,
msgcomm option
+ - --output-file,
msgconv option
+ - --output-file,
msgen option
+ - --output-file,
msgfilter option
+ - --output-file,
msgfmt option
+ - --output-file,
msggrep option
+ - --output-file,
msginit option
+ - --output-file,
msgmerge option
+ - --output-file,
msgunfmt option
+ - --output-file,
msguniq option
+ - --properties-input,
msgattrib option
+ - --properties-input,
msgcat option
+ - --properties-input,
msgcmp option
+ - --properties-input,
msgcomm option
+ - --properties-input,
msgconv option
+ - --properties-input,
msgen option
+ - --properties-input,
msgexec option
+ - --properties-input,
msgfilter option
+ - --properties-input,
msgfmt option
+ - --properties-input,
msggrep option
+ - --properties-input,
msginit option
+ - --properties-input,
msgmerge option
+ - --properties-input,
msguniq option
+ - --properties-output,
msgattrib option
+ - --properties-output,
msgcat option
+ - --properties-output,
msgcomm option
+ - --properties-output,
msgconv option
+ - --properties-output,
msgen option
+ - --properties-output,
msgfilter option
+ - --properties-output,
msggrep option
+ - --properties-output,
msginit option
+ - --properties-output,
msgmerge option
+ - --properties-output,
msgunfmt option
+ - --properties-output,
msguniq option
+ - --properties-output,
xgettext option
+ - --qt,
msgfmt option
+ - --qt,
xgettext option
+ - --quiet,
msgfilter option
+ - --quiet,
msgmerge option
+ - --regexp=,
msggrep option
+ - --repeated,
msguniq option
+ - --resource,
msgfmt option, --resource, msgfmt option
+ - --resource,
msgunfmt option, --resource, msgunfmt option
+ - --set-fuzzy,
msgattrib option
+ - --set-obsolete,
msgattrib option
+ - --silent,
msgfilter option
+ - --silent,
msgmerge option
+ - --sort-by-file,
msgattrib option
+ - --sort-by-file,
msgcat option
+ - --sort-by-file,
msgcomm option
+ - --sort-by-file,
msgconv option
+ - --sort-by-file,
msgen option
+ - --sort-by-file,
msgfilter option
+ - --sort-by-file,
msggrep option
+ - --sort-by-file,
msgmerge option
+ - --sort-by-file,
msguniq option
+ - --sort-by-file,
xgettext option
+ - --sort-output,
msgattrib option
+ - --sort-output,
msgcat option
+ - --sort-output,
msgcomm option
+ - --sort-output,
msgconv option
+ - --sort-output,
msgen option
+ - --sort-output,
msgfilter option
+ - --sort-output,
msggrep option
+ - --sort-output,
msgmerge option
+ - --sort-output,
msgunfmt option
+ - --sort-output,
msguniq option
+ - --sort-output,
xgettext option
+ - --statistics,
msgfmt option
+ - --strict,
msgattrib option
+ - --strict,
msgcat option
+ - --strict,
msgcomm option
+ - --strict,
msgconv option
+ - --strict,
msgen option
+ - --strict,
msgfilter option
+ - --strict,
msgfmt option
+ - --strict,
msggrep option
+ - --strict,
msgmerge option
+ - --strict,
msgunfmt option
+ - --strict,
msguniq option
+ - --strict,
xgettext option
+ - --stringtable-input,
msgattrib option
+ - --stringtable-input,
msgcat option
+ - --stringtable-input,
msgcmp option
+ - --stringtable-input,
msgcomm option
+ - --stringtable-input,
msgen option
+ - --stringtable-input,
msgexec option
+ - --stringtable-input,
msgfilter option
+ - --stringtable-input,
msgfmt option
+ - --stringtable-input,
msggrep option
+ - --stringtable-input,
msginit option
+ - --stringtable-input,
msgmerge option
+ - --stringtable-input,
msgonv option
+ - --stringtable-input,
msguniq option
+ - --stringtable-output,
msgattrib option
+ - --stringtable-output,
msgcat option
+ - --stringtable-output,
msgcomm option
+ - --stringtable-output,
msgconv option
+ - --stringtable-output,
msgen option
+ - --stringtable-output,
msgfilter option
+ - --stringtable-output,
msggrep option
+ - --stringtable-output,
msginit option
+ - --stringtable-output,
msgmerge option
+ - --stringtable-output,
msgunfmt option
+ - --stringtable-output,
msguniq option
+ - --stringtable-output,
xgettext option
+ - --suffix,
msgmerge option
+ - --tcl,
msgfmt option
+ - --tcl,
msgunfmt option
+ - --to-code,
msgcat option
+ - --to-code,
msgconv option
+ - --to-code,
msguniq option
+ - --translated,
msgattrib option
+ - --trigraphs,
xgettext option
+ - --unique,
msgcat option
+ - --unique,
msgcomm option
+ - --unique,
msguniq option
+ - --untranslated,
msgattrib option
+ - --update,
msgmerge option
+ - --use-first,
msgcat option
+ - --use-first,
msguniq option
+ - --use-fuzzy,
msgfmt option
+ - --variables,
envsubst option
+ - --verbose,
msgfmt option
+ - --verbose,
msgmerge option
+ - --verbose,
msgunfmt option
+ - --version,
autopoint option
+ - --version,
envsubst option
+ - --version,
gettext option
+ - --version,
gettextize option
+ - --version,
msgattrib option
+ - --version,
msgcat option
+ - --version,
msgcmp option
+ - --version,
msgcomm option
+ - --version,
msgconv option
+ - --version,
msgen option
+ - --version,
msgexec option
+ - --version,
msgfilter option
+ - --version,
msgfmt option
+ - --version,
msggrep option
+ - --version,
msginit option
+ - --version,
msgmerge option
+ - --version,
msgunfmt option
+ - --version,
msguniq option
+ - --version,
ngettext option
+ - --version,
xgettext option
+ - --width,
msgattrib option
+ - --width,
msgcat option
+ - --width,
msgcomm option
+ - --width,
msgconv option
+ - --width,
msgen option
+ - --width,
msgfilter option
+ - --width,
msggrep option
+ - --width,
msginit option
+ - --width,
msgmerge option
+ - --width,
msgunfmt option
+ - --width,
msguniq option
+ - --width,
xgettext option
+ - -<,
msgcat option
+ - -<,
msgcomm option
+ - ->,
msgcat option
+ - ->,
msgcomm option
+ - -a,
msgfmt option
+ - -a,
xgettext option
+ - -c,
gettextize option
+ - -C,
msgfmt option
+ - -c,
msgfmt option
+ - -C,
msggrep option
+ - -C,
msgmerge option
+ - -C,
xgettext option
+ - -c,
xgettext option
+ - -d,
autopoint option
+ - -d,
gettext option
+ - -d,
gettextize option
+ - -D,
msgattrib option
+ - -D,
msgcat option
+ - -D,
msgcmp option
+ - -D,
msgcomm option
+ - -D,
msgconv option
+ - -D,
msgen option
+ - -D,
msgexec option
+ - -D,
msgfilter option
+ - -d,
msgfmt option, -d, msgfmt option, -d, msgfmt option
+ - -D,
msgfmt option
+ - -D,
msggrep option
+ - -D,
msgmerge option
+ - -d,
msgunfmt option, -d, msgunfmt option
+ - -D,
msguniq option
+ - -d,
msguniq option
+ - -d,
ngettext option
+ - -D,
xgettext option
+ - -d,
xgettext option
+ - -e,
gettext option
+ - -E,
gettext option
+ - -e,
msgfilter option
+ - -E,
msggrep option
+ - -e,
msggrep option
+ - -e,
ngettext option
+ - -E,
ngettext option
+ - -f,
autopoint option
+ - -f,
gettextize option
+ - -F,
msgattrib option
+ - -f,
msgcat option
+ - -F,
msgcat option
+ - -F,
msgcomm option
+ - -f,
msgcomm option
+ - -F,
msgconv option
+ - -F,
msgen option
+ - -F,
msgfilter option
+ - -f,
msgfilter option
+ - -f,
msgfmt option
+ - -f,
msggrep option
+ - -F,
msggrep option
+ - -F,
msgmerge option
+ - -F,
msguniq option
+ - -F,
xgettext option
+ - -f,
xgettext option
+ - -h,
envsubst option
+ - -h,
gettext option
+ - -h,
msgattrib option
+ - -h,
msgcat option
+ - -h,
msgcmp option
+ - -h,
msgcomm option
+ - -h,
msgconv option
+ - -h,
msgen option
+ - -h,
msgexec option
+ - -h,
msgfilter option
+ - -h,
msgfmt option
+ - -h,
msggrep option
+ - -h,
msginit option
+ - -h,
msgmerge option
+ - -h,
msgunfmt option
+ - -h,
msguniq option
+ - -h,
ngettext option
+ - -h,
xgettext option
+ - -i,
msgattrib option
+ - -i,
msgcat option
+ - -i,
msgcomm option
+ - -i,
msgconv option
+ - -i,
msgen option
+ - -i,
msgexec option
+ - -i,
msgfilter option
+ - -i,
msggrep option
+ - -i,
msginit option
+ - -i,
msgmerge option
+ - -i,
msgunfmt option
+ - -i,
msguniq option
+ - -i,
xgettext option
+ - -j,
msgfmt option
+ - -j,
msgunfmt option
+ - -j,
xgettext option
+ - -K,
msggrep option
+ - -k,
xgettext option
+ - -l,
msgfmt option, -l, msgfmt option, -l, msgfmt option
+ - -l,
msginit option
+ - -l,
msgunfmt option, -l, msgunfmt option, -l, msgunfmt option
+ - -L,
xgettext option
+ - -m,
msgcmp option
+ - -M,
msggrep option
+ - -m,
msgmerge option
+ - -M,
xgettext option
+ - -m,
xgettext option
+ - -n,
gettext option
+ - -n,
msgattrib option
+ - -n,
msgcat option
+ - -n,
msgcomm option
+ - -n,
msgfilter option
+ - -N,
msggrep option
+ - -N,
msgmerge option
+ - -n,
msguniq option
+ - -n,
xgettext option
+ - -o,
msgattrib option
+ - -o,
msgcat option
+ - -o,
msgcomm option
+ - -o,
msgconv option
+ - -o,
msgen option
+ - -o,
msgfilter option
+ - -o,
msgfmt option
+ - -o,
msggrep option
+ - -o,
msginit option
+ - -o,
msgmerge option
+ - -o,
msgunfmt option
+ - -o,
msguniq option
+ - -o,
xgettext option
+ - -P,
msgattrib option
+ - -p,
msgattrib option
+ - -P,
msgcat option
+ - -p,
msgcat option
+ - -P,
msgcmp option
+ - -P,
msgcomm option
+ - -p,
msgcomm option
+ - -P,
msgconv option
+ - -p,
msgconv option
+ - -P,
msgen option
+ - -p,
msgen option
+ - -P,
msgexec option
+ - -P,
msgfilter option
+ - -p,
msgfilter option
+ - -P,
msgfmt option
+ - -p,
msggrep option
+ - -P,
msggrep option
+ - -P,
msginit option
+ - -p,
msginit option
+ - -p,
msgmerge option
+ - -P,
msgmerge option
+ - -p,
msgunfmt option
+ - -p,
msguniq option
+ - -P,
msguniq option
+ - -p,
xgettext option
+ - -q,
msgmerge option
+ - -r,
msgfmt option, -r, msgfmt option
+ - -r,
msgunfmt option, -r, msgunfmt option
+ - -s,
msgattrib option
+ - -s,
msgcat option
+ - -s,
msgcomm option
+ - -s,
msgconv option
+ - -s,
msgen option
+ - -s,
msgfilter option
+ - -s,
msgmerge option
+ - -s,
msgunfmt option
+ - -s,
msguniq option
+ - -s,
xgettext option
+ - -t,
msgcat option
+ - -t,
msgconv option
+ - -T,
msggrep option
+ - -t,
msguniq option
+ - -T,
xgettext option
+ - -u,
msgcat option
+ - -u,
msgcomm option
+ - -U,
msgmerge option
+ - -u,
msguniq option
+ - -v,
envsubst option
+ - -V,
envsubst option
+ - -V,
gettext option
+ - -V,
msgattrib option
+ - -V,
msgcat option
+ - -V,
msgcmp option
+ - -V,
msgcomm option
+ - -V,
msgconv option
+ - -V,
msgen option
+ - -V,
msgexec option
+ - -V,
msgfilter option
+ - -V,
msgfmt option
+ - -v,
msgfmt option
+ - -V,
msggrep option
+ - -V,
msginit option
+ - -v,
msgmerge option
+ - -V,
msgmerge option
+ - -v,
msgunfmt option
+ - -V,
msgunfmt option
+ - -V,
msguniq option
+ - -V,
ngettext option
+ - -V,
xgettext option
+ - -w,
msgattrib option
+ - -w,
msgcat option
+ - -w,
msgcomm option
+ - -w,
msgconv option
+ - -w,
msgen option
+ - -w,
msgfilter option
+ - -w,
msggrep option
+ - -w,
msginit option
+ - -w,
msgmerge option
+ - -w,
msgunfmt option
+ - -w,
msguniq option
+ - -w,
xgettext option
+ - -x,
xgettext option
diff --git a/gettext-tools/doc/gettext_19.html b/gettext-tools/doc/gettext_19.html
index a90fea2cd..83e81db2c 100644
--- a/gettext-tools/doc/gettext_19.html
+++ b/gettext-tools/doc/gettext_19.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - Variable Index
@@ -10,7 +10,7 @@ Go to the first, previous
-
Variable Index
+Variable Index
Jump to:
@@ -24,30 +24,30 @@ Jump to:
g
-- GETTEXT_LOG_UNTRANSLATED, environment variable
+
- GETTEXT_LOG_UNTRANSLATED, environment variable
l
-- LANG, environment variable, LANG, environment variable
-
- LANGUAGE, environment variable, LANGUAGE, environment variable
-
- LC_ALL, environment variable
-
- LC_COLLATE, environment variable
-
- LC_CTYPE, environment variable
-
- LC_MESSAGES, environment variable
-
- LC_MONETARY, environment variable
-
- LC_NUMERIC, environment variable
-
- LC_TIME, environment variable
-
- LINGUAS, environment variable
+
- LANG, environment variable, LANG, environment variable
+
- LANGUAGE, environment variable, LANGUAGE, environment variable
+
- LC_ALL, environment variable
+
- LC_COLLATE, environment variable
+
- LC_CTYPE, environment variable
+
- LC_MESSAGES, environment variable
+
- LC_MONETARY, environment variable
+
- LC_NUMERIC, environment variable
+
- LC_TIME, environment variable
+
- LINGUAS, environment variable
m
-- MSGEXEC_LOCATION, environment variable
-
- MSGEXEC_MSGID, environment variable
+
- MSGEXEC_LOCATION, environment variable
+
- MSGEXEC_MSGID, environment variable
t
-- TEXTDOMAIN, environment variable
-
- TEXTDOMAINDIR, environment variable
+
- TEXTDOMAIN, environment variable
+
- TEXTDOMAINDIR, environment variable
diff --git a/gettext-tools/doc/gettext_2.html b/gettext-tools/doc/gettext_2.html
index 0f19bb25b..3615d153f 100644
--- a/gettext-tools/doc/gettext_2.html
+++ b/gettext-tools/doc/gettext_2.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 2 PO Files and PO Mode Basics
@@ -185,7 +185,7 @@ can judge if the translation requires further modification, or is
acceptable as is. Once satisfied with the translation, she then removes
this fuzzy attribute. The msgmerge program inserts this
when it combined the msgid and msgstr entries after fuzzy
-search only. See section 6.3 Fuzzy Entries.
+search only. See section 6.3 Fuzzy Entries.
c-format
-
@@ -205,7 +205,7 @@ string happens to look like a C format string (with `%´ direc
In case the
c-format flag is given for a string the msgfmt
does some more tests to check to validity of the translation.
-See section 8.1 Invoking the msgfmt Program, section 3.5 Special Comments preceding Keywords and section 13.3.1 C Format Strings.
+See section 8.1 Invoking the msgfmt Program, section 3.5 Special Comments preceding Keywords and section 13.3.1 C Format Strings.
objc-format
-
@@ -213,7 +213,7 @@ See section 8.1 Invoking the
msgfmtno-objc-format
-
-Likewise for Objective C, see section 13.3.2 Objective C Format Strings.
+Likewise for Objective C, see section 13.3.2 Objective C Format Strings.
sh-format
-
@@ -221,7 +221,7 @@ Likewise for Objective C, see section 13.3.2 O
no-sh-format
-
-Likewise for Shell, see section 13.3.3 Shell Format Strings.
+Likewise for Shell, see section 13.3.3 Shell Format Strings.
python-format
-
@@ -229,7 +229,7 @@ Likewise for Shell, see section 13.3.3 Shell F
no-python-format
-
-Likewise for Python, see section 13.3.4 Python Format Strings.
+Likewise for Python, see section 13.3.4 Python Format Strings.
lisp-format
-
@@ -237,7 +237,7 @@ Likewise for Python, see section 13.3.4 Python
no-lisp-format
-
-Likewise for Lisp, see section 13.3.5 Lisp Format Strings.
+Likewise for Lisp, see section 13.3.5 Lisp Format Strings.
elisp-format
-
@@ -245,7 +245,7 @@ Likewise for Lisp, see section 13.3.5 Lisp For
no-elisp-format
-
-Likewise for Emacs Lisp, see section 13.3.6 Emacs Lisp Format Strings.
+Likewise for Emacs Lisp, see section 13.3.6 Emacs Lisp Format Strings.
librep-format
-
@@ -253,7 +253,7 @@ Likewise for Emacs Lisp, see section 13.3.6 Em
no-librep-format
-
-Likewise for librep, see section 13.3.7 librep Format Strings.
+Likewise for librep, see section 13.3.7 librep Format Strings.
smalltalk-format
-
@@ -261,7 +261,7 @@ Likewise for librep, see section 13.3.7 librep
no-smalltalk-format
-
-Likewise for Smalltalk, see section 13.3.8 Smalltalk Format Strings.
+Likewise for Smalltalk, see section 13.3.8 Smalltalk Format Strings.
java-format
-
@@ -269,85 +269,93 @@ Likewise for Smalltalk, see section 13.3.8 Sma
no-java-format
-
-Likewise for Java, see section 13.3.9 Java Format Strings.
+Likewise for Java, see section 13.3.9 Java Format Strings.
-
awk-format
+csharp-format
-
-
no-awk-format
+no-csharp-format
-
-Likewise for awk, see section 13.3.10 awk Format Strings.
+Likewise for C#, see section 13.3.10 C# Format Strings.
-
object-pascal-format
+awk-format
-
-
no-object-pascal-format
+no-awk-format
-
-Likewise for Object Pascal, see section 13.3.11 Object Pascal Format Strings.
+Likewise for awk, see section 13.3.11 awk Format Strings.
-
ycp-format
+object-pascal-format
-
-
no-ycp-format
+no-object-pascal-format
-
-Likewise for YCP, see section 13.3.12 YCP Format Strings.
+Likewise for Object Pascal, see section 13.3.12 Object Pascal Format Strings.
-
tcl-format
+ycp-format
-
-
no-tcl-format
+no-ycp-format
-
-Likewise for Tcl, see section 13.3.13 Tcl Format Strings.
+Likewise for YCP, see section 13.3.13 YCP Format Strings.
-
perl-format
+tcl-format
-
-
no-perl-format
+no-tcl-format
-
-Likewise for Perl, see section 13.3.14 Perl Format Strings.
+Likewise for Tcl, see section 13.3.14 Tcl Format Strings.
-
perl-brace-format
+perl-format
-
-
no-perl-brace-format
+no-perl-format
-
-Likewise for Perl brace, see section 13.3.14 Perl Format Strings.
+Likewise for Perl, see section 13.3.15 Perl Format Strings.
-
php-format
+perl-brace-format
-
-
no-php-format
+no-perl-brace-format
-
-Likewise for PHP, see section 13.3.15 PHP Format Strings.
+Likewise for Perl brace, see section 13.3.15 Perl Format Strings.
-
gcc-internal-format
+php-format
-
-
no-gcc-internal-format
+no-php-format
-
-Likewise for the GCC sources, see section 13.3.16 GCC internal Format Strings.
+Likewise for PHP, see section 13.3.16 PHP Format Strings.
-
qt-format
+gcc-internal-format
-
-
no-qt-format
+no-gcc-internal-format
-
-Likewise for Qt, see section 13.3.17 Qt Format Strings.
+Likewise for the GCC sources, see section 13.3.17 GCC internal Format Strings.
+
+
qt-format
+-
+
+
no-qt-format
+-
+
+Likewise for Qt, see section 13.3.18 Qt Format Strings.
-
-
+
+
A different kind of entries is used for translations which involve
plural forms.
@@ -381,7 +389,7 @@ msgstr[1] "s'han trobat %d errors fatals"
-
+
It happens that some lines, usually whitespace or comments, follow the
very last entry of a PO file. Such lines are not part of any entry,
and PO mode is unable to take action on those lines. By using the
@@ -431,7 +439,7 @@ other character, we just did it this way because it is neater.
-
+
One should carefully distinguish between end of lines marked as
`\n´ inside quotes, which are part of the represented
string, and end of lines in the PO file itself, outside string quotes,
@@ -439,7 +447,7 @@ which have no incidence on the represented string.
-
+
Outside strings, white lines and comments may be used freely.
Comments start at the beginning of a line with `#´ and extend
until the end of the PO file line. Comments written by translators
@@ -455,8 +463,8 @@ file is given to msgmerge.
2.3 Main PO mode Commands
-
-
+
+
After setting up Emacs with something similar to the lines in
section 2.1 Completing GNU gettext Installation, PO mode is activated for a window when Emacs finds a
PO file in that window. This puts the window read-only and establishes a
@@ -470,9 +478,9 @@ When PO mode is active in a window, the letters `PO´ appear
in the mode line for that window. The mode line also displays how
many entries of each kind are held in the PO file. For example,
the string `132t+3f+10u+2o´ would tell the translator that the
-PO mode contains 132 translated entries (see section 6.2 Translated Entries,
-3 fuzzy entries (see section 6.3 Fuzzy Entries), 10 untranslated entries
-(see section 6.4 Untranslated Entries) and 2 obsolete entries (see section 6.5 Obsolete Entries). Zero-coefficients items are not shown. So, in this example, if
+PO mode contains 132 translated entries (see section 6.2 Translated Entries,
+3 fuzzy entries (see section 6.3 Fuzzy Entries), 10 untranslated entries
+(see section 6.4 Untranslated Entries) and 2 obsolete entries (see section 6.5 Obsolete Entries). Zero-coefficients items are not shown. So, in this example, if
the fuzzy entries were unfuzzied, the untranslated entries were translated
and the obsolete entries were deleted, the mode line would merely display
`145t´ for the counters.
@@ -488,47 +496,47 @@ in special ways.
- _
-
-
+
Undo last modification to the PO file (
po-undo).
- Q
-
-
+
Quit processing and save the PO file (
po-quit).
- q
-
-
+
Quit processing, possibly after confirmation (
po-confirm-and-quit).
- 0
-
-
+
Temporary leave the PO file window (
po-other-window).
- ?
-
- h
-
-
-
+
+
Show help about PO mode (
po-help).
- =
-
-
+
Give some PO file statistics (
po-statistics).
- V
-
-
+
Batch validate the format of the whole PO file (
po-validate).
-
-
+
+
The command _ (po-undo) interfaces to the Emacs
undo facility. See section `Undoing Changes' in The Emacs Editor. Each time U is typed, modifications which the translator
did to the PO file are undone a little more. For the purpose of
@@ -540,10 +548,10 @@ can undo the edition work quite parsimoniously.
-
-
+
+
The commands Q (po-quit) and q
(po-confirm-and-quit) are used when the translator is done with the
PO file. The former is a bit less verbose than the latter. If the file
@@ -556,8 +564,8 @@ of an Emacs PO file buffer. Merely killing it through the usual command
-
-
+
+
The command 0 (po-other-window) is another, softer way,
to leave PO mode, temporarily. It just moves the cursor to some other
Emacs window, and pops one if necessary. For example, if the translator
@@ -571,9 +579,9 @@ PO mode is then recovered.
-
-
+
+
The command h (po-help) displays a summary of all available PO
mode commands. The translator should then type any character to resume
normal PO mode operations. The command ? has the same effect
@@ -581,8 +589,8 @@ as h.
-
-
+
+
The command = (po-statistics) computes the total number of
entries in the PO file, the ordinal of the current entry (counted from
1), the number of untranslated entries, the number of obsolete entries,
@@ -590,8 +598,8 @@ and displays all these numbers.
-
-
+
+
The command V (po-validate) launches msgfmt in
checking and verbose
mode over the current PO file. This command first offers to save the
@@ -602,7 +610,7 @@ as well as all individual entries.
-
+
The program msgfmt runs asynchronously with Emacs, so the
translator regains control immediately while her PO file is being studied.
Error output is collected in the Emacs `*compilation*´ buffer,
@@ -618,7 +626,7 @@ any PO mode action which would help correcting the error.
2.4 Entry Positioning
-
+
The cursor in a PO file window is almost always part of
an entry. The only exceptions are the special case when the cursor
is after the last entry in the file, or when the PO file is
@@ -629,7 +637,7 @@ the PO file, this also selects on which entry commands operate.
-
+
Some PO mode commands alter the position of the cursor in a specialized
way. A few of those special purpose positioning are described here,
the others are described in following sections (for a complete list try
@@ -640,51 +648,51 @@ the others are described in following sections (for a complete list try
- .
-
-
+
Redisplay the current entry (
po-current-entry).
- n
-
-
+
Select the entry after the current one (
po-next-entry).
- p
-
-
+
Select the entry before the current one (
po-previous-entry).
- <
-
-
+
Select the first entry in the PO file (
po-first-entry).
- >
-
-
+
Select the last entry in the PO file (
po-last-entry).
- m
-
-
+
Record the location of the current entry for later use
(
po-push-location).
- r
-
-
+
Return to a previously saved entry location (
po-pop-location).
- x
-
-
+
Exchange the current entry location with the previously saved one
(
po-exchange-location).
-
-
+
+
Any Emacs command able to reposition the cursor may be used
to select the current entry in PO mode, including commands which
move by characters, lines, paragraphs, screens or pages, and search
@@ -713,10 +721,10 @@ how others should do translation.
-
-
+
+
The commands n (po-next-entry) and p
(po-previous-entry) move the cursor the entry following,
or preceding, the current one. If n is given while the
@@ -725,10 +733,10 @@ is given while the cursor is on the first entry, no move is done.
-
-
+
+
The commands < (po-first-entry) and >
(po-last-entry) move the cursor to the first entry, or last
entry, of the PO file. When the cursor is located past the last
@@ -751,10 +759,10 @@ register for getting back, or else, use the location ring.
-
-
+
+
PO mode offers another approach, by which cursor locations may be saved
onto a special stack. The command m (po-push-location)
merely adds the location of current entry to the stack, pushing
@@ -774,8 +782,8 @@ ought to use m immediately after r.
-
-
+
+
The command x (po-exchange-location) simultaneously
repositions the cursor to the entry associated with the top element of
the stack of saved locations, and replaces that top element with the
@@ -790,7 +798,7 @@ merely use x for making the switch.
2.5 Normalizing Strings in Entries
@@ -824,12 +832,12 @@ command is available:
- M-x po-normalize
-
-
+
Tidy the whole PO file by making entries more uniform.
@@ -861,7 +869,7 @@ for continued lines.
-
+
Having such an explicit normalizing command allows for importing PO
files from other sources, but also eases the evolution of the current
convention, evolution driven mostly by aesthetic concerns, as of now.
@@ -874,7 +882,7 @@ their PO files in nice ways.
-
+
Right now, in PO mode, strings are single line or multi-line. A string
goes multi-line if and only if it has embedded newlines, that
is, if it matches `[^\n]\n+[^\n]´. So, we would have:
diff --git a/gettext-tools/doc/gettext_20.html b/gettext-tools/doc/gettext_20.html
index eb80dd6ba..3ccbb0962 100644
--- a/gettext-tools/doc/gettext_20.html
+++ b/gettext-tools/doc/gettext_20.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - PO Mode Index
@@ -10,7 +10,7 @@ Go to the first, previous
-
PO Mode Index
+PO Mode Index
Jump to:
@@ -46,28 +46,28 @@ Jump to:
a
-- auxiliary PO file
+
- auxiliary PO file
c
-- commands
-
- comment out PO file entry
-
- consulting program sources
-
- consulting translations to other languages
-
- current entry of a PO file
-
- cut and paste for translated strings
+
- commands
+
- comment out PO file entry
+
- consulting program sources
+
- consulting translations to other languages
+
- current entry of a PO file
+
- cut and paste for translated strings
e
-- editing comments
-
- editing multiple entries
-
- editing translations
-
etags, using for marking strings
-- exiting PO subedit
+
- editing comments
+
- editing multiple entries
+
- editing translations
+
etags, using for marking strings
+- exiting PO subedit
f
-- find source fragment for a PO file entry
+
- find source fragment for a PO file entry
i
@@ -75,40 +75,40 @@ Jump to:
l
-- looking at the source to aid translation
+
- looking at the source to aid translation
m
-- marking strings for translation
-
- moving by fuzzy entries
-
- moving by obsolete entries
-
- moving by translated entries
-
- moving by untranslated entries
-
- moving through a PO file
+
- marking strings for translation
+
- moving by fuzzy entries
+
- moving by obsolete entries
+
- moving by translated entries
+
- moving by untranslated entries
+
- moving through a PO file
o
-- obsolete active entry
+
- obsolete active entry
p
-- pending subedits
+
- pending subedits
s
-- starting a string translation
-
- string normalization in entries
-
- subedit minor mode
+
- starting a string translation
+
- string normalization in entries
+
- subedit minor mode
t
-- `TAGS´, and marking translatable strings
+
- `TAGS´, and marking translatable strings
u
-- use the source, Luke
-
- using obsolete translations to make new entries
-
- using translation compendia
+
- use the source, Luke
+
- using obsolete translations to make new entries
+
- using translation compendia
diff --git a/gettext-tools/doc/gettext_21.html b/gettext-tools/doc/gettext_21.html
index fe9f5dcb7..55d31ad69 100644
--- a/gettext-tools/doc/gettext_21.html
+++ b/gettext-tools/doc/gettext_21.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - Autoconf Macro Index
@@ -10,7 +10,7 @@ Go to the first, previous
-
Autoconf Macro Index
+Autoconf Macro Index
Jump to:
@@ -18,10 +18,10 @@ Jump to:
a
-- AM_GNU_GETTEXT
-
- AM_GNU_GETTEXT_VERSION
-
- AM_ICONV
-
- AM_PO_SUBDIRS
+
- AM_GNU_GETTEXT
+
- AM_GNU_GETTEXT_VERSION
+
- AM_ICONV
+
- AM_PO_SUBDIRS
diff --git a/gettext-tools/doc/gettext_22.html b/gettext-tools/doc/gettext_22.html
index 7a732f07c..c0b5721e3 100644
--- a/gettext-tools/doc/gettext_22.html
+++ b/gettext-tools/doc/gettext_22.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - General Index
@@ -10,7 +10,7 @@ Go to the first, previous
-
General Index
+General Index
Jump to:
@@ -68,382 +68,391 @@ Jump to:
_
-_, a macro to mark strings for translation
-_nl_msg_cat_cntr
+_, a macro to mark strings for translation
+_nl_msg_cat_cntr
a
-- `ABOUT-NLS´ file
-
- `acconfig.h´ file
-
- accumulating translations
-
- `aclocal.m4´ file
-
- adding keywords,
xgettext
- - ambiguities
-
- apply a filter to translations
-
- apply command to all translations in a catalog
-
- attribute manipulation
-
- attribute, fuzzy
-
- attributes of a PO file entry
-
- attributes, manipulating
-
- autoconf macros for
gettext
- autopoint program, usage
-- auxiliary PO file
-
- available translations
-
- awk
+
- `ABOUT-NLS´ file
+
- `acconfig.h´ file
+
- accumulating translations
+
- `aclocal.m4´ file
+
- adding keywords,
xgettext
+ - ambiguities
+
- apply a filter to translations
+
- apply command to all translations in a catalog
+
- Arabic digits
+
- attribute manipulation
+
- attribute, fuzzy
+
- attributes of a PO file entry
+
- attributes, manipulating
+
- autoconf macros for
gettext
+ autopoint program, usage
+- auxiliary PO file
+
- available translations
+
- awk
b
-- backup old file, and
msgmerge program
- - bash
-
- bibliography
+
- backup old file, and
msgmerge program
+ - bash
+
- bibliography
- big picture
-
- bind_textdomain_codeset
+
- bind_textdomain_codeset
- bug report address
c
-- C and C-like languages
-
- C trigraphs
-
- catalog encoding and
msgexec output
- catclose, a catgets function
-catgets, X/Open specification
-catgets, a catgets function
-catopen, a catgets function
+- C and C-like languages
+
- C trigraphs
+
- C#
+
- C# mode, and
msgfmt program
+ - C# mode, and
msgunfmt program
+ - C# resources mode, and
msgfmt program
+ - C# resources mode, and
msgunfmt program
+ - C#, string concatenation
+
- catalog encoding and
msgexec output
+ catclose, a catgets function
+catgets, X/Open specification
+catgets, a catgets function
+catopen, a catgets function
- character encoding
-
- charset conversion at runtime
-
- charset of PO files
-
- check format strings
-
- checking of translations
-
- clisp
-
- clisp C sources
+
- charset conversion at runtime
+
- charset of PO files
+
- check format strings
+
- checking of translations
+
- clisp
+
- clisp C sources
- codeset
-
- comments in PO files
-
- Common Lisp
-
- compare PO files
-
- comparison of interfaces
-
- compatibility with X/Open
msgfmt
- - compendium
-
- compendium, creating
-
- concatenate PO files
-
- concatenating PO files into a compendium
-
- concatenation of strings
-
- `config.h.in´ file
-
- convert binary message catalog into PO file
-
- convert translations to a different encoding
-
- converting a package to use
gettext
- - country codes
-
- create new PO file
-
- creating a new PO file
-
- creating compendia
+
- comments in PO files
+
- Common Lisp
+
- compare PO files
+
- comparison of interfaces
+
- compatibility with X/Open
msgfmt
+ - compendium
+
- compendium, creating
+
- concatenate PO files
+
- concatenating PO files into a compendium
+
- concatenation of strings
+
- `config.h.in´ file
+
- convert binary message catalog into PO file
+
- convert translations to a different encoding
+
- converting a package to use
gettext
+ - country codes
+
- create new PO file
+
- creating a new PO file
+
- creating compendia
- currency symbols
d
- date format
-
- dcngettext
-
- debugging messages marked as format strings
-
- dialect
-
- disabling NLS
-
- dngettext
-
- dollar substitution
-
- domain ambiguities
-
- duplicate elimination
-
- duplicate removal
+
- dcngettext
+
- debugging messages marked as format strings
+
- dialect
+
- disabling NLS
+
- dngettext
+
- dollar substitution
+
- domain ambiguities
+
- duplicate elimination
+
- duplicate removal
e
-- editing comments in PO files
-
- editing translations
-
- Emacs Lisp
+
- editing comments in PO files
+
- editing translations
+
- Emacs Lisp
- encoding
-
- encoding conversion
-
- encoding conversion at runtime
-
- encoding for your language
-
- encoding list
-
- encoding of PO files
-
- environment variables
-
envsubst program, usage
-eval_gettext function, usage
-eval_ngettext function, usage
+- encoding conversion
+
- encoding conversion at runtime
+
- encoding for your language
+
- encoding list
+
- encoding of PO files
+
- environment variables
+
envsubst program, usage
+eval_gettext function, usage
+eval_ngettext function, usage
- evolution of packages
-
- extracting parts of a PO file into a compendium
+
- extracting parts of a PO file into a compendium
f
-- file format, `.mo´
+
- file format, `.mo´
- file format, `.po´
- files, `.po´ and `.mo´
- files, `.pot´
-
- filter messages according to attributes
-
- find common messages
-
- force use of fuzzy entries
-
- format strings
-
- Free Pascal
-
- function attribute, __format__
-
- function attribute, __format_arg__
-
- fuzzy entries
+
- filter messages according to attributes
+
- find common messages
+
- force use of fuzzy entries
+
- format strings
+
- Free Pascal
+
- function attribute, __format__
+
- function attribute, __format_arg__
+
- fuzzy entries
g
-- gawk
-
- GCC-source
-
- generate binary message catalog from PO file
-
- generate translation catalog in English
-
gettext files
+- gawk
+
- GCC-source
+
- generate binary message catalog from PO file
+
- generate translation catalog in English
+
gettext files
gettext installation
-gettext interface
-gettext program, usage
-gettext, a programmer's view
-- `gettext.h´ file
-
gettext vs catgets
-gettextize program, usage
-- GUI programs
+
gettext interface
+gettext program, usage
+gettext, a programmer's view
+- `gettext.h´ file
+
gettext vs catgets
+gettextize program, usage
+- GUI programs
h
-- hash table, inside MO files
+
- hash table, inside MO files
- he, she, and they
-
- header entry of a PO file
-
- help option
-
- history of GNU
gettext
+ - header entry of a PO file
+
- help option
+
- history of GNU
gettext
i
- i18n
-
- importing PO files
-
- include file `libintl.h´, include file `libintl.h´, include file `libintl.h´, include file `libintl.h´
-
- initialization
-
- initialize new PO file
-
- initialize translations from a compendium
+
- importing PO files
+
- include file `libintl.h´, include file `libintl.h´, include file `libintl.h´, include file `libintl.h´
+
- initialization
+
- initialize new PO file
+
- initialize translations from a compendium
- installing
gettext
- - interface to
catgets
+ - interface to
catgets
- internationalization
-
inttypes.h
-- ISO 3166
-
- ISO 639
+
inttypes.h
+- ISO 3166
+
- ISO 639
j
-- Java
-
- Java mode, and
msgfmt program
- - Java mode, and
msgunfmt program
- - Java, string concatenation
+
- Java
+
- Java mode, and
msgfmt program
+ - Java mode, and
msgunfmt program
+ - Java, string concatenation
k
-- keyboard accelerator checking
+
- keyboard accelerator checking
l
- l10n
-
- language codes
-
- language selection
-
- language selection at runtime
-
- large package
-
libiconv library
-libintl for Java
-libintl library
-librep Lisp
-- `LINGUAS´ file
+
- language codes
+
- language selection
+
- language selection at runtime
+
- large package
+
libiconv library
+libintl for C#
+libintl for Java
+libintl library
+librep Lisp
+- `LINGUAS´ file
- link with `libintl´
-
- Linux, Linux, Linux
-
- Lisp
-
- list of translation teams, where to find
-
- locale facet, LC_ALL
-
- locale facet, LC_COLLATE
-
- locale facet, LC_CTYPE, locale facet, LC_CTYPE, locale facet, LC_CTYPE
-
- locale facet, LC_MESSAGES, locale facet, LC_MESSAGES
-
- locale facet, LC_MONETARY, locale facet, LC_MONETARY
-
- locale facet, LC_NUMERIC, locale facet, LC_NUMERIC
-
- locale facet, LC_RESPONSES
-
- locale facet, LC_TIME, locale facet, LC_TIME
+
- Linux, Linux, Linux
+
- Lisp
+
- list of translation teams, where to find
+
- locale facet, LC_ALL
+
- locale facet, LC_COLLATE
+
- locale facet, LC_CTYPE, locale facet, LC_CTYPE, locale facet, LC_CTYPE
+
- locale facet, LC_MESSAGES, locale facet, LC_MESSAGES
+
- locale facet, LC_MONETARY, locale facet, LC_MONETARY
+
- locale facet, LC_NUMERIC, locale facet, LC_NUMERIC
+
- locale facet, LC_RESPONSES
+
- locale facet, LC_TIME, locale facet, LC_TIME
- locale facets
-
locale program
+locale program
- localization
-
- lookup message translation, lookup message translation
-
- lookup plural message translation, lookup plural message translation
+
- lookup message translation, lookup message translation
+
- lookup plural message translation, lookup plural message translation
m
-- magic signature of MO files
-
- `Makevars´ file
-
- manipulating PO files
-
- marking Perl sources
-
- marking string initializers
-
- marking strings that require translation
-
- marking strings, preparations
+
- magic signature of MO files
+
- `Makevars´ file
+
- manipulating PO files
+
- marking Perl sources
+
- marking string initializers
+
- marking strings that require translation
+
- marking strings, preparations
- marking translatable strings
-
- menu entries
-
- menu, keyboard accelerator support
-
- merge PO files
-
- merging two PO files
-
- message catalog files location
+
- menu entries
+
- menu, keyboard accelerator support
+
- merge PO files
+
- merging two PO files
+
- message catalog files location
- messages
-
- migration from earlier versions of
gettext
- - `mkinstalldirs´ file
-
- mnemonics of menu entries
-
- MO file's format
-
- modify message attrributes
-
msgattrib program, usage
-msgcat program, usage
-msgcmp program, usage
-msgcomm program, usage
-msgconv program, usage
-msgen program, usage
-msgexec program, usage
-msgfilter filter and catalog encoding
-msgfilter program, usage
-msgfmt program, usage
-msggrep program, usage
-msginit program, usage
-msgmerge program, usage
-msgunfmt program, usage
-msguniq program, usage
-- multi-line strings
+
- migration from earlier versions of
gettext
+ - `mkinstalldirs´ file
+
- mnemonics of menu entries
+
- MO file's format
+
- modify message attrributes
+
msgattrib program, usage
+msgcat program, usage
+msgcmp program, usage
+msgcomm program, usage
+msgconv program, usage
+msgen program, usage
+msgexec program, usage
+msgfilter filter and catalog encoding
+msgfilter program, usage
+msgfmt program, usage
+msggrep program, usage
+msginit program, usage
+msgmerge program, usage
+msgunfmt program, usage
+msguniq program, usage
+- multi-line strings
n
-N_, a convenience macro
+N_, a convenience macro
- Native Language Support
- Natural Language Support
-
- newlines in PO files
-
- ngettext
-
ngettext program, usage
+- newlines in PO files
+
- ngettext
+
ngettext program, usage
- NLS
- number format
o
-- Object Pascal
-
- obsolete entries
-
- optimization of
gettext functions
- - orthography
-
- output to stdout,
xgettext
+ - Object Pascal
+
- obsolete entries
+
- optimization of
gettext functions
+ - orthography
+
- outdigits
+
- output to stdout,
xgettext
- overview of
gettext
p
-- package and version declaration in `configure.in´
-
- package build and installation options
-
- package maintainer's view of
gettext
- - paragraphs
-
- Pascal
-
- Perl
-
- Perl default keywords
-
- Perl invalid string interpolation
-
- Perl long lines
-
- Perl parentheses
-
- Perl pitfalls
-
- Perl quote-like expressions
-
- Perl special keywords for hash-lookups
-
- Perl valid string interpolation
-
- PHP
-
- Pike
-
- plural form formulas
-
- plural forms
-
- plural forms, in MO files
-
- plural forms, in PO files
+
- package and version declaration in `configure.in´
+
- package build and installation options
+
- package maintainer's view of
gettext
+ - paragraphs
+
- Pascal
+
- Perl
+
- Perl default keywords
+
- Perl invalid string interpolation
+
- Perl long lines
+
- Perl parentheses
+
- Perl pitfalls
+
- Perl quote-like expressions
+
- Perl special keywords for hash-lookups
+
- Perl valid string interpolation
+
- PHP
+
- Pike
+
- plural form formulas
+
- plural forms
+
- plural forms, in MO files
+
- plural forms, in PO files
- PO files' format
-
- PO mode (Emacs) commands
-
- PO template file
-
- po_file_domains
-
- po_file_free
-
- po_file_read
-
- po_message_iterator
-
- po_message_iterator_free
-
- po_message_msgid
-
- po_message_msgid_plural
-
- po_message_msgstr
-
- po_message_msgstr_plural
-
- po_next_message
-
- portability problems with
sed
- - `POTFILES.in´ file
-
- preparing programs for translation
-
- preparing shell scripts for translation
-
- problems with
catgets interface
- - programming languages
-
- Python
+
- PO mode (Emacs) commands
+
- PO template file
+
- po_file_domains
+
- po_file_free
+
- po_file_read
+
- po_message_iterator
+
- po_message_iterator_free
+
- po_message_msgid
+
- po_message_msgid_plural
+
- po_message_msgstr
+
- po_message_msgstr_plural
+
- po_next_message
+
- portability problems with
sed
+ - `POTFILES.in´ file
+
- preparing programs for translation
+
- preparing shell scripts for translation
+
- problems with
catgets interface
+ - programming languages
+
- Python
q
-- Qt format strings
-
- Qt mode, and
msgfmt program
- - quotation marks, quotation marks
-
- quote characters, use in PO files
+
- Qt format strings
+
- Qt mode, and
msgfmt program
+ - quotation marks, quotation marks
+
- quote characters, use in PO files
r
-- related reading
-
- RST
+
- related reading
+
- RST
s
-- scripting languages
-
- search messages in a catalog
-
- selecting message language
-
- sentences
-
- setting up
gettext at build time
- - setting up
gettext at run time
- - several domains
+
- scripting languages
+
- search messages in a catalog
+
- selecting message language
+
- sentences
+
- setting up
gettext at build time
+ - setting up
gettext at run time
+ - several domains
- sex
-
- sgettext
+
- sgettext
- she, he, and they
-
- shell format string
-
- shell scripts
-
- Smalltalk
-
- sorting
msgcat output
- - sorting
msgmerge output
- - sorting
msgunfmt output
- - sorting output of
xgettext
- - specifying plural form in a PO file
-
- standard output, and
msgcat
- - standard output, and
msgmerge program
- - string concatenation
-
- string normalization in entries
-
- style
-
- supported languages,
xgettext
+ - shell format string
+
- shell scripts
+
- Smalltalk
+
- sorting
msgcat output
+ - sorting
msgmerge output
+ - sorting
msgunfmt output
+ - sorting output of
xgettext
+ - specifying plural form in a PO file
+
- standard output, and
msgcat
+ - standard output, and
msgmerge program
+ - string concatenation
+
- string normalization in entries
+
- style
+
- supported languages,
xgettext
t
-- Tcl
-
- Tcl mode, and
msgfmt program
- - Tcl mode, and
msgunfmt program
+ - Tcl
+
- Tcl mode, and
msgfmt program
+ - Tcl mode, and
msgunfmt program
- template PO file
-
- testing `.po´ files for equivalence
-
- Tk's scripting language
-
- translated entries
-
- translating menu entries
+
- testing `.po´ files for equivalence
+
- Tk's scripting language
+
- translated entries
+
- translating menu entries
- translation aspects
-
- Translation Matrix
+
- Translation Matrix
- Translation Project
-
- turning off NLS support
+
- turning off NLS support
- tutorial of
gettext usage
u
-- unify duplicate translations
-
- untranslated entries
-
- update translations from a compendium
-
- upgrading to new versions of
gettext
+ - unify duplicate translations
+
- untranslated entries
+
- update translations from a compendium
+
- upgrading to new versions of
gettext
v
-- version control for backup files,
msgmerge
+ - version control for backup files,
msgmerge
w
-wxWindows library
+wxWindows library
x
-xargs, and output from msgexec
-xgettext program, usage
-xmodmap program, and typing quotation marks
+xargs, and output from msgexec
+xgettext program, usage
+xmodmap program, and typing quotation marks
y
-- YaST2 scripting language
-
- YCP
+
- YaST2 scripting language
+
- YCP
diff --git a/gettext-tools/doc/gettext_3.html b/gettext-tools/doc/gettext_3.html
index 12e0cf606..c1b1acf98 100644
--- a/gettext-tools/doc/gettext_3.html
+++ b/gettext-tools/doc/gettext_3.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 3 Preparing Program Sources
@@ -12,7 +12,7 @@ Go to the first, previous<
3 Preparing Program Sources
@@ -29,12 +29,12 @@ needing translation.
Presuming that your set of programs, or package, has been adjusted
so all needed GNU gettext files are available, and your
-`Makefile´ files are adjusted (see section 12 The Maintainer's View), each C module
+`Makefile´ files are adjusted (see section 12 The Maintainer's View), each C module
having translated C strings should contain the line:
#include <libintl.h>
@@ -62,7 +62,7 @@ sections of this chapter.
3.1 Triggering gettext Operations
-
+
The initialization of locale data should be done with more or less
the same code in every program, as demonstrated below:
@@ -87,8 +87,8 @@ or hello sources for more information.
-
-
+
+
The use of LC_ALL might not be appropriate for you.
LC_ALL includes all locale categories and especially
LC_CTYPE. This later category is responsible for determining
@@ -129,13 +129,13 @@ code above by a sequence of setlocale lines
-
-
+
+
On all POSIX conformant systems the locale categories LC_CTYPE,
LC_MESSAGES, LC_COLLATE, LC_MONETARY,
LC_NUMERIC, and LC_TIME are available. On some systems
@@ -166,7 +166,7 @@ is not multithread-safe.
3.2 Preparing Translatable Strings
-
+
Before strings can be marked for translations, they sometimes need to
be adjusted. Usually preparing a string for translation is done right
before marking it, during the marking phase which is described in the
@@ -198,7 +198,7 @@ Let's look at some examples of these guidelines.
-
+
Translatable strings should be in good English style. If slang language
with abbreviations and shortcuts is used, often translators will not
understand the message and will produce very inappropriate translations.
@@ -227,13 +227,13 @@ of the objects"?
-
+
In both cases, adding more words to the message will help both the
translator and the English speaking user.
-
+
Translatable strings should be entire sentences. It is often not possible
to translate single verbs or adjectives in a substitutable way.
@@ -319,7 +319,7 @@ combined by xgettext, so the translator has to handle them once only.)
-
+
Translatable strings should be limited to one paragraph; don't let a
single message be longer than ten lines. The reason is that when the
translatable string changes, the translator is faced with the task of
@@ -330,7 +330,7 @@ the entire message.
-
+
Many GNU programs have a `--help´ output that extends over several
screen pages. It is a courtesy towards the translators to split such a
message into several ones of five to ten lines each. While doing that,
@@ -341,8 +341,8 @@ looking for.
-
-
+
+
Hardcoded string concatenation is sometimes used to construct English
strings:
@@ -369,7 +369,7 @@ sprintf (s, "Replace %s with %s?", object1, object2);
-
+
A similar case is compile time concatenation of strings. The ISO C 99
include file <inttypes.h> contains a macro PRId64 that
can be used as a formatting directive for outputting an `int64_t´
@@ -423,10 +423,11 @@ regardless whether in decimal, octal or hexadecimal.
-
+
+
All this applies to other programming languages as well. For example, in
-Java, string contenation is very frequently used, because it is a compiler
-built-in operator. Like in C, in Java, you would change
+Java and C#, string contenation is very frequently used, because it is a
+compiler built-in operator. Like in C, in Java, you would change
@@ -445,11 +446,30 @@ System.out.println(
new Object[] { object1, object2 }));
+
+Similarly, in C#, you would change
+
+
+
+
+Console.WriteLine("Replace "+object1+" with "+object2+"?");
+
+
+
+into a statement involving a format string:
+
+
+
+
+Console.WriteLine(
+ String.Format("Replace {0} with {1}?", object1, object2));
+
+
3.3 How Marks Appear in Sources
@@ -500,7 +520,7 @@ sources for those trying to keep them within 79 or 80 columns.
-
+
Many packages use `_´ (a simple underline) as a keyword,
and write `_("Translatable string")´ instead of `gettext
("Translatable string")´. Further, the coding rule, from GNU standards,
@@ -536,7 +556,7 @@ an example of string not requiring translation!
3.4 Marking Translatable Strings
@@ -553,7 +573,7 @@ translation in some language, for the package being internationalized.
-
+
The set of program sources, targetted by the PO mode commands describe
here, should have an Emacs tags table constructed for your project,
prior to using these PO file commands. This is easy to do. In any
@@ -575,7 +595,7 @@ format Emacs can understand.
-
+
For packages following the GNU coding standards, there is
a make goal tags or TAGS which constructs the tag files in
all directories and for all files containing source code.
@@ -595,18 +615,18 @@ fill in while you mark strings as translatable in your program sources.
- ,
-
-
+
Search through program sources for a string which looks like a
candidate for translation (
po-tags-search).
- M-,
-
-
+
Mark the last string found with `_()´ (
po-mark-translatable).
- M-.
-
-
+
Mark the last string found with a keyword taken from a set of possible
keywords. This command with a prefix allows some management of these
keywords (
po-select-mark-and-mark).
@@ -614,7 +634,7 @@ keywords (po-select-mark-and-mark).
-
+
The , (po-tags-search) command searches for the next
occurrence of a string which looks like a possible candidate for
translation, and displays the program source in another Emacs window,
@@ -666,8 +686,8 @@ first tags file, this reinitialization might be considered spurious.
-
-
+
+
The M-, (po-mark-translatable) command will mark the
recently found string with the `_´ keyword. The M-.
(po-select-mark-and-mark) command will request that you type
@@ -728,7 +748,7 @@ prefer `_´, as this one is already built in the M-,3.5 Special Comments preceding Keywords
-
+
In C programs strings are often used within calls of functions from the
printf family. The special thing about these format strings is
that they can contain format specifiers introduced with %. Assume
@@ -796,8 +816,8 @@ only a heuristic. In the `.po´ file the entry is marked using th
-
-
+
+
The careful reader now might say that this again can cause problems.
The heuristic might guess it wrong. This is true and therefore
xgettext knows about a special kind of comment which lets
@@ -834,7 +854,7 @@ to use must contain the string xgettext:no-c-format.
If a string is marked with c-format and this is not correct the
user can find out who is responsible for the decision. See
-section 4.1 Invoking the xgettext Program to see how the --debug option can be
+section 4.1 Invoking the xgettext Program to see how the --debug option can be
used for solving this problem.
@@ -843,7 +863,7 @@ used for solving this problem.
3.6 Special Cases of Translatable Strings
-
+
The attentive reader might now point out that it is not always possible
to mark translatable string with gettext or something like this.
Consider the following case:
@@ -870,7 +890,7 @@ Consider the following case:
While it is no problem to mark the string "a default message" it
is not possible to mark the string initializers for messages.
What is to be done? We have to fulfill two tasks. First we have to mark the
-strings so that the xgettext program (see section 4.1 Invoking the xgettext Program)
+strings so that the xgettext program (see section 4.1 Invoking the xgettext Program)
can find them, and second we have to translate the string at runtime
before printing them.
@@ -903,7 +923,7 @@ from the array. So one solution can look like this:
Please convince yourself that the string which is written by
fputs is translated in any case. How to get xgettext know
-the additional keyword gettext_noop is explained in section 4.1 Invoking the xgettext Program.
+the additional keyword gettext_noop is explained in section 4.1 Invoking the xgettext Program.
@@ -1025,6 +1045,114 @@ which is - in the current state of software (as of 2003) - a major hassle
for translators using GNU Emacs or XEmacs with po-mode.
+
+
+3.8 Preparing Library Sources
+
+
+When you are preparing a library, not a program, for the use of
+gettext, only a few details are different. Here we assume that
+the library has a translation domain and a POT file of its own. (If
+it uses the translation domain and POT file of the main program, then
+the previous sections apply without changes.)
+
+
+
+
+-
+
+The library code doesn't call
setlocale (LC_ALL, ""). It's the
+responsibility of the main program to set the locale. The library's
+documentation should mention this fact, so that developers of programs
+using the library are aware of it.
+
+ -
+
+The library code doesn't call
textdomain (PACKAGE), because it
+would interfere with the text domain set by the main program.
+
+ -
+
+The initialization code for a program was
+
+
+
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
+
+For a library it is reduced to
+
+
+
+ bindtextdomain (PACKAGE, LOCALEDIR);
+
+
+If your library's API doesn't already have an initialization function,
+you need to create one, containing at least the bindtextdomain
+invocation. However, you usually don't need to export and document this
+initialization function: It is sufficient that all entry points of the
+library call the initialization function if it hasn't been called before.
+The typical idiom used to achieve this is a static boolean variable that
+indicates whether the initialization function has been called. Like this:
+
+
+
+static bool libfoo_initialized;
+
+static void
+libfoo_initialize (void)
+{
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ libfoo_initialized = true;
+}
+
+/* This function is part of the exported API. */
+struct foo *
+create_foo (...)
+{
+ /* Must ensure the initialization is performed. */
+ if (!libfoo_initialized)
+ libfoo_initialize ();
+ ...
+}
+
+/* This function is part of the exported API. The argument must be
+ non-NULL and have been created through create_foo(). */
+int
+foo_refcount (struct foo *argument)
+{
+ /* No need to invoke the initialization function here, because
+ create_foo() must already have been called before. */
+ ...
+}
+
+
+ -
+
+The usual declaration of the `_´ macro in each source file was
+
+
+
+#include <libintl.h>
+#define _(String) gettext (String)
+
+
+for a program. For a library, which has its own translation domain,
+it reads like this:
+
+
+
+#include <libintl.h>
+#define _(String) dgettext (PACKAGE, String)
+
+
+In other words, dgettext is used instead of gettext.
+Similary, the dngettext function should be used in place of the
+ngettext function.
+
+
Go to the first, previous, next, last section, table of contents.
diff --git a/gettext-tools/doc/gettext_4.html b/gettext-tools/doc/gettext_4.html
index 767835d93..61163541b 100644
--- a/gettext-tools/doc/gettext_4.html
+++ b/gettext-tools/doc/gettext_4.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 4 Making the PO Template File
@@ -10,9 +10,9 @@ Go to the first, previous<
-
4 Making the PO Template File
+4 Making the PO Template File
@@ -32,11 +32,11 @@ was fuzzy, and the suffix `.pot´ wasn't in use at that time.)
-
4.1 Invoking the xgettext Program
+4.1 Invoking the xgettext Program
xgettext [option] [inputfile] ...
@@ -49,7 +49,7 @@ input files.
-4.1.1 Input file location
+4.1.1 Input file location
@@ -61,8 +61,8 @@ Input files.
-
- `--files-from=file´
-
-
-
+
+
Read the names of the input files from file instead of getting
them from the command line.
@@ -70,8 +70,8 @@ them from the command line.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -84,7 +84,7 @@ If inputfile is `-´, standard input is read.
-
4.1.2 Output file location
+4.1.2 Output file location
@@ -92,16 +92,16 @@ If inputfile is `-´, standard input is read.
-
- `--default-domain=name´
-
-
-
+
+
Use `name.po´ for output (instead of `messages.po´).
- `-o file´
-
- `--output=file´
-
-
-
+
+
Write output to specified file (instead of `name.po´ or
`messages.po´).
@@ -109,21 +109,21 @@ Write output to specified file (instead of `name.po´ o
-
- `--output-dir=dir´
-
-
-
+
+
Output files will be placed in directory dir.
-
+
If the output file is `-´ or `/dev/stdout´, the output
is written to standard output.
-4.1.3 Choice of input file language
+4.1.3 Choice of input file language
@@ -131,21 +131,22 @@ is written to standard output.
-
- `--language=name´
-
-
-
-
+
+
+
Specifies the language of the input files. The supported languages
are
C, C++, ObjectiveC, PO, Python,
Lisp, EmacsLisp, librep, Smalltalk, Java,
-JavaProperties, awk, YCP, Tcl, Perl,
-PHP, GCC-source, NXStringTable, RST, Glade.
+JavaProperties, C#, awk, YCP, Tcl,
+Perl, PHP, GCC-source, NXStringTable, RST,
+Glade.
- `-C´
-
- `--c++´
-
-
-
+
+
This is a shorthand for
--language=C++.
@@ -157,13 +158,13 @@ extension.
-4.1.4 Input file interpretation
+4.1.4 Input file interpretation
- `--from-code=name´
-
-
+
Specifies the encoding of the input files. This option is needed only
if some untranslated message strings or their corresponding comments
contain non-ASCII characters. Note that Python, Tcl, and Glade input
@@ -177,7 +178,7 @@ By default the input files are assumed to be in ASCII.
-
4.1.5 Operation mode
+4.1.5 Operation mode
@@ -185,16 +186,16 @@ By default the input files are assumed to be in ASCII.
-
- `--join-existing´
-
-
-
+
+
Join messages with existing file.
- `-x file´
-
- `--exclude-file=file´
-
-
-
+
+
Entries from file are not extracted. file should be a PO or
POT file.
@@ -202,8 +203,8 @@ POT file.
-
- `--add-comments[=tag]´
-
-
-
+
+
Place comment block with tag (or those preceding keyword lines)
in output file.
@@ -211,7 +212,7 @@ in output file.
-
4.1.6 Language specific options
+4.1.6 Language specific options
@@ -219,23 +220,24 @@ in output file.
-
- `--extract-all´
-
-
-
+
+
Extract all strings.
-This option has an effect with most languages, namely C, C++, ObjectiveC, Shell,
-Python, Lisp, EmacsLisp, librep, Java, awk, Tcl, Perl, PHP, GCC-source, Glade.
+This option has an effect with most languages, namely C, C++, ObjectiveC,
+Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
+GCC-source, Glade.
- `-k keywordspec´
-
- `--keyword[=keywordspec]´
-
-
-
+
+
Additional keyword to be looked for (without keywordspec means not to
use default keywords).
-
+
If keywordspec is a C identifer id,
xgettext looks
for strings in the first argument of each call to the function or macro
id. If keywordspec is of the form
@@ -251,18 +253,19 @@ explicitly disabled, are gettext, dgettext:2,
dcgettext:2, ngettext:1,2, dngettext:2,3,
dcngettext:2,3, and gettext_noop.
-This option has an effect with most languages, namely C, C++, ObjectiveC, Shell,
-Python, Lisp, EmacsLisp, librep, Java, awk, Tcl, Perl, PHP, GCC-source, Glade.
+This option has an effect with most languages, namely C, C++, ObjectiveC,
+Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
+GCC-source, Glade.
- `--flag=word:arg:flag´
-
-
+
Specifies additional flags for strings occurring as part of the argth
argument of the function word. The possible flags are the possible
format string indicators, such as `c-format´, and their negations,
such as `no-c-format´, possibly prefixed with `pass-´.
-
+
The meaning of --flag=function:arg:lang-format
is that in language lang, the specified function expects as
argth argument a format string. (For those of you familiar with
@@ -280,7 +283,7 @@ together with the checks done by `msgfmt -c´ it will ensure t
translators cannot accidentally use format string directives that would
lead to a crash at runtime.
-
+
The meaning of --flag=function:arg:pass-lang-format
is that in language lang, if the function call occurs in a
position that must yield a format string, then its argth argument
@@ -298,30 +301,34 @@ This is useful when such strings contain no format string directives:
together with the checks done by `msgfmt -c´ it will ensure that
translators cannot accidentally use format string directives that would
lead to a crash at runtime.
+
+This option has an effect with most languages, namely C, C++, ObjectiveC,
+Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, YCP, Tcl, Perl, PHP,
+GCC-source.
- `-T´
-
- `--trigraphs´
-
-
-
-
+
+
+
Understand ANSI C trigraphs for input.
This option has an effect only with the languages C, C++, ObjectiveC.
- `--qt´
-
-
-
+
+
Recognize Qt format strings.
This option has an effect only with the language C++.
- `--debug´
-
-
-
+
+
Use the flags
c-format and possible-c-format to show who was
responsible for marking a message as a format string. The latter form is
used if the xgettext program decided, the format form is used if
@@ -340,53 +347,53 @@ adjacent strings, and escaped end of lines for continued strings.
-4.1.7 Output details
+4.1.7 Output details
- `--force-po´
-
-
+
Always write an output file even if no message is defined.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `-n´
-
- `--add-location´
-
-
-
+
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
- `--properties-output´
-
-
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -394,15 +401,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -411,9 +418,9 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
-
+
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -421,16 +428,16 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
- `--omit-header´
-
-
+
Don't write header with `msgid ""´ entry.
-
+
This is useful for testing purposes because it eliminates a source
of variance for generated
.gmo files. With --omit-header,
two invocations of xgettext on the same files with the same
@@ -438,7 +445,7 @@ options at different times are guaranteed to produce the same results.
- `--copyright-holder=string´
-
-
+
Set the copyright holder in the output. string should be the
copyright holder of the surrounding package. (Note that the msgstr
strings, extracted from the package's sources, belong to the copyright
@@ -454,14 +461,14 @@ simply because
xgettext was first used in the GNU project.
- `--foreign-user´
-
-
+
Omit FSF copyright in output. This option is equivalent to
`--copyright-holder="´. It can be useful for packages outside the GNU
project that want their translations to be in the public domain.
- `--msgid-bugs-address=email@address´
-
-
+
Set the reporting address for msgid bugs. This is the email address or URL
to which the translators shall report bugs in the untranslated strings:
@@ -495,23 +502,23 @@ Don't forget to specify this option.
-
- `--msgstr-prefix[=string]´
-
-
-
+
+
Use string (or "" if not specified) as prefix for msgstr entries.
- `-M [string]´
-
- `--msgstr-suffix[=string]´
-
-
-
+
+
Use string (or "" if not specified) as suffix for msgstr entries.
-4.1.8 Informative output
+4.1.8 Informative output
@@ -519,16 +526,16 @@ Use string (or "" if not specified) as suffix for msgstr entries.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
diff --git a/gettext-tools/doc/gettext_5.html b/gettext-tools/doc/gettext_5.html
index 98622854d..18eea7f34 100644
--- a/gettext-tools/doc/gettext_5.html
+++ b/gettext-tools/doc/gettext_5.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 5 Creating a New PO File
@@ -10,9 +10,9 @@ Go to the first, previous<
-
5 Creating a New PO File
+5 Creating a New PO File
@@ -44,26 +44,26 @@ the header entry of this file.
-
5.1 Invoking the msginit Program
+5.1 Invoking the msginit Program
msginit [option]
-
-
+
+
The msginit program creates a new PO file, initializing the meta
information with values from the user's environment.
-5.1.1 Input file location
+5.1.1 Input file location
@@ -71,8 +71,8 @@ information with values from the user's environment.
-
- `--input=inputfile´
-
-
-
+
+
Input POT file.
@@ -84,7 +84,7 @@ POT file. If it is `-´, standard input is read.
-5.1.2 Output file location
+5.1.2 Output file location
@@ -92,8 +92,8 @@ POT file. If it is `-´, standard input is read.
-
- `--output-file=file´
-
-
-
+
+
Write output to specified PO file.
@@ -106,7 +106,7 @@ standard output.
-5.1.3 Input file syntax
+5.1.3 Input file syntax
@@ -114,14 +114,14 @@ standard output.
-
- `--properties-input´
-
-
-
+
+
Assume the input file is a Java ResourceBundle in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input file is a NeXTstep/GNUstep localized resource file in
.strings syntax, not in PO file syntax.
@@ -129,7 +129,7 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-5.1.4 Output details
+5.1.4 Output details
@@ -137,15 +137,15 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-
- `--locale=ll_CC´
-
-
-
+
+
Set target locale. ll should be a language code, and CC should
be a country code. The command `locale -a´ can be used to output a list
of all installed locales. The default is the user's locale setting.
- `--no-translator´
-
-
+
Declares that the PO file will not have a human translator and is instead
automatically generated.
@@ -153,15 +153,15 @@ automatically generated.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -169,15 +169,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -186,7 +186,7 @@ lines which are wider than the output page width will be split.
-
5.1.5 Informative output
+5.1.5 Informative output
@@ -194,25 +194,25 @@ lines which are wider than the output page width will be split.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-5.2 Filling in the Header Entry
+5.2 Filling in the Header Entry
@@ -281,7 +281,7 @@ Before starting a translation, it is a good idea to get in touch with
your translation team, not only to make sure you don't do duplicated work,
but also to coordinate difficult linguistic issues.
-
+
In the Free Translation Project, each translation team has its own mailing
list. The up-to-date list of teams can be found at the Free Translation
Project's homepage, http://www.iro.umontreal.ca/contrib/po/HTML/,
@@ -289,14 +289,14 @@ in the "National teams" area.
- Content-Type
-
-
-
+
+
Replace `CHARSET´ with the character encoding used for your language,
in your locale, or UTF-8. This field is needed for correct operation of the
msgmerge and msgfmt programs, as well as for users whose
-locale's character encoding differs from yours (see section 10.2.4 How to specify the output character set gettext uses).
+locale's character encoding differs from yours (see section 10.2.4 How to specify the output character set gettext uses).
-
+
You get the character encoding of your locale by running the shell command
`locale charmap´. If the result is `C´ or `ANSI_X3.4-1968´,
which is equivalent to `ASCII´ (= `US-ASCII´), it means that your
@@ -304,7 +304,7 @@ locale is not correctly configured. In this case, ask your translation
team which charset to use. `ASCII´ is not usable for any language
except Latin.
-
+
Because the PO files must be portable to operating systems with less advanced
internationalization facilities, the character encodings that can be used
are limited to those supported by both GNU libc and GNU
@@ -321,11 +321,11 @@ are limited to those supported by both GNU libc and GNU
BIG5, BIG5-HKSCS, GBK, GB18030, SHIFT_JIS,
JOHAB, TIS-620, VISCII, GEORGIAN-PS, UTF-8.
-
+
In the GNU system, the following encodings are frequently used for the
corresponding languages.
-
+
ISO-8859-1 for
@@ -385,8 +385,8 @@ for traditional writing of Chinese,
-
-
+
+
When single quote characters or double quote characters are used in
translations for your language, and your locale's encoding is one of the
ISO-8859-* charsets, it is best if you create your PO files in UTF-8
@@ -398,7 +398,7 @@ real quote characters, whereas users in ISO-8859-* locales will see the
vertical apostrophe and the vertical double quote instead (because that's
what the character set conversion will transliterate them to).
-
+
To enter such quote characters under X11, you can change your keyboard
mapping using the xmodmap program. The X11 names of the quote
characters are "leftsinglequotemark", "rightsinglequotemark",
@@ -420,7 +420,7 @@ Set this to 8bit.
-
This field is optional. It is only needed if the PO file has plural forms.
You can find them by searching for the `msgid_plural´ keyword. The
-format of the plural forms field is described in section 10.2.5 Additional functions for plural forms.
+format of the plural forms field is described in section 10.2.5 Additional functions for plural forms.
diff --git a/gettext-tools/doc/gettext_6.html b/gettext-tools/doc/gettext_6.html
index f73b77efd..097c1fa8b 100644
--- a/gettext-tools/doc/gettext_6.html
+++ b/gettext-tools/doc/gettext_6.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 6 Updating Existing PO Files
@@ -10,15 +10,15 @@ Go to the first, previous<
-
6 Updating Existing PO Files
+6 Updating Existing PO Files
-6.1 Invoking the msgmerge Program
+6.1 Invoking the msgmerge Program
msgmerge [option] def.po ref.pot
@@ -39,7 +39,7 @@ is used to produce better results.
-6.1.1 Input file location
+6.1.1 Input file location
@@ -55,8 +55,8 @@ References to the new sources.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -65,16 +65,16 @@ file will be written relative to the current directory, though.
-
- `--compendium=file´
-
-
-
-Specify an additional library of message translations. See section 6.11 Using Translation Compendia.
+
+
+Specify an additional library of message translations. See section 6.11 Using Translation Compendia.
This option may be specified more than once.
-6.1.2 Operation mode
+6.1.2 Operation mode
@@ -82,15 +82,15 @@ This option may be specified more than once.
-
- `--update´
-
-
-
+
+
Update def.po. Do nothing if def.po is already up to date.
-6.1.3 Output file location
+6.1.3 Output file location
@@ -98,21 +98,21 @@ Update def.po. Do nothing if def.po is already up to date
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
-
+
The results are written to standard output if no output file is specified
or if it is `-´.
-6.1.4 Output file location in update mode
+6.1.4 Output file location in update mode
The result is written back to def.po.
@@ -122,19 +122,19 @@ The result is written back to def.po.
- `--backup=control´
-
-
-
+
+
Make a backup of def.po
- `--suffix=suffix´
-
-
+
Override the usual backup suffix.
-
+
The version control method may be selected via the --backup option
or through the VERSION_CONTROL environment variable. Here are the
values:
@@ -176,7 +176,7 @@ The backup suffix is `~´, unless set with --suffix
-6.1.5 Operation modifiers
+6.1.5 Operation modifiers
@@ -184,23 +184,23 @@ The backup suffix is `~´, unless set with --suffix
- `--multi-domain´
-
-
-
+
+
Apply ref.pot to each of the domains in def.po.
- `-N´
-
- `--no-fuzzy-matching´
-
-
-
+
+
Do not use fuzzy matching when an exact match is not found. This may speed
up the operation considerably.
-6.1.6 Input file syntax
+6.1.6 Input file syntax
@@ -208,14 +208,14 @@ up the operation considerably.
-
- `--properties-input´
-
-
-
+
+
Assume the input files are Java ResourceBundles in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input files are NeXTstep/GNUstep localized resource files in
.strings syntax, not in PO file syntax.
@@ -223,36 +223,36 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
-6.1.7 Output details
+6.1.7 Output details
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `--add-location´
-
-
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -261,15 +261,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -277,15 +277,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -294,9 +294,9 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
-
+
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -304,15 +304,15 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
-6.1.8 Informative output
+6.1.8 Informative output
@@ -320,24 +320,24 @@ Sort output by file location.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
- `-v´
-
- `--verbose´
-
-
-
+
+
Increase verbosity level.
- `-q´
@@ -346,30 +346,30 @@ Increase verbosity level.
-
- `--silent´
-
-
-
-
+
+
+
Suppress progress indicators.
-6.2 Translated Entries
+6.2 Translated Entries
Each PO file entry for which the msgstr field has been filled with
-a translation, and which is not marked as fuzzy (see section 6.3 Fuzzy Entries),
+a translation, and which is not marked as fuzzy (see section 6.3 Fuzzy Entries),
is said to be a translated entry. Only translated entries will
later be compiled by GNU msgfmt and become usable in programs.
Other entry types will be excluded; translation will not occur for them.
-
+
Some commands are more specifically related to translated entry processing.
@@ -377,21 +377,21 @@ Some commands are more specifically related to translated entry processing.
- t
-
-
+
Find the next translated entry (
po-next-translated-entry).
- T
-
-
+
Find the previous translated entry (
po-previous-translated-entry).
-
-
-
+
+
+
The commands t (po-next-translated-entry) and T
(po-previous-translated-entry) move forwards or backwards, chasing
for an translated entry. If none is found, the search is extended and
@@ -399,25 +399,25 @@ wraps around in the PO file buffer.
-
+
Translated entries usually result from the translator having edited in
-a translation for them, section 6.6 Modifying Translations. However, if the
+a translation for them, section 6.6 Modifying Translations. However, if the
variable po-auto-fuzzy-on-edit is not nil, the entry having
received a new translation first becomes a fuzzy entry, which ought to
be later unfuzzied before becoming an official, genuine translated entry.
-See section 6.3 Fuzzy Entries.
+See section 6.3 Fuzzy Entries.
-6.3 Fuzzy Entries
+6.3 Fuzzy Entries
-
-
+
+
Each PO file entry may have a set of attributes, which are
qualities given a name and explicitly associated with the translation,
using a special system comment. One of these attributes
@@ -440,7 +440,7 @@ might mark some entries as being fuzzy.
-
+
Also, the translator may decide herself to mark an entry as fuzzy
for her own convenience, when she wants to remember that the entry
has to be later revisited. So, some commands are more specifically
@@ -451,26 +451,26 @@ related to fuzzy entry processing.
- z
-
-
+
Find the next fuzzy entry (
po-next-fuzzy-entry).
- Z
-
-
+
Find the previous fuzzy entry (
po-previous-fuzzy-entry).
- TAB
-
-
+
Remove the fuzzy attribute of the current entry (
po-unfuzzy).
-
-
-
+
+
+
The commands z (po-next-fuzzy-entry) and Z
(po-previous-fuzzy-entry) move forwards or backwards, chasing for
a fuzzy entry. If none is found, the search is extended and wraps
@@ -478,9 +478,9 @@ around in the PO file buffer.
-
-
-
+
+
+
The command TAB (po-unfuzzy) removes the fuzzy
attribute associated with an entry, usually leaving it translated.
Further, if the variable po-auto-select-on-unfuzzy has not
@@ -502,8 +502,8 @@ to chase another entry, leaving the entry fuzzy.
-
-
+
+
The translator may also use the DEL command
(po-fade-out-entry) over any translated entry to mark it as being
fuzzy, when she wants to easily leave a trace she wants to later return
@@ -518,9 +518,9 @@ still exists.
-6.4 Untranslated Entries
+6.4 Untranslated Entries
@@ -540,7 +540,7 @@ are easily recognizable by the fact they end with `msgstr ""´
-
+
The work of the translator might be (quite naively) seen as the process
of seeking for an untranslated entry, editing a translation for
it, and repeating these actions until no untranslated entries remain.
@@ -552,26 +552,26 @@ processing.
- u
-
-
+
Find the next untranslated entry (
po-next-untranslated-entry).
- U
-
-
+
Find the previous untranslated entry (
po-previous-untransted-entry).
- k
-
-
+
Turn the current entry into an untranslated one (
po-kill-msgstr).
-
-
-
+
+
+
The commands u (po-next-untranslated-entry) and U
(po-previous-untransted-entry) move forwards or backwards,
chasing for an untranslated entry. If none is found, the search is
@@ -579,11 +579,11 @@ extended and wraps around in the PO file buffer.
-
-
+
+
An entry can be turned back into an untranslated entry by
merely emptying its translation, using the command k
-(po-kill-msgstr). See section 6.6 Modifying Translations.
+(po-kill-msgstr). See section 6.6 Modifying Translations.
@@ -594,9 +594,9 @@ if some untranslated string still exists.
-6.5 Obsolete Entries
+6.5 Obsolete Entries
@@ -622,7 +622,7 @@ after the fact.
-
+
Moreover, some commands are more specifically related to obsolete
entry processing.
@@ -631,27 +631,27 @@ entry processing.
- o
-
-
+
Find the next obsolete entry (
po-next-obsolete-entry).
- O
-
-
+
Find the previous obsolete entry (
po-previous-obsolete-entry).
- DEL
-
-
+
Make an active entry obsolete, or zap out an obsolete entry
(
po-fade-out-entry).
-
-
-
+
+
+
The commands o (po-next-obsolete-entry) and O
(po-previous-obsolete-entry) move forwards or backwards,
chasing for an obsolete entry. If none is found, the search is
@@ -667,10 +667,10 @@ introducing useless msgid values.
-
-
-
+
+
+
However, it is possible to comment out an active entry, so making
it obsolete. GNU gettext utilities will later react to the
disappearance of a translation by using the untranslated string.
@@ -680,7 +680,7 @@ translated entry), then it is first made fuzzy. If it is already fuzzy,
then the entry is merely commented out, with confirmation. If the entry
is already obsolete, then it is completely deleted from the PO file.
It is easy to recycle the translation so deleted into some other PO file
-entry, usually one which is untranslated. See section 6.6 Modifying Translations.
+entry, usually one which is untranslated. See section 6.6 Modifying Translations.
@@ -698,10 +698,10 @@ merely tries to provide handy tools for helping her to do so.
-6.6 Modifying Translations
+6.6 Modifying Translations
@@ -727,40 +727,40 @@ using the following commands for modifying the translations.
- RET
-
-
+
Interactively edit the translation (
po-edit-msgstr).
- LFD
-
- C-j
-
-
-
+
+
Reinitialize the translation with the original, untranslated string
(
po-msgid-to-msgstr).
- k
-
-
+
Save the translation on the kill ring, and delete it (
po-kill-msgstr).
- w
-
-
+
Save the translation on the kill ring, without deleting it
(
po-kill-ring-save-msgstr).
- y
-
-
+
Replace the translation, taking the new from the kill ring
(
po-yank-msgstr).
-
-
+
+
The command RET (po-edit-msgstr) opens a new Emacs
window meant to edit in a new translation, or to modify an already existing
translation. The new window contains a copy of the translation taken from
@@ -768,14 +768,14 @@ the current PO file entry, all ready for edition, expunged of all quoting
marks, fully modifiable and with the complete extent of Emacs modifying
commands. When the translator is done with her modifications, she may use
C-c C-c to close the subedit window with the automatically requoted
-results, or C-c C-k to abort her modifications. See section 6.8 Details of Sub Edition,
+results, or C-c C-k to abort her modifications. See section 6.8 Details of Sub Edition,
for more information.
-
-
-
+
+
+
The command LFD (po-msgid-to-msgstr) initializes, or
reinitializes the translation with the original string. This command is
normally used when the translator wants to redo a fresh translation of
@@ -783,7 +783,7 @@ the original string, disregarding any previous work.
-
+
It is possible to arrange so, whenever editing an untranslated
entry, the LFD command be automatically executed. If you set
po-auto-edit-with-msgid to t, the translation gets
@@ -792,7 +792,7 @@ The default value for po-auto-edit-with-msgid is nil.
-
+
In fact, whether it is best to start a translation with an empty
string, or rather with a copy of the original string, is a matter of
taste or habit. Sometimes, the source language and the
@@ -806,11 +806,11 @@ if this requires some extra editing work to get rid of the original.
-
-
-
+
+
+
The command k (po-kill-msgstr) merely empties the
translation string, so turning the entry into an untranslated
one. But while doing so, its previous contents is put apart in
@@ -842,8 +842,8 @@ entries, the translation is also uncommented prior to saving.
-
-
+
+
The command y (po-yank-msgstr) completely replaces the
translation of the current entry by a string taken from the kill ring.
Following Emacs terminology, we then say that the replacement
@@ -877,7 +877,7 @@ yanking commands themselves.
-
+
To better illustrate the operation of killing and yanking, let's
use an actual example, taken from a common situation. When the
programmer slightly modifies some string right in the program, his
@@ -915,10 +915,10 @@ See section `Keyboard Macros' in The Emacs Editor.
-6.7 Modifying Comments
+6.7 Modifying Comments
@@ -940,31 +940,31 @@ they are not meant for the translator to modify. See section 6.6 Modifying Translations.
+so the general indications given for those apply here. See section 6.6 Modifying Translations.
- #
-
-
+
Interactively edit the translator comments (
po-edit-comment).
- K
-
-
+
Save the translator comments on the kill ring, and delete it
(
po-kill-comment).
- W
-
-
+
Save the translator comments on the kill ring, without deleting it
(
po-kill-ring-save-comment).
- Y
-
-
+
Replace the translator comments, taking the new from the kill ring
(
po-yank-comment).
@@ -976,12 +976,12 @@ strings, and behave much the same way as they do, except that they handle
this part of PO file comments meant for translator usage, rather
than the translation strings. So, if the descriptions given below are
slightly succinct, it is because the full details have already been given.
-See section 6.6 Modifying Translations.
+See section 6.6 Modifying Translations.
-
-
+
+
The command # (po-edit-comment) opens a new Emacs window
containing a copy of the translator comments on the current PO file entry.
If there are no such comments, PO mode understands that the translator wants
@@ -991,22 +991,22 @@ removed before edition, and reinstated after. For translator comments
pertaining to obsolete entries, the uncommenting and recommenting operations
are done twice. Once in the editing window, the keys C-c C-c
allow the translator to tell she is finished with editing the comment.
-See section 6.8 Details of Sub Edition, for further details.
+See section 6.8 Details of Sub Edition, for further details.
-
+
Functions found on po-subedit-mode-hook, if any, are executed after
the string has been inserted in the edit buffer.
-
-
-
+
+
+
The command K (po-kill-comment) gets rid of all
translator comments, while saving those comments on the kill ring.
The command W (po-kill-ring-save-comment) takes
@@ -1045,9 +1045,9 @@ regular Emacs commands C-y (yank) and M-y
-6.8 Details of Sub Edition
+6.8 Details of Sub Edition
@@ -1060,25 +1060,25 @@ of Emacs, which are described below.
- C-c C-c
-
-
+
Complete edition (
po-subedit-exit).
- C-c C-k
-
-
+
Abort edition (
po-subedit-abort).
- C-c C-a
-
-
+
Consult auxiliary PO files (
po-subedit-cycle-auxiliary).
-
-
-
+
+
+
The window's contents represents a translation for a given message,
or a translator comment. The translator may modify this window to
her heart's content. Once this is done, the command C-c C-c
@@ -1088,8 +1088,8 @@ sight or if buffers were switched.
-
-
+
+
If the translator becomes unsatisfied with her translation or comment,
to the extent she prefers keeping what was existent prior to the
RET or # command, she may use the command C-c C-k
@@ -1100,14 +1100,14 @@ whole effect of last edition.
-
-
+
+
The command C-c C-a (po-subedit-cycle-auxiliary)
allows for glancing through translations
already achieved in other languages, directly while editing the current
translation. This may be quite convenient when the translator is fluent
at many languages, but of course, only makes sense when such completed
-auxiliary PO files are already available to her (see section 6.10 Consulting Auxiliary PO Files).
+auxiliary PO files are already available to her (see section 6.10 Consulting Auxiliary PO Files).
@@ -1135,7 +1135,7 @@ in the editing window, as ending with two < in a row.
-
+
When a translation (or a comment) is being edited, the translator may move
the cursor back into the PO file buffer and freely move to other entries,
browsing at will. If, with an edition pending, the translator wanders in the
@@ -1148,7 +1148,7 @@ the translator should better be comfortable at handling many Emacs windows!
-
+
Pending subedits may be completed or aborted in any order, regardless
of how or when they were started. When many subedits are pending and the
translator asks for quitting the PO file (with the q command), subedits
@@ -1157,11 +1157,11 @@ are automatically resumed one at a time, so she may decide for each of them.
-6.9 C Sources Context
+6.9 C Sources Context
@@ -1198,7 +1198,7 @@ overall organization, than to the program code itself.
-
+
The following commands are meant to help the translator at getting
program source context for a PO file entry.
@@ -1207,35 +1207,35 @@ program source context for a PO file entry.
- s
-
-
+
Resume the display of a program source context, or cycle through them
(
po-cycle-source-reference).
- M-s
-
-
+
Display of a program source context selected by menu
(
po-select-source-reference).
- S
-
-
+
Add a directory to the search path for source files
(
po-consider-source-path).
- M-S
-
-
+
Delete a directory from the search path for source files
(
po-ignore-source-path).
-
-
-
+
+
+
The commands s (po-cycle-source-reference) and M-s
(po-select-source-reference) both open another window displaying
some source program file, and already positioned in such a way that
@@ -1280,10 +1280,10 @@ available for a single string to translate.
-
-
-
+
+
+
Program source files are usually found relative to where the PO
file stands. As a special provision, when this fails, the file is
also looked for, but relative to the directory immediately above it.
@@ -1301,9 +1301,9 @@ one of the directories she does not want anymore on the search path.
-6.10 Consulting Auxiliary PO Files
+6.10 Consulting Auxiliary PO Files
@@ -1316,8 +1316,8 @@ at once, for translators preferring to work in this way.
-
-
+
+
An auxiliary PO file is an existing PO file meant for the same
package the translator is working on, but targeted to a different mother
tongue language. Commands exist for declaring and handling auxiliary
@@ -1332,41 +1332,41 @@ Here are the auxiliary file commands available in PO mode.
- a
-
-
+
Seek auxiliary files for another translation for the same entry
(
po-cycle-auxiliary).
- C-c C-a
-
-
+
Switch to a particular auxiliary file (
po-select-auxiliary).
- A
-
-
+
Declare this PO file as an auxiliary file (
po-consider-as-auxiliary).
- M-A
-
-
+
Remove this PO file from the list of auxiliary files
(
po-ignore-as-auxiliary).
-
-
-
+
+
+
Command A (po-consider-as-auxiliary) adds the current
PO file to the list of auxiliary files, while command M-A
(po-ignore-as-auxiliary just removes it.
-
-
+
+
The command a (po-cycle-auxiliary) seeks all auxiliary PO
files, round-robin, searching for a translated entry in some other language
having an msgid field identical as the one for the current entry.
@@ -1378,8 +1378,8 @@ so repeating a will eventually yield back the original PO file.
-
-
+
+
The command C-c C-a (po-select-auxiliary) asks the translator
for her choice of a particular auxiliary file, with completion, and
then switches to that selected PO file. The command also checks if
@@ -1399,7 +1399,7 @@ their msgid entries written by the same GNU gettext to
-
+
However, PO files initially created by PO mode itself, while marking
strings in source files, are normalised differently. So are PO
files resulting of the the `M-x normalize´ command. Until these
@@ -1409,13 +1409,13 @@ fully resolved, the translator should stay aware of normalisation issues.
-6.11 Using Translation Compendia
+6.11 Using Translation Compendia
-
+
A compendium is a special PO file containing a set of
translations recurring in many different packages. The translator can
use gettext tools to build a new compendium, to add entries to her
@@ -1426,10 +1426,10 @@ already translated entries, from translations kept in the compendium.
-
6.11.1 Creating Compendia
+6.11.1 Creating Compendia
@@ -1441,11 +1441,11 @@ files and extracting a message subset from a PO file.
-6.11.1.1 Concatenate PO Files
+6.11.1.1 Concatenate PO Files
-
-
+
+
To concatenate several valid PO files into one compendium file you can
use `msgcomm´ or `msgcat´ (the latter preferred):
@@ -1524,9 +1524,9 @@ files or postprocess the result using `msgattrib --translated --no-fuzzy&a
-6.11.1.2 Extract a Message Subset from a PO File
+6.11.1.2 Extract a Message Subset from a PO File
@@ -1546,7 +1546,7 @@ msggrep --location src/getopt.c -o compendium.po file.po
-
6.11.2 Using Compendia
+6.11.2 Using Compendia
You can use a compendium file to initialize a translation from scratch
@@ -1555,9 +1555,9 @@ or to update an already existing translation.
-6.11.2.1 Initialize a New Translation File
+6.11.2.1 Initialize a New Translation File
@@ -1572,9 +1572,9 @@ msgmerge --compendium compendium.po -o file.po /dev/null file.pot
-
6.11.2.2 Update an Existing Translation File
+6.11.2.2 Update an Existing Translation File
diff --git a/gettext-tools/doc/gettext_7.html b/gettext-tools/doc/gettext_7.html
index dd3ebe666..ceefffcc8 100644
--- a/gettext-tools/doc/gettext_7.html
+++ b/gettext-tools/doc/gettext_7.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 7 Manipulating PO Files
@@ -10,9 +10,9 @@ Go to the first, previous<
-
7 Manipulating PO Files
+7 Manipulating PO Files
@@ -22,7 +22,7 @@ complete set of tools for this purpose.
-
+
When merging two packages into a single package, the resulting POT file
will be the concatenation of the two packages' POT files. Thus the
maintainer must concatenate the two existing package translations into
@@ -32,7 +32,7 @@ possible conflicts that arose during the merge.
-
+
When a translator takes over the translation job from another translator,
but she uses a different character encoding in her locale, she will
convert the catalog to her character encoding. This is best done through
@@ -48,8 +48,8 @@ that source file and use `msgmerge´.
-
-
+
+
When a translator wants to adjust some translation catalog for a special
dialect or orthography -- for example, German as written in Switzerland
versus German as written in Germany -- she needs to apply some text
@@ -66,14 +66,14 @@ that's why it's better to use the original POT file if available.
-
+
When a translator wants to check her translations, for example according
to orthography rules or using a non-interactive spell checker, she can do
so using the `msgexec´ program.
-
+
When third party tools create PO or POT files, sometimes duplicates cannot
be avoided. But the GNU gettext tools give an error when they
encounter duplicate msgids in the same file and in the same domain.
@@ -91,7 +91,7 @@ completely translated.
-
+
`msgattrib´ can be used to select and extract only the fuzzy
or untranslated messages of a translation catalog.
@@ -110,19 +110,19 @@ write other specialized programs that process PO files.
-
7.1 Invoking the msgcat Program
+7.1 Invoking the msgcat Program
msgcat [option] [inputfile]...
-
-
+
+
The msgcat program concatenates and merges the specified PO files.
It finds messages which are common to two or more of the specified PO files.
By using the --more-than option, greater commonality may be requested
@@ -136,7 +136,7 @@ to define them. File positions from all PO files will be cumulated.
-7.1.1 Input file location
+7.1.1 Input file location
@@ -148,8 +148,8 @@ Input files.
-
- `--files-from=file´
-
-
-
+
+
Read the names of the input files from file instead of getting
them from the command line.
@@ -157,8 +157,8 @@ them from the command line.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -171,7 +171,7 @@ If inputfile is `-´, standard input is read.
-
7.1.2 Output file location
+7.1.2 Output file location
@@ -179,21 +179,21 @@ If inputfile is `-´, standard input is read.
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
-
+
The results are written to standard output if no output file is specified
or if it is `-´.
-7.1.3 Message selection
+7.1.3 Message selection
@@ -201,8 +201,8 @@ or if it is `-´.
-
- `--less-than=number´
-
-
-
+
+
Print messages with less than number definitions, defaults to infinite
if not set.
@@ -210,8 +210,8 @@ if not set.
-
- `--more-than=number´
-
-
-
+
+
Print messages with more than number definitions, defaults to 0 if not
set.
@@ -219,8 +219,8 @@ set.
-
- `--unique´
-
-
-
+
+
Shorthand for `--less-than=2´. Requests that only unique messages be
printed.
@@ -228,7 +228,7 @@ printed.
-
7.1.4 Input file syntax
+7.1.4 Input file syntax
@@ -236,14 +236,14 @@ printed.
-
- `--properties-input´
-
-
-
+
+
Assume the input files are Java ResourceBundles in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input files are NeXTstep/GNUstep localized resource files in
.strings syntax, not in PO file syntax.
@@ -251,7 +251,7 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
-7.1.5 Output details
+7.1.5 Output details
@@ -259,45 +259,45 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
-
- `--to-code=name´
-
-
-
+
+
Specify encoding for output.
- `--use-first´
-
-
+
Use first available translation for each message. Don't merge several
translations into one.
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `-n´
-
- `--add-location´
-
-
-
+
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -306,15 +306,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -322,15 +322,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -339,9 +339,9 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
-
+
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -349,15 +349,15 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
-7.1.6 Informative output
+7.1.6 Informative output
@@ -365,41 +365,41 @@ Sort output by file location.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.2 Invoking the msgconv Program
+7.2 Invoking the msgconv Program
msgconv [option] [inputfile]
-
+
The msgconv program converts a translation catalog to a different
character encoding.
-7.2.1 Input file location
+7.2.1 Input file location
@@ -411,8 +411,8 @@ Input PO file.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -425,7 +425,7 @@ If no inputfile is given or if it is `-´, standard
-
7.2.2 Output file location
+7.2.2 Output file location
@@ -433,8 +433,8 @@ If no inputfile is given or if it is `-´, standard
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
@@ -446,7 +446,7 @@ or if it is `-´.
-7.2.3 Conversion target
+7.2.3 Conversion target
@@ -454,8 +454,8 @@ or if it is `-´.
-
- `--to-code=name´
-
-
-
+
+
Specify encoding for output.
@@ -466,7 +466,7 @@ The default encoding is the current locale's encoding.
-7.2.4 Input file syntax
+7.2.4 Input file syntax
@@ -474,14 +474,14 @@ The default encoding is the current locale's encoding.
-
- `--properties-input´
-
-
-
+
+
Assume the input file is a Java ResourceBundle in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input file is a NeXTstep/GNUstep localized resource file in
.strings syntax, not in PO file syntax.
@@ -489,36 +489,36 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-7.2.5 Output details
+7.2.5 Output details
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `--add-location´
-
-
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -527,15 +527,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -543,15 +543,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -560,8 +560,8 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -569,15 +569,15 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
-7.2.6 Informative output
+7.2.6 Informative output
@@ -585,41 +585,41 @@ Sort output by file location.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.3 Invoking the msggrep Program
+7.3 Invoking the msggrep Program
msggrep [option] [inputfile]
-
+
The msggrep program extracts all messages of a translation catalog
that match a given pattern or belong to some given source files.
-7.3.1 Input file location
+7.3.1 Input file location
@@ -631,8 +631,8 @@ Input PO file.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -645,7 +645,7 @@ If no inputfile is given or if it is `-´, standard
-
7.3.2 Output file location
+7.3.2 Output file location
@@ -653,8 +653,8 @@ If no inputfile is given or if it is `-´, standard
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
@@ -666,7 +666,7 @@ or if it is `-´.
-7.3.3 Message selection
+7.3.3 Message selection
@@ -716,8 +716,8 @@ expressions if -E is given, or fixed strings if -F is given.
-
- `--location=sourcefile´
-
-
-
+
+
Select messages extracted from sourcefile. sourcefile can be
either a literal file name or a wildcard pattern.
@@ -725,79 +725,79 @@ either a literal file name or a wildcard pattern.
-
- `--domain=domainname´
-
-
-
+
+
Select messages belonging to domain domainname.
- `-K´
-
- `--msgid´
-
-
-
+
+
Start of patterns for the msgid.
- `-T´
-
- `--msgstr´
-
-
-
+
+
Start of patterns for the msgstr.
- `-C´
-
- `--comment´
-
-
-
+
+
Start of patterns for the translator's comment.
- `-E´
-
- `--extended-regexp´
-
-
-
+
+
Specify that pattern is an extended regular expression.
- `-F´
-
- `--fixed-strings´
-
-
-
+
+
Specify that pattern is a set of newline-separated strings.
- `-e pattern´
-
- `--regexp=pattern´
-
-
-
+
+
Use pattern as a regular expression.
- `-f file´
-
- `--file=file´
-
-
-
+
+
Obtain pattern from file.
- `-i´
-
- `--ignore-case´
-
-
-
+
+
Ignore case distinctions.
-7.3.4 Input file syntax
+7.3.4 Input file syntax
@@ -805,14 +805,14 @@ Ignore case distinctions.
-
- `--properties-input´
-
-
-
+
+
Assume the input file is a Java ResourceBundle in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input file is a NeXTstep/GNUstep localized resource file in
.strings syntax, not in PO file syntax.
@@ -820,33 +820,33 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-7.3.5 Output details
+7.3.5 Output details
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `--indent´
-
-
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `--add-location´
-
-
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -855,15 +855,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -871,35 +871,35 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
- `--sort-output´
-
-
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
- `--sort-by-file´
-
-
+
Sort output by file location.
-7.3.6 Informative output
+7.3.6 Informative output
@@ -907,41 +907,41 @@ Sort output by file location.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.4 Invoking the msgfilter Program
+7.4 Invoking the msgfilter Program
msgfilter [option] filter [filter-option]
-
+
The msgfilter program applies a filter to all translations of a
translation catalog.
-7.4.1 Input file location
+7.4.1 Input file location
@@ -949,16 +949,16 @@ translation catalog.
-
- `--input=inputfile´
-
-
-
+
+
Input PO file.
- `-D directory´
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -971,7 +971,7 @@ If no inputfile is given or if it is `-´, standard
-
7.4.2 Output file location
+7.4.2 Output file location
@@ -979,8 +979,8 @@ If no inputfile is given or if it is `-´, standard
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
@@ -992,7 +992,7 @@ or if it is `-´.
-7.4.3 The filter
+7.4.3 The filter
The filter can be any program that reads a translation from standard
@@ -1001,7 +1001,7 @@ used filter is `sed´.
-
+
Note: It is your responsibility to ensure that the filter can cope
with input encoded in the translation catalog's encoding. If the
filter wants input in a particular encoding, you can in a first step
@@ -1014,7 +1014,7 @@ locale, by using the LC_ALL environment variable.
-
+
Note: Most translations in a translation catalog don't end with a newline
character. For this reason, it is important that the filter
recognizes its last input line even if it ends without a newline, and that
@@ -1026,7 +1026,7 @@ does not have this limitation.
-7.4.4 Useful filter-options when the filter is `sed´
+7.4.4 Useful filter-options when the filter is `sed´
@@ -1034,16 +1034,16 @@ does not have this limitation.
-
- `--expression=script´
-
-
-
+
+
Add script to the commands to be executed.
- `-f scriptfile´
-
- `--file=scriptfile´
-
-
-
+
+
Add the contents of scriptfile to the commands to be executed.
- `-n´
@@ -1052,16 +1052,16 @@ Add the contents of scriptfile to the commands to be executed.
-
- `--silent´
-
-
-
-
+
+
+
Suppress automatic printing of pattern space.
-7.4.5 Input file syntax
+7.4.5 Input file syntax
@@ -1069,14 +1069,14 @@ Suppress automatic printing of pattern space.
-
- `--properties-input´
-
-
-
+
+
Assume the input file is a Java ResourceBundle in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input file is a NeXTstep/GNUstep localized resource file in
.strings syntax, not in PO file syntax.
@@ -1084,40 +1084,40 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-7.4.6 Output details
+7.4.6 Output details
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `--indent´
-
-
+
Write the .po file using indented style.
- `--keep-header´
-
-
+
Keep the header entry, i.e. the message with `msgid ""´, unmodified,
instead of filtering it. By default, the header entry is subject to
filtering like any other message.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `--add-location´
-
-
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -1126,15 +1126,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -1142,15 +1142,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -1159,8 +1159,8 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -1168,15 +1168,15 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
-7.4.7 Informative output
+7.4.7 Informative output
@@ -1184,35 +1184,35 @@ Sort output by file location.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.5 Invoking the msguniq Program
+7.5 Invoking the msguniq Program
msguniq [option] [inputfile]
-
-
+
+
The msguniq program unifies duplicate translations in a translation
catalog. It finds duplicate translations of the same message ID. Such
duplicates are invalid input for other programs like msgfmt,
@@ -1227,7 +1227,7 @@ discarded.
-7.5.1 Input file location
+7.5.1 Input file location
@@ -1239,8 +1239,8 @@ Input PO file.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -1253,7 +1253,7 @@ If no inputfile is given or if it is `-´, standard
-
7.5.2 Output file location
+7.5.2 Output file location
@@ -1261,8 +1261,8 @@ If no inputfile is given or if it is `-´, standard
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
@@ -1274,7 +1274,7 @@ or if it is `-´.
-7.5.3 Message selection
+7.5.3 Message selection
@@ -1282,23 +1282,23 @@ or if it is `-´.
-
- `--repeated´
-
-
-
+
+
Print only duplicates.
- `-u´
-
- `--unique´
-
-
-
+
+
Print only unique messages, discard duplicates.
-7.5.4 Input file syntax
+7.5.4 Input file syntax
@@ -1306,14 +1306,14 @@ Print only unique messages, discard duplicates.
-
- `--properties-input´
-
-
-
+
+
Assume the input file is a Java ResourceBundle in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input file is a NeXTstep/GNUstep localized resource file in
.strings syntax, not in PO file syntax.
@@ -1321,7 +1321,7 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-7.5.5 Output details
+7.5.5 Output details
@@ -1329,45 +1329,45 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-
- `--to-code=name´
-
-
-
+
+
Specify encoding for output.
- `--use-first´
-
-
+
Use first available translation for each message. Don't merge several
translations into one.
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `-n´
-
- `--add-location´
-
-
-
+
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -1376,15 +1376,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -1392,15 +1392,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -1409,8 +1409,8 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -1418,15 +1418,15 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
-7.5.6 Informative output
+7.5.6 Informative output
@@ -1434,34 +1434,34 @@ Sort output by file location.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.6 Invoking the msgcomm Program
+7.6 Invoking the msgcomm Program
msgcomm [option] [inputfile]...
-
+
The msgcomm program finds messages which are common to two or more
of the specified PO files.
By using the --more-than option, greater commonality may be requested
@@ -1475,7 +1475,7 @@ cumulated.
-7.6.1 Input file location
+7.6.1 Input file location
@@ -1487,8 +1487,8 @@ Input files.
-
- `--files-from=file´
-
-
-
+
+
Read the names of the input files from file instead of getting
them from the command line.
@@ -1496,8 +1496,8 @@ them from the command line.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -1510,7 +1510,7 @@ If inputfile is `-´, standard input is read.
-
7.6.2 Output file location
+7.6.2 Output file location
@@ -1518,8 +1518,8 @@ If inputfile is `-´, standard input is read.
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
@@ -1531,7 +1531,7 @@ or if it is `-´.
-7.6.3 Message selection
+7.6.3 Message selection
@@ -1539,8 +1539,8 @@ or if it is `-´.
-
- `--less-than=number´
-
-
-
+
+
Print messages with less than number definitions, defaults to infinite
if not set.
@@ -1548,8 +1548,8 @@ if not set.
-
- `--more-than=number´
-
-
-
+
+
Print messages with more than number definitions, defaults to 1 if not
set.
@@ -1557,8 +1557,8 @@ set.
-
- `--unique´
-
-
-
+
+
Shorthand for `--less-than=2´. Requests that only unique messages be
printed.
@@ -1566,7 +1566,7 @@ printed.
-
7.6.4 Input file syntax
+7.6.4 Input file syntax
@@ -1574,14 +1574,14 @@ printed.
-
- `--properties-input´
-
-
-
+
+
Assume the input files are Java ResourceBundles in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input files are NeXTstep/GNUstep localized resource files in
.strings syntax, not in PO file syntax.
@@ -1589,39 +1589,39 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
-7.6.5 Output details
+7.6.5 Output details
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `-n´
-
- `--add-location´
-
-
-
+
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -1630,15 +1630,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -1646,15 +1646,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -1663,8 +1663,8 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -1672,20 +1672,20 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
- `--omit-header´
-
-
+
Don't write header with `msgid ""´ entry.
-7.6.6 Informative output
+7.6.6 Informative output
@@ -1693,34 +1693,34 @@ Don't write header with `msgid ""´ entry.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.7 Invoking the msgcmp Program
+7.7 Invoking the msgcmp Program
msgcmp [option] def.po ref.pot
-
+
The msgcmp program compares two Uniforum style .po files to check that
both contain the same set of msgid strings. The def.po file is an
existing PO file with the translations. The ref.pot file is the last
@@ -1732,7 +1732,7 @@ used to produce better diagnostics.
-7.7.1 Input file location
+7.7.1 Input file location
@@ -1748,8 +1748,8 @@ References to the sources.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories.
@@ -1757,7 +1757,7 @@ searched relative to this list of directories.
-
7.7.2 Operation modifiers
+7.7.2 Operation modifiers
@@ -1765,15 +1765,15 @@ searched relative to this list of directories.
-
- `--multi-domain´
-
-
-
+
+
Apply ref.pot to each of the domains in def.po.
-7.7.3 Input file syntax
+7.7.3 Input file syntax
@@ -1781,14 +1781,14 @@ Apply ref.pot to each of the domains in def.po.
-
- `--properties-input´
-
-
-
+
+
Assume the input files are Java ResourceBundles in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input files are NeXTstep/GNUstep localized resource files in
.strings syntax, not in PO file syntax.
@@ -1796,7 +1796,7 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
-7.7.4 Informative output
+7.7.4 Informative output
@@ -1804,42 +1804,42 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.8 Invoking the msgattrib Program
+7.8 Invoking the msgattrib Program
msgattrib [option] [inputfile]
-
-
+
+
The msgattrib program filters the messages of a translation catalog
according to their attributes, and manipulates the attributes.
-7.8.1 Input file location
+7.8.1 Input file location
@@ -1851,8 +1851,8 @@ Input PO file.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -1865,7 +1865,7 @@ If no inputfile is given or if it is `-´, standard
-
7.8.2 Output file location
+7.8.2 Output file location
@@ -1873,8 +1873,8 @@ If no inputfile is given or if it is `-´, standard
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
@@ -1886,48 +1886,48 @@ or if it is `-´.
-7.8.3 Message selection
+7.8.3 Message selection
- `--translated´
-
-
+
Keep translated messages, remove untranslated messages.
- `--untranslated´
-
-
+
Keep untranslated messages, remove translated messages.
- `--no-fuzzy´
-
-
+
Remove `fuzzy' marked messages.
- `--only-fuzzy´
-
-
+
Keep `fuzzy' marked messages, remove all other messsages.
- `--no-obsolete´
-
-
+
Remove obsolete #~ messages.
- `--only-obsolete´
-
-
+
Keep obsolete #~ messages, remove all other messages.
-7.8.4 Attribute manipulation
+7.8.4 Attribute manipulation
-
+
Attributes are modified after the message selection/removal has been
performed. If the `--only-file´ or `--ignore-file´ option is
specified, the attribute modification is applied only to those messages
@@ -1939,45 +1939,45 @@ that are listed in the only-file and not listed in the
- `--set-fuzzy´
-
-
+
Set all messages `fuzzy'.
- `--clear-fuzzy´
-
-
+
Set all messages non-`fuzzy'.
- `--set-obsolete´
-
-
+
Set all messages obsolete.
- `--clear-obsolete´
-
-
+
Set all messages non-obsolete.
- `--only-file=file´
-
-
+
Limit the attribute changes to entries that are listed in file.
file should be a PO or POT file.
- `--ignore-file=file´
-
-
+
Limit the attribute changes to entries that are not listed in file.
file should be a PO or POT file.
- `--fuzzy´
-
-
+
Synonym for `--only-fuzzy --clear-fuzzy´: It keeps only the fuzzy
messages and removes their `fuzzy' mark.
- `--obsolete´
-
-
+
Synonym for `--only-obsolete --clear-obsolete´: It keeps only the
obsolete messages and makes them non-obsolete.
@@ -1985,7 +1985,7 @@ obsolete messages and makes them non-obsolete.
-
7.8.5 Input file syntax
+7.8.5 Input file syntax
@@ -1993,14 +1993,14 @@ obsolete messages and makes them non-obsolete.
-
- `--properties-input´
-
-
-
+
+
Assume the input file is a Java ResourceBundle in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input file is a NeXTstep/GNUstep localized resource file in
.strings syntax, not in PO file syntax.
@@ -2008,39 +2008,39 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-7.8.6 Output details
+7.8.6 Output details
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `-n´
-
- `--add-location´
-
-
-
+
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -2049,15 +2049,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -2065,15 +2065,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -2082,8 +2082,8 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -2091,15 +2091,15 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
-7.8.7 Informative output
+7.8.7 Informative output
@@ -2107,34 +2107,34 @@ Sort output by file location.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.9 Invoking the msgen Program
+7.9 Invoking the msgen Program
msgen [option] inputfile
-
+
The msgen program creates an English translation catalog. The
input file is the last created English PO file, or a PO Template file
(generally created by xgettext). Untranslated entries are assigned a
@@ -2149,7 +2149,7 @@ the header entry, whereas msgen doesn't.
-7.9.1 Input file location
+7.9.1 Input file location
@@ -2161,8 +2161,8 @@ Input PO or POT file.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -2175,7 +2175,7 @@ If inputfile is `-´, standard input is read.
-
7.9.2 Output file location
+7.9.2 Output file location
@@ -2183,8 +2183,8 @@ If inputfile is `-´, standard input is read.
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
@@ -2196,7 +2196,7 @@ or if it is `-´.
-7.9.3 Input file syntax
+7.9.3 Input file syntax
@@ -2204,14 +2204,14 @@ or if it is `-´.
-
- `--properties-input´
-
-
-
+
+
Assume the input file is a Java ResourceBundle in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input file is a NeXTstep/GNUstep localized resource file in
.strings syntax, not in PO file syntax.
@@ -2219,36 +2219,36 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-7.9.4 Output details
+7.9.4 Output details
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--no-location´
-
-
+
Do not write `#: filename:line´ lines.
- `--add-location´
-
-
+
Generate `#: filename:line´ lines (default).
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -2257,15 +2257,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -2273,15 +2273,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -2290,8 +2290,8 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -2299,15 +2299,15 @@ for the translator to understand each message's context.
-
- `--sort-by-file´
-
-
-
+
+
Sort output by file location.
-7.9.5 Informative output
+7.9.5 Informative output
@@ -2315,34 +2315,34 @@ Sort output by file location.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.10 Invoking the msgexec Program
+7.10 Invoking the msgexec Program
msgexec [option] command [command-option]
-
+
The msgexec program applies a command to all translations of a
translation catalog.
The command can be any program that reads a translation from standard
@@ -2352,15 +2352,15 @@ across all invocations.
-
+
A special builtin command called `0´ outputs the translation, followed
by a null byte. The output of `msgexec 0´ is suitable as input for
`xargs -0´.
-
-
+
+
During each command invocation, the environment variable
MSGEXEC_MSGID is bound to the message's msgid, and the environment
variable MSGEXEC_LOCATION is bound to the location in the PO file
@@ -2368,7 +2368,7 @@ of the message.
-
+
Note: It is your responsibility to ensure that the command can cope
with input encoded in the translation catalog's encoding. If the
command wants input in a particular encoding, you can in a first step
@@ -2382,7 +2382,7 @@ locale, by using the LC_ALL environment variable.
-7.10.1 Input file location
+7.10.1 Input file location
@@ -2390,16 +2390,16 @@ locale, by using the LC_ALL environment variable.
-
- `--input=inputfile´
-
-
-
+
+
Input PO file.
- `-D directory´
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -2412,7 +2412,7 @@ If no inputfile is given or if it is `-´, standard
-
7.10.2 Input file syntax
+7.10.2 Input file syntax
@@ -2420,14 +2420,14 @@ If no inputfile is given or if it is `-´, standard
-
- `--properties-input´
-
-
-
+
+
Assume the input file is a Java ResourceBundle in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input file is a NeXTstep/GNUstep localized resource file in
.strings syntax, not in PO file syntax.
@@ -2435,7 +2435,7 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-7.10.3 Informative output
+7.10.3 Informative output
@@ -2443,23 +2443,23 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
-7.11 Writing your own programs that process PO files
+7.11 Writing your own programs that process PO files
For the tasks for which a combination of `msgattrib´, `msgcat´ etc.
@@ -2478,7 +2478,7 @@ defined in a library called `libgettextpo´.
- Data Type: po_file_t
-
-
+
-
This is a pointer type that refers to the contents of a PO file, after it has
been read into memory.
@@ -2487,7 +2487,7 @@ been read into memory.
- Data Type: po_message_iterator_t
-
-
+
-
This is a pointer type that refers to an iterator that produces a sequence of
messages.
@@ -2496,7 +2496,7 @@ messages.
- Data Type: po_message_t
-
-
+
-
This is a pointer type that refers to a message of a PO file, including its
translation.
@@ -2505,7 +2505,7 @@ translation.
- Function: po_file_t po_file_read (const char *filename)
-
-
+
-
The
po_file_read function reads a PO file into memory. The file name
is given as argument. The return value is a handle to the PO file's contents,
valid until po_file_free is called on it. In case of error, the return
@@ -2516,7 +2516,7 @@ value is NULL, and errno is set.
- Function: void po_file_free (po_file_t file)
-
-
+
-
The
po_file_free function frees a PO file's contents from memory,
including all messages that are only implicitly accessible through iterators.
@@ -2525,7 +2525,7 @@ including all messages that are only implicitly accessible through iterators.
- Function: const char * const * po_file_domains (po_file_t file)
-
-
+
-
The
po_file_domains function returns the domains for which the given
PO file has messages. The return value is a NULL terminated array
which is valid as long as the file handle is valid. For PO files which
@@ -2537,7 +2537,7 @@ namely the default domain "messages".
- Function: po_message_iterator_t po_message_iterator (po_file_t file, const char *domain)
-
-
+
-
The
po_message_iterator returns an iterator that will produce the
messages of file that belong to the given domain. If domain
is NULL, the default domain is used instead. To list the messages,
@@ -2548,7 +2548,7 @@ use the function po_next_message repeatedly.
- Function: void po_message_iterator_free (po_message_iterator_t iterator)
-
-
+
-
The
po_message_iterator_free function frees an iterator previously
allocated through the po_message_iterator function.
@@ -2557,7 +2557,7 @@ allocated through the po_message_iterator function.
- Function: po_message_t po_next_message (po_message_iterator_t iterator)
-
-
+
-
The
po_next_message function returns the next message from
iterator and advances the iterator. It returns NULL when the
iterator has reached the end of its message list.
@@ -2572,7 +2572,7 @@ that the results are valid as long as the file handle is valid.
- Function: const char * po_message_msgid (po_message_t message)
-
-
+
-
The
po_message_msgid function returns the msgid (untranslated
English string) of a message. This is guaranteed to be non-NULL.
@@ -2581,7 +2581,7 @@ English string) of a message. This is guaranteed to be non-NULL.
- Function: const char * po_message_msgid_plural (po_message_t message)
-
-
+
-
The
po_message_msgid_plural function returns the msgid_plural
(untranslated English plural string) of a message with plurals, or NULL
for a message without plural.
@@ -2591,7 +2591,7 @@ for a message without plural.
- Function: const char * po_message_msgstr (po_message_t message)
-
-
+
-
The
po_message_msgstr function returns the msgstr (translation)
of a message. For an untranslated message, the return value is an empty
string.
@@ -2601,7 +2601,7 @@ string.
- Function: const char * po_message_msgstr_plural (po_message_t message, int index)
-
-
+
-
The
po_message_msgstr_plural function returns the
msgstr[index] of a message with plurals, or NULL when
the index is out of range or for a message without plural.
diff --git a/gettext-tools/doc/gettext_8.html b/gettext-tools/doc/gettext_8.html
index 2b2a0c56e..f2b1237ae 100644
--- a/gettext-tools/doc/gettext_8.html
+++ b/gettext-tools/doc/gettext_8.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 8 Producing Binary MO Files
@@ -10,29 +10,29 @@ Go to the first, previous<
-
8 Producing Binary MO Files
+8 Producing Binary MO Files
-8.1 Invoking the msgfmt Program
+8.1 Invoking the msgfmt Program
msgfmt [option] filename.po ...
-
+
The msgfmt programs generates a binary message catalog from a textual
translation description.
-8.1.1 Input file location
+8.1.1 Input file location
@@ -42,8 +42,8 @@ translation description.
-
- `--directory=directory´
-
-
-
+
+
Add directory to the list of directories. Source files are
searched relative to this list of directories. The resulting `.po´
file will be written relative to the current directory, though.
@@ -56,7 +56,7 @@ If an input file is `-´, standard input is read.
-
8.1.2 Operation mode
+8.1.2 Operation mode
@@ -64,33 +64,46 @@ If an input file is `-´, standard input is read.
-
- `--java´
-
-
-
-
+
+
+
Java mode: generate a Java
ResourceBundle class.
- `--java2´
-
-
+
Like --java, and assume Java2 (JDK 1.2 or higher).
+
- `--csharp´
+
-
+
+
+C# mode: generate a .NET .dll file containing a subclass of
+
GettextResourceSet.
+
+ - `--csharp-resources´
+
-
+
+
+C# resources mode: generate a .NET `.resources´ file.
+
- `--tcl´
-
-
-
+
+
Tcl mode: generate a tcl/msgcat `.msg´ file.
- `--qt´
-
-
-
+
+
Qt mode: generate a Qt `.qm´ file.
-8.1.3 Output file location
+8.1.3 Output file location
@@ -98,13 +111,13 @@ Qt mode: generate a Qt `.qm´ file.
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
- `--strict´
-
-
+
Direct the program to work strictly following the Uniforum/Sun
implementation. Currently this only affects the naming of the output
file. If this option is not given the name of the output file is the
@@ -123,7 +136,7 @@ If the output file is `-´, output is written to st
-
8.1.4 Output file location in Java mode
+8.1.4 Output file location in Java mode
@@ -131,22 +144,22 @@ If the output file is `-´, output is written to st
-
- `--resource=resource´
-
-
-
+
+
Specify the resource name.
- `-l locale´
-
- `--locale=locale´
-
-
-
+
+
Specify the locale name, either a language specification of the form ll
or a combined language and country specification of the form ll_CC.
- `-d directory´
-
-
+
Specify the base directory of classes directory hierarchy.
@@ -159,22 +172,58 @@ is written under the specified directory.
-8.1.5 Output file location in Tcl mode
+8.1.5 Output file location in C# mode
+- `-r resource´
+
-
+
- `--resource=resource´
+
-
+
+
+Specify the resource name.
+
- `-l locale´
-
- `--locale=locale´
-
-
-
+
+
Specify the locale name, either a language specification of the form ll
or a combined language and country specification of the form ll_CC.
- `-d directory´
-
-
+
+Specify the base directory for locale dependent `.dll´ files.
+
+
+
+
+The `-l´ and `-d´ options are mandatory. The `.dll´ file is
+written in a subdirectory of the specified directory whose name depends on the
+locale.
+
+
+
+
+8.1.6 Output file location in Tcl mode
+
+
+
+- `-l locale´
+
-
+
- `--locale=locale´
+
-
+
+
+Specify the locale name, either a language specification of the form ll
+or a combined language and country specification of the form ll_CC.
+
+
- `-d directory´
+
-
+
Specify the base directory of `.msg´ message catalogs.
@@ -186,7 +235,7 @@ written in the specified directory.
-8.1.6 Input file syntax
+8.1.7 Input file syntax
@@ -194,14 +243,14 @@ written in the specified directory.
-
- `--properties-input´
-
-
-
+
+
Assume the input files are Java ResourceBundles in Java
.properties
syntax, not in PO file syntax.
- `--stringtable-input´
-
-
+
Assume the input files are NeXTstep/GNUstep localized resource files in
.strings syntax, not in PO file syntax.
@@ -209,7 +258,7 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
-8.1.7 Input file interpretation
+8.1.8 Input file interpretation
@@ -217,15 +266,15 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
-
- `--check´
-
-
-
+
+
Perform all the checks implied by
--check-format, --check-header,
--check-domain.
- `--check-format´
-
-
-
+
+
Check language dependent format strings.
If the string represents a format string used in a
@@ -244,19 +293,19 @@ used in a
printf-like function and so msgfmt might rep
errors where there are none.
To solve this problem the programmer can dictate the decision to the
-xgettext program (see section 13.3.1 C Format Strings). The translator should not
+xgettext program (see section 13.3.1 C Format Strings). The translator should not
consider removing the flag from the #, line. This "fix" would be
reversed again as soon as msgmerge is called the next time.
- `--check-header´
-
-
-Verify presence and contents of the header entry. See section 5.2 Filling in the Header Entry,
+
+Verify presence and contents of the header entry. See section 5.2 Filling in the Header Entry,
for a description of the various fields in the header entry.
- `--check-domain´
-
-
+
Check for conflicts between domain directives and the
--output-file
option
@@ -264,18 +313,18 @@ option
-
- `--check-compatibility´
-
-
-
-
+
+
+
Check that GNU msgfmt behaves like X/Open msgfmt. This will give an error
when attempting to use the GNU extensions.
- `--check-accelerators[=char]´
-
-
-
-
-
+
+
+
+
Check presence of keyboard accelerators for menu items. This is based on
the convention used in some GUIs that a keyboard accelerator in a menu
item string is designated by an immediately preceding `&´ character.
@@ -290,9 +339,9 @@ instead of `&´.
-
- `--use-fuzzy´
-
-
-
-
+
+
+
Use fuzzy entries in output. Note that using this option is usually wrong,
because fuzzy messages are exactly those which have not been validated by
a human translator.
@@ -301,7 +350,7 @@ a human translator.
-
8.1.8 Output details
+8.1.9 Output details
@@ -309,13 +358,13 @@ a human translator.
-
- `--alignment=number´
-
-
-
+
+
Align strings to number bytes (default: 1).
- `--no-hash´
-
-
+
Don't include a hash table in the binary file. Lookup will be more expensive
at run time (binary search instead of hash table lookup).
@@ -323,7 +372,7 @@ at run time (binary search instead of hash table lookup).
-
8.1.9 Informative output
+8.1.10 Informative output
@@ -331,54 +380,54 @@ at run time (binary search instead of hash table lookup).
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
- `--statistics´
-
-
+
Print statistics about translations.
- `-v´
-
- `--verbose´
-
-
-
+
+
Increase verbosity level.
-8.2 Invoking the msgunfmt Program
+8.2 Invoking the msgunfmt Program
msgunfmt [option] [file]...
-
+
The msgunfmt program converts a binary message catalog to a
Uniforum style .po file.
-8.2.1 Operation mode
+8.2.1 Operation mode
@@ -386,22 +435,35 @@ Uniforum style .po file.
-
- `--java´
-
-
-
-
+
+
+
Java mode: input is a Java
ResourceBundle class.
+ - `--csharp´
+
-
+
+
+C# mode: input is a .NET .dll file containing a subclass of
+
GettextResourceSet.
+
+ - `--csharp-resources´
+
-
+
+
+C# resources mode: input is a .NET `.resources´ file.
+
- `--tcl´
-
-
-
+
+
Tcl mode: input is a tcl/msgcat `.msg´ file.
-8.2.2 Input file location
+8.2.2 Input file location
@@ -417,7 +479,7 @@ If no input file is given or if it is `-´, standar
-8.2.3 Input file location in Java mode
+8.2.3 Input file location in Java mode
@@ -425,16 +487,16 @@ If no input file is given or if it is `-´, standar
-
- `--resource=resource´
-
-
-
+
+
Specify the resource name.
- `-l locale´
-
- `--locale=locale´
-
-
-
+
+
Specify the locale name, either a language specification of the form ll
or a combined language and country specification of the form ll_CC.
@@ -447,22 +509,58 @@ separated with an underscore. The class is located using the
CLASSPATH
-8.2.4 Input file location in Tcl mode
+8.2.4 Input file location in C# mode
+- `-r resource´
+
-
+
- `--resource=resource´
+
-
+
+
+Specify the resource name.
+
- `-l locale´
-
- `--locale=locale´
-
-
-
+
+
Specify the locale name, either a language specification of the form ll
or a combined language and country specification of the form ll_CC.
- `-d directory´
-
-
+
+Specify the base directory for locale dependent `.dll´ files.
+
+
+
+
+The `-l´ and `-d´ options are mandatory. The `.msg´ file is
+located in a subdirectory of the specified directory whose name depends on the
+locale.
+
+
+
+
+8.2.5 Input file location in Tcl mode
+
+
+
+- `-l locale´
+
-
+
- `--locale=locale´
+
-
+
+
+Specify the locale name, either a language specification of the form ll
+or a combined language and country specification of the form ll_CC.
+
+
- `-d directory´
+
-
+
Specify the base directory of `.msg´ message catalogs.
@@ -474,7 +572,7 @@ located in the specified directory.
-8.2.5 Output file location
+8.2.6 Output file location
@@ -482,8 +580,8 @@ located in the specified directory.
-
- `--output-file=file´
-
-
-
+
+
Write output to specified file.
@@ -495,26 +593,26 @@ or if it is `-´.
-8.2.6 Output details
+8.2.7 Output details
- `--force-po´
-
-
+
Always write an output file even if it contains no message.
- `-i´
-
- `--indent´
-
-
-
+
+
Write the .po file using indented style.
- `--strict´
-
-
+
Write out a strict Uniforum conforming PO file. Note that this
Uniforum format should be avoided because it doesn't support the
GNU extensions.
@@ -523,15 +621,15 @@ GNU extensions.
-
- `--properties-output´
-
-
-
+
+
Write out a Java ResourceBundle in Java
.properties syntax. Note
that this file format doesn't support plural forms and silently drops
obsolete messages.
- `--stringtable-output´
-
-
+
Write out a NeXTstep/GNUstep localized resource file in
.strings syntax.
Note that this file format doesn't support plural forms.
@@ -539,15 +637,15 @@ Note that this file format doesn't support plural forms.
-
- `--width=number´
-
-
-
+
+
Set the output page width. Long strings in the output files will be
split across multiple lines in order to ensure that each line's width
(= number of screen columns) is less or equal to the given number.
- `--no-wrap´
-
-
+
Do not break long message lines. Message lines whose width exceeds the
output page width will not be split into several lines. Only file reference
lines which are wider than the output page width will be split.
@@ -556,9 +654,9 @@ lines which are wider than the output page width will be split.
-
- `--sort-output´
-
-
-
-
+
+
+
Generate sorted output. Note that using this option makes it much harder
for the translator to understand each message's context.
@@ -566,7 +664,7 @@ for the translator to understand each message's context.
-
8.2.7 Informative output
+8.2.8 Informative output
@@ -574,34 +672,34 @@ for the translator to understand each message's context.
-
- `--help´
-
-
-
+
+
Display this help and exit.
- `-V´
-
- `--version´
-
-
-
+
+
Output version information and exit.
- `-v´
-
- `--verbose´
-
-
-
+
+
Increase verbosity level.
-8.3 The Format of GNU MO Files
+8.3 The Format of GNU MO Files
@@ -610,7 +708,7 @@ which appears below.
-
+
The first two words serve the identification of the file. The magic
number will always signal GNU MO files. The number is stored in the
byte order of the generating machine, so the magic number really is
@@ -658,7 +756,7 @@ translated tables, making the system information very easy to find.
-
+
The size S of the hash table can be zero. In this case, the
hash table itself is not contained in the MO file. Some people might
prefer this because a precomputed hashing table takes disk space, and
@@ -679,7 +777,7 @@ machines, a correct alignment will speed things up.
-
+
Plural forms are stored by letting the plural of the original string
follow the singular of the original string, separated through a
NUL byte. The length which appears in the string descriptor
diff --git a/gettext-tools/doc/gettext_9.html b/gettext-tools/doc/gettext_9.html
index 495a8bb33..9c5cec001 100644
--- a/gettext-tools/doc/gettext_9.html
+++ b/gettext-tools/doc/gettext_9.html
@@ -1,7 +1,7 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - 9 The User's View
@@ -10,7 +10,7 @@ Go to the first, previous<
-
9 The User's View
+9 The User's View
When GNU gettext will truly have reached its goal, average users
@@ -43,11 +43,11 @@ for both installers and end users.
-
9.1 The Current `ABOUT-NLS´ Matrix
+9.1 The Current `ABOUT-NLS´ Matrix
@@ -57,7 +57,7 @@ may check the distribution for the `ABOUT-NLS´ information file,
some `ll.po´ files, often kept together into some `po/´
directory, or for an `intl/´ directory. Internationalized packages
have usually many `ll.po´ files, where ll represents
-the language. section 9.3 Magic for End Users for a complete description of the format
+the language. section 9.3 Magic for End Users for a complete description of the format
for ll.
@@ -75,10 +75,10 @@ Translation Project sites, and also on most GNU archive sites.
-9.2 Magic for Installers
+9.2 Magic for Installers
@@ -97,7 +97,7 @@ produces programs totally unable to translate messages.
-
+
Internationalized packages have usually many `ll.po´
files. Unless
translations are disabled, all those available are installed together
@@ -109,20 +109,20 @@ codes, stating which languages are allowed.
-9.3 Magic for End Users
+9.3 Magic for End Users
-
+
We consider here those packages using GNU gettext internally,
and for which the installers did not disable translation at
configure time. Then, users only have to set the LANG
environment variable to the appropriate `ll_CC´
-combination prior to using the programs in the package. See section 9.1 The Current `ABOUT-NLS´ Matrix.
+combination prior to using the programs in the package. See section 9.1 The Current `ABOUT-NLS´ Matrix.
For example, let's presume a German site. At the shell prompt, users
merely have to execute `setenv LANG de_DE´ (in csh) or
`export LANG; LANG=de_DE´ (in sh). They could even do
diff --git a/gettext-tools/doc/gettext_foot.html b/gettext-tools/doc/gettext_foot.html
index b81057a30..bb6b97493 100644
--- a/gettext-tools/doc/gettext_foot.html
+++ b/gettext-tools/doc/gettext_foot.html
@@ -1,14 +1,14 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - Footnotes
-GNU gettext tools, version 0.13.1
+GNU gettext tools, version 0.14
Native Language Support Library and Tools
-Edition 0.13.1, 7 December 2003
+Edition 0.14, 17 January 2004
Ulrich Drepper
Jim Meyering
François Pinard
@@ -36,7 +36,7 @@ variables.
Additions are welcome. Send appropriate information to
bug-glibc-manual@gnu.org.
-This document was generated on 9 December 2003 using the
+This document was generated on 28 January 2004 using the
texi2html
translator version 1.52a.
diff --git a/gettext-tools/doc/gettext_toc.html b/gettext-tools/doc/gettext_toc.html
index 7f46d3b3e..deb0f0d30 100644
--- a/gettext-tools/doc/gettext_toc.html
+++ b/gettext-tools/doc/gettext_toc.html
@@ -1,14 +1,14 @@
+ from gettext.texi on 28 January 2004 -->
GNU gettext utilities - Table of Contents
-GNU gettext tools, version 0.13.1
+GNU gettext tools, version 0.14
Native Language Support Library and Tools
-Edition 0.13.1, 7 December 2003
+Edition 0.14, 17 January 2004
Ulrich Drepper
Jim Meyering
François Pinard
@@ -41,365 +41,370 @@
- 3.5 Special Comments preceding Keywords
- 3.6 Special Cases of Translatable Strings
- 3.7 Marking Proper Names for Translation
+
- 3.8 Preparing Library Sources
-
- 4 Making the PO Template File
+
- 4 Making the PO Template File
-- 4.1 Invoking the
xgettext Program
+ - 4.1 Invoking the
xgettext Program
-- 4.1.1 Input file location
-
- 4.1.2 Output file location
-
- 4.1.3 Choice of input file language
-
- 4.1.4 Input file interpretation
-
- 4.1.5 Operation mode
-
- 4.1.6 Language specific options
-
- 4.1.7 Output details
-
- 4.1.8 Informative output
+
- 4.1.1 Input file location
+
- 4.1.2 Output file location
+
- 4.1.3 Choice of input file language
+
- 4.1.4 Input file interpretation
+
- 4.1.5 Operation mode
+
- 4.1.6 Language specific options
+
- 4.1.7 Output details
+
- 4.1.8 Informative output
- - 5 Creating a New PO File
+
- 5 Creating a New PO File
-
- 6 Updating Existing PO Files
+
- 6 Updating Existing PO Files
-- 6.1 Invoking the
msgmerge Program
+ - 6.1 Invoking the
msgmerge Program
-- 6.1.1 Input file location
-
- 6.1.2 Operation mode
-
- 6.1.3 Output file location
-
- 6.1.4 Output file location in update mode
-
- 6.1.5 Operation modifiers
-
- 6.1.6 Input file syntax
-
- 6.1.7 Output details
-
- 6.1.8 Informative output
+
- 6.1.1 Input file location
+
- 6.1.2 Operation mode
+
- 6.1.3 Output file location
+
- 6.1.4 Output file location in update mode
+
- 6.1.5 Operation modifiers
+
- 6.1.6 Input file syntax
+
- 6.1.7 Output details
+
- 6.1.8 Informative output
- - 6.2 Translated Entries
-
- 6.3 Fuzzy Entries
-
- 6.4 Untranslated Entries
-
- 6.5 Obsolete Entries
-
- 6.6 Modifying Translations
-
- 6.7 Modifying Comments
-
- 6.8 Details of Sub Edition
-
- 6.9 C Sources Context
-
- 6.10 Consulting Auxiliary PO Files
-
- 6.11 Using Translation Compendia
+
- 6.2 Translated Entries
+
- 6.3 Fuzzy Entries
+
- 6.4 Untranslated Entries
+
- 6.5 Obsolete Entries
+
- 6.6 Modifying Translations
+
- 6.7 Modifying Comments
+
- 6.8 Details of Sub Edition
+
- 6.9 C Sources Context
+
- 6.10 Consulting Auxiliary PO Files
+
- 6.11 Using Translation Compendia
- - 7 Manipulating PO Files
+
- 7 Manipulating PO Files
-- 7.1 Invoking the
msgcat Program
+ - 7.1 Invoking the
msgcat Program
-- 7.1.1 Input file location
-
- 7.1.2 Output file location
-
- 7.1.3 Message selection
-
- 7.1.4 Input file syntax
-
- 7.1.5 Output details
-
- 7.1.6 Informative output
+
- 7.1.1 Input file location
+
- 7.1.2 Output file location
+
- 7.1.3 Message selection
+
- 7.1.4 Input file syntax
+
- 7.1.5 Output details
+
- 7.1.6 Informative output
- - 7.2 Invoking the
msgconv Program
+ - 7.2 Invoking the
msgconv Program
-- 7.2.1 Input file location
-
- 7.2.2 Output file location
-
- 7.2.3 Conversion target
-
- 7.2.4 Input file syntax
-
- 7.2.5 Output details
-
- 7.2.6 Informative output
+
- 7.2.1 Input file location
+
- 7.2.2 Output file location
+
- 7.2.3 Conversion target
+
- 7.2.4 Input file syntax
+
- 7.2.5 Output details
+
- 7.2.6 Informative output
- - 7.3 Invoking the
msggrep Program
+ - 7.3 Invoking the
msggrep Program
-- 7.3.1 Input file location
-
- 7.3.2 Output file location
-
- 7.3.3 Message selection
-
- 7.3.4 Input file syntax
-
- 7.3.5 Output details
-
- 7.3.6 Informative output
+
- 7.3.1 Input file location
+
- 7.3.2 Output file location
+
- 7.3.3 Message selection
+
- 7.3.4 Input file syntax
+
- 7.3.5 Output details
+
- 7.3.6 Informative output
- - 7.4 Invoking the
msgfilter Program
+ - 7.4 Invoking the
msgfilter Program
-- 7.4.1 Input file location
-
- 7.4.2 Output file location
-
- 7.4.3 The filter
-
- 7.4.4 Useful filter-options when the filter is `sed´
-
- 7.4.5 Input file syntax
-
- 7.4.6 Output details
-
- 7.4.7 Informative output
+
- 7.4.1 Input file location
+
- 7.4.2 Output file location
+
- 7.4.3 The filter
+
- 7.4.4 Useful filter-options when the filter is `sed´
+
- 7.4.5 Input file syntax
+
- 7.4.6 Output details
+
- 7.4.7 Informative output
- - 7.5 Invoking the
msguniq Program
+ - 7.5 Invoking the
msguniq Program
-- 7.5.1 Input file location
-
- 7.5.2 Output file location
-
- 7.5.3 Message selection
-
- 7.5.4 Input file syntax
-
- 7.5.5 Output details
-
- 7.5.6 Informative output
+
- 7.5.1 Input file location
+
- 7.5.2 Output file location
+
- 7.5.3 Message selection
+
- 7.5.4 Input file syntax
+
- 7.5.5 Output details
+
- 7.5.6 Informative output
- - 7.6 Invoking the
msgcomm Program
+ - 7.6 Invoking the
msgcomm Program
-- 7.6.1 Input file location
-
- 7.6.2 Output file location
-
- 7.6.3 Message selection
-
- 7.6.4 Input file syntax
-
- 7.6.5 Output details
-
- 7.6.6 Informative output
+
- 7.6.1 Input file location
+
- 7.6.2 Output file location
+
- 7.6.3 Message selection
+
- 7.6.4 Input file syntax
+
- 7.6.5 Output details
+
- 7.6.6 Informative output
- - 7.7 Invoking the
msgcmp Program
+ - 7.7 Invoking the
msgcmp Program
- - 7.8 Invoking the
msgattrib Program
+ - 7.8 Invoking the
msgattrib Program
-- 7.8.1 Input file location
-
- 7.8.2 Output file location
-
- 7.8.3 Message selection
-
- 7.8.4 Attribute manipulation
-
- 7.8.5 Input file syntax
-
- 7.8.6 Output details
-
- 7.8.7 Informative output
+
- 7.8.1 Input file location
+
- 7.8.2 Output file location
+
- 7.8.3 Message selection
+
- 7.8.4 Attribute manipulation
+
- 7.8.5 Input file syntax
+
- 7.8.6 Output details
+
- 7.8.7 Informative output
- - 7.9 Invoking the
msgen Program
+ - 7.9 Invoking the
msgen Program
- - 7.10 Invoking the
msgexec Program
+ - 7.10 Invoking the
msgexec Program
- - 7.11 Writing your own programs that process PO files
+
- 7.11 Writing your own programs that process PO files
- - 8 Producing Binary MO Files
+
- 8 Producing Binary MO Files
-- 8.1 Invoking the
msgfmt Program
+ - 8.1 Invoking the
msgfmt Program
- - 8.2 Invoking the
msgunfmt Program
+ - 8.1.1 Input file location
+
- 8.1.2 Operation mode
+
- 8.1.3 Output file location
+
- 8.1.4 Output file location in Java mode
+
- 8.1.5 Output file location in C# mode
+
- 8.1.6 Output file location in Tcl mode
+
- 8.1.7 Input file syntax
+
- 8.1.8 Input file interpretation
+
- 8.1.9 Output details
+
- 8.1.10 Informative output
+
+ - 8.2 Invoking the
msgunfmt Program
-- 8.2.1 Operation mode
-
- 8.2.2 Input file location
-
- 8.2.3 Input file location in Java mode
-
- 8.2.4 Input file location in Tcl mode
-
- 8.2.5 Output file location
-
- 8.2.6 Output details
-
- 8.2.7 Informative output
+
- 8.2.1 Operation mode
+
- 8.2.2 Input file location
+
- 8.2.3 Input file location in Java mode
+
- 8.2.4 Input file location in C# mode
+
- 8.2.5 Input file location in Tcl mode
+
- 8.2.6 Output file location
+
- 8.2.7 Output details
+
- 8.2.8 Informative output
- - 8.3 The Format of GNU MO Files
+
- 8.3 The Format of GNU MO Files
-
- 9 The User's View
+
- 9 The User's View
-
- 10 The Programmer's View
-
-- 10.1 About
catgets
+ - 10 The Programmer's View
-
- 10.2 About
gettext
+ - 10.1 About
catgets
-- 10.2.1 The Interface
-
- 10.2.2 Solving Ambiguities
-
- 10.2.3 Locating Message Catalog Files
-
- 10.2.4 How to specify the output character set
gettext uses
- - 10.2.5 Additional functions for plural forms
-
- 10.2.6 How to use
gettext in GUI programs
- - 10.2.7 Optimization of the *gettext functions
+
- 10.1.1 The Interface
+
- 10.1.2 Problems with the
catgets Interface?!
+
+ - 10.2 About
gettext
+
- - 10.3 Comparing the Two Interfaces
-
- 10.4 Using libintl.a in own programs
-
- 10.5 Being a
gettext grok
- - 10.6 Temporary Notes for the Programmers Chapter
-
-
- - 11 The Translator's View
-
-
- 12 The Maintainer's View
-
-- 12.1 Flat or Non-Flat Directory Structures
-
- 12.2 Prerequisite Works
-
- 12.3 Invoking the
gettextize Program
- - 12.4 Files You Must Create or Alter
-
-- 12.4.1 `POTFILES.in´ in `po/´
-
- 12.4.2 `LINGUAS´ in `po/´
-
- 12.4.3 `Makefile´ pieces in `po/´
-
- 12.4.4 `configure.in´ at top level
-
- 12.4.5 `config.guess´, `config.sub´ at top level
-
- 12.4.6 `mkinstalldirs´ at top level
-
- 12.4.7 `aclocal.m4´ at top level
-
- 12.4.8 `acconfig.h´ at top level
-
- 12.4.9 `config.h.in´ at top level
-
- 12.4.10 `Makefile.in´ at top level
-
- 12.4.11 `Makefile.in´ in `src/´
-
- 12.4.12 `gettext.h´ in `lib/´
-
- - 12.5 Autoconf macros for use in `configure.in´
-
-
- 12.6 Integrating with CVS
-
-
- - 13 Other Programming Languages
-
-- 13.1 The Language Implementor's View
-
- 13.2 The Programmer's View
-
- 13.3 The Translator's View
-
-- 13.3.1 C Format Strings
-
- 13.3.2 Objective C Format Strings
-
- 13.3.3 Shell Format Strings
-
- 13.3.4 Python Format Strings
-
- 13.3.5 Lisp Format Strings
-
- 13.3.6 Emacs Lisp Format Strings
-
- 13.3.7 librep Format Strings
-
- 13.3.8 Smalltalk Format Strings
-
- 13.3.9 Java Format Strings
-
- 13.3.10 awk Format Strings
-
- 13.3.11 Object Pascal Format Strings
-
- 13.3.12 YCP Format Strings
-
- 13.3.13 Tcl Format Strings
-
- 13.3.14 Perl Format Strings
-
- 13.3.15 PHP Format Strings
-
- 13.3.16 GCC internal Format Strings
-
- 13.3.17 Qt Format Strings
-
- - 13.4 The Maintainer's View
-
- 13.5 Individual Programming Languages
-
-- 13.5.1 C, C++, Objective C
-
- 13.5.2 sh - Shell Script
-
-- 13.5.2.1 Preparing Shell Scripts for Internationalization
-
- 13.5.2.2 Contents of
gettext.sh
- - 13.5.2.3 Invoking the
gettext program
- - 13.5.2.4 Invoking the
ngettext program
- - 13.5.2.5 Invoking the
envsubst program
- - 13.5.2.6 Invoking the
eval_gettext function
- - 13.5.2.7 Invoking the
eval_ngettext function
-
- - 13.5.3 bash - Bourne-Again Shell Script
-
- 13.5.4 Python
-
- 13.5.5 GNU clisp - Common Lisp
-
- 13.5.6 GNU clisp C sources
-
- 13.5.7 Emacs Lisp
-
- 13.5.8 librep
-
- 13.5.9 GNU Smalltalk
-
- 13.5.10 Java
-
- 13.5.11 GNU awk
-
- 13.5.12 Pascal - Free Pascal Compiler
-
- 13.5.13 wxWindows library
-
- 13.5.14 YCP - YaST2 scripting language
-
- 13.5.15 Tcl - Tk's scripting language
-
- 13.5.16 Perl
-
-- 13.5.16.1 General Problems Parsing Perl Code
-
- 13.5.16.2 Which keywords will xgettext look for?
-
- 13.5.16.3 How to Extract Hash Keys
-
- 13.5.16.4 What are Strings And Quote-like Expressions?
-
- 13.5.16.5 Invalid Uses Of String Interpolation
-
- 13.5.16.6 Valid Uses Of String Interpolation
-
- 13.5.16.7 When To Use Parentheses
-
- 13.5.16.8 How To Grok with Long Lines
-
- 13.5.16.9 Bugs, Pitfalls, And Things That Do Not Work
-
- - 13.5.17 PHP Hypertext Preprocessor
-
- 13.5.18 Pike
-
- 13.5.19 GNU Compiler Collection sources
-
- - 13.6 Internationalizable Data
-
-
- - 14 Concluding Remarks
-
-
- A Language Codes
-
- B Country Codes
-
- Program Index
-
- Option Index
-
- Variable Index
-
- PO Mode Index
-
- Autoconf Macro Index
-
- General Index
+
- 10.3 Comparing the Two Interfaces
+
- 10.4 Using libintl.a in own programs
+
- 10.5 Being a
gettext grok
+ - 10.6 Temporary Notes for the Programmers Chapter
+
+
+
- 11 The Translator's View
+
+
- 12 The Maintainer's View
+
+- 12.1 Flat or Non-Flat Directory Structures
+
- 12.2 Prerequisite Works
+
- 12.3 Invoking the
gettextize Program
+ - 12.4 Files You Must Create or Alter
+
+- 12.4.1 `POTFILES.in´ in `po/´
+
- 12.4.2 `LINGUAS´ in `po/´
+
- 12.4.3 `Makefile´ pieces in `po/´
+
- 12.4.4 `configure.in´ at top level
+
- 12.4.5 `config.guess´, `config.sub´ at top level
+
- 12.4.6 `mkinstalldirs´ at top level
+
- 12.4.7 `aclocal.m4´ at top level
+
- 12.4.8 `acconfig.h´ at top level
+
- 12.4.9 `config.h.in´ at top level
+
- 12.4.10 `Makefile.in´ at top level
+
- 12.4.11 `Makefile.in´ in `src/´
+
- 12.4.12 `gettext.h´ in `lib/´
+
+ - 12.5 Autoconf macros for use in `configure.in´
+
+
- 12.6 Integrating with CVS
+
+
+ - 13 Other Programming Languages
+
+- 13.1 The Language Implementor's View
+
- 13.2 The Programmer's View
+
- 13.3 The Translator's View
+
+- 13.3.1 C Format Strings
+
- 13.3.2 Objective C Format Strings
+
- 13.3.3 Shell Format Strings
+
- 13.3.4 Python Format Strings
+
- 13.3.5 Lisp Format Strings
+
- 13.3.6 Emacs Lisp Format Strings
+
- 13.3.7 librep Format Strings
+
- 13.3.8 Smalltalk Format Strings
+
- 13.3.9 Java Format Strings
+
- 13.3.10 C# Format Strings
+
- 13.3.11 awk Format Strings
+
- 13.3.12 Object Pascal Format Strings
+
- 13.3.13 YCP Format Strings
+
- 13.3.14 Tcl Format Strings
+
- 13.3.15 Perl Format Strings
+
- 13.3.16 PHP Format Strings
+
- 13.3.17 GCC internal Format Strings
+
- 13.3.18 Qt Format Strings
+
+ - 13.4 The Maintainer's View
+
- 13.5 Individual Programming Languages
+
+- 13.5.1 C, C++, Objective C
+
- 13.5.2 sh - Shell Script
+
+- 13.5.2.1 Preparing Shell Scripts for Internationalization
+
- 13.5.2.2 Contents of
gettext.sh
+ - 13.5.2.3 Invoking the
gettext program
+ - 13.5.2.4 Invoking the
ngettext program
+ - 13.5.2.5 Invoking the
envsubst program
+ - 13.5.2.6 Invoking the
eval_gettext function
+ - 13.5.2.7 Invoking the
eval_ngettext function
+
+ - 13.5.3 bash - Bourne-Again Shell Script
+
- 13.5.4 Python
+
- 13.5.5 GNU clisp - Common Lisp
+
- 13.5.6 GNU clisp C sources
+
- 13.5.7 Emacs Lisp
+
- 13.5.8 librep
+
- 13.5.9 GNU Smalltalk
+
- 13.5.10 Java
+
- 13.5.11 C#
+
- 13.5.12 GNU awk
+
- 13.5.13 Pascal - Free Pascal Compiler
+
- 13.5.14 wxWindows library
+
- 13.5.15 YCP - YaST2 scripting language
+
- 13.5.16 Tcl - Tk's scripting language
+
- 13.5.17 Perl
+
+- 13.5.17.1 General Problems Parsing Perl Code
+
- 13.5.17.2 Which keywords will xgettext look for?
+
- 13.5.17.3 How to Extract Hash Keys
+
- 13.5.17.4 What are Strings And Quote-like Expressions?
+
- 13.5.17.5 Invalid Uses Of String Interpolation
+
- 13.5.17.6 Valid Uses Of String Interpolation
+
- 13.5.17.7 When To Use Parentheses
+
- 13.5.17.8 How To Grok with Long Lines
+
- 13.5.17.9 Bugs, Pitfalls, And Things That Do Not Work
+
+ - 13.5.18 PHP Hypertext Preprocessor
+
- 13.5.19 Pike
+
- 13.5.20 GNU Compiler Collection sources
+
+ - 13.6 Internationalizable Data
+
+
+ - 14 Concluding Remarks
+
+
- A Language Codes
+
- B Country Codes
+
- Program Index
+
- Option Index
+
- Variable Index
+
- PO Mode Index
+
- Autoconf Macro Index
+
- General Index
-This document was generated on 9 December 2003 using the
+This document was generated on 28 January 2004 using the
texi2html
translator version 1.52a.
diff --git a/gettext-tools/doc/iso-639.texi b/gettext-tools/doc/iso-639.texi
index bc121cca9..b8694b11e 100644
--- a/gettext-tools/doc/iso-639.texi
+++ b/gettext-tools/doc/iso-639.texi
@@ -6,6 +6,8 @@ Abkhazian.
Avestan.
@item af
Afrikaans.
+@item ak
+Akan.
@item am
Amharic.
@item an
@@ -14,6 +16,8 @@ Aragonese.
Arabic.
@item as
Assamese.
+@item av
+Avaric.
@item ay
Aymara.
@item az
@@ -28,6 +32,8 @@ Bulgarian.
Bihari.
@item bi
Bislama.
+@item bm
+Bambara.
@item bn
Bengali; Bangla.
@item bo
@@ -44,6 +50,8 @@ Chechen.
Chamorro.
@item co
Corsican.
+@item cr
+Cree.
@item cs
Czech.
@item cu
@@ -56,8 +64,12 @@ Welsh.
Danish.
@item de
German.
+@item dv
+Divehi.
@item dz
Dzongkha; Bhutani.
+@item ee
+@'Ew@'e.
@item el
Greek.
@item en
@@ -72,6 +84,8 @@ Estonian.
Basque.
@item fa
Persian.
+@item ff
+Fulah.
@item fi
Finnish.
@item fj
@@ -118,6 +132,8 @@ Interlingua.
Indonesian (formerly in).
@item ie
Interlingue.
+@item ig
+Igbo.
@item ii
Sichuan Yi.
@item ik
@@ -136,6 +152,8 @@ Japanese.
Javanese.
@item ka
Georgian.
+@item kg
+Kongo.
@item ki
Kikuyu.
@item kj
@@ -150,6 +168,8 @@ Khmer; Cambodian.
Kannada.
@item ko
Korean.
+@item kr
+Kanuri.
@item ks
Kashmiri.
@item ku
@@ -164,6 +184,8 @@ Kirghiz.
Latin.
@item lb
Letzeburgesch.
+@item lg
+Ganda.
@item li
Limburgish; Limburger; Limburgan.
@item ln
@@ -172,6 +194,8 @@ Lingala.
Lao; Laotian.
@item lt
Lithuanian.
+@item lu
+Luba-Katanga.
@item lv
Latvian; Lettish.
@item mg
@@ -220,6 +244,8 @@ Navajo.
Chichewa; Nyanja.
@item oc
Occitan; Proven@,{c}al.
+@item oj
+Ojibwa.
@item om
(Afan) Oromo.
@item or
@@ -320,6 +346,8 @@ Ukrainian.
Urdu.
@item uz
Uzbek.
+@item ve
+Venda.
@item vi
Vietnamese.
@item vo
diff --git a/gettext-tools/doc/version.texi b/gettext-tools/doc/version.texi
index f397258aa..041470dbc 100644
--- a/gettext-tools/doc/version.texi
+++ b/gettext-tools/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 7 December 2003
-@set UPDATED-MONTH December 2003
-@set EDITION 0.13.1
-@set VERSION 0.13.1
+@set UPDATED 17 January 2004
+@set UPDATED-MONTH January 2004
+@set EDITION 0.14
+@set VERSION 0.14
diff --git a/gettext-tools/examples/Makefile.in b/gettext-tools/examples/Makefile.in
index 5c2bd1896..55e4ed69c 100644
--- a/gettext-tools/examples/Makefile.in
+++ b/gettext-tools/examples/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 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.
@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -36,6 +35,81 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+subdir = examples
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/installpaths.in ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
+ $(top_srcdir)/../config/m4/libtool.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intmax.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes-pri.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/nls.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/po.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/printf-posix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/progtest.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/signed.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/size_max.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
+ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
+ $(top_srcdir)/m4/backupfile.m4 \
+ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \
+ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \
+ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \
+ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/extensions.m4 \
+ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/gcj.m4 \
+ $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getndelim2.m4 \
+ $(top_srcdir)/m4/hostname.m4 $(top_srcdir)/m4/javacomp.m4 \
+ $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/locale-fr.m4 \
+ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+ $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \
+ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/relocatable.m4 \
+ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \
+ $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \
+ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \
+ $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/strerror.m4 \
+ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = installpaths
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
+am__installdirs = $(DESTDIR)$(examplesdir)
+examplesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(examples_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
@@ -48,6 +122,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILDCSHARP = @BUILDCSHARP@
BUILDJAVA = @BUILDJAVA@
BUILDJAVAEXE = @BUILDJAVAEXE@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -60,6 +135,7 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS_COMPILING = @CROSS_COMPILING@
+CSHARP_CHOICE = @CSHARP_CHOICE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -76,6 +152,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMACS = @EMACS@
+EMACSLOADPATH = @EMACSLOADPATH@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -86,11 +163,17 @@ GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_CSC = @HAVE_CSC@
+HAVE_CSCC = @HAVE_CSCC@
+HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
+HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
HAVE_GCJ = @HAVE_GCJ@
HAVE_GCJ_C = @HAVE_GCJ_C@
HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
HAVE_GIJ = @HAVE_GIJ@
HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
+HAVE_ILRUN = @HAVE_ILRUN@
+HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
HAVE_JAVA = @HAVE_JAVA@
HAVE_JAVAC = @HAVE_JAVAC@
HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
@@ -102,6 +185,10 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
+HAVE_MCS = @HAVE_MCS@
+HAVE_MCS_IN_PATH = @HAVE_MCS_IN_PATH@
+HAVE_MONO = @HAVE_MONO@
+HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_WPRINTF = @HAVE_WPRINTF@
@@ -127,13 +214,14 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LOCALE_FR = @LOCALE_FR@
-LTALLOCA = @LTALLOCA@
LTLIBEXPAT = @LTLIBEXPAT@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_PATH = @MONO_PATH@
+MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
OBJDUMP = @OBJDUMP@
@@ -156,7 +244,9 @@ SET_RELOCATABLE = @SET_RELOCATABLE@
SHELL = @SHELL@
STDBOOL_H = @STDBOOL_H@
STRIP = @STRIP@
+TESTCSHARP = @TESTCSHARP@
TESTJAVA = @TESTJAVA@
+TESTLIBASPRINTF = @TESTLIBASPRINTF@
TEXI2PDF = @TEXI2PDF@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
@@ -187,7 +277,6 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
-
docdir = @docdir@
exec_prefix = @exec_prefix@
host = @host@
@@ -204,6 +293,7 @@ lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -211,19 +301,15 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
AUTOMAKE_OPTIONS = 1.2 gnits
SUBDIRS = po
-
# VMS support.
# Woe32 support.
EXTRA_DIST = Makefile.vms Makefile.msvc
examplesdir = $(docdir)/examples
-
examples_DATA = installpaths
-
EXAMPLESFILES = \
\
hello-c/INSTALL \
@@ -236,13 +322,16 @@ EXAMPLESFILES = \
hello-c/po/Makevars \
hello-c/po/POTFILES.in \
hello-c/po/LINGUAS \
+ hello-c/po/af.po \
hello-c/po/ca.po \
hello-c/po/de.po \
hello-c/po/es.po \
hello-c/po/fr.po \
hello-c/po/ja.po \
+ hello-c/po/nl.po \
hello-c/po/pl.po \
hello-c/po/ro.po \
+ hello-c/po/sk.po \
hello-c/po/sr.po \
hello-c/po/sv.po \
hello-c/po/tr.po \
@@ -261,13 +350,16 @@ EXAMPLESFILES = \
hello-c-gnome/po/Makevars \
hello-c-gnome/po/POTFILES.in \
hello-c-gnome/po/LINGUAS \
+ hello-c-gnome/po/af.po \
hello-c-gnome/po/ca.po \
hello-c-gnome/po/de.po \
hello-c-gnome/po/es.po \
hello-c-gnome/po/fr.po \
hello-c-gnome/po/ja.po \
+ hello-c-gnome/po/nl.po \
hello-c-gnome/po/pl.po \
hello-c-gnome/po/ro.po \
+ hello-c-gnome/po/sk.po \
hello-c-gnome/po/sr.po \
hello-c-gnome/po/sv.po \
hello-c-gnome/po/tr.po \
@@ -283,13 +375,16 @@ EXAMPLESFILES = \
hello-c++/po/Makevars \
hello-c++/po/POTFILES.in \
hello-c++/po/LINGUAS \
+ hello-c++/po/af.po \
hello-c++/po/ca.po \
hello-c++/po/de.po \
hello-c++/po/es.po \
hello-c++/po/fr.po \
hello-c++/po/ja.po \
+ hello-c++/po/nl.po \
hello-c++/po/pl.po \
hello-c++/po/ro.po \
+ hello-c++/po/sk.po \
hello-c++/po/sr.po \
hello-c++/po/sv.po \
hello-c++/po/tr.po \
@@ -306,13 +401,16 @@ EXAMPLESFILES = \
hello-c++-qt/m4/qt.m4 \
hello-c++-qt/po/Makefile.am \
hello-c++-qt/po/LINGUAS \
+ hello-c++-qt/po/af.po \
hello-c++-qt/po/ca.po \
hello-c++-qt/po/de.po \
hello-c++-qt/po/es.po \
hello-c++-qt/po/fr.po \
hello-c++-qt/po/ja.po \
+ hello-c++-qt/po/nl.po \
hello-c++-qt/po/pl.po \
hello-c++-qt/po/ro.po \
+ hello-c++-qt/po/sk.po \
hello-c++-qt/po/sr.po \
hello-c++-qt/po/sv.po \
hello-c++-qt/po/tr.po \
@@ -328,16 +426,43 @@ EXAMPLESFILES = \
hello-c++-kde/Makefile.am \
hello-c++-kde/configure.in.in \
hello-c++-kde/m4/Makefile.am \
+ hello-c++-kde/admin/acinclude.m4.in \
+ hello-c++-kde/admin/am_edit \
+ hello-c++-kde/admin/ChangeLog \
+ hello-c++-kde/admin/compile \
+ hello-c++-kde/admin/conf.change.pl \
+ hello-c++-kde/admin/config.guess \
+ hello-c++-kde/admin/config.pl \
+ hello-c++-kde/admin/config.sub \
+ hello-c++-kde/admin/configure.in.bot.end \
+ hello-c++-kde/admin/configure.in.min \
+ hello-c++-kde/admin/cvs-clean.pl \
+ hello-c++-kde/admin/cvs.sh \
+ hello-c++-kde/admin/debianrules \
+ hello-c++-kde/admin/depcomp \
+ hello-c++-kde/admin/detect-autoconf.sh \
+ hello-c++-kde/admin/Doxyfile.am \
+ hello-c++-kde/admin/Doxyfile.global \
+ hello-c++-kde/admin/install-sh \
+ hello-c++-kde/admin/libtool.m4.in \
+ hello-c++-kde/admin/ltmain.sh \
+ hello-c++-kde/admin/Makefile.common \
+ hello-c++-kde/admin/missing \
+ hello-c++-kde/admin/mkinstalldirs \
+ hello-c++-kde/admin/ylwrap \
hello-c++-kde/po/Makevars \
hello-c++-kde/po/POTFILES.in \
hello-c++-kde/po/LINGUAS \
+ hello-c++-kde/po/af.po \
hello-c++-kde/po/ca.po \
hello-c++-kde/po/de.po \
hello-c++-kde/po/es.po \
hello-c++-kde/po/fr.po \
hello-c++-kde/po/ja.po \
+ hello-c++-kde/po/nl.po \
hello-c++-kde/po/pl.po \
hello-c++-kde/po/ro.po \
+ hello-c++-kde/po/sk.po \
hello-c++-kde/po/sr.po \
hello-c++-kde/po/sv.po \
hello-c++-kde/po/tr.po \
@@ -358,13 +483,16 @@ EXAMPLESFILES = \
hello-c++-gnome/po/Makevars \
hello-c++-gnome/po/POTFILES.in \
hello-c++-gnome/po/LINGUAS \
+ hello-c++-gnome/po/af.po \
hello-c++-gnome/po/ca.po \
hello-c++-gnome/po/de.po \
hello-c++-gnome/po/es.po \
hello-c++-gnome/po/fr.po \
hello-c++-gnome/po/ja.po \
+ hello-c++-gnome/po/nl.po \
hello-c++-gnome/po/pl.po \
hello-c++-gnome/po/ro.po \
+ hello-c++-gnome/po/sk.po \
hello-c++-gnome/po/sr.po \
hello-c++-gnome/po/sv.po \
hello-c++-gnome/po/tr.po \
@@ -380,13 +508,16 @@ EXAMPLESFILES = \
hello-objc/po/Makevars \
hello-objc/po/POTFILES.in \
hello-objc/po/LINGUAS \
+ hello-objc/po/af.po \
hello-objc/po/ca.po \
hello-objc/po/de.po \
hello-objc/po/es.po \
hello-objc/po/fr.po \
hello-objc/po/ja.po \
+ hello-objc/po/nl.po \
hello-objc/po/pl.po \
hello-objc/po/ro.po \
+ hello-objc/po/sk.po \
hello-objc/po/sr.po \
hello-objc/po/sv.po \
hello-objc/po/tr.po \
@@ -405,13 +536,16 @@ EXAMPLESFILES = \
hello-objc-gnustep/po/GNUmakefile \
hello-objc-gnustep/po/LocaleAliases \
hello-objc-gnustep/po/LINGUAS \
+ hello-objc-gnustep/po/af.po \
hello-objc-gnustep/po/ca.po \
hello-objc-gnustep/po/de.po \
hello-objc-gnustep/po/es.po \
hello-objc-gnustep/po/fr.po \
hello-objc-gnustep/po/ja.po \
+ hello-objc-gnustep/po/nl.po \
hello-objc-gnustep/po/pl.po \
hello-objc-gnustep/po/ro.po \
+ hello-objc-gnustep/po/sk.po \
hello-objc-gnustep/po/sr.po \
hello-objc-gnustep/po/sv.po \
hello-objc-gnustep/po/tr.po \
@@ -430,13 +564,16 @@ EXAMPLESFILES = \
hello-objc-gnome/po/Makevars \
hello-objc-gnome/po/POTFILES.in \
hello-objc-gnome/po/LINGUAS \
+ hello-objc-gnome/po/af.po \
hello-objc-gnome/po/ca.po \
hello-objc-gnome/po/de.po \
hello-objc-gnome/po/es.po \
hello-objc-gnome/po/fr.po \
hello-objc-gnome/po/ja.po \
+ hello-objc-gnome/po/nl.po \
hello-objc-gnome/po/pl.po \
hello-objc-gnome/po/ro.po \
+ hello-objc-gnome/po/sk.po \
hello-objc-gnome/po/sr.po \
hello-objc-gnome/po/sv.po \
hello-objc-gnome/po/tr.po \
@@ -451,13 +588,16 @@ EXAMPLESFILES = \
hello-sh/m4/Makefile.am \
hello-sh/po/Makefile.am \
hello-sh/po/LINGUAS \
+ hello-sh/po/af.po \
hello-sh/po/ca.po \
hello-sh/po/de.po \
hello-sh/po/es.po \
hello-sh/po/fr.po \
hello-sh/po/ja.po \
+ hello-sh/po/nl.po \
hello-sh/po/pl.po \
hello-sh/po/ro.po \
+ hello-sh/po/sk.po \
hello-sh/po/sr.po \
hello-sh/po/sv.po \
hello-sh/po/tr.po \
@@ -472,13 +612,16 @@ EXAMPLESFILES = \
hello-python/m4/Makefile.am \
hello-python/po/Makefile.am \
hello-python/po/LINGUAS \
+ hello-python/po/af.po \
hello-python/po/ca.po \
hello-python/po/de.po \
hello-python/po/es.po \
hello-python/po/fr.po \
hello-python/po/ja.po \
+ hello-python/po/nl.po \
hello-python/po/pl.po \
hello-python/po/ro.po \
+ hello-python/po/sk.po \
hello-python/po/sr.po \
hello-python/po/sv.po \
hello-python/po/tr.po \
@@ -493,13 +636,16 @@ EXAMPLESFILES = \
hello-clisp/m4/Makefile.am \
hello-clisp/po/Makefile.am \
hello-clisp/po/LINGUAS \
+ hello-clisp/po/af.po \
hello-clisp/po/ca.po \
hello-clisp/po/de.po \
hello-clisp/po/es.po \
hello-clisp/po/fr.po \
hello-clisp/po/ja.po \
+ hello-clisp/po/nl.po \
hello-clisp/po/pl.po \
hello-clisp/po/ro.po \
+ hello-clisp/po/sk.po \
hello-clisp/po/sr.po \
hello-clisp/po/sv.po \
hello-clisp/po/tr.po \
@@ -514,13 +660,16 @@ EXAMPLESFILES = \
hello-librep/m4/Makefile.am \
hello-librep/po/Makefile.am \
hello-librep/po/LINGUAS \
+ hello-librep/po/af.po \
hello-librep/po/ca.po \
hello-librep/po/de.po \
hello-librep/po/es.po \
hello-librep/po/fr.po \
hello-librep/po/ja.po \
+ hello-librep/po/nl.po \
hello-librep/po/pl.po \
hello-librep/po/ro.po \
+ hello-librep/po/sk.po \
hello-librep/po/sr.po \
hello-librep/po/sv.po \
hello-librep/po/tr.po \
@@ -535,13 +684,16 @@ EXAMPLESFILES = \
hello-smalltalk/m4/Makefile.am \
hello-smalltalk/po/Makefile.am \
hello-smalltalk/po/LINGUAS \
+ hello-smalltalk/po/af.po \
hello-smalltalk/po/ca.po \
hello-smalltalk/po/de.po \
hello-smalltalk/po/es.po \
hello-smalltalk/po/fr.po \
hello-smalltalk/po/ja.po \
+ hello-smalltalk/po/nl.po \
hello-smalltalk/po/pl.po \
hello-smalltalk/po/ro.po \
+ hello-smalltalk/po/sk.po \
hello-smalltalk/po/sr.po \
hello-smalltalk/po/sv.po \
hello-smalltalk/po/tr.po \
@@ -556,13 +708,16 @@ EXAMPLESFILES = \
hello-java/m4/Makefile.am \
hello-java/po/Makefile.am \
hello-java/po/LINGUAS \
+ hello-java/po/af.po \
hello-java/po/ca.po \
hello-java/po/de.po \
hello-java/po/es.po \
hello-java/po/fr.po \
hello-java/po/ja.po \
+ hello-java/po/nl.po \
hello-java/po/pl.po \
hello-java/po/ro.po \
+ hello-java/po/sk.po \
hello-java/po/sr.po \
hello-java/po/sv.po \
hello-java/po/tr.po \
@@ -580,13 +735,16 @@ EXAMPLESFILES = \
hello-java-awt/m4/TestAWT.class \
hello-java-awt/po/Makefile.am \
hello-java-awt/po/LINGUAS \
+ hello-java-awt/po/af.po \
hello-java-awt/po/ca.po \
hello-java-awt/po/de.po \
hello-java-awt/po/es.po \
hello-java-awt/po/fr.po \
hello-java-awt/po/ja.po \
+ hello-java-awt/po/nl.po \
hello-java-awt/po/pl.po \
hello-java-awt/po/ro.po \
+ hello-java-awt/po/sk.po \
hello-java-awt/po/sr.po \
hello-java-awt/po/sv.po \
hello-java-awt/po/tr.po \
@@ -604,18 +762,70 @@ EXAMPLESFILES = \
hello-java-swing/m4/TestAWT.class \
hello-java-swing/po/Makefile.am \
hello-java-swing/po/LINGUAS \
+ hello-java-swing/po/af.po \
hello-java-swing/po/ca.po \
hello-java-swing/po/de.po \
hello-java-swing/po/es.po \
hello-java-swing/po/fr.po \
hello-java-swing/po/ja.po \
+ hello-java-swing/po/nl.po \
hello-java-swing/po/pl.po \
hello-java-swing/po/ro.po \
+ hello-java-swing/po/sk.po \
hello-java-swing/po/sr.po \
hello-java-swing/po/sv.po \
hello-java-swing/po/tr.po \
hello-java-swing/po/zh_CN.po \
\
+ hello-csharp/INSTALL \
+ hello-csharp/autogen.sh \
+ hello-csharp/autoclean.sh \
+ hello-csharp/hello.cs \
+ hello-csharp/Makefile.am \
+ hello-csharp/configure.ac \
+ hello-csharp/m4/Makefile.am \
+ hello-csharp/po/Makefile.am \
+ hello-csharp/po/LINGUAS \
+ hello-csharp/po/af.po \
+ hello-csharp/po/ca.po \
+ hello-csharp/po/de.po \
+ hello-csharp/po/es.po \
+ hello-csharp/po/fr.po \
+ hello-csharp/po/ja.po \
+ hello-csharp/po/nl.po \
+ hello-csharp/po/pl.po \
+ hello-csharp/po/ro.po \
+ hello-csharp/po/sk.po \
+ hello-csharp/po/sr.po \
+ hello-csharp/po/sv.po \
+ hello-csharp/po/tr.po \
+ hello-csharp/po/zh_CN.po \
+ \
+ hello-csharp-forms/INSTALL \
+ hello-csharp-forms/BUGS \
+ hello-csharp-forms/autogen.sh \
+ hello-csharp-forms/autoclean.sh \
+ hello-csharp-forms/hello.cs \
+ hello-csharp-forms/Makefile.am \
+ hello-csharp-forms/configure.ac \
+ hello-csharp-forms/m4/Makefile.am \
+ hello-csharp-forms/po/Makefile.am \
+ hello-csharp-forms/po/LINGUAS \
+ hello-csharp-forms/po/af.po \
+ hello-csharp-forms/po/ca.po \
+ hello-csharp-forms/po/de.po \
+ hello-csharp-forms/po/es.po \
+ hello-csharp-forms/po/fr.po \
+ hello-csharp-forms/po/ja.po \
+ hello-csharp-forms/po/nl.po \
+ hello-csharp-forms/po/pl.po \
+ hello-csharp-forms/po/ro.po \
+ hello-csharp-forms/po/sk.po \
+ hello-csharp-forms/po/sr.po \
+ hello-csharp-forms/po/sv.po \
+ hello-csharp-forms/po/tr.po \
+ hello-csharp-forms/po/zh_CN.po \
+ \
hello-gawk/INSTALL \
hello-gawk/autogen.sh \
hello-gawk/autoclean.sh \
@@ -625,13 +835,16 @@ EXAMPLESFILES = \
hello-gawk/m4/Makefile.am \
hello-gawk/po/Makefile.am \
hello-gawk/po/LINGUAS \
+ hello-gawk/po/af.po \
hello-gawk/po/ca.po \
hello-gawk/po/de.po \
hello-gawk/po/es.po \
hello-gawk/po/fr.po \
hello-gawk/po/ja.po \
+ hello-gawk/po/nl.po \
hello-gawk/po/pl.po \
hello-gawk/po/ro.po \
+ hello-gawk/po/sk.po \
hello-gawk/po/sr.po \
hello-gawk/po/sv.po \
hello-gawk/po/tr.po \
@@ -647,13 +860,16 @@ EXAMPLESFILES = \
hello-pascal/m4/Makefile.am \
hello-pascal/po/Makefile.am \
hello-pascal/po/LINGUAS \
+ hello-pascal/po/af.po \
hello-pascal/po/ca.po \
hello-pascal/po/de.po \
hello-pascal/po/es.po \
hello-pascal/po/fr.po \
hello-pascal/po/ja.po \
+ hello-pascal/po/nl.po \
hello-pascal/po/pl.po \
hello-pascal/po/ro.po \
+ hello-pascal/po/sk.po \
hello-pascal/po/sr.po \
hello-pascal/po/sv.po \
hello-pascal/po/tr.po \
@@ -668,13 +884,16 @@ EXAMPLESFILES = \
hello-ycp/m4/Makefile.am \
hello-ycp/po/Makefile.am \
hello-ycp/po/LINGUAS \
+ hello-ycp/po/af.po \
hello-ycp/po/ca.po \
hello-ycp/po/de.po \
hello-ycp/po/es.po \
hello-ycp/po/fr.po \
hello-ycp/po/ja.po \
+ hello-ycp/po/nl.po \
hello-ycp/po/pl.po \
hello-ycp/po/ro.po \
+ hello-ycp/po/sk.po \
hello-ycp/po/sr.po \
hello-ycp/po/sv.po \
hello-ycp/po/tr.po \
@@ -689,13 +908,16 @@ EXAMPLESFILES = \
hello-tcl/m4/Makefile.am \
hello-tcl/po/Makefile.am \
hello-tcl/po/LINGUAS \
+ hello-tcl/po/af.po \
hello-tcl/po/ca.po \
hello-tcl/po/de.po \
hello-tcl/po/es.po \
hello-tcl/po/fr.po \
hello-tcl/po/ja.po \
+ hello-tcl/po/nl.po \
hello-tcl/po/pl.po \
hello-tcl/po/ro.po \
+ hello-tcl/po/sk.po \
hello-tcl/po/sr.po \
hello-tcl/po/sv.po \
hello-tcl/po/tr.po \
@@ -710,13 +932,16 @@ EXAMPLESFILES = \
hello-tcl-tk/m4/Makefile.am \
hello-tcl-tk/po/Makefile.am \
hello-tcl-tk/po/LINGUAS \
+ hello-tcl-tk/po/af.po \
hello-tcl-tk/po/ca.po \
hello-tcl-tk/po/de.po \
hello-tcl-tk/po/es.po \
hello-tcl-tk/po/fr.po \
hello-tcl-tk/po/ja.po \
+ hello-tcl-tk/po/nl.po \
hello-tcl-tk/po/pl.po \
hello-tcl-tk/po/ro.po \
+ hello-tcl-tk/po/sk.po \
hello-tcl-tk/po/sr.po \
hello-tcl-tk/po/sv.po \
hello-tcl-tk/po/tr.po \
@@ -732,13 +957,16 @@ EXAMPLESFILES = \
hello-perl/m4/Makefile.am \
hello-perl/po/Makefile.am \
hello-perl/po/LINGUAS \
+ hello-perl/po/af.po \
hello-perl/po/ca.po \
hello-perl/po/de.po \
hello-perl/po/es.po \
hello-perl/po/fr.po \
hello-perl/po/ja.po \
+ hello-perl/po/nl.po \
hello-perl/po/pl.po \
hello-perl/po/ro.po \
+ hello-perl/po/sk.po \
hello-perl/po/sr.po \
hello-perl/po/sv.po \
hello-perl/po/tr.po \
@@ -754,13 +982,16 @@ EXAMPLESFILES = \
hello-php/m4/Makefile.am \
hello-php/po/Makefile.am \
hello-php/po/LINGUAS \
+ hello-php/po/af.po \
hello-php/po/ca.po \
hello-php/po/de.po \
hello-php/po/es.po \
hello-php/po/fr.po \
hello-php/po/ja.po \
+ hello-php/po/nl.po \
hello-php/po/pl.po \
hello-php/po/ro.po \
+ hello-php/po/sk.po \
hello-php/po/sr.po \
hello-php/po/sv.po \
hello-php/po/tr.po \
@@ -771,32 +1002,39 @@ EXAMPLESFILES = \
# Temporary directories created by po/Makefile.
CLEANFILES = tmp-hello-*
-subdir = examples
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = installpaths
-DIST_SOURCES =
-DATA = $(examples_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am \
- installpaths.in
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits examples/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnits examples/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-installpaths: $(top_builddir)/config.status installpaths.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+installpaths: $(top_builddir)/config.status $(srcdir)/installpaths.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
@@ -808,10 +1046,9 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-examplesDATA_INSTALL = $(INSTALL_DATA)
install-examplesDATA: $(examples_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(examplesdir)
+ $(mkdir_p) $(DESTDIR)$(examplesdir)
@list='$(examples_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -886,14 +1123,6 @@ ctags-recursive:
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -902,6 +1131,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -927,7 +1157,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -950,10 +1179,6 @@ GTAGS:
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -967,7 +1192,7 @@ distdir: $(DISTFILES)
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -984,13 +1209,13 @@ distdir: $(DISTFILES)
done
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || mkdir "$(distdir)/$$subdir" \
|| exit 1; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="../$(top_distdir)" \
+ distdir="../$(distdir)/$$subdir" \
distdir) \
|| exit 1; \
fi; \
@@ -1000,8 +1225,7 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am: installdirs-local
- $(mkinstalldirs) $(DESTDIR)$(examplesdir)
-
+ $(mkdir_p) $(DESTDIR)$(examplesdir)
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -1013,7 +1237,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -1040,6 +1264,8 @@ dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
info: info-recursive
info-am:
@@ -1074,23 +1300,20 @@ uninstall-am: uninstall-examplesDATA uninstall-info-am uninstall-local
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-recursive ctags \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-recursive ctags \
ctags-recursive distclean distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-local \
- install-data-recursive install-examplesDATA install-exec \
- install-exec-am install-exec-recursive install-info \
- install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-examplesDATA uninstall-info-am \
- uninstall-info-recursive uninstall-local uninstall-recursive
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-data-local install-examplesDATA \
+ install-exec install-exec-am install-info install-info-am \
+ install-man install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-examplesDATA \
+ uninstall-info-am uninstall-local
install-data-local: $(EXAMPLESFILES)
diff --git a/gettext-tools/examples/po/Makefile.in b/gettext-tools/examples/po/Makefile.in
index 38a509f30..44148e2da 100644
--- a/gettext-tools/examples/po/Makefile.in
+++ b/gettext-tools/examples/po/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 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.
@@ -13,7 +13,6 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -36,6 +34,68 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+subdir = examples/po
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
+ $(top_srcdir)/../config/m4/libtool.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intmax.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes-pri.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/nls.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/po.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/printf-posix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/progtest.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/signed.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/size_max.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
+ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
+ $(top_srcdir)/m4/backupfile.m4 \
+ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \
+ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \
+ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \
+ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/extensions.m4 \
+ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/gcj.m4 \
+ $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getndelim2.m4 \
+ $(top_srcdir)/m4/hostname.m4 $(top_srcdir)/m4/javacomp.m4 \
+ $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/locale-fr.m4 \
+ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+ $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \
+ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/relocatable.m4 \
+ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \
+ $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \
+ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \
+ $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/strerror.m4 \
+ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
@@ -48,6 +108,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILDCSHARP = @BUILDCSHARP@
BUILDJAVA = @BUILDJAVA@
BUILDJAVAEXE = @BUILDJAVAEXE@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -60,6 +121,7 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS_COMPILING = @CROSS_COMPILING@
+CSHARP_CHOICE = @CSHARP_CHOICE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -76,6 +138,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMACS = @EMACS@
+EMACSLOADPATH = @EMACSLOADPATH@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -86,11 +149,17 @@ GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_CSC = @HAVE_CSC@
+HAVE_CSCC = @HAVE_CSCC@
+HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
+HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
HAVE_GCJ = @HAVE_GCJ@
HAVE_GCJ_C = @HAVE_GCJ_C@
HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
HAVE_GIJ = @HAVE_GIJ@
HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
+HAVE_ILRUN = @HAVE_ILRUN@
+HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
HAVE_JAVA = @HAVE_JAVA@
HAVE_JAVAC = @HAVE_JAVAC@
HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
@@ -102,6 +171,10 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
+HAVE_MCS = @HAVE_MCS@
+HAVE_MCS_IN_PATH = @HAVE_MCS_IN_PATH@
+HAVE_MONO = @HAVE_MONO@
+HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_WPRINTF = @HAVE_WPRINTF@
@@ -127,15 +200,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LOCALE_FR = @LOCALE_FR@
-LTALLOCA = @LTALLOCA@
LTLIBEXPAT = @LTLIBEXPAT@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_PATH = @MONO_PATH@
+MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
MSGFMT = @MSGFMT@
-
MSGMERGE = msgmerge
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -157,7 +230,9 @@ SET_RELOCATABLE = @SET_RELOCATABLE@
SHELL = @SHELL@
STDBOOL_H = @STDBOOL_H@
STRIP = @STRIP@
+TESTCSHARP = @TESTCSHARP@
TESTJAVA = @TESTJAVA@
+TESTLIBASPRINTF = @TESTLIBASPRINTF@
TEXI2PDF = @TEXI2PDF@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
@@ -201,10 +276,10 @@ install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
lispdir = @lispdir@
-
localedir = $(datadir)/locale
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -212,7 +287,6 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
AUTOMAKE_OPTIONS = 1.5 gnits
# List of files which contain translatable strings.
@@ -240,6 +314,8 @@ POTFILES = \
examples/hello-java/Hello.java \
examples/hello-java-awt/Hello.java \
examples/hello-java-swing/Hello.java \
+ examples/hello-csharp/hello.cs \
+ examples/hello-csharp-forms/hello.cs \
examples/hello-gawk/hello.awk \
examples/hello-pascal/hello.pas \
examples/hello-ycp/hello.ycp \
@@ -269,6 +345,8 @@ SMALLPOTS = \
hello-java.pot \
hello-java-awt.pot \
hello-java-swing.pot \
+ hello-csharp.pot \
+ hello-csharp-forms.pot \
hello-gawk.pot \
hello-pascal.pot \
hello-ycp.pot \
@@ -324,20 +402,14 @@ POFILES = @POFILES@
UPDATEPOFILES = @UPDATEPOFILES@
# This is computed as $(foreach lang, $(LINGUAS), $(lang).nop)
DUMMYPOFILES = @DUMMYPOFILES@
-
SUFFIXES = .po .sed .sin .nop .po-update
-
MOSTLYCLEANFILES = remove-potcdate.sed stamp-poT core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po *.o
-
DISTCLEANFILES = $(SMALLPOTS)
-
MAINTAINERCLEANFILES = stamp-po
-
EXTRA_DIST = remove-potcdate.sin xsmallpot.sh mmsmallpo.sh LINGUAS \
$(DOMAIN).pot stamp-po $(POFILES)
-
# Rules for updating small PO files in the other directories.
# Depend on LL being set.
SMALLPOFILES_FOR_lang = \
@@ -358,6 +430,8 @@ SMALLPOFILES_FOR_lang = \
../hello-java/po/$$lang.po \
../hello-java-awt/po/$$lang.po \
../hello-java-swing/po/$$lang.po \
+ ../hello-csharp/po/$$lang.po \
+ ../hello-csharp-forms/po/$$lang.po \
../hello-gawk/po/$$lang.po \
../hello-pascal/po/$$lang.po \
../hello-ycp/po/$$lang.po \
@@ -366,22 +440,39 @@ SMALLPOFILES_FOR_lang = \
../hello-perl/po/$$lang.po \
../hello-php/po/$$lang.po
-subdir = examples/po
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
.SUFFIXES: .po .sed .sin .nop .po-update
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits examples/po/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnits examples/po/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-rm -f *.lo
@@ -398,10 +489,6 @@ TAGS:
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -415,7 +502,7 @@ distdir: $(DISTFILES)
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -433,7 +520,6 @@ distdir: $(DISTFILES)
check-am: all-am
check: check-am
all-am: Makefile all-local
-
installdirs:
install: install-am
install-exec: install-exec-am
@@ -446,7 +532,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -474,6 +560,8 @@ dvi: dvi-am
dvi-am:
+html: html-am
+
info: info-am
info-am:
@@ -508,13 +596,13 @@ uninstall-am: uninstall-info-am
.PHONY: all all-am all-local check check-am clean clean-generic \
clean-libtool distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-info-am
.sin.sed:
@@ -617,6 +705,12 @@ hello-java-awt.pot : $(POTFILES_DEPS)
hello-java-swing.pot : $(POTFILES_DEPS)
$(SHELL) xsmallpot.sh hello-java-swing
+hello-csharp.pot : $(POTFILES_DEPS)
+ $(SHELL) xsmallpot.sh hello-csharp
+
+hello-csharp-forms.pot : $(POTFILES_DEPS)
+ $(SHELL) xsmallpot.sh hello-csharp-forms
+
hello-gawk.pot : $(POTFILES_DEPS)
$(SHELL) xsmallpot.sh hello-gawk
@@ -742,6 +836,12 @@ $(DUMMYPOFILES):
../hello-java-swing/po/$(LL).po: hello-java-swing.pot $(LL).po
$(SHELL) mmsmallpo.sh hello-java-swing $(LL)
+../hello-csharp/po/$(LL).po: hello-csharp.pot $(LL).po
+ $(SHELL) mmsmallpo.sh hello-csharp $(LL)
+
+../hello-csharp-forms/po/$(LL).po: hello-csharp-forms.pot $(LL).po
+ $(SHELL) mmsmallpo.sh hello-csharp-forms $(LL)
+
../hello-gawk/po/$(LL).po: hello-gawk.pot $(LL).po
$(SHELL) mmsmallpo.sh hello-gawk $(LL)
diff --git a/gettext-tools/examples/po/af.po b/gettext-tools/examples/po/af.po
index 0617894bd..e892ac204 100644
--- a/gettext-tools/examples/po/af.po
+++ b/gettext-tools/examples/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples-0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-31 10:30+2\n"
"Last-Translator: Ysbeer \n"
"Language-Team: Afrikaans \n"
@@ -23,9 +23,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Hallo wêreld!"
@@ -35,7 +36,7 @@ msgstr "Hallo wêreld!"
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -71,12 +72,13 @@ msgid "This program is running as process number ~D."
msgstr "Hierdie program loop as prosesnommer ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Hierdie program loop as prosesnommer {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Hierdie program loop as prosesnommer {pid}"
diff --git a/gettext-tools/examples/po/ca.po b/gettext-tools/examples/po/ca.po
index 46a08e1c5..2129bb2c3 100644
--- a/gettext-tools/examples/po/ca.po
+++ b/gettext-tools/examples/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples 0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-18 10:41+0100\n"
"Last-Translator: Ivan Vilata i Balaguer \n"
"Language-Team: Catalan \n"
@@ -24,9 +24,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Hola, món!"
@@ -36,7 +37,7 @@ msgstr "Hola, món!"
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -72,12 +73,13 @@ msgid "This program is running as process number ~D."
msgstr "Aquest programa està corrent amb el número de procés ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Aquest programa està corrent amb el número de procés {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Aquest programa està corrent amb el número de procés {pid}."
diff --git a/gettext-tools/examples/po/de.po b/gettext-tools/examples/po/de.po
index 246cd501a..0e1586b99 100644
--- a/gettext-tools/examples/po/de.po
+++ b/gettext-tools/examples/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples 0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-18 10:09+0100\n"
"Last-Translator: Karl Eichwalder \n"
"Language-Team: German \n"
@@ -25,9 +25,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Hallo Welt!"
@@ -37,7 +38,7 @@ msgstr "Hallo Welt!"
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -73,12 +74,13 @@ msgid "This program is running as process number ~D."
msgstr "Dieses Programm läuft mit der Prozess-Nummer ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Dieses Programm läuft mit der Prozess-Nummer {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Dieses Programm läuft mit der ProzeÃ-Nummer {pid}."
diff --git a/gettext-tools/examples/po/es.po b/gettext-tools/examples/po/es.po
index a4c294e4d..91a67d16e 100644
--- a/gettext-tools/examples/po/es.po
+++ b/gettext-tools/examples/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples-0.13-pre1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-11-24 19:19-0600\n"
"Last-Translator: Max de Mendizábal \n"
"Language-Team: Spanish \n"
@@ -23,9 +23,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "¡Hola, mundo!"
@@ -35,7 +36,7 @@ msgstr "
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -71,12 +72,13 @@ msgid "This program is running as process number ~D."
msgstr "Este programa está corriendo como el proceso número ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Este programa está corriendo como el proceso número {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, fuzzy, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Este programa está corriendo como el proceso número $pid."
diff --git a/gettext-tools/examples/po/fr.po b/gettext-tools/examples/po/fr.po
index df78c055e..1f378c815 100644
--- a/gettext-tools/examples/po/fr.po
+++ b/gettext-tools/examples/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext-examples 0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-18 08:00-0500\n"
"Last-Translator: Michel Robitaille \n"
"Language-Team: French \n"
@@ -23,9 +23,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Bonjour, le monde!"
@@ -35,7 +36,7 @@ msgstr "Bonjour, le monde!"
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -71,12 +72,13 @@ msgid "This program is running as process number ~D."
msgstr "Ce programme est exécuté en tant que processus numéro ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Ce programme est exécuté en tant que processus numéro {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Ce programme est exécuté en tant que processus numéro {pid}."
diff --git a/gettext-tools/examples/po/gettext-examples.pot b/gettext-tools/examples/po/gettext-examples.pot
index 2082c2054..ecb24e6fc 100644
--- a/gettext-tools/examples/po/gettext-examples.pot
+++ b/gettext-tools/examples/po/gettext-examples.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -24,9 +24,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr ""
@@ -36,7 +37,7 @@ msgstr ""
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -72,12 +73,13 @@ msgid "This program is running as process number ~D."
msgstr ""
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr ""
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr ""
diff --git a/gettext-tools/examples/po/ja.po b/gettext-tools/examples/po/ja.po
index f1e78cadc..91c732130 100644
--- a/gettext-tools/examples/po/ja.po
+++ b/gettext-tools/examples/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext-examples 0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-20 00:24+0900\n"
"Last-Translator: Masahito Yamaga \n"
"Language-Team: Japanese \n"
@@ -22,9 +22,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "À¤³¦¤è, ¤³¤ó¤Ë¤Á¤Ï!"
@@ -34,7 +35,7 @@ msgstr "
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -70,12 +71,13 @@ msgid "This program is running as process number ~D."
msgstr "¤³¤Î¥×¥í¥°¥é¥à¤Ï¥×¥í¥»¥¹ÈÖ¹æ ~D ¤Çư¤¤¤Æ¤¤¤Þ¤¹."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "¤³¤Î¥×¥í¥°¥é¥à¤Ï¥×¥í¥»¥¹ÈÖ¹æ {0} ¤Çư¤¤¤Æ¤¤¤Þ¤¹."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "¤³¤Î¥×¥í¥°¥é¥à¤Ï¥×¥í¥»¥¹ÈÖ¹æ {pid} ¤Çư¤¤¤Æ¤¤¤Þ¤¹."
diff --git a/gettext-tools/examples/po/nl.po b/gettext-tools/examples/po/nl.po
index a0e6dbb14..3927a9ab9 100644
--- a/gettext-tools/examples/po/nl.po
+++ b/gettext-tools/examples/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples 0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2004-01-04 20:50+0100\n"
"Last-Translator: Elros Cyriatan \n"
"Language-Team: Dutch \n"
@@ -24,9 +24,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Hallo, wereld!"
@@ -36,7 +37,7 @@ msgstr "Hallo, wereld!"
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -72,12 +73,13 @@ msgid "This program is running as process number ~D."
msgstr "Dit programma draait als proces nummer ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Dit programma draait als proces nummer {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Dit programma draait als proces nummer {pid}."
diff --git a/gettext-tools/examples/po/pl.po b/gettext-tools/examples/po/pl.po
index d0d955490..261acfe65 100644
--- a/gettext-tools/examples/po/pl.po
+++ b/gettext-tools/examples/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples-0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-18 12:00+0100\n"
"Last-Translator: Rafa³ Maszkowski \n"
"Language-Team: Polish \n"
@@ -23,9 +23,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Witaj ¶wiecie!"
@@ -35,7 +36,7 @@ msgstr "Witaj
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -71,12 +72,13 @@ msgid "This program is running as process number ~D."
msgstr "Ten program dzia³a jako proces o numerze ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Ten program dzia³a jako proces o numerze {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Ten program dzia³a jako proces o numerze {pid}."
diff --git a/gettext-tools/examples/po/ro.po b/gettext-tools/examples/po/ro.po
index cf508bad4..13321e9ae 100644
--- a/gettext-tools/examples/po/ro.po
+++ b/gettext-tools/examples/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples 0.13-pre1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-11-22 11:15+0200\n"
"Last-Translator: Eugen Hoanca \n"
"Language-Team: Romanian \n"
@@ -23,9 +23,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Salut, lume! (Hello, world!)"
@@ -35,7 +36,7 @@ msgstr "Salut, lume! (Hello, world!)"
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -71,12 +72,13 @@ msgid "This program is running as process number ~D."
msgstr "Acest program este rulat ca procesul numãrul ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Acest program este rulat ca procesul numãrul {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, fuzzy, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Acest program ruleazã ca procesul numãrul $pid."
diff --git a/gettext-tools/examples/po/sr.po b/gettext-tools/examples/po/sr.po
index 52940aea0..0c17ddb74 100644
--- a/gettext-tools/examples/po/sr.po
+++ b/gettext-tools/examples/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples 0.13\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-01 13:15-0500\n"
"Last-Translator: Aleksandar Jelenak \n"
"Language-Team: Serbian \n"
@@ -22,9 +22,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Hello, world!"
@@ -34,7 +35,7 @@ msgstr "Hello, world!"
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -70,12 +71,13 @@ msgid "This program is running as process number ~D."
msgstr "ÐÐ²Ð°Ñ Ð¿ÑогÑам Ñе извÑÑава као пÑоÑÐµÑ Ð±ÑÐ¾Ñ ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "ÐÐ²Ð°Ñ Ð¿ÑогÑам Ñе извÑÑава као пÑоÑÐµÑ Ð±ÑÐ¾Ñ {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, fuzzy, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "ÐÐ²Ð°Ñ Ð¿ÑогÑам Ñе извÑÑава као пÑоÑÐµÑ Ð±ÑÐ¾Ñ $pid."
diff --git a/gettext-tools/examples/po/sv.po b/gettext-tools/examples/po/sv.po
index bd91a3e92..e1727c37a 100644
--- a/gettext-tools/examples/po/sv.po
+++ b/gettext-tools/examples/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples 0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-20 22:33+0100\n"
"Last-Translator: Jan Djärv \n"
"Language-Team: Swedish \n"
@@ -22,9 +22,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "Hej världen!"
@@ -34,7 +35,7 @@ msgstr "Hej v
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -70,12 +71,13 @@ msgid "This program is running as process number ~D."
msgstr "Detta program kör som process nummer ~D."
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Detta program kör som process nummer {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Detta program kör som process nummer {pid}."
diff --git a/gettext-tools/examples/po/zh_CN.po b/gettext-tools/examples/po/zh_CN.po
index f74d039f9..efd25aac2 100644
--- a/gettext-tools/examples/po/zh_CN.po
+++ b/gettext-tools/examples/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-examples 0.13.1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
"PO-Revision-Date: 2003-12-18 19:07+0800\n"
"Last-Translator: Funda Wang \n"
"Language-Team: Chinese (simplified) \n"
@@ -23,9 +23,10 @@ msgstr ""
#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
+#: hello-csharp/hello.cs:29 hello-csharp-forms/hello.cs:30
#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
+#: hello-perl/hello-1.pl.in:18 hello-perl/hello-2.pl.in:13
#: hello-php/hello.php:13
msgid "Hello, world!"
msgstr "ä¸çä½ å¥½ï¼"
@@ -35,7 +36,7 @@ msgstr "ä¸çä½ å¥½ï¼"
#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
+#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:20
#: hello-php/hello.php:15
#, php-format
msgid "This program is running as process number %d."
@@ -71,12 +72,13 @@ msgid "This program is running as process number ~D."
msgstr "æ¤ç¨åºæ£ä»¥è¿ç¨å· ~D è¿è¡ã"
#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java-swing/Hello.java:26 hello-csharp/hello.cs:32
+#: hello-csharp-forms/hello.cs:37
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "æ¤ç¨åºæ£ä»¥è¿ç¨å· {0} è¿è¡ã"
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:15
#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "æ¤ç¨åºæ£ä»¥è¿ç¨å· {pid} è¿è¡ã"
diff --git a/gettext-tools/lib/Makefile.in b/gettext-tools/lib/Makefile.in
index 9f0eed4ae..3746d4bf1 100644
--- a/gettext-tools/lib/Makefile.in
+++ b/gettext-tools/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 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.
@@ -14,6 +14,10 @@
@SET_MAKE@
+
+
+SOURCES = $(libgettextlib_la_SOURCES)
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -21,7 +25,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -36,6 +39,109 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+subdir = lib
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/csharpcomp.sh.in \
+ $(srcdir)/csharpexec.sh.in $(srcdir)/javacomp.sh.in \
+ $(srcdir)/javaexec.sh.in ChangeLog atexit.c canonicalize.c \
+ fnmatch.c getline.c getndelim2.c memmove.c memset.c mkdtemp.c \
+ readlink.c relocatable.c setenv.c stpcpy.c strcasecmp.c \
+ strcspn.c strerror.c strncasecmp.c strpbrk.c strstr.c \
+ unsetenv.c vasprintf.c
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
+ $(top_srcdir)/../config/m4/libtool.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intmax.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes-pri.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/nls.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/po.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/printf-posix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/progtest.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/signed.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/size_max.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
+ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
+ $(top_srcdir)/m4/backupfile.m4 \
+ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \
+ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \
+ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \
+ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/extensions.m4 \
+ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/gcj.m4 \
+ $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getndelim2.m4 \
+ $(top_srcdir)/m4/hostname.m4 $(top_srcdir)/m4/javacomp.m4 \
+ $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/locale-fr.m4 \
+ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+ $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \
+ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/relocatable.m4 \
+ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \
+ $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \
+ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \
+ $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/strerror.m4 \
+ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = javacomp.sh javaexec.sh csharpcomp.sh \
+ csharpexec.sh
+am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(examplesconfigdir) $(DESTDIR)$(gettextsrcdir)
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libgettextlib_la_DEPENDENCIES = @LTLIBOBJS@
+am_libgettextlib_la_OBJECTS = allocsa.lo argmatch.lo backupfile.lo \
+ addext.lo basename.lo c-ctype.lo classpath.lo closeout.lo \
+ copy-file.lo csharpcomp.lo csharpexec.lo error.lo \
+ error-progname.lo execute.lo fatal-signal.lo findprog.lo \
+ fstrcmp.lo full-write.lo fwriteerror.lo gcd.lo getopt.lo \
+ getopt1.lo hash.lo javacomp.lo javaexec.lo linebreak.lo \
+ mbswidth.lo obstack.lo concatpath.lo pipe-bidi.lo pipe-in.lo \
+ pipe-out.lo progname.lo progreloc.lo safe-read.lo \
+ safe-write.lo sh-quote.lo stpncpy.lo strtoul.lo tmpdir.lo \
+ wait-process.lo xmalloc.lo xstrdup.lo xallocsa.lo xerror.lo \
+ xreadlink.lo xsetenv.lo localcharset.lo
+libgettextlib_la_OBJECTS = $(am_libgettextlib_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libgettextlib_la_SOURCES)
+DIST_SOURCES = $(libgettextlib_la_SOURCES)
+examplesconfigDATA_INSTALL = $(INSTALL_DATA)
+gettextsrcDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(examplesconfig_DATA) $(gettextsrc_DATA)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
@@ -48,6 +154,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILDCSHARP = @BUILDCSHARP@
BUILDJAVA = @BUILDJAVA@
BUILDJAVAEXE = @BUILDJAVAEXE@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -60,13 +167,13 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS_COMPILING = @CROSS_COMPILING@
+CSHARP_CHOICE = @CSHARP_CHOICE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
-
DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(libdir)\"
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
@@ -77,6 +184,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMACS = @EMACS@
+EMACSLOADPATH = @EMACSLOADPATH@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -87,11 +195,17 @@ GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_CSC = @HAVE_CSC@
+HAVE_CSCC = @HAVE_CSCC@
+HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
+HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
HAVE_GCJ = @HAVE_GCJ@
HAVE_GCJ_C = @HAVE_GCJ_C@
HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
HAVE_GIJ = @HAVE_GIJ@
HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
+HAVE_ILRUN = @HAVE_ILRUN@
+HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
HAVE_JAVA = @HAVE_JAVA@
HAVE_JAVAC = @HAVE_JAVAC@
HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
@@ -103,6 +217,10 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
+HAVE_MCS = @HAVE_MCS@
+HAVE_MCS_IN_PATH = @HAVE_MCS_IN_PATH@
+HAVE_MONO = @HAVE_MONO@
+HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_WPRINTF = @HAVE_WPRINTF@
@@ -128,13 +246,14 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LOCALE_FR = @LOCALE_FR@
-LTALLOCA = @LTALLOCA@
LTLIBEXPAT = @LTLIBEXPAT@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_PATH = @MONO_PATH@
+MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
OBJDUMP = @OBJDUMP@
@@ -157,7 +276,9 @@ SET_RELOCATABLE = @SET_RELOCATABLE@
SHELL = @SHELL@
STDBOOL_H = @STDBOOL_H@
STRIP = @STRIP@
+TESTCSHARP = @TESTCSHARP@
TESTJAVA = @TESTJAVA@
+TESTLIBASPRINTF = @TESTLIBASPRINTF@
TEXI2PDF = @TEXI2PDF@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
@@ -189,7 +310,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
-
# Files installed for the examples.
docdir = @docdir@
exec_prefix = @exec_prefix@
@@ -207,6 +327,7 @@ lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -214,10 +335,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
-
# >>> gnulib module stdbool.
# <<< gnulib module stdbool.
@@ -236,23 +355,18 @@ EXTRA_DIST = \
ChangeLog.0\
stdbool_.h alloca_.h fnmatch_.h config.charset ref-add.sin ref-del.sin Makefile.vms Makefile.msvc
MOSTLYCLEANFILES = stdbool.h alloca.h fnmatch.h
-
CLEANFILES = charset.alias ref-add.sed ref-del.sed
-
DISTCLEANFILES = fnmatch.h
-
SUFFIXES = .sed .sin
-
RM = rm -f
-
lib_LTLIBRARIES = libgettextlib.la
-
# Sources that are compiled on all platforms.
# <<< gnulib module fnmatch.
# >>> gnulib module localcharset.
libgettextlib_la_SOURCES = \
+ allocsa.h allocsa.c \
argmatch.h argmatch.c \
backupfile.h backupfile.c addext.c \
basename.h basename.c \
@@ -261,6 +375,8 @@ libgettextlib_la_SOURCES = \
classpath.h classpath.c \
closeout.h closeout.c \
copy-file.h copy-file.c \
+ csharpcomp.h csharpcomp.c \
+ csharpexec.h csharpexec.c \
error.h error.c \
error-progname.h error-progname.c \
execute.h execute.c w32spawn.h \
@@ -293,16 +409,15 @@ libgettextlib_la_SOURCES = \
unlocked-io.h \
wait-process.h wait-process.c \
xalloc.h xmalloc.c xstrdup.c \
+ xallocsa.h xallocsa.c \
xerror.h xerror.c \
xreadlink.h xreadlink.c \
xsetenv.h xsetenv.c \
xsize.h\
localcharset.h localcharset.c
-
# Sources that are compiled only on platforms that lack the functions.
LIBADD_SOURCE = \
- alloca.c \
atexit.c \
canonicalize.h canonicalize.c \
fnmatch.c \
@@ -324,15 +439,13 @@ LIBADD_SOURCE = \
vasprintf.h vasprintf.c
-
# Unused sources.
UNUSED_SOURCE = \
xgetcwd.h xgetcwd.c
-
# How to build libgettextlib.la.
-libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@
+libgettextlib_la_LIBADD = @LTLIBOBJS@
# Need @LTLIBINTL@ because many source files use gettext().
# Need @LTLIBICONV@ because linebreak.c uses iconv().
@@ -341,81 +454,64 @@ libgettextlib_la_LDFLAGS = \
@LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
-
# Extra files to be installed.
gettextsrcdir = $(datadir)/gettext
gettextsrc_DATA = gettext.h
examplesconfigdir = $(docdir)/examples/config
-examplesconfig_DATA = javacomp.sh.in javaexec.sh.in
+examplesconfig_DATA = \
+ javacomp.sh.in javaexec.sh.in \
+ csharpcomp.sh.in csharpexec.sh.in
# List of files to be distributed.
noinst_HEADERS = gettext.h
-
AM_CPPFLAGS = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
-
charset_alias = $(DESTDIR)$(libdir)/charset.alias
charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-subdir = lib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = javacomp.sh javaexec.sh
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libgettextlib_la_DEPENDENCIES = @LTALLOCA@ @LTLIBOBJS@
-am_libgettextlib_la_OBJECTS = argmatch.lo backupfile.lo addext.lo \
- basename.lo c-ctype.lo classpath.lo closeout.lo copy-file.lo \
- error.lo error-progname.lo execute.lo fatal-signal.lo \
- findprog.lo fstrcmp.lo full-write.lo fwriteerror.lo gcd.lo \
- getopt.lo getopt1.lo hash.lo javacomp.lo javaexec.lo \
- linebreak.lo mbswidth.lo obstack.lo concatpath.lo pipe-bidi.lo \
- pipe-in.lo pipe-out.lo progname.lo progreloc.lo safe-read.lo \
- safe-write.lo sh-quote.lo stpncpy.lo strtoul.lo tmpdir.lo \
- wait-process.lo xmalloc.lo xstrdup.lo xerror.lo xreadlink.lo \
- xsetenv.lo localcharset.lo
-libgettextlib_la_OBJECTS = $(am_libgettextlib_la_OBJECTS)
-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libgettextlib_la_SOURCES)
-DATA = $(examplesconfig_DATA) $(gettextsrc_DATA)
-
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in ChangeLog \
- Makefile.am alloca.c atexit.c canonicalize.c fnmatch.c \
- getline.c getndelim2.c javacomp.sh.in javaexec.sh.in memmove.c \
- memset.c mkdtemp.c readlink.c relocatable.c setenv.c stpcpy.c \
- strcasecmp.c strcspn.c strerror.c strncasecmp.c strpbrk.c \
- strstr.c unsetenv.c vasprintf.c
-SOURCES = $(libgettextlib_la_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .sed .sin .c .lo .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnits lib/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-javacomp.sh: $(top_builddir)/config.status javacomp.sh.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+javacomp.sh: $(top_builddir)/config.status $(srcdir)/javacomp.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-javaexec.sh: $(top_builddir)/config.status javaexec.sh.in
+javaexec.sh: $(top_builddir)/config.status $(srcdir)/javaexec.sh.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+csharpcomp.sh: $(top_builddir)/config.status $(srcdir)/csharpcomp.sh.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+csharpexec.sh: $(top_builddir)/config.status $(srcdir)/csharpexec.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-libLTLIBRARIES_INSTALL = $(INSTALL)
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(libdir)
+ $(mkdir_p) $(DESTDIR)$(libdir)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -444,19 +540,19 @@ libgettextlib.la: $(libgettextlib_la_OBJECTS) $(libgettextlib_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libgettextlib_la_LDFLAGS) $(libgettextlib_la_OBJECTS) $(libgettextlib_la_LIBADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
.c.o:
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ $(COMPILE) -c $<
.c.obj:
- $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ $(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -467,10 +563,9 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-examplesconfigDATA_INSTALL = $(INSTALL_DATA)
install-examplesconfigDATA: $(examplesconfig_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(examplesconfigdir)
+ $(mkdir_p) $(DESTDIR)$(examplesconfigdir)
@list='$(examplesconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -485,10 +580,9 @@ uninstall-examplesconfigDATA:
echo " rm -f $(DESTDIR)$(examplesconfigdir)/$$f"; \
rm -f $(DESTDIR)$(examplesconfigdir)/$$f; \
done
-gettextsrcDATA_INSTALL = $(INSTALL_DATA)
install-gettextsrcDATA: $(gettextsrc_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir)
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir)
@list='$(gettextsrc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -504,14 +598,6 @@ uninstall-gettextsrcDATA:
rm -f $(DESTDIR)$(gettextsrcdir)/$$f; \
done
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -520,6 +606,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -534,7 +621,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -557,10 +643,6 @@ GTAGS:
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -574,7 +656,7 @@ distdir: $(DISTFILES)
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -592,9 +674,8 @@ distdir: $(DISTFILES)
check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(examplesconfigdir) $(DESTDIR)$(gettextsrcdir)
+ $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(examplesconfigdir) $(DESTDIR)$(gettextsrcdir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -606,7 +687,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -636,6 +717,8 @@ dvi: dvi-am
dvi-am:
+html: html-am
+
info: info-am
info-am:
@@ -672,22 +755,23 @@ uninstall-am: uninstall-examplesconfigDATA uninstall-gettextsrcDATA \
.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
clean-generic clean-libLTLIBRARIES clean-libtool ctags \
- distclean distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am \
- install-examplesconfigDATA install-exec install-exec-am \
- install-exec-local install-gettextsrcDATA install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
- pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-examplesconfigDATA uninstall-gettextsrcDATA \
- uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-examplesconfigDATA install-exec \
+ install-exec-am install-exec-local install-gettextsrcDATA \
+ install-info install-info-am install-libLTLIBRARIES \
+ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-examplesconfigDATA \
+ uninstall-gettextsrcDATA uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-local
# No need to install libgettextlib.a.
-install-exec-am: install-exec-clean
+install-exec-local: install-libLTLIBRARIES install-exec-clean
install-exec-clean:
$(RM) $(DESTDIR)$(libdir)/libgettextlib.a
diff --git a/gettext-tools/libuniname/Makefile.in b/gettext-tools/libuniname/Makefile.in
index 6cc374703..c9c647fdd 100644
--- a/gettext-tools/libuniname/Makefile.in
+++ b/gettext-tools/libuniname/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 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.
@@ -14,6 +14,9 @@
@SET_MAKE@
+
+SOURCES = $(libuniname_a_SOURCES) test-names.c
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -21,7 +24,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -36,6 +38,92 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+noinst_PROGRAMS = test-names$(EXEEXT)
+subdir = libuniname
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
+ $(top_srcdir)/../config/m4/libtool.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intmax.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes-pri.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/nls.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/po.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/printf-posix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/progtest.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/signed.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/size_max.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
+ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
+ $(top_srcdir)/m4/backupfile.m4 \
+ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \
+ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \
+ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \
+ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/extensions.m4 \
+ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/gcj.m4 \
+ $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getndelim2.m4 \
+ $(top_srcdir)/m4/hostname.m4 $(top_srcdir)/m4/javacomp.m4 \
+ $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/locale-fr.m4 \
+ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+ $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \
+ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/relocatable.m4 \
+ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \
+ $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \
+ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \
+ $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/strerror.m4 \
+ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+ARFLAGS = cru
+LIBRARIES = $(noinst_LIBRARIES)
+libuniname_a_AR = $(AR) $(ARFLAGS)
+libuniname_a_LIBADD =
+am_libuniname_a_OBJECTS = uniname.$(OBJEXT)
+libuniname_a_OBJECTS = $(am_libuniname_a_OBJECTS)
+PROGRAMS = $(noinst_PROGRAMS)
+test_names_SOURCES = test-names.c
+test_names_OBJECTS = test-names.$(OBJEXT)
+test_names_DEPENDENCIES = libuniname.a ../lib/libgettextlib.la
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libuniname_a_SOURCES) test-names.c
+DIST_SOURCES = $(libuniname_a_SOURCES) test-names.c
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
@@ -48,6 +136,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILDCSHARP = @BUILDCSHARP@
BUILDJAVA = @BUILDJAVA@
BUILDJAVAEXE = @BUILDJAVAEXE@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -60,6 +149,7 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS_COMPILING = @CROSS_COMPILING@
+CSHARP_CHOICE = @CSHARP_CHOICE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -76,6 +166,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMACS = @EMACS@
+EMACSLOADPATH = @EMACSLOADPATH@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -86,11 +177,17 @@ GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_CSC = @HAVE_CSC@
+HAVE_CSCC = @HAVE_CSCC@
+HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
+HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
HAVE_GCJ = @HAVE_GCJ@
HAVE_GCJ_C = @HAVE_GCJ_C@
HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
HAVE_GIJ = @HAVE_GIJ@
HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
+HAVE_ILRUN = @HAVE_ILRUN@
+HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
HAVE_JAVA = @HAVE_JAVA@
HAVE_JAVAC = @HAVE_JAVAC@
HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
@@ -102,6 +199,10 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
+HAVE_MCS = @HAVE_MCS@
+HAVE_MCS_IN_PATH = @HAVE_MCS_IN_PATH@
+HAVE_MONO = @HAVE_MONO@
+HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_WPRINTF = @HAVE_WPRINTF@
@@ -127,13 +228,14 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LOCALE_FR = @LOCALE_FR@
-LTALLOCA = @LTALLOCA@
LTLIBEXPAT = @LTLIBEXPAT@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_PATH = @MONO_PATH@
+MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
OBJDUMP = @OBJDUMP@
@@ -156,7 +258,9 @@ SET_RELOCATABLE = @SET_RELOCATABLE@
SHELL = @SHELL@
STDBOOL_H = @STDBOOL_H@
STRIP = @STRIP@
+TESTCSHARP = @TESTCSHARP@
TESTJAVA = @TESTJAVA@
+TESTLIBASPRINTF = @TESTLIBASPRINTF@
TEXI2PDF = @TEXI2PDF@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
@@ -203,6 +307,7 @@ lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -210,68 +315,51 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
-
# VMS support.
# Woe32 support.
EXTRA_DIST = gen-uninames $(TESTS) UnicodeDataNames.txt Makefile.vms Makefile.msvc
-
noinst_LIBRARIES = libuniname.a
-
libuniname_a_SOURCES = uniname.h uniname.c uninames.h
-
AM_CPPFLAGS = -I.. -I../lib -I$(top_srcdir)/lib
-
TESTS = test-names.sh
TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) $(SHELL)
-
-noinst_PROGRAMS = test-names
test_names_LDADD = libuniname.a ../lib/libgettextlib.la
-subdir = libuniname
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libuniname_a_AR = $(AR) cru
-libuniname_a_LIBADD =
-am_libuniname_a_OBJECTS = uniname.$(OBJEXT)
-libuniname_a_OBJECTS = $(am_libuniname_a_OBJECTS)
-noinst_PROGRAMS = test-names$(EXEEXT)
-PROGRAMS = $(noinst_PROGRAMS)
-
-test_names_SOURCES = test-names.c
-test_names_OBJECTS = test-names.$(OBJEXT)
-test_names_DEPENDENCIES = libuniname.a ../lib/libgettextlib.la
-test_names_LDFLAGS =
-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libuniname_a_SOURCES) test-names.c
-DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
-SOURCES = $(libuniname_a_SOURCES) test-names.c
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits libuniname/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnits libuniname/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -291,19 +379,19 @@ test-names$(EXEEXT): $(test_names_OBJECTS) $(test_names_DEPENDENCIES)
$(LINK) $(test_names_LDFLAGS) $(test_names_OBJECTS) $(test_names_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
.c.o:
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ $(COMPILE) -c $<
.c.obj:
- $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ $(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -315,14 +403,6 @@ distclean-libtool:
-rm -f libtool
uninstall-info-am:
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -331,6 +411,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -345,7 +426,6 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -382,24 +462,24 @@ check-TESTS: $(TESTS)
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
*" $$tst "*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
;; \
*) \
- echo "PASS: $$tst"; \
+ echo "PASS: $$tst"; \
;; \
esac; \
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
*" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
;; \
*) \
- failed=`expr $$failed + 1`; \
- echo "FAIL: $$tst"; \
+ failed=`expr $$failed + 1`; \
+ echo "FAIL: $$tst"; \
;; \
esac; \
else \
@@ -441,10 +521,6 @@ check-TESTS: $(TESTS)
echo "$$dashes"; \
test "$$failed" -eq 0; \
else :; fi
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -458,7 +534,7 @@ distdir: $(DISTFILES)
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -477,7 +553,6 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
all-am: Makefile $(LIBRARIES) $(PROGRAMS)
-
installdirs:
install: install-am
install-exec: install-exec-am
@@ -490,7 +565,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -517,6 +592,8 @@ dvi: dvi-am
dvi-am:
+html: html-am
+
info: info-am
info-am:
@@ -554,10 +631,10 @@ uninstall-am: uninstall-info-am
clean-generic clean-libtool clean-noinstLIBRARIES \
clean-noinstPROGRAMS ctags distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am
diff --git a/gettext-tools/m4/Makefile.in b/gettext-tools/m4/Makefile.in
index 406985c6e..1ac80d839 100644
--- a/gettext-tools/m4/Makefile.in
+++ b/gettext-tools/m4/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 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.
@@ -23,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -38,6 +37,73 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+subdir = m4
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
+ $(top_srcdir)/../config/m4/libtool.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intmax.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes-pri.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/nls.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/po.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/printf-posix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/progtest.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/signed.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/size_max.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
+ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
+ $(top_srcdir)/m4/backupfile.m4 \
+ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \
+ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \
+ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \
+ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/extensions.m4 \
+ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/gcj.m4 \
+ $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getndelim2.m4 \
+ $(top_srcdir)/m4/hostname.m4 $(top_srcdir)/m4/javacomp.m4 \
+ $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/locale-fr.m4 \
+ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+ $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \
+ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/relocatable.m4 \
+ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \
+ $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \
+ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \
+ $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/strerror.m4 \
+ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__installdirs = $(DESTDIR)$(aclocaldir) $(DESTDIR)$(examplesconfigdir)
+aclocalDATA_INSTALL = $(INSTALL_DATA)
+examplesconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(aclocal_DATA) $(examplesconfig_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
@@ -50,6 +116,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILDCSHARP = @BUILDCSHARP@
BUILDJAVA = @BUILDJAVA@
BUILDJAVAEXE = @BUILDJAVAEXE@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -62,6 +129,7 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS_COMPILING = @CROSS_COMPILING@
+CSHARP_CHOICE = @CSHARP_CHOICE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -78,6 +146,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMACS = @EMACS@
+EMACSLOADPATH = @EMACSLOADPATH@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -88,11 +157,17 @@ GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_CSC = @HAVE_CSC@
+HAVE_CSCC = @HAVE_CSCC@
+HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
+HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
HAVE_GCJ = @HAVE_GCJ@
HAVE_GCJ_C = @HAVE_GCJ_C@
HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
HAVE_GIJ = @HAVE_GIJ@
HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
+HAVE_ILRUN = @HAVE_ILRUN@
+HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
HAVE_JAVA = @HAVE_JAVA@
HAVE_JAVAC = @HAVE_JAVAC@
HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
@@ -104,6 +179,10 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
+HAVE_MCS = @HAVE_MCS@
+HAVE_MCS_IN_PATH = @HAVE_MCS_IN_PATH@
+HAVE_MONO = @HAVE_MONO@
+HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_WPRINTF = @HAVE_WPRINTF@
@@ -129,13 +208,14 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LOCALE_FR = @LOCALE_FR@
-LTALLOCA = @LTALLOCA@
LTLIBEXPAT = @LTLIBEXPAT@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_PATH = @MONO_PATH@
+MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
OBJDUMP = @OBJDUMP@
@@ -158,7 +238,9 @@ SET_RELOCATABLE = @SET_RELOCATABLE@
SHELL = @SHELL@
STDBOOL_H = @STDBOOL_H@
STRIP = @STRIP@
+TESTCSHARP = @TESTCSHARP@
TESTJAVA = @TESTJAVA@
+TESTLIBASPRINTF = @TESTLIBASPRINTF@
TEXI2PDF = @TEXI2PDF@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
@@ -174,7 +256,6 @@ ac_ct_F77 = @ac_ct_F77@
ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
-
aclocaldir = @aclocaldir@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -191,7 +272,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
-
# Files installed for the examples.
docdir = @docdir@
exec_prefix = @exec_prefix@
@@ -209,6 +289,7 @@ lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -247,15 +328,23 @@ aclocal_DATA = \
../../gettext-runtime/m4/xsize.m4
examplesconfigdir = $(docdir)/examples/config
-examplesconfig_DATA = gcj.m4 javacomp.m4 javaexec.m4
+examplesconfig_DATA = \
+ gcj.m4 javacomp.m4 javaexec.m4 \
+ csharpcomp.m4 csharpexec.m4
+
# Generate this list with
# find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
EXTRA_DIST = README ChangeLog.0 \
alloca.m4 \
+allocsa.m4 \
backupfile.m4 \
canonicalize.m4 \
+csharp.m4 \
+csharpcomp.m4 \
+csharpexec.m4 \
eaccess.m4 \
+eealloc.m4 \
error.m4 \
extensions.m4 \
fnmatch.m4 \
@@ -288,23 +377,38 @@ unionwait.m4 \
unlocked-io.m4 \
xreadlink.m4
-subdir = m4
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(aclocal_DATA) $(examplesconfig_DATA)
-
-DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu m4/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-rm -f *.lo
@@ -315,10 +419,9 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-aclocalDATA_INSTALL = $(INSTALL_DATA)
install-aclocalDATA: $(aclocal_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(aclocaldir)
+ $(mkdir_p) $(DESTDIR)$(aclocaldir)
@list='$(aclocal_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -333,10 +436,9 @@ uninstall-aclocalDATA:
echo " rm -f $(DESTDIR)$(aclocaldir)/$$f"; \
rm -f $(DESTDIR)$(aclocaldir)/$$f; \
done
-examplesconfigDATA_INSTALL = $(INSTALL_DATA)
install-examplesconfigDATA: $(examplesconfig_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(examplesconfigdir)
+ $(mkdir_p) $(DESTDIR)$(examplesconfigdir)
@list='$(examplesconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -357,10 +459,6 @@ TAGS:
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -374,7 +472,7 @@ distdir: $(DISTFILES)
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -392,9 +490,8 @@ distdir: $(DISTFILES)
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(aclocaldir) $(DESTDIR)$(examplesconfigdir)
+ $(mkdir_p) $(DESTDIR)$(aclocaldir) $(DESTDIR)$(examplesconfigdir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -406,7 +503,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -431,6 +528,8 @@ dvi: dvi-am
dvi-am:
+html: html-am
+
info: info-am
info-am:
@@ -466,13 +565,14 @@ uninstall-am: uninstall-aclocalDATA uninstall-examplesconfigDATA \
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am info info-am install install-aclocalDATA install-am \
- install-data install-data-am install-examplesconfigDATA \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am uninstall uninstall-aclocalDATA uninstall-am \
+ dvi-am html html-am info info-am install install-aclocalDATA \
+ install-am install-data install-data-am \
+ install-examplesconfigDATA install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
+ uninstall-aclocalDATA uninstall-am \
uninstall-examplesconfigDATA uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/gettext-tools/man/Makefile.in b/gettext-tools/man/Makefile.in
index 837deb5a4..cce00efc5 100644
--- a/gettext-tools/man/Makefile.in
+++ b/gettext-tools/man/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 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.
@@ -13,7 +13,6 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -36,6 +34,73 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+subdir = man
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/x-to-1.in ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
+ $(top_srcdir)/../config/m4/libtool.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intmax.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes-pri.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/nls.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/po.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/printf-posix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/progtest.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/signed.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/size_max.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
+ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
+ $(top_srcdir)/m4/backupfile.m4 \
+ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \
+ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \
+ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \
+ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/extensions.m4 \
+ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/gcj.m4 \
+ $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getndelim2.m4 \
+ $(top_srcdir)/m4/hostname.m4 $(top_srcdir)/m4/javacomp.m4 \
+ $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/locale-fr.m4 \
+ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+ $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \
+ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/relocatable.m4 \
+ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \
+ $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \
+ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \
+ $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/strerror.m4 \
+ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = x-to-1
+SOURCES =
+DIST_SOURCES =
+man1dir = $(mandir)/man1
+am__installdirs = $(DESTDIR)$(man1dir)
+NROFF = nroff
+MANS = $(man_MANS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
@@ -48,6 +113,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILDCSHARP = @BUILDCSHARP@
BUILDJAVA = @BUILDJAVA@
BUILDJAVAEXE = @BUILDJAVAEXE@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -60,6 +126,7 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS_COMPILING = @CROSS_COMPILING@
+CSHARP_CHOICE = @CSHARP_CHOICE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -76,6 +143,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMACS = @EMACS@
+EMACSLOADPATH = @EMACSLOADPATH@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -86,11 +154,17 @@ GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_CSC = @HAVE_CSC@
+HAVE_CSCC = @HAVE_CSCC@
+HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
+HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
HAVE_GCJ = @HAVE_GCJ@
HAVE_GCJ_C = @HAVE_GCJ_C@
HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
HAVE_GIJ = @HAVE_GIJ@
HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
+HAVE_ILRUN = @HAVE_ILRUN@
+HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
HAVE_JAVA = @HAVE_JAVA@
HAVE_JAVAC = @HAVE_JAVAC@
HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
@@ -102,6 +176,10 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
+HAVE_MCS = @HAVE_MCS@
+HAVE_MCS_IN_PATH = @HAVE_MCS_IN_PATH@
+HAVE_MONO = @HAVE_MONO@
+HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_WPRINTF = @HAVE_WPRINTF@
@@ -127,13 +205,14 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LOCALE_FR = @LOCALE_FR@
-LTALLOCA = @LTALLOCA@
LTLIBEXPAT = @LTLIBEXPAT@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_PATH = @MONO_PATH@
+MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
OBJDUMP = @OBJDUMP@
@@ -145,7 +224,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-
PERL = @PERL@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -157,11 +235,12 @@ SET_RELOCATABLE = @SET_RELOCATABLE@
SHELL = @SHELL@
STDBOOL_H = @STDBOOL_H@
STRIP = @STRIP@
+TESTCSHARP = @TESTCSHARP@
TESTJAVA = @TESTJAVA@
+TESTLIBASPRINTF = @TESTLIBASPRINTF@
TEXI2PDF = @TEXI2PDF@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
-
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
YACC = @YACC@
@@ -202,10 +281,10 @@ install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
lispdir = @lispdir@
-
localedir = $(datadir)/locale
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -214,16 +293,13 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
htmldir = $(docdir)
-
AUTOMAKE_OPTIONS = 1.2 gnits
-
# VMS support.
# Woe32 support.
EXTRA_DIST = help2man $(man_aux) $(man_MAN1OTHER) $(man_HTMLOTHER) ChangeLog.0 Makefile.vms Makefile.msvc
-
# A manual page for each of the bin_PROGRAMS in src/Makefile.am
# and for each of the bin_SCRIPTS in misc/Makefile.am.
man_aux = \
@@ -232,7 +308,6 @@ msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x msggrep.x
gettextize.x autopoint.x
-
# Likewise.
man_MAN1OTHER = \
msgcmp.1 msgfmt.1 msgmerge.1 msgunfmt.1 xgettext.1 \
@@ -241,7 +316,6 @@ gettextize.1 autopoint.1
man_MAN1 = $(man_MAN1OTHER)
man_MANS = $(man_MAN1)
-
man_HTMLOTHER = \
msgcmp.1.html msgfmt.1.html msgmerge.1.html msgunfmt.1.html xgettext.1.html \
msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
@@ -260,25 +334,39 @@ MAN2HTML = groff -mandoc -Thtml
# Update them also during "make dist", in order to propagate added command
# line options that were added, even if version.sh didn't change.
UPDATEMODE =
-subdir = man
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = x-to-1
-DIST_SOURCES =
-
-NROFF = nroff
-MANS = $(man_MANS)
-DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am x-to-1.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits man/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnits man/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-x-to-1: $(top_builddir)/config.status x-to-1.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+x-to-1: $(top_builddir)/config.status $(srcdir)/x-to-1.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
@@ -290,11 +378,9 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-
-man1dir = $(mandir)/man1
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(man1dir)
+ $(mkdir_p) $(DESTDIR)$(man1dir)
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -343,10 +429,6 @@ TAGS:
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -360,7 +442,7 @@ distdir: $(DISTFILES)
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -378,9 +460,8 @@ distdir: $(DISTFILES)
check-am: all-am
check: check-am
all-am: Makefile $(MANS) all-local
-
installdirs: installdirs-local
- $(mkinstalldirs) $(DESTDIR)$(man1dir)
+ $(mkdir_p) $(DESTDIR)$(man1dir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -392,7 +473,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -418,6 +499,10 @@ dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am: html-local
+
info: info-am
info-am:
@@ -454,14 +539,14 @@ uninstall-man: uninstall-man1
.PHONY: all all-am all-local check check-am clean clean-generic \
clean-libtool distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec install-exec-am \
- install-info install-info-am install-man install-man1 \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-info-am uninstall-local \
- uninstall-man uninstall-man1
+ distdir dvi dvi-am html html-am html-local info info-am \
+ install install-am install-data install-data-am \
+ install-data-local install-exec install-exec-am install-info \
+ install-info-am install-man install-man1 install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am uninstall-local uninstall-man uninstall-man1
# We distribute both the man pages and their HTML equivalent.
@@ -469,7 +554,7 @@ uninstall-man: uninstall-man1
# make man
# make html
-all-local: html
+all-local: html-local
install-data-local: install-html
installdirs-local: installdirs-html
uninstall-local: uninstall-html
@@ -525,7 +610,7 @@ update-man1:
# Man pages in HTML format.
-html: $(man_HTML)
+html-local: $(man_HTML)
msgcmp.1.html: msgcmp.1
$(MAN2HTML) `if test -f msgcmp.1; then echo .; else echo $(srcdir); fi`/msgcmp.1 | sed -e '/CreationDate:/d' > t-$@
diff --git a/gettext-tools/man/autopoint.1 b/gettext-tools/man/autopoint.1
index 381c174ef..3e6ac4cb4 100644
--- a/gettext-tools/man/autopoint.1
+++ b/gettext-tools/man/autopoint.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH AUTOPOINT "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH AUTOPOINT "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
autopoint \- copies standard gettext infrastructure
.SH SYNOPSIS
diff --git a/gettext-tools/man/gettextize.1 b/gettext-tools/man/gettextize.1
index 3591b425e..cb0cb1438 100644
--- a/gettext-tools/man/gettextize.1
+++ b/gettext-tools/man/gettextize.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH GETTEXTIZE "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH GETTEXTIZE "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
gettextize \- install or upgrade gettext infrastructure
.SH SYNOPSIS
@@ -36,7 +36,7 @@ Written by Ulrich Drepper
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2003 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/gettextize.1.html b/gettext-tools/man/gettextize.1.html
index e208256ed..855d44d7c 100644
--- a/gettext-tools/man/gettextize.1.html
+++ b/gettext-tools/man/gettextize.1.html
@@ -151,7 +151,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 1995-1998, 2000-2003 Free Software Foundation,
+Copyright 1995-1998, 2000-2004 Free Software Foundation,
Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
diff --git a/gettext-tools/man/msgattrib.1 b/gettext-tools/man/msgattrib.1
index 9dc3b1952..aa95a59e4 100644
--- a/gettext-tools/man/msgattrib.1
+++ b/gettext-tools/man/msgattrib.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGATTRIB "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGATTRIB "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgattrib \- attribute matching and manipulation on message catalog
.SH SYNOPSIS
@@ -132,7 +132,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgattrib.1.html b/gettext-tools/man/msgattrib.1.html
index 0de34b18f..b91b7901d 100644
--- a/gettext-tools/man/msgattrib.1.html
+++ b/gettext-tools/man/msgattrib.1.html
@@ -540,7 +540,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/msgcat.1 b/gettext-tools/man/msgcat.1
index 5aba85d3c..54df5b20b 100644
--- a/gettext-tools/man/msgcat.1
+++ b/gettext-tools/man/msgcat.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGCAT "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGCAT "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgcat \- combines several message catalogs
.SH SYNOPSIS
@@ -119,7 +119,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgcat.1.html b/gettext-tools/man/msgcat.1.html
index cf974c177..e3a3f8329 100644
--- a/gettext-tools/man/msgcat.1.html
+++ b/gettext-tools/man/msgcat.1.html
@@ -449,7 +449,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/msgcmp.1 b/gettext-tools/man/msgcmp.1
index feca4ca01..dc491e282 100644
--- a/gettext-tools/man/msgcmp.1
+++ b/gettext-tools/man/msgcmp.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGCMP "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGCMP "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgcmp \- compare message catalog and template
.SH SYNOPSIS
@@ -50,7 +50,7 @@ Written by Peter Miller.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2003 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgcmp.1.html b/gettext-tools/man/msgcmp.1.html
index 3a59702ba..8e69b3787 100644
--- a/gettext-tools/man/msgcmp.1.html
+++ b/gettext-tools/man/msgcmp.1.html
@@ -199,7 +199,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 1995-1998, 2000-2003 Free Software Foundation,
+Copyright 1995-1998, 2000-2004 Free Software Foundation,
Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
diff --git a/gettext-tools/man/msgcomm.1 b/gettext-tools/man/msgcomm.1
index 2aaccdaa9..e255b9550 100644
--- a/gettext-tools/man/msgcomm.1
+++ b/gettext-tools/man/msgcomm.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGCOMM "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGCOMM "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgcomm \- match two message catalogs
.SH SYNOPSIS
@@ -114,7 +114,7 @@ Written by Peter Miller.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2003 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgcomm.1.html b/gettext-tools/man/msgcomm.1.html
index ac0c2f922..8444f4b89 100644
--- a/gettext-tools/man/msgcomm.1.html
+++ b/gettext-tools/man/msgcomm.1.html
@@ -435,7 +435,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 1995-1998, 2000-2003 Free Software Foundation,
+Copyright 1995-1998, 2000-2004 Free Software Foundation,
Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
diff --git a/gettext-tools/man/msgconv.1 b/gettext-tools/man/msgconv.1
index 5bd83a0c9..d4d922f27 100644
--- a/gettext-tools/man/msgconv.1
+++ b/gettext-tools/man/msgconv.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGCONV "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGCONV "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgconv \- character set conversion for message catalog
.SH SYNOPSIS
@@ -93,7 +93,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgconv.1.html b/gettext-tools/man/msgconv.1.html
index a6045a1c5..acd936fdb 100644
--- a/gettext-tools/man/msgconv.1.html
+++ b/gettext-tools/man/msgconv.1.html
@@ -383,7 +383,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/msgen.1 b/gettext-tools/man/msgen.1
index b2593d5e6..53fbcc007 100644
--- a/gettext-tools/man/msgen.1
+++ b/gettext-tools/man/msgen.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGEN "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGEN "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgen \- create English message catalog
.SH SYNOPSIS
@@ -90,7 +90,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgen.1.html b/gettext-tools/man/msgen.1.html
index d76766a4e..275e0b45b 100644
--- a/gettext-tools/man/msgen.1.html
+++ b/gettext-tools/man/msgen.1.html
@@ -359,7 +359,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/msgexec.1 b/gettext-tools/man/msgexec.1
index 533ab5cb0..e3174be15 100644
--- a/gettext-tools/man/msgexec.1
+++ b/gettext-tools/man/msgexec.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGEXEC "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGEXEC "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgexec \- process translations of message catalog
.SH SYNOPSIS
@@ -46,7 +46,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgexec.1.html b/gettext-tools/man/msgexec.1.html
index 125b38c69..6c6b4d08f 100644
--- a/gettext-tools/man/msgexec.1.html
+++ b/gettext-tools/man/msgexec.1.html
@@ -183,7 +183,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/msgfilter.1 b/gettext-tools/man/msgfilter.1
index 7522b50d8..f7fc9ee38 100644
--- a/gettext-tools/man/msgfilter.1
+++ b/gettext-tools/man/msgfilter.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGFILTER "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGFILTER "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgfilter \- edit translations of message catalog
.SH SYNOPSIS
@@ -104,7 +104,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgfilter.1.html b/gettext-tools/man/msgfilter.1.html
index 0877d58b7..31d7c1850 100644
--- a/gettext-tools/man/msgfilter.1.html
+++ b/gettext-tools/man/msgfilter.1.html
@@ -422,7 +422,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/msgfmt.1 b/gettext-tools/man/msgfmt.1
index 2b6d96fdb..d82c408ad 100644
--- a/gettext-tools/man/msgfmt.1
+++ b/gettext-tools/man/msgfmt.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGFMT "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGFMT "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgfmt \- compile message catalog to binary format
.SH SYNOPSIS
@@ -29,6 +29,12 @@ Java mode: generate a Java ResourceBundle class
\fB\-\-java2\fR
like \fB\-\-java\fR, and assume Java2 (JDK 1.2 or higher)
.TP
+\fB\-\-csharp\fR
+C# mode: generate a .NET .dll file
+.TP
+\fB\-\-csharp\-resources\fR
+C# resources mode: generate a .NET .resources file
+.TP
\fB\-\-tcl\fR
Tcl mode: generate a tcl/msgcat .msg file
.TP
@@ -57,6 +63,19 @@ base directory of classes directory hierarchy
The class name is determined by appending the locale name to the resource name,
separated with an underscore. The \fB\-d\fR option is mandatory. The class is
written under the specified directory.
+.SS "Output file location in C# mode:"
+.TP
+\fB\-r\fR, \fB\-\-resource\fR=\fIRESOURCE\fR
+resource name
+.TP
+\fB\-l\fR, \fB\-\-locale\fR=\fILOCALE\fR
+locale name, either language or language_COUNTRY
+.TP
+\fB\-d\fR DIRECTORY
+base directory for locale dependent .dll files
+.PP
+The \fB\-l\fR and \fB\-d\fR options are mandatory. The .dll file is written in a
+subdirectory of the specified directory whose name depends on the locale.
.SS "Output file location in Tcl mode:"
.TP
\fB\-l\fR, \fB\-\-locale\fR=\fILOCALE\fR
@@ -125,7 +144,7 @@ Written by Ulrich Drepper.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2003 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgfmt.1.html b/gettext-tools/man/msgfmt.1.html
index be1a74063..603b6150b 100644
--- a/gettext-tools/man/msgfmt.1.html
+++ b/gettext-tools/man/msgfmt.1.html
@@ -117,6 +117,31 @@ Java mode: generate a Java ResourceBundle class
like --java, and assume Java2 (JDK 1.2 or
higher)
+
+
+
+--csharp
+
+
+
+
+C# mode: generate a .NET .dll file
+
+
+
+
+--csharp-resources
+
+
+
+
+C# resources mode: generate a .NET .resources
+file
+
@@ -230,6 +255,57 @@ the resource name, separated with an underscore. The
-d option is mandatory. The class is written under
the specified directory.
+
+
+
+Output file location in C# mode:
+
+
+
+
+-r, --resource=RESOURCE
+
+
+
+
+resource name
+
+
+
+
+-l, --locale=LOCALE
+
+
+
+
+locale name, either language or
+language_COUNTRY
+
+
+
+
+-d DIRECTORY
+
+
+
+
+base directory for locale dependent .dll files
+
+
+
+
+The -l and -d options are mandatory. The .dll
+file is written in a subdirectory of the specified directory
+whose name depends on the locale.
+
@@ -500,7 +576,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 1995-1998, 2000-2003 Free Software Foundation,
+Copyright 1995-1998, 2000-2004 Free Software Foundation,
Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
diff --git a/gettext-tools/man/msggrep.1 b/gettext-tools/man/msggrep.1
index fac238374..9fde92295 100644
--- a/gettext-tools/man/msggrep.1
+++ b/gettext-tools/man/msggrep.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGGREP "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGGREP "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msggrep \- pattern matching on message catalog
.SH SYNOPSIS
@@ -137,7 +137,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msggrep.1.html b/gettext-tools/man/msggrep.1.html
index c8ac3425d..c1e4178ff 100644
--- a/gettext-tools/man/msggrep.1.html
+++ b/gettext-tools/man/msggrep.1.html
@@ -533,7 +533,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/msginit.1 b/gettext-tools/man/msginit.1
index aca916a1b..6fb74dab1 100644
--- a/gettext-tools/man/msginit.1
+++ b/gettext-tools/man/msginit.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGINIT "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGINIT "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msginit \- initialize a message catalog
.SH SYNOPSIS
@@ -65,7 +65,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msginit.1.html b/gettext-tools/man/msginit.1.html
index 453c31b3f..39e57afa0 100644
--- a/gettext-tools/man/msginit.1.html
+++ b/gettext-tools/man/msginit.1.html
@@ -264,7 +264,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/msgmerge.1 b/gettext-tools/man/msgmerge.1
index ac46c10f0..9f525ff94 100644
--- a/gettext-tools/man/msgmerge.1
+++ b/gettext-tools/man/msgmerge.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGMERGE "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGMERGE "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgmerge \- merge message catalog and template
.SH SYNOPSIS
@@ -146,7 +146,7 @@ Written by Peter Miller.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2003 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgmerge.1.html b/gettext-tools/man/msgmerge.1.html
index 084b8ca46..037d03aac 100644
--- a/gettext-tools/man/msgmerge.1.html
+++ b/gettext-tools/man/msgmerge.1.html
@@ -555,7 +555,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 1995-1998, 2000-2003 Free Software Foundation,
+Copyright 1995-1998, 2000-2004 Free Software Foundation,
Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
diff --git a/gettext-tools/man/msgunfmt.1 b/gettext-tools/man/msgunfmt.1
index 95483379c..574713adf 100644
--- a/gettext-tools/man/msgunfmt.1
+++ b/gettext-tools/man/msgunfmt.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGUNFMT "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGUNFMT "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msgunfmt \- uncompile message catalog from binary format
.SH SYNOPSIS
@@ -16,6 +16,12 @@ Mandatory arguments to long options are mandatory for short options too.
\fB\-j\fR, \fB\-\-java\fR
Java mode: input is a Java ResourceBundle class
.TP
+\fB\-\-csharp\fR
+C# mode: input is a .NET .dll file
+.TP
+\fB\-\-csharp\-resources\fR
+C# resources mode: input is a .NET .resources file
+.TP
\fB\-\-tcl\fR
Tcl mode: input is a tcl/msgcat .msg file
.SS "Input file location:"
@@ -34,6 +40,19 @@ locale name, either language or language_COUNTRY
.PP
The class name is determined by appending the locale name to the resource name,
separated with an underscore. The class is located using the CLASSPATH.
+.SS "Input file location in C# mode:"
+.TP
+\fB\-r\fR, \fB\-\-resource\fR=\fIRESOURCE\fR
+resource name
+.TP
+\fB\-l\fR, \fB\-\-locale\fR=\fILOCALE\fR
+locale name, either language or language_COUNTRY
+.TP
+\fB\-d\fR DIRECTORY
+base directory for locale dependent .dll files
+.PP
+The \fB\-l\fR and \fB\-d\fR options are mandatory. The .dll file is located in a
+subdirectory of the specified directory whose name depends on the locale.
.SS "Input file location in Tcl mode:"
.TP
\fB\-l\fR, \fB\-\-locale\fR=\fILOCALE\fR
@@ -98,7 +117,7 @@ Written by Ulrich Drepper.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2003 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msgunfmt.1.html b/gettext-tools/man/msgunfmt.1.html
index 6baa61177..5d2c8d936 100644
--- a/gettext-tools/man/msgunfmt.1.html
+++ b/gettext-tools/man/msgunfmt.1.html
@@ -68,6 +68,31 @@ options too.
Java mode: input is a Java ResourceBundle class
+
+
+
+--csharp
+
+
+
+
+C# mode: input is a .NET .dll file
+
+
+
+
+--csharp-resources
+
+
+
+
+C# resources mode: input is a .NET .resources
+file
+
@@ -144,6 +169,57 @@ The class name is determined by appending the locale name to
the resource name, separated with an underscore. The class
is located using the CLASSPATH.
+
+
+
+Input file location in C# mode:
+
+
+
+
+-r, --resource=RESOURCE
+
+
+
+
+resource name
+
+
+
+
+-l, --locale=LOCALE
+
+
+
+
+locale name, either language or
+language_COUNTRY
+
+
+
+
+-d DIRECTORY
+
+
+
+
+base directory for locale dependent .dll files
+
+
+
+
+The -l and -d options are mandatory. The .dll
+file is located in a subdirectory of the specified directory
+whose name depends on the locale.
+
@@ -398,7 +474,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 1995-1998, 2000-2003 Free Software Foundation,
+Copyright 1995-1998, 2000-2004 Free Software Foundation,
Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
diff --git a/gettext-tools/man/msguniq.1 b/gettext-tools/man/msguniq.1
index 5d358a07a..841ed0e4d 100644
--- a/gettext-tools/man/msguniq.1
+++ b/gettext-tools/man/msguniq.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGUNIQ "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH MSGUNIQ "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
msguniq \- unify duplicate translations in message catalog
.SH SYNOPSIS
@@ -108,7 +108,7 @@ Written by Bruno Haible.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 2001-2003 Free Software Foundation, Inc.
+Copyright \(co 2001-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/msguniq.1.html b/gettext-tools/man/msguniq.1.html
index 0f7dff6da..9d619eca2 100644
--- a/gettext-tools/man/msguniq.1.html
+++ b/gettext-tools/man/msguniq.1.html
@@ -422,7 +422,7 @@ Report bugs to <bug-gnu-gettext@gnu.org>.
cols="2" cellspacing="0" cellpadding="0">
-Copyright 2001-2003 Free Software Foundation, Inc.
+Copyright 2001-2004 Free Software Foundation, Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
diff --git a/gettext-tools/man/xgettext.1 b/gettext-tools/man/xgettext.1
index ab4a2b74e..fbc8371c7 100644
--- a/gettext-tools/man/xgettext.1
+++ b/gettext-tools/man/xgettext.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH XGETTEXT "1" "December 2003" "GNU gettext-tools 0.13.1" GNU
+.TH XGETTEXT "1" "January 2004" "GNU gettext-tools 0.14" GNU
.SH NAME
xgettext \- extract gettext strings from source
.SH SYNOPSIS
@@ -42,7 +42,7 @@ If output file is -, output is written to standard output.
recognise the specified language
(C, C++, ObjectiveC, PO, Shell, Python, Lisp,
EmacsLisp, librep, Smalltalk, Java,
-JavaProperties, awk, YCP, Tcl, Perl, PHP,
+JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,
GCC-source, NXStringTable, RST, Glade)
.TP
\fB\-C\fR, \fB\-\-c\fR++
@@ -72,7 +72,7 @@ preceding keyword lines) in output file
\fB\-a\fR, \fB\-\-extract\-all\fR
extract all strings
(only languages C, C++, ObjectiveC, Shell,
-Python, Lisp, EmacsLisp, librep, Java, awk,
+Python, Lisp, EmacsLisp, librep, Java, C#, awk,
Tcl, Perl, PHP, GCC-source, Glade)
.TP
\fB\-k\fR, \fB\-\-keyword\fR[=\fIWORD\fR]
@@ -80,7 +80,7 @@ additional keyword to be looked for (without
WORD means not to use default keywords)
.IP
(only languages C, C++, ObjectiveC, Shell,
-Python, Lisp, EmacsLisp, librep, Java, awk,
+Python, Lisp, EmacsLisp, librep, Java, C#, awk,
Tcl, Perl, PHP, GCC-source, Glade)
.TP
\fB\-\-flag\fR=\fIWORD\fR:ARG:FLAG
@@ -88,7 +88,7 @@ additional flag for strings inside the argument
number ARG of keyword WORD
.IP
(only languages C, C++, ObjectiveC, Shell,
-Python, Lisp, EmacsLisp, librep, Java, awk,
+Python, Lisp, EmacsLisp, librep, Java, C#, awk,
YCP, Tcl, Perl, PHP, GCC-source)
.TP
\fB\-T\fR, \fB\-\-trigraphs\fR
@@ -172,7 +172,7 @@ Written by Ulrich Drepper.
.SH "REPORTING BUGS"
Report bugs to .
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2003 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2004 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/gettext-tools/man/xgettext.1.html b/gettext-tools/man/xgettext.1.html
index b67457c70..cbefbd644 100644
--- a/gettext-tools/man/xgettext.1.html
+++ b/gettext-tools/man/xgettext.1.html
@@ -165,7 +165,7 @@ output.
recognise the specified language (C, C++, ObjectiveC, PO,
Shell, Python, Lisp, EmacsLisp, librep, Smalltalk, Java,
-JavaProperties, awk, YCP, Tcl, Perl, PHP, GCC-source,
+JavaProperties, C#, awk, YCP, Tcl, Perl, PHP, GCC-source,
NXStringTable, RST, Glade)
extract all strings (only languages C, C++, ObjectiveC,
-Shell, Python, Lisp, EmacsLisp, librep, Java, awk, Tcl,
+Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl,
Perl, PHP, GCC-source, Glade)
(only languages C, C++, ObjectiveC, Shell, Python, Lisp,
-EmacsLisp, librep, Java, awk, Tcl, Perl, PHP, GCC-source,
-Glade)
+EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
+GCC-source, Glade)
@@ -315,7 +315,7 @@ of keyword WORD
(only languages C, C++, ObjectiveC, Shell, Python, Lisp,
-EmacsLisp, librep, Java, awk, YCP, Tcl, Perl, PHP,
+EmacsLisp, librep, Java, C#, awk, YCP, Tcl, Perl, PHP,
GCC-source)
cols="2" cellspacing="0" cellpadding="0">
-Copyright 1995-1998, 2000-2003 Free Software Foundation,
+Copyright 1995-1998, 2000-2004 Free Software Foundation,
Inc.
This is free software; see the source for copying
conditions. There is NO warranty; not even for
diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in
index 2871887f8..bfa570279 100644
--- a/gettext-tools/misc/Makefile.in
+++ b/gettext-tools/misc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 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.
@@ -14,6 +14,8 @@
@SET_MAKE@
+
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -36,6 +37,79 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+subdir = misc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/autopoint.in $(srcdir)/gettextize.in ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
+ $(top_srcdir)/../config/m4/libtool.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
+ $(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/intmax.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes-pri.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/nls.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/po.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/printf-posix.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/progtest.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/signed.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/size_max.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
+ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
+ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
+ $(top_srcdir)/m4/backupfile.m4 \
+ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \
+ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \
+ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \
+ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/extensions.m4 \
+ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/gcj.m4 \
+ $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getndelim2.m4 \
+ $(top_srcdir)/m4/hostname.m4 $(top_srcdir)/m4/javacomp.m4 \
+ $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/locale-fr.m4 \
+ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+ $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \
+ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/relocatable.m4 \
+ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \
+ $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \
+ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \
+ $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/strerror.m4 \
+ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = gettextize autopoint
+am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(lispdir) $(DESTDIR)$(gettextsrcdir)
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+lispLISP_INSTALL = $(INSTALL_DATA)
+LISP = $(lisp_LISP)
+ELCFILES = po-compat.elc po-mode.elc
+am__ELFILES = po-compat.el po-mode.el
+elisp_comp = $(top_srcdir)/../config/elisp-comp
+gettextsrcDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(gettextsrc_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
@@ -48,6 +122,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILDCSHARP = @BUILDCSHARP@
BUILDJAVA = @BUILDJAVA@
BUILDJAVAEXE = @BUILDJAVAEXE@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -60,6 +135,7 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CROSS_COMPILING = @CROSS_COMPILING@
+CSHARP_CHOICE = @CSHARP_CHOICE@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -76,6 +152,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMACS = @EMACS@
+EMACSLOADPATH = @EMACSLOADPATH@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -86,11 +163,17 @@ GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_CSC = @HAVE_CSC@
+HAVE_CSCC = @HAVE_CSCC@
+HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
+HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
HAVE_GCJ = @HAVE_GCJ@
HAVE_GCJ_C = @HAVE_GCJ_C@
HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@
HAVE_GIJ = @HAVE_GIJ@
HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
+HAVE_ILRUN = @HAVE_ILRUN@
+HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
HAVE_JAVA = @HAVE_JAVA@
HAVE_JAVAC = @HAVE_JAVAC@
HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
@@ -102,6 +185,10 @@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
+HAVE_MCS = @HAVE_MCS@
+HAVE_MCS_IN_PATH = @HAVE_MCS_IN_PATH@
+HAVE_MONO = @HAVE_MONO@
+HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
HAVE_SNPRINTF = @HAVE_SNPRINTF@
HAVE_WPRINTF = @HAVE_WPRINTF@
@@ -127,13 +214,14 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LOCALE_FR = @LOCALE_FR@
-LTALLOCA = @LTALLOCA@
LTLIBEXPAT = @LTLIBEXPAT@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_PATH = @MONO_PATH@
+MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@
MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
OBJDUMP = @OBJDUMP@
@@ -156,7 +244,9 @@ SET_RELOCATABLE = @SET_RELOCATABLE@
SHELL = @SHELL@
STDBOOL_H = @STDBOOL_H@
STRIP = @STRIP@
+TESTCSHARP = @TESTCSHARP@
TESTJAVA = @TESTJAVA@
+TESTLIBASPRINTF = @TESTLIBASPRINTF@
TEXI2PDF = @TEXI2PDF@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
@@ -203,6 +293,7 @@ lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -210,10 +301,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
AUTOMAKE_OPTIONS = 1.2 gnits
-
# Old sh interface.
# Old Tcl interface.
@@ -224,53 +313,55 @@ AUTOMAKE_OPTIONS = 1.2 gnits
# Woe32 support.
EXTRA_DIST = add-to-archive cvsuser.c archive.tar.gz $(lisp_LISP) gettext-sh tcl_gettext.c README-Tcl gettext.perl Makefile.vms Makefile.msvc
-
DISTCLEANFILES = gettextize autopoint
-
# Scripts for maintainers.
bin_SCRIPTS = gettextize autopoint
-
gettextsrcdir = $(datadir)/gettext
gettextsrc_DATA = archive.tar.gz
-
# Emacs Lisp code.
lisp_LISP = po-mode.el po-compat.el
-subdir = misc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = gettextize autopoint
-SCRIPTS = $(bin_SCRIPTS)
-
-DIST_SOURCES =
-LISP = $(lisp_LISP)
-
-ELCFILES = po-compat.elc po-mode.elc
-am__ELFILES = po-compat.el po-mode.el
-elisp_comp = $(top_srcdir)/../config/elisp-comp
-DATA = $(gettextsrc_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am autopoint.in \
- gettextize.in
all: all-am
.SUFFIXES:
.SUFFIXES: .el .elc
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits misc/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnits misc/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-gettextize: $(top_builddir)/config.status gettextize.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+gettextize: $(top_builddir)/config.status $(srcdir)/gettextize.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autopoint: $(top_builddir)/config.status autopoint.in
+autopoint: $(top_builddir)/config.status $(srcdir)/autopoint.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
+ $(mkdir_p) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@@ -296,8 +387,8 @@ installcheck-binSCRIPTS: $(bin_SCRIPTS)
f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
for opt in --help --version; do \
if $(DESTDIR)$(bindir)/$$f $$opt > c$${pid}_.out 2> c$${pid}_.err \
- && test -n "`cat c$${pid}_.out`" \
- && test -z "`cat c$${pid}_.err`"; then :; \
+ && test -n "`cat c$${pid}_.out`" \
+ && test -z "`cat c$${pid}_.err`"; then :; \
else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
done; \
done; rm -f c$${pid}_.???; exit $$bad
@@ -311,18 +402,17 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-lispLISP_INSTALL = $(INSTALL_DATA)
elc-stamp: $(am__ELFILES)
@echo 'WARNING: Warnings can be ignored. :-)'
- if test $(EMACS) != no; then \
+ if test "$(EMACS)" != no; then \
set x; \
list='$(am__ELFILES)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
set x "$$@" "$$d$$p"; shift; \
done; \
shift; \
- EMACS=$(EMACS) $(SHELL) $(elisp_comp) "$$@" || exit 1; \
+ EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \
else : ; fi
touch $@
@@ -333,8 +423,8 @@ elc-stamp: $(am__ELFILES)
else : ; fi
install-lispLISP: $(lisp_LISP) $(ELCFILES)
@$(NORMAL_INSTALL)
- @if test -n "$(lispdir)"; then \
- $(mkinstalldirs) $(DESTDIR)$(lispdir); \
+ @if test "$(EMACS)" != no; then \
+ $(mkdir_p) $(DESTDIR)$(lispdir); \
list='$(lisp_LISP)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -349,7 +439,7 @@ install-lispLISP: $(lisp_LISP) $(ELCFILES)
uninstall-lispLISP:
@$(NORMAL_UNINSTALL)
- @if test -n "$(lispdir)"; then \
+ @if test "$(EMACS)" != no; then \
list='$(lisp_LISP)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(lispdir)/$$f $(DESTDIR)$(lispdir)/$${f}c"; \
@@ -359,10 +449,9 @@ uninstall-lispLISP:
clean-lisp:
-rm -f elc-stamp $(ELCFILES)
-gettextsrcDATA_INSTALL = $(INSTALL_DATA)
install-gettextsrcDATA: $(gettextsrc_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir)
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir)
@list='$(gettextsrc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -383,10 +472,6 @@ TAGS:
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -400,7 +485,7 @@ distdir: $(DISTFILES)
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -418,9 +503,8 @@ distdir: $(DISTFILES)
check-am: all-am
check: check-am
all-am: Makefile $(SCRIPTS) $(LISP) elc-stamp $(ELCFILES) $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(lispdir) $(DESTDIR)$(gettextsrcdir)
+ $(mkdir_p) $(DESTDIR)$(bindir) $(DESTDIR)$(lispdir) $(DESTDIR)$(gettextsrcdir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -432,7 +516,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -458,6 +542,8 @@ dvi: dvi-am
dvi-am:
+html: html-am
+
info: info-am
info-am:
@@ -493,15 +579,16 @@ uninstall-am: uninstall-binSCRIPTS uninstall-gettextsrcDATA \
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
clean-lisp distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am info info-am install install-am \
- install-binSCRIPTS install-data install-data-am install-exec \
- install-exec-am install-gettextsrcDATA install-info \
- install-info-am install-lispLISP install-man install-strip \
- installcheck installcheck-am installcheck-binSCRIPTS \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
- uninstall-gettextsrcDATA uninstall-info-am uninstall-lispLISP
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-binSCRIPTS install-data install-data-am \
+ install-exec install-exec-am install-gettextsrcDATA \
+ install-info install-info-am install-lispLISP install-man \
+ install-strip installcheck installcheck-am \
+ installcheck-binSCRIPTS installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-binSCRIPTS uninstall-gettextsrcDATA \
+ uninstall-info-am uninstall-lispLISP
# The archive.tar.gz is not in the CVS. Alpha-testers must use the one from an
diff --git a/gettext-tools/po/be.po b/gettext-tools/po/be.po
index ac7ee9f7e..6d255e618 100644
--- a/gettext-tools/po/be.po
+++ b/gettext-tools/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext 0.11.5\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 2002-09-04 18:51+0300\n"
"Last-Translator: Ales Nyakhaychyk \n"
"Language-Team: Belarusian \n"
@@ -35,9 +35,9 @@ msgstr "Ð ÑÑаÑÑнÑÑ Ð°ÑгÑмÑнÑÑ:"
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "памÑлка Ñ ÑÐ°Ñ ÑÑÑанÑÐ½Ñ Ñайла \"%s\""
@@ -66,10 +66,10 @@ msgstr "памÑлка паÑÐ»Ñ ÑÑÑанÑÐ½Ñ \"%s\""
msgid "Unknown system error"
msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ ÑÑÑÑÑÐ¼Ð½Ð°Ñ Ð¿Ð°Ð¼Ñлка"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr "%s падпÑаÑÑÑ ÑпÑÐ½ÐµÐ½Ñ Ð·-за памÑлкÑ"
@@ -129,12 +129,12 @@ msgstr "%s: вÑÐ±Ð°Ñ `-W %s' неадназнаÑнÑ\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: вÑÐ±Ð°Ñ `-W %s' не паÑÑабÑе аÑгÑмÑнÑаÑ\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java кампÑлÑÑÐ°Ñ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½, паÑпÑабÑйÑе ÑÑÑалÑваÑÑ gcj ÑÑ $JAVAC"
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -163,12 +163,12 @@ msgstr "падпÑаÑÑÑ %s завеÑÑÑÑÑÑ Ð· кодам вÑÑ
Ð°Ð´Ñ %d
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr "%s падпÑаÑÑÑ"
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr "%s падÑаÑÑÑ Ð°ÑÑÑÐ¼Ð°Ñ ÑаÑалÑÐ½Ñ ÑÑгнал %d"
@@ -188,7 +188,7 @@ msgstr "ÑпÑÑÑÑÑкаÑÑÑ ÑаÑмаÑÑ Ð´Ð»Ñ Ð°ÑгÑмÑнÑа %u, Ñ
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "ÑпÑÑÑÑÑкаÑÑÑ ÑаÑмаÑÑ Ð´Ð»Ñ Ð°ÑгÑмÑнÑа %u Ð½Ñ Ð¹ÑнÑе Ñ '%s'"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -197,24 +197,24 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "ÑпÑÑÑÑÑкаÑаÑÑ ÑаÑмаÑÑ Ñ 'msgid' Ñ '%s' Ð´Ð»Ñ Ð°ÑгÑмÑнÑа %u неаднолÑкавÑÑ"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "колÑкаÑÑÑÑ ÑпÑÑÑÑÑкаÑÑй ÑаÑмаÑÑ Ñ 'msgid' Ñ '%s' не ÑÑпадае"
@@ -273,72 +273,72 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "ÑпÑÑÑÑÑкаÑÑÑ ÑаÑмаÑÑ Ð´Ð»Ñ Ð°ÑгÑмÑнÑа {%u}, Ñк Ñ '%s', не йÑнÑе Ñ 'msgid'"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "ÑпÑÑÑÑÑкаÑÑÑ ÑаÑмаÑÑ Ð´Ð»Ñ Ð°ÑгÑмÑнÑа {%u} не йÑнÑе Ñ '%s'"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -508,9 +508,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -524,28 +524,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "ÐÑÑÐ°Ñ %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "велÑÐ¼Ñ ÑÐ¼Ð°Ñ Ð°ÑгÑмÑнÑаÑ"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÐаÑпÑабÑйÑе \"%s --help\" Ð´Ð»Ñ Ð±Ð¾Ð»ÑÑ Ð¿Ð°Ð´ÑабÑзнÑÑ
зÑвеÑÑак.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr "ÐÑкаÑÑÑÑанÑне: %s [ÐЫÐÐÐ ]\n"
@@ -585,27 +585,27 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, fuzzy, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
@@ -615,9 +615,9 @@ msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
msgid "Report bugs to .\n"
msgstr "ÐаведамлÑйÑе аб памÑлкаÑ
на адÑÐ°Ñ .\n"
@@ -627,7 +627,7 @@ msgid "could not get host name"
msgstr "немагÑÑма аÑÑÑмаÑÑ Ð½Ð°Ð·Ð²Ñ Ð²Ñзла"
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, c-format
msgid "at most one input file allowed"
msgstr "па болÑÑай ÑаÑÑÑÑ Ð°Ð´Ð·Ñн ÑваÑ
одзÑÑÑ Ñайл заÑÑвеÑджан"
@@ -635,15 +635,15 @@ msgstr "па болÑÑай ÑаÑÑÑÑ Ð°Ð´Ð·Ñн ÑваÑ
одзÑÑÑ Ñай
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s Ñ %s Ñзаема вÑклÑÑнÑ"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "ÐÑкаÑÑÑÑанÑне: %s [ÐЫÐÐÐ ] [УÐÐÐ¥ÐÐÐЯЧЫ_ФÐÐÐ]\n"
@@ -659,7 +659,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -669,28 +669,28 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "невÑзнаÑан ÑваÑ
одзÑÑÑ Ñайл"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, fuzzy, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
@@ -699,23 +699,23 @@ msgstr ""
"ÐÐ°Ð»Ñ ÑваÑ
одзÑÑÑ Ñайл не зададзен, ÑÑ Ð·Ð°Ð¼ÐµÑÑ Ñго -, ÑÑÑае ÑÑандаÑÑÐ½Ñ Ñвод.\n"
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, fuzzy, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -813,21 +813,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -835,87 +835,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -937,15 +937,15 @@ msgstr ""
" -s, --sort-output ÑÑваÑаÑÑ ÑпаÑÐ°Ð´ÐºÐ°Ð²Ð°Ð½Ñ Ð²Ñвад\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -955,7 +955,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "зададзен немагÑÑÐ¼Ñ ÐºÑÑÑÑÑÑй вÑбаÑÑ (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "ÐÑкаÑÑÑÑанÑне: %s [ÐЫÐÐÐ ] [УÐÐÐ¥ÐÐÐЯЧЫ_ФÐÐÐ]...\n"
@@ -984,18 +984,18 @@ msgstr ""
"бÑдÑÑÑ ÑзÑÑÑ Ð· пеÑÑага PO-Ñайла.\n"
"ÐазÑÑÑÑ Ð· ÑÑÑÑ
PO-ÑÐ°Ð¹Ð»Ð°Ñ Ð±ÑдÑÑÑ Ð°Ð±'ÑÐ´Ð½Ð°Ð½Ñ Ñ ÐºÑÑÑ\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -1021,15 +1021,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1048,17 +1048,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "не Ð·Ð°Ð´Ð°Ð´Ð·ÐµÐ½Ñ ÑводзÑÑÑÑ ÑайлÑ"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "паÑÑабÑеÑÑа менавÑÑа 2 ÑводзÑÑÑÑ
Ñайла"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "ÐÑкаÑÑÑÑанÑне: %s [ÐЫÐÐÐ ] def.po ref.pot\n"
@@ -1091,12 +1091,12 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, fuzzy, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
@@ -1106,17 +1106,17 @@ msgstr ""
" -m, --multi-domain пÑÑмÑнÑÑÑ ref.pot Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð°Ð³Ð° маÑнÑка з def."
"po\n"
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "гÑÑа паведамленÑне вÑкаÑÑÑÑоÑваеÑÑа, але не вÑзнаÑана..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...але гÑÑа вÑзнаÑÑнÑне падобна"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "гÑÑа паведамленÑне вÑкаÑÑÑÑоÑваеÑÑа, але не вÑзнаÑана Ñ %s"
@@ -1167,7 +1167,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1191,31 +1191,31 @@ msgstr ""
" -t, --to-code=ÐÐÐÐРпеÑакаÑÑваÑае кадзÑÑоÑÐºÑ Ð´Ð»Ñ Ð²ÑвадÑ\n"
"ÐвÑÑайна вÑкаÑÑÑÑоÑвÑваеÑÑа бÑгÑÑÐ°Ñ ÐºÐ°Ð´Ð·ÑÑоÑка лакалÑ\n"
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "невÑзнаÑан ÑваÑ
одзÑÑÑ Ñайл"
@@ -1351,13 +1351,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1393,33 +1393,33 @@ msgstr "памÑлка ÑÑÑанÑÐ½Ñ Ð· падпÑаÑÑÑа %s"
msgid "%s subprocess terminated with exit code %d"
msgstr "падпÑаÑÑÑ %s завеÑÑÑÑÑÑ Ð· кодам вÑÑ
Ð°Ð´Ñ %d"
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "аÑгÑмÑÐ½Ñ %s павÑнен бÑÑÑ Ð°Ð´Ð·ÑноÑнÑм знакам пÑÑпÑнкÑ"
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s паÑÑабÑе \"-d дÑÑÑкÑоÑÑÑ\" ÑпÑÑÑÑÑкаÑÑÑ"
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr "%s паÑÑабÑе \"-l locale\" ÑпÑÑÑÑÑкаÑÑÑ"
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s ÑÑÑаÑÑÐ½Ñ ÑолÑÐºÑ Ð· %s"
-
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s ÑÑÑаÑÑÐ½Ñ ÑолÑÐºÑ Ð· %s ÑÑ %s"
-#: src/msgfmt.c:503
+#: src/msgfmt.c:477 src/msgfmt.c:483
+#, fuzzy, c-format
+msgid "%s is only valid with %s, %s or %s"
+msgstr "%s ÑÑÑаÑÑÐ½Ñ ÑолÑÐºÑ Ð· %s ÑÑ %s"
+
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1427,7 +1427,7 @@ msgstr[0] "%d паведамленÑне пеÑакладзена"
msgstr[1] "%d паведамленÑÐ½Ñ Ð¿ÐµÑакладзена"
msgstr[2] "%d паведамленÑнÑÑ Ð¿ÐµÑакладзена"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1441,7 +1441,7 @@ msgstr[2] ""
",\n"
"%d недакладнÑÑ
пеÑакладаÑ"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1455,17 +1455,17 @@ msgstr[2] ""
",\n"
"%d непеÑакладзенÑÑ
паведамленÑнÑÑ"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "ÐÑкаÑÑÑÑанÑне: %s [ÐЫÐÐÐ ] Ñайл.po ...\n"
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "СÑваÑае дваÑÑÐ½Ñ ÐºÐ°ÑалÑг паведамленÑнÑÑ Ð·Ñ ÑÑ
ÑÑкÑÑавага апÑÑанÑнÑ.\n"
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1474,37 +1474,55 @@ msgstr ""
"ÐÑгÑмÑнÑÑ, абавÑзковÑÑ Ð´Ð»Ñ Ð´Ð¾ÑгÑ
вÑбаÑаÑ, абавÑÐ·ÐºÐ¾Ð²Ñ Ñак Ñама\n"
"Ñ Ð´Ð»Ñ ÐºÐ°ÑоÑкÑ. Тое Ñаме-ж Ñ Ð´Ð»Ñ Ð²ÑбаÑаÑнÑÑ
аÑгÑмÑнÑаÑ.\n"
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, fuzzy, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+"Ð ÑжÑм дзеÑнÑнÑ:\n"
+" -j, --java Java ÑÑжÑм: Ñвод гÑÑа ResourceBundle клÑÑ\n"
+" --tcl Tcl ÑÑжÑм: Ñвод гÑÑа tcl/msgcat .msg Ñайл\n"
+
+#: src/msgfmt.c:641
+#, fuzzy, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"Ð ÑжÑм дзеÑнÑнÑ:\n"
+" -j, --java Java ÑÑжÑм: Ñвод гÑÑа ResourceBundle клÑÑ\n"
+" --tcl Tcl ÑÑжÑм: Ñвод гÑÑа tcl/msgcat .msg Ñайл\n"
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, fuzzy, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
@@ -1512,40 +1530,41 @@ msgstr ""
" -j, --java Java ÑÑжÑм: Ñвод гÑÑа ResourceBundle клÑÑ\n"
" --tcl Tcl ÑÑжÑм: Ñвод гÑÑа tcl/msgcat .msg Ñайл\n"
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, fuzzy, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1563,29 +1582,48 @@ msgstr ""
"абмежаванÑм падкÑÑÑÑлÑванÑнем. ÐÑÐ±Ð°Ñ -d абавÑзковÑ. ÐлÑÑ Ð·Ð°Ð¿ÑÑваеÑÑа Ñ\n"
"зададзенÑÑ Ð´ÑÑÑкÑоÑÑÑ.\n"
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "невÑзнаÑан ÑваÑ
одзÑÑÑ Ñайл"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1593,33 +1631,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1627,12 +1665,12 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, fuzzy, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -1642,7 +1680,7 @@ msgstr ""
"d)\n"
" --no-hash дваÑÑÐ½Ñ Ñайл не зÑмÑÑÑае Ñ
ÑÑ ÑаблÑÑÑ\n"
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, fuzzy, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
@@ -1652,38 +1690,38 @@ msgstr ""
"d)\n"
" --no-hash дваÑÑÐ½Ñ Ñайл не зÑмÑÑÑае Ñ
ÑÑ ÑаблÑÑÑ\n"
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr "вÑÑаз множнага лÑÐºÑ Ð¼Ð¾Ð¶Ð° ÑÑваÑаÑÑ Ð°Ð´Ð¼Ð¾Ñнае знаÑÑнÑне"
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
"nplurals = %lu але вÑÑаз множнага лÑÐºÑ Ð¼Ð¾Ð¶Ð° ÑÑваÑаÑÑ Ð·Ð½Ð°ÑÑнÑÐ½Ñ ÑакÑÑ Ñк %lu"
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr "вÑÑаз множнага лÑÐºÑ Ð¼Ð¾Ð¶Ð° ÑÑваÑаÑÑ Ð´Ð·ÑленÑне на нÑлÑ"
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr "вÑÑаз множнага лÑÐºÑ Ð¼Ð¾Ð¶Ð° ÑÑваÑаÑÑ ÑÑлалÑкавае пеÑапаÑненÑне"
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
@@ -1692,37 +1730,37 @@ msgstr ""
"вÑÑаз множнага лÑÐºÑ Ð¼Ð¾Ð¶Ð° ÑÑваÑаÑÑ Ð°ÑÑÑмÑÑÑÑнÑÑ Ð²ÑклÑÑÑнÑнÑ, магÑÑма\n"
"дзÑленÑне на нÑлÑ"
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr "каÑалÑг паведамленÑÐ½Ñ Ð¼Ð°Ðµ пеÑÐ°ÐºÐ»Ð°Ð´Ñ ÑоÑм множнага лÑкÑ..."
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr "...але Ñ Ð·Ð°Ð³Ð°Ð»Ð¾ÑÐºÑ Ð½ÐµÑ
апае аÑÑÑбÑÑа \"plural=ÐЫРÐÐ\""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr "...але Ñ Ð·Ð°Ð³Ð°Ð»Ð¾ÑÐºÑ Ð½ÐµÑ
апае аÑÑÑбÑÑа \"plural=ЦÐÐЫ_ÐÐÐ\""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, c-format
msgid "invalid nplurals value"
msgstr "неÑÑÑаÑÑнае знаÑÑнÑне nplurals"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, c-format
msgid "invalid plural expression"
msgstr "неÑÑÑаÑÑÐ½Ñ Ð²ÑÑаз ÑоÑÐ¼Ñ Ð¼Ð½Ð½Ð¾Ð¶Ð½Ð°Ð³Ð° лÑÐºÑ (plural)"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr "nplurals = %lu..."
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
@@ -1732,7 +1770,7 @@ msgstr[1] "...але некаÑоÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ñ Ð¼Ð°ÑÑÑ Ñ
msgstr[2] ""
"...але некаÑоÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ñ Ð¼Ð°ÑÑÑ ÑолÑÐºÑ %lu ÑоÑÐ¼Ð°Ñ Ð¼Ð½Ð¾Ð¶Ð½Ð°Ð³Ð° лÑкÑ"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
@@ -1740,153 +1778,153 @@ msgstr[0] "...але некаÑоÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ñ Ð¼Ð°ÑÑÑ Ð°
msgstr[1] "...але некаÑоÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ñ Ð¼Ð°ÑÑÑ %lu ÑоÑÐ¼Ñ Ð¼Ð½Ð¾Ð¶Ð½Ð°Ð³Ð° лÑкÑ"
msgstr[2] "...але некаÑоÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ñ Ð¼Ð°ÑÑÑ %lu ÑоÑÐ¼Ð°Ñ Ð¼Ð½Ð¾Ð¶Ð½Ð°Ð³Ð° лÑкÑ"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr "ÐаÑпÑабÑйÑе вÑкаÑÑÑÑоÑваÑÑ Ð½Ð°ÑÑÑпнае, ÑÑÑаÑÑнае Ð´Ð»Ñ %s\n"
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' Ñ `msgid_plural' не паÑÑнаÑÑÑа Ñазам з '\\n'"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' Ñ `msgstr[%u]' не паÑÑнаÑÑÑа Ñазам з \"\\n\""
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' Ñ `msgstr' не паÑÑнаÑÑÑа Ñазам з '\\n'"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' Ñ `msgid_plural' не заканÑваÑÑÑа Ñазам на '\\n'"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' Ñ `msgstr[%u]' не заканÑваÑÑÑа Ñазам на '\\n'"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' Ñ `msgstr' не заканÑваÑÑÑа Ñазам на '\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr "апÑаÑоÑка множнага лÑÐºÑ - гÑÑа паÑÑÑÑнÑне GNU gettext"
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, fuzzy, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr "'%s' - гÑÑа неÑÑÑаÑÑÐ½Ñ %s ÑаÑÐ¼Ð°Ñ ÑадкÑ, Ñ Ð°Ð´ÑозÑненÑне ад 'msgid'"
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "поле Ð·Ð°Ð³Ð°Ð»Ð¾ÐºÑ `%s' пÑапÑÑÑана Ñ Ð·Ð°Ð³Ð°Ð»Ð¾ÑкÑ\n"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "поле Ð·Ð°Ð³Ð°Ð»Ð¾ÐºÑ `%s' павÑнна паÑÑнаÑÑа на паÑаÑÐºÑ Ñадка\n"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
msgid "some header fields still have the initial default value\n"
msgstr "некаÑоÑÑÑ Ð¿Ð°Ð»Ñ Ð·Ð°Ð³Ð°Ð»Ð¾ÐºÐ° ÑÑÑ ÑÑÑÑ Ð¼Ð°ÑÑÑ Ð¿Ð°ÑаÑковае знаÑÑнÑне\n"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, c-format
msgid "field `%s' still has initial default value\n"
msgstr "поле `%s' ÑÑÑ ÑÑÑÑ Ð¼Ð°Ðµ паÑаÑковае знаÑÑнÑне\n"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "Ñвага: загаловак PO-Ñайла пÑапÑÑÑан ÑÑ Ð½ÐµÑÑÑаÑÑнÑ\n"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "Ñвага: пеÑаÑÑваÑÑнÑне кадзÑÑовак не бÑдзе пÑаÑаваÑÑ\n"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "Ñвага: загаловак PO-Ñайла мае Ð½ÐµÐ´Ð°ÐºÐ»Ð°Ð´Ð½Ñ Ð¿ÐµÑаклад\n"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "Ð´Ð°Ð¼ÐµÐ½Ð½Ð°Ñ Ð½Ð°Ð·Ð²Ð° \"%s\" не падÑÑ
одзÑÑÑ Ñ ÑкаÑÑÑ Ð½Ð°Ð·Ð²Ñ Ñайла"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"Ð´Ð°Ð¼ÐµÐ½Ð½Ð°Ñ Ð½Ð°Ð·Ð²Ð° \"%s\" не падÑÑ
одзÑÑÑ Ñ ÑкаÑÑÑ Ð½Ð°Ð·Ð²Ñ Ñайла;\n"
"бÑдзе вÑкаÑÑÑÑÐ°Ð½Ñ Ð¿ÑÑÑÑкÑ"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "дÑÑÑкÑÑва `domain %s' ÑгнаÑÑеÑÑа"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "паÑожнÑе ÑваÑ
оджанÑне `msgstr' пÑапÑÑÑана"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "недакладнае ÑваÑ
оджанÑне `msgstr' пÑапÑÑÑана"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: Ñвага: ÑзÑÑ
Ð¾Ð´Ð½Ñ Ñайл змÑÑÑае Ð½ÐµÐ´Ð°ÐºÐ»Ð°Ð´Ð½Ñ Ð¿ÐµÑаклад"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, fuzzy, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
"вÑÐ±Ð°Ñ '%c' не можа бÑÑÑ Ð²ÑкаÑÑÑÑÐ°Ð½Ñ Ñаней ÑÑм 'K' ÑÑ 'T' бÑдÑÑÑ Ð·Ð°Ð´Ð°Ð´Ð·ÐµÐ½Ñ"
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1918,35 +1956,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr "памÑлка запÑÑÑ Ñ Ð¿Ð°Ð´Ð¿ÑаÑÑÑ grep"
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1957,12 +1995,12 @@ msgstr ""
"ÐÐ°Ð»Ñ Ð»Ð°Ñка, задайÑе мÑÑÑоваÑÑÑÑ Ð· дапамогай вÑбаÑÑ --locale\n"
"ÑÑ .po Ñайл вÑÐ²Ð°Ð´Ñ Ð· дапамогай вÑбаÑÑ --output-file.\n"
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr "СÑвоÑан %s.\n"
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -1971,12 +2009,12 @@ msgstr ""
"СÑваÑае Ð½Ð¾Ð²Ñ PO Ñайл, задае паÑаÑковÑÑ Ð¼ÑÑададзенÑÑ Ð·Ð½Ð°ÑÑнÑнÑÐ¼Ñ Ð· аÑÑÑодзÑдзÑ\n"
"каÑÑÑÑалÑнÑка.\n"
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, fuzzy, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -1987,12 +2025,12 @@ msgstr ""
" ФÐÐÐ ... .mo ÑайлÑ\n"
"ÐÐ°Ð»Ñ ÑваÑ
одзÑÑÑ Ñайл не зададзен, ÑÑ Ð·Ð°Ð¼ÐµÑÑ Ñго -, ÑÑÑае ÑÑандаÑÑÐ½Ñ Ñвод.\n"
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, fuzzy, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2003,18 +2041,18 @@ msgstr ""
" --strict ÑклÑÑае ÑÑжÑм жоÑÑÑкага адпавÑданÑÐ½Ñ Uniforum\n"
"ÐÐ°Ð»Ñ Ð·Ð°Ð¼ÐµÑÑ Ð½Ð°Ð·Ð²Ñ Ñайла вÑÐ²Ð°Ð´Ñ -, вÑвад запÑÑваеÑÑа Ñ ÑÑандаÑÑÐ½Ñ Ð²Ñвад.\n"
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2022,12 +2060,12 @@ msgstr ""
"Ðнойдзен болÑÑ ÑÑм адзÑн .pot Ñайл.\n"
"ÐÐ°Ð»Ñ Ð»Ð°Ñка задайÑе .pot Ñайл ÑÐ²Ð¾Ð´Ñ Ð· дапамогай вÑбаÑа --input.\n"
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr "памÑлка ÑÑÑанÑÐ½Ñ Ð±ÑгÑÑай дÑÑÑкÑоÑÑÑ"
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2035,24 +2073,24 @@ msgstr ""
"ÐÑ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½ .pot Ñайл Ñ Ð±ÑгÑÑай дÑÑÑкÑоÑÑÑ.\n"
"ÐÐ°Ð»Ñ Ð»Ð°Ñка задайÑе .pot Ñайл ÑÐ²Ð¾Ð´Ñ Ð· дапамогай вÑбаÑа --input.\n"
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr "fdopen() памÑлка"
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr "падпÑаÑÑÑ %s, памÑлка ÑводÑ-вÑвадÑ"
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, fuzzy, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "падпÑаÑÑÑ %s завеÑÑÑÑÑÑ Ð· кодам вÑÑ
Ð°Ð´Ñ %d"
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -2064,22 +2102,22 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr "ÐелаÑÑÑÐºÑ Ð¿ÐµÑаклад Ð´Ð»Ñ %s"
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "ÑваÑ
одзÑÑÑ Ñайл зÑмÑÑÑае два ÑознÑÑ
набоÑа ÑÑÐ¼Ð²Ð°Ð»Ð°Ñ \"%s\" Ñ \"%s\""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
@@ -2087,7 +2125,7 @@ msgstr ""
"ÑваÑ
одзÑÑÑ Ñайл `%s' не зÑмÑÑÑае загаловаÑÐ½Ñ Ð·Ð°Ð¿ÑÑ\n"
"Ñа ÑÑпеÑÑÑÑкаÑÑей кодавай ÑÑаÑонкÑ"
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, fuzzy, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2096,26 +2134,26 @@ msgstr ""
"ÑваÑ
одзÑÑÑ Ñайл `%s' не зÑмÑÑÑае загаловаÑÐ½Ñ Ð·Ð°Ð¿ÑÑ\n"
"Ñа ÑÑпеÑÑÑÑкаÑÑей кодавай ÑÑаÑонкÑ"
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr "Ñвага: "
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2124,7 +2162,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2133,12 +2171,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2146,7 +2184,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2155,7 +2193,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2163,17 +2201,17 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr "памÑлка пеÑаÑÑваÑÑнÑнÑ"
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "ÑваÑ
одзÑÑÑ Ñайл не змÑÑÑае загаловаÑнага запÑÑÑ Ð°Ð± набоÑÑ ÑÑмвалаÑ"
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2182,14 +2220,14 @@ msgstr ""
"ÐадзÑÑоÑка \"%s\" не падÑÑÑмлÑваеÑÑа. %s ÑпадзÑеÑÑа на iconv(),\n"
"але iconv() не падÑÑÑмлÑвае \"%s\".\n"
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2198,11 +2236,16 @@ msgstr ""
"ÐадзÑÑоÑка \"%s\" не падÑÑÑмлÑваеÑÑа. %s ÑпадзÑеÑÑа на iconv().\n"
"ÐÑÑа вÑÑÑÑÑ Ð¿Ð°Ð±Ñдавана без iconv().\n"
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr "%s ÑÑÑаÑÑÐ½Ñ ÑолÑÐºÑ Ð· %s"
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2223,51 +2266,51 @@ msgstr ""
"ÑÑпадзенÑне Ð½Ñ Ð±Ñдзе знойдзена, вÑкаÑÑÑÑоÑвÑваеÑÑа недакладае - длÑ\n"
"лепÑай пÑавеÑкÑ.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2279,7 +2322,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2287,27 +2330,27 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, c-format
msgid "this message should define plural forms"
msgstr "гÑÑае паведамленÑне павÑнна вÑзнаÑаÑÑ Ñ
оÑÐ¼Ñ Ð¼Ð½Ð¾Ð¶Ð½Ð°Ð³Ð° лÑка"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, c-format
msgid "this message should not define plural forms"
msgstr "гÑÑае паведамленÑне не павÑнна вÑзнаÑаÑÑ Ñ
оÑÐ¼Ñ Ð¼Ð½Ð¾Ð¶Ð½Ð°Ð³Ð° лÑка"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2316,26 +2359,26 @@ msgstr ""
"%sÐÑаÑÑÑана %ld ÑÑаÑÑÑ
+ %ld новÑÑ
, аб'ÑднанÑÑ
%ld, недакладнÑÑ
%ld;\n"
"пÑапÑÑÑана %ld, ÑаÑÑаÑÑлÑÑ
%ld.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " зÑоблена.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s Ñ ÑÑÐ½Ð°Ñ Ð½Ð°Ð·Ð²Ð° Ñайла Ñзаема вÑклÑÑалÑнÑ"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr "ÐÑкаÑÑÑÑанÑне: %s [ÐЫÐÐÐ ] [ФÐÐÐ]...\n"
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr "ÐеÑаÑÑваÑае дваÑÑÐ½Ñ ÐºÐ°ÑалÑг паведамленÑнÑÑ Ñ Uniforum .po Ñайл.\n"
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, fuzzy, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
@@ -2345,7 +2388,25 @@ msgstr ""
" -j, --java Java ÑÑжÑм: Ñвод гÑÑа ResourceBundle клÑÑ\n"
" --tcl Tcl ÑÑжÑм: Ñвод гÑÑа tcl/msgcat .msg Ñайл\n"
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, fuzzy, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+"Ð ÑжÑм дзеÑнÑнÑ:\n"
+" -j, --java Java ÑÑжÑм: Ñвод гÑÑа ResourceBundle клÑÑ\n"
+" --tcl Tcl ÑÑжÑм: Ñвод гÑÑа tcl/msgcat .msg Ñайл\n"
+
+#: src/msgunfmt.c:427
+#, fuzzy, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"Ð ÑжÑм дзеÑнÑнÑ:\n"
+" -j, --java Java ÑÑжÑм: Ñвод гÑÑа ResourceBundle клÑÑ\n"
+" --tcl Tcl ÑÑжÑм: Ñвод гÑÑа tcl/msgcat .msg Ñайл\n"
+
+#: src/msgunfmt.c:429
#, fuzzy, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2354,17 +2415,17 @@ msgstr ""
" -j, --java Java ÑÑжÑм: Ñвод гÑÑа ResourceBundle клÑÑ\n"
" --tcl Tcl ÑÑжÑм: Ñвод гÑÑа tcl/msgcat .msg Ñайл\n"
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, fuzzy, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2381,24 +2442,36 @@ msgstr ""
"абмежаванÑм падкÑÑÑÑлÑванÑнем. ÐÑÐ±Ð°Ñ -d абавÑзковÑ. ÐлÑÑ Ð·Ð°Ð¿ÑÑваеÑÑа Ñ\n"
"зададзенÑÑ Ð´ÑÑÑкÑоÑÑÑ.\n"
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "невÑзнаÑан ÑваÑ
одзÑÑÑ Ñайл"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2435,13 +2508,13 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr "%s: Ñвага: "
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2450,15 +2523,15 @@ msgstr ""
"ÐадзÑÑоÑка \"%s\" не з'ÑÑлÑеÑÑа пеÑанаÑÑмай назвай кадзÑÑоÑкÑ.\n"
"ÐеÑаÑÑваÑÑнÑне паведамленÑнÑÑ Ñ ÐºÐ°Ð´Ð·ÑÑоÑÐºÑ ÐºÐ°ÑÑÑÑалÑнÑка можа не пÑаÑаваÑÑ\n"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr "ÐÑаÑÑг вÑкананÑнÑ... ÑакаÑÑÑа памÑÐ»ÐºÑ ÑазбоÑÑ."
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr "ÐÑаÑÑг вÑкананÑнÑ..."
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2467,7 +2540,7 @@ msgstr ""
"ÐадзÑÑоÑка \"%s\" не падÑÑÑмлÑваеÑÑа. %s ÑпадзÑеÑÑа на iconv(),\n"
"але iconv() не падÑÑÑмлÑвае \"%s\".\n"
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
@@ -2476,12 +2549,12 @@ msgstr ""
"УÑÑалÑванÑне GNU libiconv Ñ Ð¿ÐµÑаÑÑÑалÑванÑне GNU gettext\n"
"павÑнна вÑпÑавÑÑÑ Ð³ÑÑÑ Ð¿ÑаблемÑ.\n"
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2490,7 +2563,7 @@ msgstr ""
"ÐадзÑÑоÑка \"%s\" не падÑÑÑмлÑваеÑÑа. %s ÑпадзÑеÑÑа на iconv().\n"
"ÐÑÑа вÑÑÑÑÑ Ð¿Ð°Ð±Ñдавана без iconv().\n"
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2536,7 +2609,7 @@ msgstr "ÑоÑÐ¼Ñ Ð¼Ð½Ð¾Ð¶Ð½Ð°Ð³Ð° лÑÐºÑ Ð¼Ð°ÑÑÑ Ð´ÑÑннÑÑ ÑндÑ
msgid "too many errors, aborting"
msgstr "велÑÐ¼Ñ ÑÐ¼Ð°Ñ Ð¿Ð°Ð¼Ñлак..."
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr "неÑÑÑаÑÑÐ½Ð°Ñ ÑмаÑÑÑмвалÑÐ½Ð°Ñ Ð¿Ð°ÑлÑдоÑнаÑÑÑ"
@@ -2557,11 +2630,11 @@ msgid "iconv failure"
msgstr "памÑлка iconv"
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "памÑлка Ñ ÑÐ°Ñ ÑÑÑанÑÐ½Ñ \"%s\""
@@ -2586,7 +2659,7 @@ msgstr "ÑÑмвал канÑа Ñайла знаÑ
одзÑÑÑа ÑнÑÑÑÑ
msgid "end-of-line within string"
msgstr "ÑÑмвал канÑа Ñадка знаÑ
одзÑÑÑа ÑнÑÑÑÑ Ñадка"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, c-format
msgid "file \"%s\" is truncated"
msgstr "Ñайл \"%s\" абÑÑзан"
@@ -2596,17 +2669,17 @@ msgstr "Ñайл \"%s\" абÑÑзан"
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "Ñайл \"%s\" змÑÑÑае Ñадок не завеÑÑÐ°Ð½Ñ Ð½ÑлÑм"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "ÑаÑÐ¼Ð°Ñ Ñайла \"%s\" не GNU .mo"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "Ñайл \"%s\" зÑмÑÑÑае Ñадок не завеÑÑÐ°Ð½Ñ Ð½ÑлÑм, Ð»Ñ %s"
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "гÑÑÑ Ñайл можа не змÑÑÑаÑÑ Ð´ÑÑÑкÑÑÑ Ð´Ð°Ð¼ÐµÐ½Ñ"
@@ -2673,54 +2746,54 @@ msgstr ""
msgid "error writing stdout"
msgstr "памÑлка запÑÑÑ Ñ stdout"
-#: src/write-java.c:977
+#: src/write-java.c:982
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "немагÑÑма знайÑÑÑ ÑаÑовÑÑ Ð´ÑÑÑкÑоÑÑÑ, паÑпÑабÑйÑе ÑÑÑалÑваÑÑ $TMPDIR"
-#: src/write-java.c:987
+#: src/write-java.c:992
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr ""
"немагÑÑма ÑÑваÑÑÑÑ ÑаÑовÑÑ Ð´ÑÑÑкÑоÑÑÑ,\n"
"вÑкаÑÑÑÑоÑвÑваÑÑÑ ÑÐ·Ð¾Ñ \"%s\""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr "неÑÑÑаÑÑÐ½Ð°Ñ Ð½Ð°Ð·Ð²Ð° Java-клаÑа: %s"
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr "немагÑÑма ÑÑваÑÑÑÑ \"%s\""
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "памÑлка Ñ ÑÐ°Ñ Ð·Ð°Ð¿ÑÑÑ Ñайла \"%s\""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
"памÑлка кампÑлÑÑÑÑ Java клÑÑа, ÐºÐ°Ð»Ñ Ð»Ð°Ñка паÑпÑабÑйÑе --verbose,\n"
"ÑÑ ÑÑÑалÑваÑÑ Ð¿ÐµÑаменнÑÑ Ð°ÑÑÑÐ¾Ð´Ð´Ð·Ñ $JAVAC"
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "памÑлка Ñ ÑÐ°Ñ Ð°Ð´ÐºÑÑÑÑÑ \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÑ"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"пеÑакладзенÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ñ Ð½Ðµ павÑÐ½Ð½Ñ Ð·ÑмÑÑÑаÑÑ \"\\%c\" ESC-паÑÑлÑдоÑнаÑÑÑÑ"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2734,21 +2807,21 @@ msgstr ""
"вÑкаÑÑÑÑанÑÐ½Ñ ÑолÑÐºÑ ASCII ÑÑмбалÑÑ Ñ msgid\n"
"%s\n"
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2756,19 +2829,19 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, fuzzy, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr "каÑалÑг паведамленÑÐ½Ñ Ð¼Ð°Ðµ пеÑÐ°ÐºÐ»Ð°Ð´Ñ ÑоÑм множнага лÑкÑ..."
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "немагÑÑма ÑÑваÑÑÑÑ Ñайл вÑÐ²Ð°Ð´Ñ \"%s\""
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "ÑÑандаÑÑÐ½Ñ Ð²Ñвад"
@@ -2786,28 +2859,28 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: Ñвага: незавеÑÑÐ°Ð½Ñ Ñадок"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: Ñвага: незавеÑÑÐ°Ð½Ñ Ñадок"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: Ñвага: незавеÑÑÐ°Ð½Ð°Ñ ÑÑмвалÑÐ½Ð°Ñ ÐºÐ°Ð½ÑÑанÑа"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: Ñвага: незавеÑÑÐ°Ð½Ñ Ñадок"
@@ -2826,62 +2899,62 @@ msgstr ""
"ÐадзÑÑоÑка \"%s\" не падÑÑÑмлÑваеÑÑа. %s ÑпадзÑеÑÑа на iconv().\n"
"ÐÑÑа вÑÑÑÑÑ Ð¿Ð°Ð±Ñдавана без iconv().\n"
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: Ñвага: незавеÑÑÐ°Ð½Ñ Ñадок"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s:%d: неÑÑÑаÑÑнае вÑзнаÑÑнÑне Ñадка"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
-#: src/x-python.c:588
+#: src/x-python.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: Ñвага: незавеÑÑÐ°Ð½Ð°Ñ ÑÑмвалÑÐ½Ð°Ñ ÐºÐ°Ð½ÑÑанÑа"
@@ -2901,134 +2974,136 @@ msgstr "%s:%d: пÑапÑÑÑан нÑÐ¼Ð°Ñ Ð¿Ð°ÑÑÐ»Ñ #"
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: неÑÑÑаÑÑÐ½Ñ Ð²ÑÑаз-Ñадок"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--joun-existing не можа бÑÑÑ Ð²ÑкаÑаÑÑÐ°Ð½Ñ Ð¿ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ stdout"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext не можа пÑаÑаваÑÑ Ð±ÐµÐ· клÑÑавÑÑ
ÑÐ»Ð¾Ñ Ð´Ð»Ñ Ð¿Ð¾ÑÑкÑ"
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "Ñвага: Ñайл \"%s\" ÑÑÑÑÐºÑ \"%s\" невÑдомÑ; паÑпÑабÑйÑе C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "ÐÑÑÑмлÑвае пеÑакладаемÑÑ ÑÐ°Ð´ÐºÑ Ð· дадзенÑÑ
ÑваÑ
одзÑÑÑÑ
ÑайлаÑ.\n"
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "невÑзнаÑан ÑваÑ
одзÑÑÑ Ñайл"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3036,25 +3111,26 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, fuzzy, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
@@ -3062,91 +3138,91 @@ msgstr ""
" -j, --java Java ÑÑжÑм: Ñвод гÑÑа ResourceBundle клÑÑ\n"
" --tcl Tcl ÑÑжÑм: Ñвод гÑÑа tcl/msgcat .msg Ñайл\n"
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
msgstr ""
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "ÑÑандаÑÑÐ½Ñ Ñвод"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, fuzzy, c-format
msgid "%s%s: warning: "
msgstr "%s: Ñвага: "
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, fuzzy, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr "'%s' - гÑÑа неÑÑÑаÑÑÐ½Ñ %s ÑаÑÐ¼Ð°Ñ ÑадкÑ, Ñ Ð°Ð´ÑозÑненÑне ад 'msgid'"
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -3156,7 +3232,7 @@ msgstr ""
"gettext(\"\") вÑÑÑае загаловак зÑ\n"
"меÑададзенÑмÑ, а Ð½Ñ Ð¿ÑÑÑÑ Ñадок.\n"
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3164,7 +3240,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð¼Ð¾Ð²Ð° `%s'"
diff --git a/gettext-tools/po/cs.po b/gettext-tools/po/cs.po
index 138895272..af11d299f 100644
--- a/gettext-tools/po/cs.po
+++ b/gettext-tools/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.38\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 2001-08-18 15:22+0200\n"
"Last-Translator: Vladimir Michl \n"
"Language-Team: Czech \n"
@@ -44,9 +44,9 @@ msgstr ""
# src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
# src/xget-lex.c:191 src/xgettext.c:616
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
@@ -80,10 +80,10 @@ msgstr "chyba p
msgid "Unknown system error"
msgstr "Neznámá systémová chyba"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr ""
@@ -154,12 +154,12 @@ msgstr "%s: p
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: pøepínaè ` -W %s' musí být zadán bez argumentu\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -189,12 +189,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr ""
@@ -217,7 +217,7 @@ msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:909
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -226,25 +226,25 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
# src/msgfmt.c:892
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, fuzzy, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
@@ -303,53 +303,53 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
@@ -357,7 +357,7 @@ msgid ""
msgstr ""
# src/msgfmt.c:909
-#: src/format-java.c:715
+#: src/format-java.c:732
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -365,13 +365,13 @@ msgid ""
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:909
-#: src/format-java.c:730
+#: src/format-java.c:747
#, fuzzy, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:909
-#: src/format-java.c:755
+#: src/format-java.c:772
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -546,9 +546,9 @@ msgstr ""
# src/msgunfmt.c:175 src/xgettext.c:394
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -564,15 +564,15 @@ msgstr ""
# src/msgunfmt.c:180 src/xgettext.c:399
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Autor: %s\n"
# src/gettextp.c:164
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "pøíli¹ mnoho argumentù"
@@ -581,14 +581,14 @@ msgstr "p
# src/msgunfmt.c:210 src/xgettext.c:532
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Více informací získáte pøíkazem `%s --help'.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr ""
@@ -623,27 +623,27 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
@@ -652,9 +652,9 @@ msgstr ""
# src/msgunfmt.c:234 src/xgettext.c:582
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
#, fuzzy
msgid "Report bugs to .\n"
msgstr ""
@@ -669,7 +669,7 @@ msgstr ""
# src/msgcmp.c:165 src/msgmerge.c:272
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
@@ -678,15 +678,15 @@ msgstr "jsou po
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s a %s se vzájemnì vyluèují"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -710,50 +710,50 @@ msgstr ""
# src/msgfmt.c:273 src/xgettext.c:410
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "vstupní soubor není zadán"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -847,21 +847,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -869,88 +869,88 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
# src/msgunfmt.c:215
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -974,15 +974,15 @@ msgstr ""
" -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -992,7 +992,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "zadáno nemo¾né výbìrové kritérium (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
@@ -1026,18 +1026,18 @@ msgstr ""
"ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
"v souborech bude ponecháno ze v¹ech .po souborù.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -1063,15 +1063,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1091,18 +1091,18 @@ msgid ""
msgstr ""
# src/msgcmp.c:160 src/msgmerge.c:267
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "vstupní soubory nejsou zadány"
# src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1143,12 +1143,12 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
@@ -1156,19 +1156,19 @@ msgid ""
msgstr ""
# src/msgcmp.c:259 src/msgmerge.c:711
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "tato zpráva je pou¾ita, ale nikoli definována..."
# src/msgcmp.c:261 src/msgmerge.c:713
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...ale tato definice je podobná"
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
@@ -1228,7 +1228,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1249,32 +1249,32 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
# src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "vstupní soubor není zadán"
@@ -1400,13 +1400,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1442,34 +1442,34 @@ msgstr ""
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
-msgid "%s is only valid with %s"
+msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:477 src/msgfmt.c:483
#, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
msgstr ""
# src/msgfmt.c:343
-#: src/msgfmt.c:503
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1478,7 +1478,7 @@ msgstr[1] "%d p
msgstr[2] "%d pøelo¾ených zpráv"
# src/msgfmt.c:345
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1487,7 +1487,7 @@ msgstr[1] ", %d ne
msgstr[2] ", %d neúplných pøekladù"
# src/msgfmt.c:347
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1495,92 +1495,105 @@ msgstr[0] ", %d nep
msgstr[1] ", %d nepøelo¾ené zprávy"
msgstr[2] ", %d nepøelo¾ených zpráv"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1589,29 +1602,49 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+# src/msgfmt.c:273 src/xgettext.c:410
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "vstupní soubor není zadán"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1619,33 +1652,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1653,94 +1686,94 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
# src/po-lex.c:332
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, fuzzy, c-format
msgid "invalid nplurals value"
msgstr "neplatná øídící sekvence"
# src/po-lex.c:332
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, fuzzy, c-format
msgid "invalid plural expression"
msgstr "neplatná øídící sekvence"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, fuzzy, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
@@ -1749,7 +1782,7 @@ msgstr[1] "tato zpr
msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
@@ -1757,12 +1790,12 @@ msgstr[0] "tato zpr
msgstr[1] "tato zpráva je pou¾ita, ale nikoli definována v %s"
msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
@@ -1770,119 +1803,119 @@ msgid ""
msgstr ""
# src/msgfmt.c:870
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgid_plural' nezaèínají '\\n'"
# src/msgfmt.c:870
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nezaèínají '\\n'"
# src/msgfmt.c:870
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgstr' nezaèínají '\\n'"
# src/msgfmt.c:878
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgid_plural' nekonèí '\\n'"
# src/msgfmt.c:878
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nekonèí '\\n'"
# src/msgfmt.c:878
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgstr' nekonèí '\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
# src/msgfmt.c:561
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, fuzzy, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "polo¾ka hlavièky `%s' v hlavièce chybí"
# src/msgfmt.c:564
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, fuzzy, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "polo¾ka hlavièky `%s' by mìla zaèínat na zaèátku øádku"
# src/msgfmt.c:573
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
#, fuzzy
msgid "some header fields still have the initial default value\n"
msgstr "nìkteré polo¾ky hlavièky mají stále poèáteèní implicitní hodnotu"
# src/msgfmt.c:583
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, fuzzy, c-format
msgid "field `%s' still has initial default value\n"
msgstr "polo¾ka `%s' má stále poèáteèní implicitní hodnotu"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, fuzzy, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
"%*s upozornìní: pøevod znakové sady nebude fungovat"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"V hlavièce chybí definice znakové sady.\n"
"Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, fuzzy, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
"%*s upozornìní: pøevod znakové sady nebude fungovat"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
# src/msgfmt.c:471
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "jméno domény \"%s\" není vhodné jako jméno souboru"
# src/msgfmt.c:476
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -1890,42 +1923,42 @@ msgstr ""
"pøedpona"
# src/msgfmt.c:489
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "pøíkaz `domain %s' ignorován"
# src/msgfmt.c:517
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "prázdná polo¾ka `msgstr' ignorována"
# src/msgfmt.c:518
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "neúplná polo¾ka `msgstr' ignorována"
# src/msgfmt.c:668
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: upozornìní: zdrojový soubor obsahuje neúplný pøeklad"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1957,35 +1990,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1993,24 +2026,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -2018,64 +2051,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -2087,54 +2120,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, fuzzy, c-format
msgid "warning: "
msgstr "%s: upozornìní: "
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2143,7 +2176,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2152,12 +2185,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2165,7 +2198,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2174,7 +2207,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2182,17 +2215,17 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2201,14 +2234,14 @@ msgstr ""
"Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
"a iconv() \"%s\" nepodporuje.\n"
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2217,12 +2250,17 @@ msgstr ""
"Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
"Tato verze byla kompilována bez iconv().\n"
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
# src/msgmerge.c:321
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2247,51 +2285,51 @@ msgstr ""
"základì podobnosti vzorù. Tím je dosa¾eno lep¹ího slití obou katalogù.\n"
" Není-li výstupní soubor urèen, výsledek bude vypisován na standardní výstup.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2303,7 +2341,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2311,30 +2349,30 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
# src/msgmerge.c:769
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2344,50 +2382,62 @@ msgstr ""
"chybí %ld, zastaralých %ld.\n"
# src/msgmerge.c:775
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " dokonèeno.\n"
# src/xgettext.c:378 src/xgettext.c:382
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, fuzzy, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s a %s se vzájemnì vyluèují"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr ""
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2395,24 +2445,37 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+# src/msgfmt.c:273 src/xgettext.c:410
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "vstupní soubor není zadán"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2446,13 +2509,13 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr "%s: upozornìní: "
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2461,15 +2524,15 @@ msgstr ""
"Oznaèení znakové sady \"%s\" není portabilní název kódování. \n"
"Pøevod znakù do u¾ivatelské znakové sady nebude fungovat.\n"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr "Pokraèuji, pøedpokládána chyba parsingu."
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr "Pokraèuji."
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2478,7 +2541,7 @@ msgstr ""
"Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
"a iconv() \"%s\" nepodporuje.\n"
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
@@ -2487,12 +2550,12 @@ msgstr ""
"Instalace GNU libiconv a následná reinstalace GNU gettextu\n"
"mù¾e napravit tento problém.\n"
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2501,7 +2564,7 @@ msgstr ""
"Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
"Tato verze byla kompilována bez iconv().\n"
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2550,7 +2613,7 @@ msgstr "mno
msgid "too many errors, aborting"
msgstr "pøíli¹ mnoho chyb, konèím"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr "neplatná víceznaková sekvence"
@@ -2572,11 +2635,11 @@ msgstr ""
# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "chyba pøi ètení \"%s\""
@@ -2606,7 +2669,7 @@ msgid "end-of-line within string"
msgstr "konec øádku uprostøed øetìzce"
# src/msgunfmt.c:267 src/msgunfmt.c:331
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, fuzzy, c-format
msgid "file \"%s\" is truncated"
msgstr "soubor \"%s\" je useknutý"
@@ -2618,19 +2681,19 @@ msgid "file \"%s\" contains a not NUL terminated string"
msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL"
# src/msgunfmt.c:373
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "soubor \"%s\" není v GNU .mo formátu"
# src/msgunfmt.c:373
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL"
# src/xgettext.c:658 src/xgettext.c:968
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "tento soubor nemù¾e obsahovat pøíkazy pro doménu"
@@ -2708,53 +2771,53 @@ msgid "error writing stdout"
msgstr "chyba pøi zápisu do souboru \"%s\""
# src/message.c:1115
-#: src/write-java.c:977
+#: src/write-java.c:982
#, fuzzy, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "výstupní soubor \"%s\" nelze vytvoøit"
# src/message.c:1115
-#: src/write-java.c:987
+#: src/write-java.c:992
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "výstupní soubor \"%s\" nelze vytvoøit"
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr ""
# src/message.c:1182
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "chyba pøi zápisu do souboru \"%s\""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
# src/msgfmt.c:321
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
# src/message.c:784
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "zprávy katalogu nesmí obsahovat escape sekvenci `\\%c'"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2763,21 +2826,21 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2785,7 +2848,7 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2793,13 +2856,13 @@ msgid ""
msgstr ""
# src/message.c:1115
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "výstupní soubor \"%s\" nelze vytvoøit"
# src/message.c:1122
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "standardní výstup"
@@ -2817,32 +2880,32 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
# src/xget-lex.c:914
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
# src/xget-lex.c:914
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
# src/xget-lex.c:892
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
# src/xget-lex.c:914
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
@@ -2862,64 +2925,64 @@ msgstr ""
"Tato verze byla kompilována bez iconv().\n"
# src/xget-lex.c:914
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
# lib/getopt.c:736
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s: neznámý pøepínaè -- %c\n"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
# src/xget-lex.c:892
-#: src/x-python.c:588
+#: src/x-python.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
@@ -2940,7 +3003,7 @@ msgstr ""
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -2948,129 +3011,131 @@ msgid ""
msgstr ""
# src/xgettext.c:386
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing nemù¾e být pou¾it, je-li výstup zapisován do stdout"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext nemù¾e pracovat bez toho, ani¾ by znal slova, která má hledat"
# src/xgettext.c:501
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "upozornìní: pøípona `%2$s' souboru `%1$s' není známa; zkusím C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
# src/msgfmt.c:273 src/xgettext.c:410
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "vstupní soubor není zadán"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3078,77 +3143,78 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3156,44 +3222,44 @@ msgid ""
msgstr ""
# src/xget-lex.c:150
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "standardní vstup"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, fuzzy, c-format
msgid "%s%s: warning: "
msgstr "%s: upozornìní: "
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr ""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3202,7 +3268,7 @@ msgid ""
msgstr ""
# src/xgettext.c:1342
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "jazyk `%s' není znám"
diff --git a/gettext-tools/po/da.po b/gettext-tools/po/da.po
index 66681d07c..1c07778e0 100644
--- a/gettext-tools/po/da.po
+++ b/gettext-tools/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-tools 0.12-pre1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 2003-03-08 19:32+0200\n"
"Last-Translator: Keld Simonsen \n"
"Language-Team: Danish \n"
@@ -37,9 +37,9 @@ msgstr "Gyldige argumenter er:"
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fejl ved læse-åbning af '%s'"
@@ -68,10 +68,10 @@ msgstr "fejl efter l
msgid "Unknown system error"
msgstr "Ukendt systemfejl"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr "%s-underproces mislykkedes"
@@ -131,12 +131,12 @@ msgstr "%s: tilvalget '-W %s' er flertydigt\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Javakompilator ikke fundet, forsøg at installere gcj eller sæt $JAVAC"
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -165,12 +165,12 @@ msgstr "%s-underproces fejlede med slutstatus %d"
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr "%s underproces"
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr "%s underproces fik et dødeligt signal %d"
@@ -192,7 +192,7 @@ msgstr ""
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "formateringsdirektiv for argument %u findes ikke i \"%s\""
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -201,24 +201,24 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "formatangivelser i 'msgid' og '%s' for argument %u er ikke ens"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "antal af formatangivelser i 'msgid' og '%s' er ikke overensstemmende"
@@ -277,60 +277,60 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -338,12 +338,12 @@ msgid ""
msgstr ""
"formateringsdirektiv for argument {%u}, som i \"%s\", findes ikke i \"msgid\""
-#: src/format-java.c:730
+#: src/format-java.c:747
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "formateringsdirektiv for argument {%u} findes ikke i \"%s\""
-#: src/format-java.c:755
+#: src/format-java.c:772
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -516,9 +516,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -532,28 +532,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Skrevet af %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "For mange argumenter"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv '%s --help' for yderligere oplysninger.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr "Brug: %s [TILVALG]\n"
@@ -593,27 +593,27 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, fuzzy, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
@@ -623,9 +623,9 @@ msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
msgid "Report bugs to .\n"
msgstr "Rapportér fejl på engelsk til .\n"
@@ -635,7 +635,7 @@ msgid "could not get host name"
msgstr "kunne ikke hente værtsnavn"
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, c-format
msgid "at most one input file allowed"
msgstr "Højst én inddatalinje tilladt"
@@ -643,15 +643,15 @@ msgstr "H
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s udelukker hinanden"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n"
@@ -667,7 +667,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -679,28 +679,28 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "ingen inddatafil angivet"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, fuzzy, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
@@ -709,23 +709,23 @@ msgstr ""
"Hvis ingen indfil er givet eller hvis den er - læses standard-ind.\n"
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, fuzzy, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -823,21 +823,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -845,87 +845,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -939,15 +939,15 @@ msgstr ""
" uddatasidens bredde, til flere linjer\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -957,7 +957,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "Umuligt udvælgelseskriterium angivet (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
@@ -984,18 +984,18 @@ msgstr ""
"men hvis --use-first er angivet, vil de blive taget fra den første PO-fil,\n"
"der definerer dem. Filpositioner fra alle PO-filer sammenbringes.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -1021,15 +1021,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1048,17 +1048,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "ingen filer angivet som inddata"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "der kræves netop to inddatafiler"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n"
@@ -1092,12 +1092,12 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, fuzzy, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
@@ -1106,17 +1106,17 @@ msgstr ""
"Bearbejdningsvarianter:\n"
" -m, --multi-domain brug ref.pot til hvert domæne i def.po\n"
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "denne tekst bruges, men er ikke erklæret..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...men denne tekst ligner"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "denne tekst er brugt, men ikke erklæret i %s"
@@ -1165,7 +1165,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1189,31 +1189,31 @@ msgstr ""
" -t, --to-code=NAVN Kodning for uddata\n"
"Standardværdi er nuværende locales kodning.\n"
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "ingen inddatafil angivet"
@@ -1350,13 +1350,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1392,65 +1392,65 @@ msgstr "l
msgid "%s subprocess terminated with exit code %d"
msgstr "%s-underproces afsluttede med slutstatus %d"
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argumentet til %s bør være et enkelt skilletegn"
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s kræver at \"-d katalog\" angives"
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr "%s kræver en \"-l lokale\"-angivelse"
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s er kun gyldig med %s"
-
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s er kun gyldig med %s eller %s"
-#: src/msgfmt.c:503
+#: src/msgfmt.c:477 src/msgfmt.c:483
+#, fuzzy, c-format
+msgid "%s is only valid with %s, %s or %s"
+msgstr "%s er kun gyldig med %s eller %s"
+
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d oversat tekst"
msgstr[1] "%d oversatte tekster"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d uafklaret oversættelse"
msgstr[1] ", %d uafklarede oversættelser"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d uoversat tekst"
msgstr[1] ", %d uoversatte tekster"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Brug: %s [FLAG] filnavn.po ...\n"
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Generér binært tekstkatalog fra oversættelsebeskrivelse i kildetekst.\n"
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1460,17 +1460,17 @@ msgstr ""
"korte tilvalg.\n"
"Tilvarende gælder for valgfri argumenter.\n"
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, fuzzy, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1480,20 +1480,42 @@ msgstr ""
" -j, --java Javatilstand: generér en Java ResourceBundle-"
"klasse\n"
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, fuzzy, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+"Kørselstilstand:\n"
+" -j, --java Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+" --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
+
+#: src/msgfmt.c:641
+#, fuzzy, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+"Kørselstilstand:\n"
+" -j, --java Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+" --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, fuzzy, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
@@ -1503,40 +1525,41 @@ msgstr ""
" --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-"
"fil\n"
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, fuzzy, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1552,29 +1575,48 @@ msgstr ""
"adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
"i det opgivne katalog.\n"
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "ingen inddatafil angivet"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1582,33 +1624,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1616,12 +1658,12 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, fuzzy, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -1630,7 +1672,7 @@ msgstr ""
" -a, --alignment=TAL læg strenge på lige TAL byte (normalt: %d)\n"
" --no-hash binærfil indholder ikke hashtabellen\n"
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, fuzzy, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
@@ -1639,93 +1681,93 @@ msgstr ""
" -a, --alignment=TAL læg strenge på lige TAL byte (normalt: %d)\n"
" --no-hash binærfil indholder ikke hashtabellen\n"
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr "flertalsudtryk kan give negative værdier"
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr "nplurals = %lu men flertalsudtryk kan give værdier op til %lu"
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr "flertalsudtryk kan give division med nul"
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr "flertalsudtryk kan give heltalsoverløb"
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr "flertalsudtryk kan give aritmetiske fejl, måske division med nul"
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr "tekstkatalog har oversættelser med flertalsform..."
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr "...men headerindgange mangler attribut af type \"plurals=UDTRYK\""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr "...men headerindgange mangler attribut af type \"plurals=HELTAL\""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, c-format
msgid "invalid nplurals value"
msgstr "ugyldig nplurals-værdi"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, c-format
msgid "invalid plural expression"
msgstr "ugyldigt flertalsudtryk"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr "nplurals = %lu..."
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "...men nogen tekster har kun én flertalsform"
msgstr[1] "...men nogen tekster har kun %lu flertalsformer"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "...men nogen tekster har én flertalsform"
msgstr[1] "...men nogen tekster har %lu flertalsformer"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr "Prøv at bruge det følgende, gældende for %s:\n"
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
@@ -1734,133 +1776,133 @@ msgstr ""
"beskedkatalog har oversættelser med flertalsformer, men mangler en "
"headerindgang med \"Plural-Forms: nplurals=HELTAL; plural=UDTRYK;\""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "'msgid' og 'msgid_plural'-teksterne begynder ikke begge med '\\n'"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' og `msgstr[%u]'-teksterne begynder ikke begge med '\\n'"
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' og `msgid_plural'-teksterne slutter ikke begge med '\\n'"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' og `msgstr[%u]'-teksterne slutter ikke begge med '\\n'"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr "flertalsbehandling er en GNU gettext-udvidelse"
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, fuzzy, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr mangler mærket \"%c\" for tastaturgenvej"
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr har for mange mærker \"%c\" for tastaturgenveje"
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "feltet `%s' mangler i hovedet\n"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "feltet '%s' i hovedet bør starte ved linjens begyndelse\n"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
msgid "some header fields still have the initial default value\n"
msgstr "nogle felter i hovedet har stadig den oprindelige standardværdi\n"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, c-format
msgid "field `%s' still has initial default value\n"
msgstr "feltet `%s' har stadig den oprindelige standardværdi\n"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "advarsel: tegnsætskonvertering vil ikke virke\n"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "advarsel: PO-filhoved er uafklaret\n"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "advarsel: ældre versioner af msgfmt vil give en fejl for dette\n"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domænet '%s' kan ikke bruges som filnavn"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domænet '%s' er ikke brugbart som filnavn. Vil bruge præfiks istedet"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s'-kommando ignoreres"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "tom `msgstr'-kommando ignoreret"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "\"fuzzy\" `msgstr'-tekst ignoreret"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
"%s: advarsel: kildetekstfilen indeholder uafklarede oversættelser (fuzzy)"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, fuzzy, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
"flaget \"%c\" kan ikke bruges førend \"K\" eller \"T\" er blevet angivet"
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -1869,7 +1911,7 @@ msgstr ""
"Udtrækker alle beskeder i et beskedskatalog som matcher et vist\n"
"mønster eller hører til en given kildetekstfil.\n"
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, fuzzy, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1928,28 +1970,28 @@ msgstr ""
" -f, --file=FIL hent MØNSTER fra FIL\n"
" -i, --ignore-case versalufølsomt\n"
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr "skrivning til grep-underproces mislykkedes"
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -1959,7 +2001,7 @@ msgstr ""
"LANG som beskrevet i filen ABOUT-NLS. Dette er nødvendigt for at\n"
"du kan teste dine oversættelser.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1970,12 +2012,12 @@ msgstr ""
"Angiv locale med flaget --locale eller\n"
".po-udfilen med flaget --output-file.\n"
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr "Oprettede %s.\n"
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -1984,12 +2026,12 @@ msgstr ""
"Opretter en ny PO-fil og initierer metainformation med værdier fra\n"
"brugerens miljøvariabler.\n"
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, fuzzy, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -2001,12 +2043,12 @@ msgstr ""
"Hvis ingen indfil angives, søges efter POT-filen i aktuelt katalog.\n"
"Hvis den er - læses standard ind.\n"
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, fuzzy, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2018,18 +2060,18 @@ msgstr ""
"brugerens\n"
"indstilling af locale. Hvis den er - skrives resultaterne på standard ud.\n"
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2037,12 +2079,12 @@ msgstr ""
"Fandt mere end en .pot-fil.\n"
"Angiv .pot-indfil med flaget --input.\n"
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr "fejl ved læsning af aktuelt katalog"
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2050,24 +2092,24 @@ msgstr ""
"Fandt ingen .pot-fil i aktuelt katalog.\n"
"Angiv .pot-indfil med flaget --input.\n"
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr "fdopen() mislykkedes"
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr "I/O-fejl i %s-underproces"
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s-underproces fejlede med slutstatus %d"
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -2082,28 +2124,28 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr "Danske oversættelser for pakke %s"
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "nuværende tegnsæt \"%s\" er ikke et portabelt kodningsnavn"
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "to forskellige tegnsæt \"%s\" og \"%s\" i indfilen"
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr "indfilen \"%s\" mangler en indgang i hovedet med angivelse af tegnsæt"
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2112,19 +2154,19 @@ msgstr ""
"domæne \"%s\" i indfil \"%s\" mangler en indgang i hovedet med angivelse af "
"tegnsæt"
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "måltegnsæt \"%s\" er ikke et portabelt kodningsnavn"
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr "advarsel: "
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2133,7 +2175,7 @@ msgstr ""
"Indfiler har beskeder med flere kodninger, deriblandt UTF-8.\n"
"Konverterer resultatet til UTF-8.\n"
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2145,7 +2187,7 @@ msgstr ""
"Konverterer resultatet til UTF-8.\n"
"Brug flaget --to-code for at vælge en anden kodning.\n"
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2158,12 +2200,12 @@ msgstr ""
"Resultatet for \"%s\" kan blive forkert.\n"
"Mulige måder at omgå problemet er:\n"
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr "- Sæt LC_ALL til et locale med kodning %s.\n"
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2174,7 +2216,7 @@ msgstr ""
" udfør derefter \"%s\",\n"
" konvertér så tilbage til %s med \"msgconv\".\n"
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2187,7 +2229,7 @@ msgstr ""
" udfør derefter \"%s\"\n"
" konvertér så tilbage til %s med \"msgconv\".\n"
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2198,17 +2240,17 @@ msgstr ""
"Resultatet for \"%s\" kan blive forkert.\n"
"En mulig måde at omgå problemet er at sætte LC_ALL=C.\n"
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr "konverteringsfejl"
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "indfilen mangler en indgang i hovedet med angivelse af tegnsæt"
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2217,14 +2259,14 @@ msgstr ""
"Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(), og iconv() "
"understøtter ikke denne konvertering."
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2233,11 +2275,16 @@ msgstr ""
"Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(). Denne version "
"er bygget uden iconv()."
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr "%s er kun gyldig med %s"
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr "sikkerhedskopitype"
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2261,24 +2308,24 @@ msgstr ""
"overensstemmelse, vil 'løs søgning' (fuzzy matching) blive brugt til at give\n"
"bedre resultater.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, fuzzy, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2289,27 +2336,27 @@ msgstr ""
" gør ingenting hvis def.po allerede er "
"opdateret\n"
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, fuzzy, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2335,7 +2382,7 @@ msgstr ""
"eller\n"
"miljøvariablen SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2343,27 +2390,27 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, c-format
msgid "this message should define plural forms"
msgstr "denne tekst burde definere flertalsformer"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, c-format
msgid "this message should not define plural forms"
msgstr "denne tekst burde ikke definere flertalsformer"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2372,26 +2419,26 @@ msgstr ""
"%sLæste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler %"
"ld, forældede %ld.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " afsluttet.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s og udtrykkelige filnavne udelukker hinanden"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr "Brug: %s [TILVALG] [FIL]...\n"
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr "Konvertér et binær beskedskatalog til en .po-fil af Uniforum-type\n"
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, fuzzy, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
@@ -2401,7 +2448,29 @@ msgstr ""
" -j, --java Javatilstand: generér en Java ResourceBundle-"
"klasse\n"
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, fuzzy, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+"Kørselstilstand:\n"
+" -j, --java Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+" --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
+
+#: src/msgunfmt.c:427
+#, fuzzy, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+"Kørselstilstand:\n"
+" -j, --java Javatilstand: inddata er en Java "
+"ResourceBundle-klasse\n"
+" --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
+
+#: src/msgunfmt.c:429
#, fuzzy, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2412,17 +2481,17 @@ msgstr ""
" --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-"
"fil\n"
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, fuzzy, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2435,24 +2504,36 @@ msgstr ""
"Klassenavnet bestemmes ved at tilføje localenavnet til ressourcenavnet\n"
"adskilt med en understreg. Klassen findes med hjælp af CLASSPATH.\n"
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "ingen inddatafil angivet"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2499,13 +2580,13 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr "%s: advarsel: "
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2514,15 +2595,15 @@ msgstr ""
"Tegnsæt '%s' er ikke et flytbart kodningsnavn.\n"
"Tekstkonvertering til brugers tegnsæt virker muligvis ikke.\n"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr "Fortsætter alligevel, forvent fortolkningsfejl."
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr "Fortsætter alligevel."
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2531,7 +2612,7 @@ msgstr ""
"Tegnsæt '%s' er ikke understøttet. %s bygger på iconv(),\n"
"og iconv() understøtter ikke '%s'.\n"
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
@@ -2540,12 +2621,12 @@ msgstr ""
"Installering af GNU libiconv og geninstallering af GNU gettext\n"
"vil løse dette problem.\n"
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2554,7 +2635,7 @@ msgstr ""
"Tegnsæt '%s' er ikke understøttet. %s bygger på iconv(),\n"
"Denne version er bygget uden iconv().\n"
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2599,7 +2680,7 @@ msgstr "flertalsform har forkert indeks"
msgid "too many errors, aborting"
msgstr "afbryder kørslen på grund af for mange fejl"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr "Ugyldig multibytesekvens"
@@ -2620,11 +2701,11 @@ msgid "iconv failure"
msgstr "iconv-fejl"
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "fejl ved læsning af '%s'"
@@ -2649,7 +2730,7 @@ msgstr "tekststreng ikke afsluttet da filens slutning blev n
msgid "end-of-line within string"
msgstr "tekststreng var ikke afsluttet ved linjeskift"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, c-format
msgid "file \"%s\" is truncated"
msgstr "filen '%s' er afkortet"
@@ -2659,17 +2740,17 @@ msgstr "filen '%s' er afkortet"
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "filen '%s' er ikke i GNU .mo-format"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "filen '%s' indeholder en ikke-NUL-afsluttet streng, ved %s"
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "denne fil må ikke indeholde 'domain'-kommandoer"
@@ -2738,51 +2819,51 @@ msgstr ""
msgid "error writing stdout"
msgstr "fejl ved skrivning af standard-uddata"
-#: src/write-java.c:977
+#: src/write-java.c:982
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "kan ikke finde et midlertidigt katalog, prøv at sætte $TMPDIR"
-#: src/write-java.c:987
+#: src/write-java.c:992
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr "ikke et gyldigt Java-klassenavn: %s"
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr "kunne ikke oprette '%s'"
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "fejl ved skrivning til filen '%s'"
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
"oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
"$JAVAC"
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "fejl opstået ved skrive-åbning af '%s'"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "oversættelige tekster må ikke indeholde `\\%c'-escapesekvensen"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2795,21 +2876,21 @@ msgstr ""
"som er et andet end dit. Forsøg at bruge en ren ASCII-msgid i stedet.\n"
"%s\n"
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2817,7 +2898,7 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, fuzzy, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2826,12 +2907,12 @@ msgstr ""
"beskedkatalog har oversættelser med flertalsformer,\n"
"men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "kan ikke oprette uddatafil '%s'"
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "standard-uddata"
@@ -2852,7 +2933,7 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
@@ -2860,22 +2941,22 @@ msgstr ""
"beskedkatalog har oversættelser med flertalsformer,\n"
"men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: advarsel: streng ikke afsluttet"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: advarsel: regulært udtryk ikke afsluttet"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: advarsel: tegnkonstant ikke afsluttet korrekt"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
@@ -2894,62 +2975,62 @@ msgstr ""
"Sproget 'glade' er ikke understøttet. %s bygger på expat,\n"
"Denne version er bygget uden expat.\n"
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: advarsel: streng ikke afsluttet"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s:%d: ugyldig streng-definition"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
-#: src/x-python.c:588
+#: src/x-python.c:596
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: advarsel: ugyldigt ISO 10646-tegn"
@@ -2969,66 +3050,67 @@ msgstr "%s:%d: mangler tal efter #"
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: ugyldigt streng-udtryk"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing kan ikke benyttes når uddata sendes til standard-uddata"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext kan ikke arbejde uden nogen nøgleord at kigge efter"
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Udtræk oversættelige strenge fra givne indfiler.\n"
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "ingen inddatafil angivet"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
"Valg af sprog for indfil:\n"
@@ -3039,19 +3121,19 @@ msgstr ""
" -C, --c++ kort skrivemåde for --language=C++\n"
"Som standard antages sproget ud fra endelsen på inddatafilen.\n"
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, fuzzy, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3062,22 +3144,22 @@ msgstr ""
" (undtagen for Python, Tcl, Glade)\n"
"Som standard antages inddatafilerne at være i ASCII.\n"
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, fuzzy, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
@@ -3088,21 +3170,22 @@ msgstr ""
" -c, --add-comments[=MÆRKE] placér kommentarafsnit for MÆRKE (eller \n"
" de foregående nøgleordslinjer) i uddata\n"
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
"Valg af sprog for indfil:\n"
@@ -3113,14 +3196,14 @@ msgstr ""
" -C, --c++ kort skrivemåde for --language=C++\n"
"Som standard antages sproget ud fra endelsen på inddatafilen.\n"
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3128,11 +3211,12 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
"Valg af sprog for indfil:\n"
@@ -3143,17 +3227,17 @@ msgstr ""
" -C, --c++ kort skrivemåde for --language=C++\n"
"Som standard antages sproget ud fra endelsen på inddatafilen.\n"
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, fuzzy, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
@@ -3163,65 +3247,65 @@ msgstr ""
" --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-"
"fil\n"
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
msgstr ""
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "standard-inddata"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, fuzzy, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
@@ -3230,26 +3314,26 @@ msgstr ""
"Ikke-ASCII streng ved %s%s.\n"
"Angiv venligst kodning af kildetekst via --from-code."
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr "%s%s: advarsel: "
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, fuzzy, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -3259,7 +3343,7 @@ msgstr ""
"gettext(\"\") returnerer hovedet med metainformation,\n"
"ikke den tomme streng.\n"
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3271,7 +3355,7 @@ msgstr ""
"variablen MSGID_BUGS_ADDRESS dér; ellers angiv\n"
"tilvalget --msgid-bugs-address på kommandolinjen.\n"
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "ukendt sprog '%s'"
diff --git a/gettext-tools/po/el.po b/gettext-tools/po/el.po
index 51ef7d5a6..846496bcc 100644
--- a/gettext-tools/po/el.po
+++ b/gettext-tools/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.34\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 1998-05-17 13:12+0200\n"
"Last-Translator: Simos KSenitellis \n"
"Language-Team: Greek \n"
@@ -35,9 +35,9 @@ msgid "write error"
msgstr ""
#
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
@@ -71,10 +71,10 @@ msgstr "
msgid "Unknown system error"
msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr ""
@@ -145,12 +145,12 @@ msgstr "%s:
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -180,12 +180,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr ""
@@ -208,7 +208,7 @@ msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -217,25 +217,25 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
#
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, fuzzy, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
@@ -295,53 +295,53 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
@@ -349,7 +349,7 @@ msgid ""
msgstr ""
#
-#: src/format-java.c:715
+#: src/format-java.c:732
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -357,13 +357,13 @@ msgid ""
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-java.c:730
+#: src/format-java.c:747
#, fuzzy, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-java.c:755
+#: src/format-java.c:772
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -540,9 +540,9 @@ msgstr ""
#
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -557,15 +557,15 @@ msgstr ""
#
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
#
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
@@ -573,14 +573,14 @@ msgstr "
#
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr ""
@@ -615,27 +615,27 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
@@ -643,9 +643,9 @@ msgstr ""
#
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
#, fuzzy
msgid "Report bugs to .\n"
msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï .\n"
@@ -657,7 +657,7 @@ msgstr ""
#
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
@@ -666,15 +666,15 @@ msgstr "
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
@@ -688,7 +688,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -698,50 +698,50 @@ msgstr ""
#
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -835,21 +835,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -857,88 +857,88 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -957,15 +957,15 @@ msgstr ""
" -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -976,7 +976,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "Ý÷åé åðéëå÷èåß áäýíáôï êñéôÞñéï åðéëïãÞò (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
@@ -1012,18 +1012,18 @@ msgstr ""
"ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
"èá äéáôçñçèïýí.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -1049,15 +1049,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1077,18 +1077,18 @@ msgid ""
msgstr ""
#
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "äåí êáèïñßóôçêáí áñ÷åßá åéóüäïõ"
#
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1130,12 +1130,12 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
@@ -1143,19 +1143,19 @@ msgid ""
msgstr ""
#
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé..."
#
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...áëëÜ áõôüò ï ïñéóìüò åßíáé ðáñüìïéïò"
#
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
@@ -1216,7 +1216,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1237,32 +1237,32 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
#
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
@@ -1389,13 +1389,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1431,139 +1431,152 @@ msgstr ""
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
-msgid "%s is only valid with %s"
+msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:477 src/msgfmt.c:483
#, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
msgstr ""
#
-#: src/msgfmt.c:503
+#: src/msgfmt.c:580
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d ìåôáöñáóìÝíá ìõíÞìáôá"
#
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
#
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d ìç ìåôáöñáóìÝíá ìçíýìáôá"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1572,29 +1585,49 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+#
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1602,33 +1635,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1636,94 +1669,94 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
#
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, fuzzy, c-format
msgid "invalid nplurals value"
msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
#
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, fuzzy, c-format
msgid "invalid plural expression"
msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
#
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, fuzzy, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
@@ -1731,19 +1764,19 @@ msgstr[0] "
msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
#
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
@@ -1751,119 +1784,119 @@ msgid ""
msgstr ""
#
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, fuzzy, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, fuzzy, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
#
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, fuzzy, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "ôï ðåäßï `%s' Ý÷åé ðáñáëçöèåß áðü ôç êåöáëßäá"
#
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, fuzzy, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "ôï ðåäßá êåöáëßäáò `%s' èá Ýðñåðå íá îåêéíÜ óôçí áñ÷Þ ôçò ãñáììÞò"
#
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
#, fuzzy
msgid "some header fields still have the initial default value\n"
msgstr "ìåñéêÜ ðåäßá ôçò êåöáëßäáò Ý÷ïõí áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
#
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, fuzzy, c-format
msgid "field `%s' still has initial default value\n"
msgstr "ôï ðåäßï `%s' Ý÷åé áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
#
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, fuzzy, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
#
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
#
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, fuzzy, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
#
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ôï üíïìá ãéá ôç ðåñéï÷Þ \"%s\" äåí åßíáé êáôÜëëçëï ãéá üíïìá áñ÷åßïõ"
#
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -1871,43 +1904,43 @@ msgstr ""
"ãßíåé ÷ñÞóç ðñïèÝìáôïò"
#
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "ç ïäçãßá `domain %s' áãíïåßôáé"
#
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "ç êåíÞ åããñáöÞ `msgstr' áãíïåßôáé"
#
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "ç ðñïóåããéóôéêÞ åããñáöÞ `msgstr' áãíïåßôáé"
#
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1939,35 +1972,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1975,24 +2008,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -2000,64 +2033,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -2069,54 +2102,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2125,7 +2158,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2134,12 +2167,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2147,7 +2180,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2156,7 +2189,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2164,43 +2197,48 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
#
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2226,51 +2264,51 @@ msgstr ""
"Ôá áðïôåëÝóìáôá ãñÜöïíôáé óôçí êáíïíéêÞ Ýîïäï åêôüò êáé áí ïñßæåôáé\n"
"êÜðïéï áñ÷åßï åîüäïõ.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2282,7 +2320,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2290,30 +2328,30 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
#
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
#
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
#
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2323,50 +2361,62 @@ msgstr ""
"Ý÷ïõí ðáñáëçöèåß %d, á÷ñçóéìïðïßçôá %d.\n"
#
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " Ýãéíå.\n"
#
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, fuzzy, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr ""
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2374,24 +2424,37 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+#
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2425,14 +2488,14 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr ""
#
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, fuzzy, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2440,34 +2503,34 @@ msgid ""
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2475,7 +2538,7 @@ msgid ""
msgstr ""
#
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, fuzzy, c-format
msgid ""
"Charset missing in header.\n"
@@ -2524,7 +2587,7 @@ msgid "too many errors, aborting"
msgstr "ðÜñá ðïëëÜ óöÜëìáôá, åãêáôáëåßðù"
#
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, fuzzy, c-format
msgid "invalid multibyte sequence"
msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
@@ -2548,11 +2611,11 @@ msgstr ""
#
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
@@ -2582,7 +2645,7 @@ msgid "end-of-line within string"
msgstr "ôÝñìá-ãñáììÞò (eol) óôï áëöáñéèìçôéêü"
#
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, fuzzy, c-format
msgid "file \"%s\" is truncated"
msgstr "ôï áñ÷åßï \"%s\" ìçäåíßóôçêå êáé èá ãñáöïýí äåäïìÝíá óå áõôü"
@@ -2594,19 +2657,19 @@ msgid "file \"%s\" contains a not NUL terminated string"
msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
#
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
#
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
#
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "áõôü ôï áñ÷åßï äåí ìðïñåß íá ðåñéÝ÷åé ïäçãßåò ãéá ôç ðåñéï÷Þ"
@@ -2684,47 +2747,47 @@ msgid "error writing stdout"
msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
#
-#: src/write-java.c:977
+#: src/write-java.c:982
#, fuzzy, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
#
-#: src/write-java.c:987
+#: src/write-java.c:992
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr ""
#
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
#
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
#
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
@@ -2732,7 +2795,7 @@ msgstr ""
"ôá ìçíýìáôá ðñïò ìåôÜöñáóç äåí ðñÝðåé íá ðåñéÝ÷ïõí ôï ÷áñáêôÞñá äéáöõãÞò `\\%"
"c'"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2741,21 +2804,21 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2763,7 +2826,7 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2771,13 +2834,13 @@ msgid ""
msgstr ""
#
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
#
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "êáíïíéêÞ Ýîïäïò"
@@ -2795,32 +2858,32 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
#
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
#
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
#
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
#
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
@@ -2838,64 +2901,64 @@ msgid ""
msgstr ""
#
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
#
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
#
-#: src/x-python.c:588
+#: src/x-python.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
@@ -2916,7 +2979,7 @@ msgstr ""
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -2924,132 +2987,134 @@ msgid ""
msgstr ""
#
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"ôï --join-existing äå ìðïñåß íá ÷ñçóéìïðïéçèåß üôáí ç Ýîïäïò ãñÜöåôáé óôçí "
"êáíïíéêÞ Ýîïäï"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr ""
#
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"ðñïåéäïðïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
#
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3057,77 +3122,78 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3135,44 +3201,44 @@ msgid ""
msgstr ""
#
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "êáíïíéêÞ åßóïäïò"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr ""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3181,7 +3247,7 @@ msgid ""
msgstr ""
#
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç"
diff --git a/gettext-tools/po/en@boldquot.po b/gettext-tools/po/en@boldquot.po
index 8229e1957..4bf1b2bce 100644
--- a/gettext-tools/po/en@boldquot.po
+++ b/gettext-tools/po/en@boldquot.po
@@ -1,7 +1,7 @@
# English translations for gettext-tools package.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2004 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext-tools package.
-# Automatically generated, 2003.
+# Automatically generated, 2004.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
@@ -32,8 +32,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-tools\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
-"PO-Revision-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
+"PO-Revision-Date: 2004-01-18 16:24+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -60,9 +60,9 @@ msgstr "Valid arguments are:"
msgid "write error"
msgstr "write error"
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "error while opening â[1m%s[0mâ for reading"
@@ -91,10 +91,10 @@ msgstr "error after reading â[1m%s[0mâ"
msgid "Unknown system error"
msgstr "Unknown system error"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr "%s subprocess failed"
@@ -154,12 +154,12 @@ msgstr "%s: option â[1m-W %s[0mâ is ambiguous\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: option â[1m-W %s[0mâ doesn't allow an argument\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java compiler not found, try installing gcj or set $JAVAC"
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Java virtual machine not found, try installing gij or set $JAVA"
@@ -187,12 +187,12 @@ msgstr "DuplicateHandle failed with error code 0x%08x"
msgid "_open_osfhandle failed"
msgstr "_open_osfhandle failed"
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr "%s subprocess"
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr "%s subprocess got fatal signal %d"
@@ -214,7 +214,7 @@ msgstr ""
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "a format specification for argument %u doesn't exist in â[1m%s[0mâ"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -225,7 +225,7 @@ msgstr ""
"format specifications in â[1mmsgid[0mâ and â[1m%s[0mâ for argument %u are "
"not the same"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
@@ -235,19 +235,19 @@ msgstr ""
"format specifier macro. The valid macro names are listed in ISO C 99 section "
"7.8.1."
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
"In the directive number %u, the token after â[1m<[0mâ is not followed by '>'."
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
"The string refers to argument number %u but ignores argument number %u."
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
@@ -319,20 +319,20 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr "The string refers to argument number %u in incompatible ways."
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
"The string ends in the middle of a directive: found â[1m{[0mâ without "
"matching '}'."
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
"In the directive number %u, â[1m{[0mâ is not followed by an argument number."
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -341,12 +341,12 @@ msgstr ""
"In the directive number %u, the substring â[1m%s[0mâ is not a valid date/"
"time style."
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr "In the directive number %u, â[1m%s[0mâ is not followed by a comma."
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
@@ -354,7 +354,7 @@ msgstr ""
"In the directive number %u, the substring â[1m%s[0mâ is not a valid number "
"style."
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
@@ -363,7 +363,7 @@ msgstr ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of â[1m%s[0mâ, â[1m%s[0mâ, â[1m%s[0mâ, â[1m%s[0mâ."
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
@@ -371,12 +371,12 @@ msgstr ""
"The string starts in the middle of a directive: found â[1m}[0mâ without "
"matching '{'."
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr "In the directive number %u, a choice contains no number."
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
@@ -385,7 +385,7 @@ msgstr ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', â[1m#[0mâ or '%s'."
-#: src/format-java.c:715
+#: src/format-java.c:732
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -394,12 +394,12 @@ msgstr ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"â[1mmsgid[0mâ"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "a format specification for argument {%u} doesn't exist in â[1m%s[0mâ"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -600,9 +600,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -615,28 +615,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Written by %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "too many arguments"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Try â[1m%s --help[0mâ for more information.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr "Usage: %s [OPTION]\n"
@@ -674,36 +674,36 @@ msgstr " -i, --ip-address addresses for the hostname\n"
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr "Informative output:\n"
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help display this help and exit\n"
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr " -V, --version output version information and exit\n"
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
msgid "Report bugs to .\n"
msgstr "Report bugs to .\n"
@@ -713,7 +713,7 @@ msgid "could not get host name"
msgstr "could not get host name"
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, c-format
msgid "at most one input file allowed"
msgstr "at most one input file allowed"
@@ -721,15 +721,15 @@ msgstr "at most one input file allowed"
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s and %s are mutually exclusive"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
@@ -745,7 +745,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -755,21 +755,21 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, c-format
msgid "Input file location:\n"
msgstr "Input file location:\n"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " INPUTFILE input PO file\n"
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -777,29 +777,29 @@ msgstr ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr "If no input file is given or if it is -, standard input is read.\n"
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr "Output file location:\n"
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=FILE write output to specified file\n"
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -900,14 +900,14 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr "Input file syntax:\n"
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
@@ -915,7 +915,7 @@ msgstr ""
" -P, --properties-input input file is in Java .properties syntax\n"
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -925,16 +925,16 @@ msgstr ""
"syntax\n"
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr "Output details:\n"
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
@@ -942,8 +942,8 @@ msgstr ""
" -e, --no-escape do not use C escapes in output (default)\n"
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
@@ -951,28 +951,28 @@ msgstr ""
" -E, --escape use C escapes in output, no extended chars\n"
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po write PO file even if empty\n"
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent write the .po file using indented style\n"
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location do not write â[1m#: filename:line[0mâ lines\n"
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -981,7 +981,7 @@ msgstr ""
"(default)\n"
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
@@ -989,15 +989,15 @@ msgstr ""
" --strict write out strict Uniforum conforming .po file\n"
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output write out a Java .properties file\n"
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
@@ -1005,15 +1005,15 @@ msgstr ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NUMBER set output page width\n"
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1023,15 +1023,15 @@ msgstr ""
" the output page width, into several lines\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output generate sorted output\n"
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr " -F, --sort-by-file sort output by file location\n"
@@ -1041,7 +1041,7 @@ msgstr " -F, --sort-by-file sort output by file location\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "impossible selection criteria specified (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
@@ -1069,18 +1069,18 @@ msgstr ""
"is specified, they will be taken from the first PO file to define them.\n"
"File positions from all PO files will be cumulated.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr " INPUTFILE ... input files\n"
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr " -f, --files-from=FILE get list of input files from FILE\n"
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr "If input file is -, standard input is read.\n"
@@ -1112,16 +1112,16 @@ msgstr ""
" -u, --unique shorthand for --less-than=2, requests\n"
" that only unique messages be printed\n"
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
" -P, --properties-input input files are in Java .properties syntax\n"
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1144,17 +1144,17 @@ msgstr ""
" --use-first use first available translation for each\n"
" message, don't merge several translations\n"
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "no input files given"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "exactly 2 input files required"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Usage: %s [OPTION] def.po ref.pot\n"
@@ -1186,12 +1186,12 @@ msgstr " def.po translations\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot references to the sources\n"
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr "Operation modifiers:\n"
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
@@ -1200,17 +1200,17 @@ msgstr ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "this message is used but not defined..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...but this definition is similar"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "this message is used but not defined in %s"
@@ -1262,7 +1262,7 @@ msgstr ""
" ->, --more-than=NUMBER print messages with more than this many\n"
" definitions, defaults to 1 if not set\n"
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1285,20 +1285,20 @@ msgstr "Conversion target:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "The default encoding is the current locale's encoding.\n"
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent indented output style\n"
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
" --no-location suppress â[1m#: filename:line[0mâ lines\n"
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
@@ -1306,13 +1306,13 @@ msgstr ""
" --add-location preserve â[1m#: filename:line[0mâ lines "
"(default)\n"
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict strict Uniforum output style\n"
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "no input file given"
@@ -1453,14 +1453,14 @@ msgid ""
msgstr ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
" --no-escape do not use C escapes in output (default)\n"
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr " --indent indented output style\n"
@@ -1497,65 +1497,65 @@ msgstr "read from %s subprocess failed"
msgid "%s subprocess terminated with exit code %d"
msgstr "%s subprocess terminated with exit code %d"
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "the argument to %s should be a single punctuation character"
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s requires a â[1m-d directory[0mâ specification"
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr "%s requires a â[1m-l locale[0mâ specification"
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s is only valid with %s"
-
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s is only valid with %s or %s"
-#: src/msgfmt.c:503
+#: src/msgfmt.c:477 src/msgfmt.c:483
+#, c-format
+msgid "%s is only valid with %s, %s or %s"
+msgstr "%s is only valid with %s, %s or %s"
+
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d translated message"
msgstr[1] "%d translated messages"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d fuzzy translation"
msgstr[1] ", %d fuzzy translations"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d untranslated message"
msgstr[1] ", %d untranslated messages"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Usage: %s [OPTION] filename.po ...\n"
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Generate binary message catalog from textual translation description.\n"
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1564,17 +1564,17 @@ msgstr ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr " filename.po ... input files\n"
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr "Operation mode:\n"
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1583,7 +1583,7 @@ msgstr ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1592,39 +1592,54 @@ msgstr ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr " --csharp C# mode: generate a .NET .dll file\n"
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt mode: generate a Qt .qm file\n"
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict enable strict Uniforum mode\n"
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr "If output file is -, output is written to standard output.\n"
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Output file location in Java mode:\n"
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=RESOURCE resource name\n"
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
@@ -1633,14 +1648,14 @@ msgstr ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1653,18 +1668,41 @@ msgstr ""
"separated with an underscore. The -d option is mandatory. The class is\n"
"written under the specified directory.\n"
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "Output file location in C# mode:\n"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Output file location in Tcl mode:\n"
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
" -d DIRECTORY base directory of .msg message catalogs\n"
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
@@ -1673,12 +1711,12 @@ msgstr ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr "Input file interpretation:\n"
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1689,13 +1727,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format check language dependent format strings\n"
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -1704,7 +1742,7 @@ msgstr ""
" --check-header verify presence and contents of the header "
"entry\n"
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -1713,7 +1751,7 @@ msgstr ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -1722,7 +1760,7 @@ msgstr ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1733,57 +1771,57 @@ msgstr ""
"for\n"
" menu items\n"
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy use fuzzy entries in output\n"
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
" --no-hash binary file will not include the hash table\n"
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics print statistics about translations\n"
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose increase verbosity level\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr "plural expression can produce negative values"
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
"nplurals = %lu but plural expression can produce values as large as %lu"
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr "plural expression can produce division by zero"
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr "plural expression can produce integer overflow"
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
@@ -1792,56 +1830,56 @@ msgstr ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr "message catalog has plural form translations..."
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr "...but header entry lacks a â[1mplural=EXPRESSION[0mâ attribute"
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr "...but header entry lacks a â[1mnplurals=INTEGER[0mâ attribute"
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, c-format
msgid "invalid nplurals value"
msgstr "invalid nplurals value"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, c-format
msgid "invalid plural expression"
msgstr "invalid plural expression"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr "nplurals = %lu..."
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "...but some messages have only one plural form"
msgstr[1] "...but some messages have only %lu plural forms"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "...but some messages have one plural form"
msgstr[1] "...but some messages have %lu plural forms"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr "Try using the following, valid for %s:\n"
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
@@ -1850,142 +1888,142 @@ msgstr ""
"message catalog has plural form translations, but lacks a header entry with "
"â[1mPlural-Forms: nplurals=INTEGER; plural=EXPRESSION;[0mâ"
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
"â[1mmsgid[0mâ and â[1mmsgid_plural[0mâ entries do not both begin with â[1m\\n"
"[0mâ"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr ""
"â[1mmsgid[0mâ and â[1mmsgstr[%u][0mâ entries do not both begin with â[1m\\n"
"[0mâ"
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr ""
"â[1mmsgid[0mâ and â[1mmsgstr[0mâ entries do not both begin with â[1m\\n[0mâ"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
"â[1mmsgid[0mâ and â[1mmsgid_plural[0mâ entries do not both end with â[1m\\n"
"[0mâ"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr ""
"â[1mmsgid[0mâ and â[1mmsgstr[%u][0mâ entries do not both end with â[1m\\n[0mâ"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr ""
"â[1mmsgid[0mâ and â[1mmsgstr[0mâ entries do not both end with â[1m\\n[0mâ"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr "plural handling is a GNU gettext extension"
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr "â[1m%s[0mâ is not a valid %s format string, unlike 'msgid'. Reason: %s"
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr lacks the keyboard accelerator mark â[1m%c[0mâ"
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr has too many keyboard accelerator marks â[1m%c[0mâ"
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "headerfield â[1m%s[0mâ missing in header\n"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "header field â[1m%s[0mâ should start at beginning of line\n"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
msgid "some header fields still have the initial default value\n"
msgstr "some header fields still have the initial default value\n"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, c-format
msgid "field `%s' still has initial default value\n"
msgstr "field â[1m%s[0mâ still has initial default value\n"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "warning: PO file header missing or invalid\n"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "warning: charset conversion will not work\n"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "warning: PO file header fuzzy\n"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "warning: older versions of msgfmt will give an error on this\n"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domain name â[1m%s[0mâ not suitable as file name"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domain name â[1m%s[0mâ not suitable as file name: will use prefix"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "â[1mdomain %s[0mâ directive ignored"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "empty â[1mmsgstr[0mâ entry ignored"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "fuzzy â[1mmsgstr[0mâ entry ignored"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: warning: source file contains fuzzy translation"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
"option â[1m%c[0mâ cannot be used before â[1mK[0mâ or â[1mT[0mâ or â[1mC[0mâ "
"has been specified"
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -1994,7 +2032,7 @@ msgstr ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2053,29 +2091,29 @@ msgstr ""
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
" --escape use C escapes in output, no extended chars\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output generate sorted output\n"
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file sort output by file location\n"
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr "write to grep subprocess failed"
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2085,7 +2123,7 @@ msgstr ""
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2096,12 +2134,12 @@ msgstr ""
"Please specify the locale through the --locale option or\n"
"the output .po file through the --output-file option.\n"
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr "Created %s.\n"
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2110,12 +2148,12 @@ msgstr ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=INPUTFILE input POT file\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -2126,12 +2164,12 @@ msgstr ""
"file.\n"
"If it is -, standard input is read.\n"
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=FILE write output to specified PO file\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2140,19 +2178,19 @@ msgstr ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC set target locale\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
" --no-translator assume the PO file is automatically generated\n"
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2160,12 +2198,12 @@ msgstr ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr "error reading current directory"
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2173,24 +2211,24 @@ msgstr ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr "fdopen() failed"
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s subprocess I/O error"
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s subprocess failed with exit code %d"
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -2207,22 +2245,22 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr "English translations for %s package"
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "present charset â[1m%s[0mâ is not a portable encoding name"
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "two different charsets â[1m%s[0mâ and â[1m%s[0mâ in input file"
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
@@ -2230,7 +2268,7 @@ msgstr ""
"input file â[1m%s[0mâ doesn't contain a header entry with a charset "
"specification"
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2239,19 +2277,19 @@ msgstr ""
"domain â[1m%s[0mâ in input file â[1m%s[0mâ doesn't contain a header entry "
"with a charset specification"
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "target charset â[1m%s[0mâ is not a portable encoding name."
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr "warning: "
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2260,7 +2298,7 @@ msgstr ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2273,7 +2311,7 @@ msgstr ""
"Converting the output to UTF-8.\n"
"To select a different output encoding, use the --to-code option.\n"
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2286,12 +2324,12 @@ msgstr ""
"Output of â[1m%s[0mâ might be incorrect.\n"
"Possible workarounds are:\n"
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr "- Set LC_ALL to a locale with encoding %s.\n"
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2302,7 +2340,7 @@ msgstr ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2315,7 +2353,7 @@ msgstr ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2326,17 +2364,17 @@ msgstr ""
"Output of â[1m%s[0mâ might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr "conversion failure"
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "input file doesn't contain a header entry with a charset specification"
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2345,7 +2383,7 @@ msgstr ""
"Cannot convert from â[1m%s[0mâ to â[1m%s[0mâ. %s relies on iconv(), and iconv"
"() does not support this conversion."
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2354,7 +2392,7 @@ msgstr ""
"Conversion from â[1m%s[0mâ to â[1m%s[0mâ introduces duplicates: some "
"different msgids become equal."
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2363,11 +2401,16 @@ msgstr ""
"Cannot convert from â[1m%s[0mâ to â[1m%s[0mâ. %s relies on iconv(). This "
"version was built without iconv()."
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr "%s is only valid with %s"
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr "backup type"
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2390,17 +2433,17 @@ msgstr ""
"comments and file positions will be preserved. Where an exact match\n"
"cannot be found, fuzzy matching is used to produce better results.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po translations referring to old sources\n"
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot references to new sources\n"
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2409,7 +2452,7 @@ msgstr ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2418,27 +2461,27 @@ msgstr ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Output file location in update mode:\n"
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "The result is written back to def.po.\n"
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL make a backup of def.po\n"
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFFIX override the usual backup suffix\n"
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2457,7 +2500,7 @@ msgstr ""
" existing, nil numbered if numbered backups exist, simple otherwise\n"
" simple, never always make simple backups\n"
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2468,27 +2511,27 @@ msgstr ""
"SIMPLE_BACKUP_SUFFIX\n"
"environment variable.\n"
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching do not use fuzzy matching\n"
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent suppress progress indicators\n"
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, c-format
msgid "this message should define plural forms"
msgstr "this message should define plural forms"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, c-format
msgid "this message should not define plural forms"
msgstr "this message should not define plural forms"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2497,26 +2540,26 @@ msgstr ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " done.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s and explicit file names are mutually exclusive"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr "Usage: %s [OPTION] [FILE]...\n"
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr "Convert binary message catalog to Uniforum style .po file.\n"
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
@@ -2525,24 +2568,38 @@ msgstr ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr " --csharp C# mode: input is a .NET .dll file\n"
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr " FILE ... input .mo files\n"
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr "Input file location in Java mode:\n"
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2553,12 +2610,26 @@ msgstr ""
"name,\n"
"separated with an underscore. The class is located using the CLASSPATH.\n"
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "Input file location in C# mode:\n"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr "Input file location in Tcl mode:\n"
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
@@ -2567,12 +2638,12 @@ msgstr ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr " -i, --indent write indented output style\n"
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr " --strict write strict uniforum style\n"
@@ -2616,13 +2687,13 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr "%s: warning: "
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2631,15 +2702,15 @@ msgstr ""
"Charset â[1m%s[0mâ is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr "Continuing anyway, expect parse errors."
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr "Continuing anyway."
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2648,7 +2719,7 @@ msgstr ""
"Charset â[1m%s[0mâ is not supported. %s relies on iconv(),\n"
"and iconv() does not support â[1m%s[0mâ.\n"
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
@@ -2657,12 +2728,12 @@ msgstr ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2671,7 +2742,7 @@ msgstr ""
"Charset â[1m%s[0mâ is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2716,7 +2787,7 @@ msgstr "plural form has wrong index"
msgid "too many errors, aborting"
msgstr "too many errors, aborting"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr "invalid multibyte sequence"
@@ -2737,11 +2808,11 @@ msgid "iconv failure"
msgstr "iconv failure"
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "error while reading â[1m%s[0mâ"
@@ -2766,7 +2837,7 @@ msgstr "end-of-file within string"
msgid "end-of-line within string"
msgstr "end-of-line within string"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, c-format
msgid "file \"%s\" is truncated"
msgstr "file â[1m%s[0mâ is truncated"
@@ -2776,17 +2847,17 @@ msgstr "file â[1m%s[0mâ is truncated"
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "file â[1m%s[0mâ contains a not NUL terminated string"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "file â[1m%s[0mâ is not in GNU .mo format"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "file â[1m%s[0mâ contains a not NUL terminated string, at %s"
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "this file may not contain domain directives"
@@ -2856,43 +2927,43 @@ msgstr ""
msgid "error writing stdout"
msgstr "error writing stdout"
-#: src/write-java.c:977
+#: src/write-java.c:982
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "cannot find a temporary directory, try setting $TMPDIR"
-#: src/write-java.c:987
+#: src/write-java.c:992
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "cannot create a temporary directory using template â[1m%s[0mâ"
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr "not a valid Java class name: %s"
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr "failed to create â[1m%s[0mâ"
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "error while writing â[1m%s[0mâ file"
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "error while opening â[1m%s[0mâ for writing"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
@@ -2900,7 +2971,7 @@ msgstr ""
"internationalized messages should not contain the â[1m\\%c[0mâ escape "
"sequence"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2913,7 +2984,7 @@ msgstr ""
"different from yours. Consider using a pure ASCII msgid instead.\n"
"%s\n"
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
@@ -2922,7 +2993,7 @@ msgstr ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
@@ -2931,7 +3002,7 @@ msgstr ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2942,7 +3013,7 @@ msgstr ""
"support them. Try generating a Java class using â[1mmsgfmt --java[0mâ, "
"instead of a properties file."
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2951,12 +3022,12 @@ msgstr ""
"message catalog has plural form translations, but the output format does not "
"support them."
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "cannot create output file â[1m%s[0mâ"
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "standard output"
@@ -2979,7 +3050,7 @@ msgstr ""
"but the Qt message catalog format supports Unicode only in the translated\n"
"strings, not in the untranslated strings\n"
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
@@ -2987,22 +3058,22 @@ msgstr ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: warning: unterminated string"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: warning: unterminated regular expression"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: warning: unterminated character constant"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: warning: unterminated string literal"
@@ -3021,66 +3092,66 @@ msgstr ""
"Language â[1mglade[0mâ is not supported. %s relies on expat.\n"
"This version was built without expat.\n"
-#: src/x-java.c:906
+#: src/x-java.c:829
#, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: warning: unterminated string constant"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr "%s:%d: warning: â[1m)[0mâ found where â[1m}[0mâ was expected"
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: warning: â[1m}[0mâ found where â[1m)[0mâ was expected"
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr "%s:%d: can't find string terminator â[1m%s[0mâ anywhere before EOF"
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr "%s:%d: missing right brace on \\x{HEXNUMBER}"
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
"%s:%d: invalid interpolation (â[1m\\l[0mâ) of 8bit character â[1m%c[0mâ"
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
"%s:%d: invalid interpolation (â[1m\\u[0mâ) of 8bit character â[1m%c[0mâ"
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s:%d: invalid variable interpolation at â[1m%c[0mâ"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
"%s:%d: invalid interpolation (â[1m\\L[0mâ) of 8bit character â[1m%c[0mâ"
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
"%s:%d: invalid interpolation (â[1m\\U[0mâ) of 8bit character â[1m%c[0mâ"
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr "%s:%d: fatal: plural message seen before singular message\n"
-#: src/x-python.c:588
+#: src/x-python.c:596
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: warning: invalid Unicode character"
@@ -3100,7 +3171,7 @@ msgstr "%s:%d: missing number after #"
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: invalid string expression"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3109,27 +3180,27 @@ msgstr ""
"%s:%lu: warning: the syntax $â[1m...[0mâ is deprecated due to security "
"reasons; use eval_gettext instead"
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing cannot be used when output is written to stdout"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext cannot work without keywords to look for"
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "warning: file â[1m%s[0mâ extension â[1m%s[0mâ is unknown; will try C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Extract translatable strings from given input files.\n"
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3138,46 +3209,48 @@ msgstr ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=FILE write output to specified file\n"
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, c-format
msgid "Choice of input file language:\n"
msgstr "Choice of input file language:\n"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ shorthand for --language=C++\n"
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3186,7 +3259,7 @@ msgstr ""
"By default the language is guessed depending on the input file name "
"extension.\n"
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3195,22 +3268,22 @@ msgstr ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "By default the input files are assumed to be in ASCII.\n"
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing join messages with existing file\n"
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
@@ -3219,28 +3292,30 @@ msgstr ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr "Language specific options:\n"
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extract all strings\n"
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
@@ -3249,7 +3324,7 @@ msgstr ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3260,69 +3335,71 @@ msgstr ""
"argument\n"
" number ARG of keyword WORD\n"
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs understand ANSI C trigraphs for input\n"
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (only languages C, C++, ObjectiveC)\n"
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt recognize Qt format strings\n"
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr " (only language C++)\n"
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
" --debug more detailed formatstring recognition result\n"
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output write out a Java .properties file\n"
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=STRING set copyright holder in output\n"
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
" --foreign-user omit FSF copyright in output for foreign user\n"
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
@@ -3331,7 +3408,7 @@ msgstr ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
@@ -3340,7 +3417,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3349,11 +3426,11 @@ msgstr ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
@@ -3362,12 +3439,12 @@ msgstr ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr "%s%s: warning: "
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
@@ -3376,7 +3453,7 @@ msgstr ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3385,7 +3462,7 @@ msgstr ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -3395,7 +3472,7 @@ msgstr ""
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3407,7 +3484,7 @@ msgstr ""
"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
"specify an --msgid-bugs-address command line option.\n"
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "language â[1m%s[0mâ unknown"
diff --git a/gettext-tools/po/en@quot.po b/gettext-tools/po/en@quot.po
index e4eb16cc1..8776e4ae1 100644
--- a/gettext-tools/po/en@quot.po
+++ b/gettext-tools/po/en@quot.po
@@ -1,7 +1,7 @@
# English translations for gettext-tools package.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2004 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext-tools package.
-# Automatically generated, 2003.
+# Automatically generated, 2004.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
@@ -29,8 +29,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-tools\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
-"PO-Revision-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
+"PO-Revision-Date: 2004-01-18 16:24+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -57,9 +57,9 @@ msgstr "Valid arguments are:"
msgid "write error"
msgstr "write error"
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "error while opening â%sâ for reading"
@@ -88,10 +88,10 @@ msgstr "error after reading â%sâ"
msgid "Unknown system error"
msgstr "Unknown system error"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr "%s subprocess failed"
@@ -151,12 +151,12 @@ msgstr "%s: option â-W %sâ is ambiguous\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: option â-W %sâ doesn't allow an argument\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java compiler not found, try installing gcj or set $JAVAC"
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Java virtual machine not found, try installing gij or set $JAVA"
@@ -184,12 +184,12 @@ msgstr "DuplicateHandle failed with error code 0x%08x"
msgid "_open_osfhandle failed"
msgstr "_open_osfhandle failed"
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr "%s subprocess"
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr "%s subprocess got fatal signal %d"
@@ -210,7 +210,7 @@ msgstr ""
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "a format specification for argument %u doesn't exist in â%sâ"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -220,7 +220,7 @@ msgid ""
msgstr ""
"format specifications in âmsgidâ and â%sâ for argument %u are not the same"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
@@ -229,19 +229,19 @@ msgstr ""
"In the directive number %u, the token after â<â is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
"In the directive number %u, the token after â<â is not followed by '>'."
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
"The string refers to argument number %u but ignores argument number %u."
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "number of format specifications in âmsgidâ and â%sâ does not match"
@@ -311,18 +311,18 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr "The string refers to argument number %u in incompatible ways."
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
"The string ends in the middle of a directive: found â{â without matching '}'."
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr "In the directive number %u, â{â is not followed by an argument number."
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -331,19 +331,19 @@ msgstr ""
"In the directive number %u, the substring â%sâ is not a valid date/time "
"style."
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr "In the directive number %u, â%sâ is not followed by a comma."
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
"In the directive number %u, the substring â%sâ is not a valid number style."
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
@@ -352,7 +352,7 @@ msgstr ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of â%sâ, â%sâ, â%sâ, â%sâ."
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
@@ -360,12 +360,12 @@ msgstr ""
"The string starts in the middle of a directive: found â}â without matching "
"'{'."
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr "In the directive number %u, a choice contains no number."
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
@@ -374,7 +374,7 @@ msgstr ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', â#â or '%s'."
-#: src/format-java.c:715
+#: src/format-java.c:732
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -383,12 +383,12 @@ msgstr ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"âmsgidâ"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "a format specification for argument {%u} doesn't exist in â%sâ"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -582,9 +582,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -597,28 +597,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Written by %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "too many arguments"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Try â%s --helpâ for more information.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr "Usage: %s [OPTION]\n"
@@ -656,36 +656,36 @@ msgstr " -i, --ip-address addresses for the hostname\n"
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr "Informative output:\n"
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help display this help and exit\n"
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr " -V, --version output version information and exit\n"
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
msgid "Report bugs to .\n"
msgstr "Report bugs to .\n"
@@ -695,7 +695,7 @@ msgid "could not get host name"
msgstr "could not get host name"
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, c-format
msgid "at most one input file allowed"
msgstr "at most one input file allowed"
@@ -703,15 +703,15 @@ msgstr "at most one input file allowed"
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s and %s are mutually exclusive"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
@@ -727,7 +727,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -737,21 +737,21 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, c-format
msgid "Input file location:\n"
msgstr "Input file location:\n"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " INPUTFILE input PO file\n"
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -759,29 +759,29 @@ msgstr ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr "If no input file is given or if it is -, standard input is read.\n"
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr "Output file location:\n"
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=FILE write output to specified file\n"
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -882,14 +882,14 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr "Input file syntax:\n"
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
@@ -897,7 +897,7 @@ msgstr ""
" -P, --properties-input input file is in Java .properties syntax\n"
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -907,16 +907,16 @@ msgstr ""
"syntax\n"
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr "Output details:\n"
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
@@ -924,8 +924,8 @@ msgstr ""
" -e, --no-escape do not use C escapes in output (default)\n"
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
@@ -933,27 +933,27 @@ msgstr ""
" -E, --escape use C escapes in output, no extended chars\n"
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po write PO file even if empty\n"
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent write the .po file using indented style\n"
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr " --no-location do not write â#: filename:lineâ lines\n"
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -961,7 +961,7 @@ msgstr ""
" -n, --add-location generate â#: filename:lineâ lines (default)\n"
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
@@ -969,15 +969,15 @@ msgstr ""
" --strict write out strict Uniforum conforming .po file\n"
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output write out a Java .properties file\n"
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
@@ -985,15 +985,15 @@ msgstr ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NUMBER set output page width\n"
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1003,15 +1003,15 @@ msgstr ""
" the output page width, into several lines\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output generate sorted output\n"
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr " -F, --sort-by-file sort output by file location\n"
@@ -1021,7 +1021,7 @@ msgstr " -F, --sort-by-file sort output by file location\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "impossible selection criteria specified (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
@@ -1049,18 +1049,18 @@ msgstr ""
"is specified, they will be taken from the first PO file to define them.\n"
"File positions from all PO files will be cumulated.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr " INPUTFILE ... input files\n"
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr " -f, --files-from=FILE get list of input files from FILE\n"
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr "If input file is -, standard input is read.\n"
@@ -1092,16 +1092,16 @@ msgstr ""
" -u, --unique shorthand for --less-than=2, requests\n"
" that only unique messages be printed\n"
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
" -P, --properties-input input files are in Java .properties syntax\n"
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1124,17 +1124,17 @@ msgstr ""
" --use-first use first available translation for each\n"
" message, don't merge several translations\n"
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "no input files given"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "exactly 2 input files required"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Usage: %s [OPTION] def.po ref.pot\n"
@@ -1166,12 +1166,12 @@ msgstr " def.po translations\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot references to the sources\n"
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr "Operation modifiers:\n"
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
@@ -1180,17 +1180,17 @@ msgstr ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "this message is used but not defined..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...but this definition is similar"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "this message is used but not defined in %s"
@@ -1242,7 +1242,7 @@ msgstr ""
" ->, --more-than=NUMBER print messages with more than this many\n"
" definitions, defaults to 1 if not set\n"
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1264,32 +1264,32 @@ msgstr "Conversion target:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "The default encoding is the current locale's encoding.\n"
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent indented output style\n"
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location suppress â#: filename:lineâ lines\n"
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
" --add-location preserve â#: filename:lineâ lines (default)\n"
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict strict Uniforum output style\n"
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "no input file given"
@@ -1430,14 +1430,14 @@ msgid ""
msgstr ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
" --no-escape do not use C escapes in output (default)\n"
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr " --indent indented output style\n"
@@ -1474,65 +1474,65 @@ msgstr "read from %s subprocess failed"
msgid "%s subprocess terminated with exit code %d"
msgstr "%s subprocess terminated with exit code %d"
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "the argument to %s should be a single punctuation character"
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s requires a â-d directoryâ specification"
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr "%s requires a â-l localeâ specification"
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s is only valid with %s"
-
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s is only valid with %s or %s"
-#: src/msgfmt.c:503
+#: src/msgfmt.c:477 src/msgfmt.c:483
+#, c-format
+msgid "%s is only valid with %s, %s or %s"
+msgstr "%s is only valid with %s, %s or %s"
+
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d translated message"
msgstr[1] "%d translated messages"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d fuzzy translation"
msgstr[1] ", %d fuzzy translations"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d untranslated message"
msgstr[1] ", %d untranslated messages"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Usage: %s [OPTION] filename.po ...\n"
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Generate binary message catalog from textual translation description.\n"
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1541,17 +1541,17 @@ msgstr ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr " filename.po ... input files\n"
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr "Operation mode:\n"
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1560,7 +1560,7 @@ msgstr ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1569,39 +1569,54 @@ msgstr ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr " --csharp C# mode: generate a .NET .dll file\n"
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt mode: generate a Qt .qm file\n"
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict enable strict Uniforum mode\n"
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr "If output file is -, output is written to standard output.\n"
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Output file location in Java mode:\n"
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=RESOURCE resource name\n"
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
@@ -1610,14 +1625,14 @@ msgstr ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1630,18 +1645,41 @@ msgstr ""
"separated with an underscore. The -d option is mandatory. The class is\n"
"written under the specified directory.\n"
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "Output file location in C# mode:\n"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Output file location in Tcl mode:\n"
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
" -d DIRECTORY base directory of .msg message catalogs\n"
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
@@ -1650,12 +1688,12 @@ msgstr ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr "Input file interpretation:\n"
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1666,13 +1704,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format check language dependent format strings\n"
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -1681,7 +1719,7 @@ msgstr ""
" --check-header verify presence and contents of the header "
"entry\n"
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -1690,7 +1728,7 @@ msgstr ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -1699,7 +1737,7 @@ msgstr ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1710,57 +1748,57 @@ msgstr ""
"for\n"
" menu items\n"
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy use fuzzy entries in output\n"
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
" --no-hash binary file will not include the hash table\n"
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics print statistics about translations\n"
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose increase verbosity level\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr "plural expression can produce negative values"
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
"nplurals = %lu but plural expression can produce values as large as %lu"
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr "plural expression can produce division by zero"
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr "plural expression can produce integer overflow"
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
@@ -1769,56 +1807,56 @@ msgstr ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr "message catalog has plural form translations..."
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr "...but header entry lacks a âplural=EXPRESSIONâ attribute"
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr "...but header entry lacks a ânplurals=INTEGERâ attribute"
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, c-format
msgid "invalid nplurals value"
msgstr "invalid nplurals value"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, c-format
msgid "invalid plural expression"
msgstr "invalid plural expression"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr "nplurals = %lu..."
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "...but some messages have only one plural form"
msgstr[1] "...but some messages have only %lu plural forms"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "...but some messages have one plural form"
msgstr[1] "...but some messages have %lu plural forms"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr "Try using the following, valid for %s:\n"
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
@@ -1827,131 +1865,131 @@ msgstr ""
"message catalog has plural form translations, but lacks a header entry with "
"âPlural-Forms: nplurals=INTEGER; plural=EXPRESSION;â"
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "âmsgidâ and âmsgid_pluralâ entries do not both begin with â\\nâ"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "âmsgidâ and âmsgstr[%u]â entries do not both begin with â\\nâ"
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "âmsgidâ and âmsgstrâ entries do not both begin with â\\nâ"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "âmsgidâ and âmsgid_pluralâ entries do not both end with â\\nâ"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "âmsgidâ and âmsgstr[%u]â entries do not both end with â\\nâ"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "âmsgidâ and âmsgstrâ entries do not both end with â\\nâ"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr "plural handling is a GNU gettext extension"
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr "â%sâ is not a valid %s format string, unlike 'msgid'. Reason: %s"
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr lacks the keyboard accelerator mark â%câ"
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr has too many keyboard accelerator marks â%câ"
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "headerfield â%sâ missing in header\n"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "header field â%sâ should start at beginning of line\n"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
msgid "some header fields still have the initial default value\n"
msgstr "some header fields still have the initial default value\n"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, c-format
msgid "field `%s' still has initial default value\n"
msgstr "field â%sâ still has initial default value\n"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "warning: PO file header missing or invalid\n"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "warning: charset conversion will not work\n"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "warning: PO file header fuzzy\n"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "warning: older versions of msgfmt will give an error on this\n"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domain name â%sâ not suitable as file name"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domain name â%sâ not suitable as file name: will use prefix"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "âdomain %sâ directive ignored"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "empty âmsgstrâ entry ignored"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "fuzzy âmsgstrâ entry ignored"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: warning: source file contains fuzzy translation"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr "option â%câ cannot be used before âKâ or âTâ or âCâ has been specified"
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -1960,7 +1998,7 @@ msgstr ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2019,29 +2057,29 @@ msgstr ""
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
" --escape use C escapes in output, no extended chars\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output generate sorted output\n"
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file sort output by file location\n"
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr "write to grep subprocess failed"
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2051,7 +2089,7 @@ msgstr ""
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2062,12 +2100,12 @@ msgstr ""
"Please specify the locale through the --locale option or\n"
"the output .po file through the --output-file option.\n"
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr "Created %s.\n"
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2076,12 +2114,12 @@ msgstr ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=INPUTFILE input POT file\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -2092,12 +2130,12 @@ msgstr ""
"file.\n"
"If it is -, standard input is read.\n"
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=FILE write output to specified PO file\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2106,19 +2144,19 @@ msgstr ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC set target locale\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
" --no-translator assume the PO file is automatically generated\n"
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2126,12 +2164,12 @@ msgstr ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr "error reading current directory"
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2139,24 +2177,24 @@ msgstr ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr "fdopen() failed"
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s subprocess I/O error"
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s subprocess failed with exit code %d"
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -2173,29 +2211,29 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr "English translations for %s package"
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "present charset â%sâ is not a portable encoding name"
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "two different charsets â%sâ and â%sâ in input file"
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
"input file â%sâ doesn't contain a header entry with a charset specification"
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2204,19 +2242,19 @@ msgstr ""
"domain â%sâ in input file â%sâ doesn't contain a header entry with a charset "
"specification"
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "target charset â%sâ is not a portable encoding name."
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr "warning: "
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2225,7 +2263,7 @@ msgstr ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2238,7 +2276,7 @@ msgstr ""
"Converting the output to UTF-8.\n"
"To select a different output encoding, use the --to-code option.\n"
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2251,12 +2289,12 @@ msgstr ""
"Output of â%sâ might be incorrect.\n"
"Possible workarounds are:\n"
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr "- Set LC_ALL to a locale with encoding %s.\n"
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2267,7 +2305,7 @@ msgstr ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2280,7 +2318,7 @@ msgstr ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2291,17 +2329,17 @@ msgstr ""
"Output of â%sâ might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr "conversion failure"
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "input file doesn't contain a header entry with a charset specification"
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2310,7 +2348,7 @@ msgstr ""
"Cannot convert from â%sâ to â%sâ. %s relies on iconv(), and iconv() does not "
"support this conversion."
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2319,7 +2357,7 @@ msgstr ""
"Conversion from â%sâ to â%sâ introduces duplicates: some different msgids "
"become equal."
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2328,11 +2366,16 @@ msgstr ""
"Cannot convert from â%sâ to â%sâ. %s relies on iconv(). This version was "
"built without iconv()."
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr "%s is only valid with %s"
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr "backup type"
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2355,17 +2398,17 @@ msgstr ""
"comments and file positions will be preserved. Where an exact match\n"
"cannot be found, fuzzy matching is used to produce better results.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po translations referring to old sources\n"
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot references to new sources\n"
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2374,7 +2417,7 @@ msgstr ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2383,27 +2426,27 @@ msgstr ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Output file location in update mode:\n"
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "The result is written back to def.po.\n"
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL make a backup of def.po\n"
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFFIX override the usual backup suffix\n"
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2422,7 +2465,7 @@ msgstr ""
" existing, nil numbered if numbered backups exist, simple otherwise\n"
" simple, never always make simple backups\n"
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2433,27 +2476,27 @@ msgstr ""
"SIMPLE_BACKUP_SUFFIX\n"
"environment variable.\n"
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching do not use fuzzy matching\n"
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent suppress progress indicators\n"
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, c-format
msgid "this message should define plural forms"
msgstr "this message should define plural forms"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, c-format
msgid "this message should not define plural forms"
msgstr "this message should not define plural forms"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2462,26 +2505,26 @@ msgstr ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " done.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s and explicit file names are mutually exclusive"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr "Usage: %s [OPTION] [FILE]...\n"
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr "Convert binary message catalog to Uniforum style .po file.\n"
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
@@ -2490,24 +2533,38 @@ msgstr ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr " --csharp C# mode: input is a .NET .dll file\n"
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr " FILE ... input .mo files\n"
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr "Input file location in Java mode:\n"
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2518,12 +2575,26 @@ msgstr ""
"name,\n"
"separated with an underscore. The class is located using the CLASSPATH.\n"
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "Input file location in C# mode:\n"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr "Input file location in Tcl mode:\n"
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
@@ -2532,12 +2603,12 @@ msgstr ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr " -i, --indent write indented output style\n"
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr " --strict write strict uniforum style\n"
@@ -2581,13 +2652,13 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr "%s: warning: "
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2596,15 +2667,15 @@ msgstr ""
"Charset â%sâ is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr "Continuing anyway, expect parse errors."
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr "Continuing anyway."
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2613,7 +2684,7 @@ msgstr ""
"Charset â%sâ is not supported. %s relies on iconv(),\n"
"and iconv() does not support â%sâ.\n"
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
@@ -2622,12 +2693,12 @@ msgstr ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2636,7 +2707,7 @@ msgstr ""
"Charset â%sâ is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2681,7 +2752,7 @@ msgstr "plural form has wrong index"
msgid "too many errors, aborting"
msgstr "too many errors, aborting"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr "invalid multibyte sequence"
@@ -2702,11 +2773,11 @@ msgid "iconv failure"
msgstr "iconv failure"
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "error while reading â%sâ"
@@ -2731,7 +2802,7 @@ msgstr "end-of-file within string"
msgid "end-of-line within string"
msgstr "end-of-line within string"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, c-format
msgid "file \"%s\" is truncated"
msgstr "file â%sâ is truncated"
@@ -2741,17 +2812,17 @@ msgstr "file â%sâ is truncated"
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "file â%sâ contains a not NUL terminated string"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "file â%sâ is not in GNU .mo format"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "file â%sâ contains a not NUL terminated string, at %s"
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "this file may not contain domain directives"
@@ -2820,50 +2891,50 @@ msgstr ""
msgid "error writing stdout"
msgstr "error writing stdout"
-#: src/write-java.c:977
+#: src/write-java.c:982
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "cannot find a temporary directory, try setting $TMPDIR"
-#: src/write-java.c:987
+#: src/write-java.c:992
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "cannot create a temporary directory using template â%sâ"
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr "not a valid Java class name: %s"
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr "failed to create â%sâ"
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "error while writing â%sâ file"
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "error while opening â%sâ for writing"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"internationalized messages should not contain the â\\%câ escape sequence"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2876,7 +2947,7 @@ msgstr ""
"different from yours. Consider using a pure ASCII msgid instead.\n"
"%s\n"
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
@@ -2885,7 +2956,7 @@ msgstr ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
@@ -2894,7 +2965,7 @@ msgstr ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2905,7 +2976,7 @@ msgstr ""
"support them. Try generating a Java class using âmsgfmt --javaâ, instead of "
"a properties file."
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2914,12 +2985,12 @@ msgstr ""
"message catalog has plural form translations, but the output format does not "
"support them."
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "cannot create output file â%sâ"
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "standard output"
@@ -2942,7 +3013,7 @@ msgstr ""
"but the Qt message catalog format supports Unicode only in the translated\n"
"strings, not in the untranslated strings\n"
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
@@ -2950,22 +3021,22 @@ msgstr ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: warning: unterminated string"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: warning: unterminated regular expression"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: warning: unterminated character constant"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: warning: unterminated string literal"
@@ -2984,62 +3055,62 @@ msgstr ""
"Language âgladeâ is not supported. %s relies on expat.\n"
"This version was built without expat.\n"
-#: src/x-java.c:906
+#: src/x-java.c:829
#, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: warning: unterminated string constant"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr "%s:%d: warning: â)â found where â}â was expected"
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: warning: â}â found where â)â was expected"
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr "%s:%d: can't find string terminator â%sâ anywhere before EOF"
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr "%s:%d: missing right brace on \\x{HEXNUMBER}"
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr "%s:%d: invalid interpolation (â\\lâ) of 8bit character â%câ"
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr "%s:%d: invalid interpolation (â\\uâ) of 8bit character â%câ"
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s:%d: invalid variable interpolation at â%câ"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr "%s:%d: invalid interpolation (â\\Lâ) of 8bit character â%câ"
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr "%s:%d: invalid interpolation (â\\Uâ) of 8bit character â%câ"
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr "%s:%d: fatal: plural message seen before singular message\n"
-#: src/x-python.c:588
+#: src/x-python.c:596
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: warning: invalid Unicode character"
@@ -3059,7 +3130,7 @@ msgstr "%s:%d: missing number after #"
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: invalid string expression"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3068,27 +3139,27 @@ msgstr ""
"%s:%lu: warning: the syntax $â...â is deprecated due to security reasons; "
"use eval_gettext instead"
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing cannot be used when output is written to stdout"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext cannot work without keywords to look for"
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "warning: file â%sâ extension â%sâ is unknown; will try C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Extract translatable strings from given input files.\n"
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3097,46 +3168,48 @@ msgstr ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=FILE write output to specified file\n"
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, c-format
msgid "Choice of input file language:\n"
msgstr "Choice of input file language:\n"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ shorthand for --language=C++\n"
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3145,7 +3218,7 @@ msgstr ""
"By default the language is guessed depending on the input file name "
"extension.\n"
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3154,22 +3227,22 @@ msgstr ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "By default the input files are assumed to be in ASCII.\n"
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing join messages with existing file\n"
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
@@ -3178,28 +3251,30 @@ msgstr ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr "Language specific options:\n"
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extract all strings\n"
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
@@ -3208,7 +3283,7 @@ msgstr ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3219,69 +3294,71 @@ msgstr ""
"argument\n"
" number ARG of keyword WORD\n"
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs understand ANSI C trigraphs for input\n"
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (only languages C, C++, ObjectiveC)\n"
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt recognize Qt format strings\n"
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr " (only language C++)\n"
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
" --debug more detailed formatstring recognition result\n"
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output write out a Java .properties file\n"
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=STRING set copyright holder in output\n"
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
" --foreign-user omit FSF copyright in output for foreign user\n"
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
@@ -3290,7 +3367,7 @@ msgstr ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
@@ -3299,7 +3376,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3308,11 +3385,11 @@ msgstr ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
@@ -3321,12 +3398,12 @@ msgstr ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr "%s%s: warning: "
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
@@ -3335,7 +3412,7 @@ msgstr ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3344,7 +3421,7 @@ msgstr ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -3354,7 +3431,7 @@ msgstr ""
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3366,7 +3443,7 @@ msgstr ""
"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
"specify an --msgid-bugs-address command line option.\n"
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "language â%sâ unknown"
diff --git a/gettext-tools/po/es.po b/gettext-tools/po/es.po
index 84eae5a0d..40137fd26 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext-tools 0.13\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 2003-12-01 11:36-0600\n"
"Last-Translator: Max de Mendizábal \n"
"Language-Team: Spanish \n"
@@ -35,9 +35,9 @@ msgstr "Los argumentos v
msgid "write error"
msgstr "error de escritura"
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "error al abrir el fichero \"%s\" para lectura"
@@ -68,10 +68,10 @@ msgstr "error despu
msgid "Unknown system error"
msgstr "Error del sistema desconocido"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr "fallo en el subproceso %s"
@@ -133,13 +133,13 @@ msgstr "%s: la opci
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
"No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -171,12 +171,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr "fallo en _open_osfhandle"
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr "subproceso %s"
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr "el subproceso %s tiene una señal fatal %d"
@@ -198,7 +198,7 @@ msgstr ""
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "una especificación de formato para el argumento %u no existe en '%s'"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -209,7 +209,7 @@ msgstr ""
"las especificaciones de formato en 'msgid' y '%s' para el argumento %u no "
"son las mismas"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
@@ -219,21 +219,21 @@ msgstr ""
"macro especificador de formato. Los nombres de macro válidos están listados "
"en el ISO C 99 sección 7.8.1."
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
"En la instrucción número %u, el token posterior a '<' no está seguido por "
"'>'."
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
"La cadena se refiere al argumento número %u, pero ignora el argumento número "
"%u."
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "el número de especificaciones de formato en `msgid' y '%s' no coincide"
@@ -306,20 +306,20 @@ msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
"La cadena se refiere al número de argumento %u de formas incompatibles."
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
"La cadena termina en medio de una instrucción: se encontró un '{' sin su '}' "
"correspondiente. "
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
"En la instrucción número %u, '{' no está seguido de un número de argumento."
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
@@ -328,12 +328,12 @@ msgstr ""
"En la instrucción número %u, la subcadena \"%s\" no está en un estilo de "
"fecha/hora válido."
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr "En la instrucción número %u, \"%s\" no está seguido de una coma."
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
@@ -341,7 +341,7 @@ msgstr ""
"En la instrucción número %u, la subcadena \"%s\" no es un estilo de número "
"válido."
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
@@ -350,7 +350,7 @@ msgstr ""
"En la instrucción número %u, el número de argumento no está seguido por una "
"coma y uno de los siguientes \"%s\", \"%s\", \"%s\", \"%s\"."
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
@@ -358,12 +358,12 @@ msgstr ""
"La cadena comienza en medio de una instrucción: se encontró un '}' sin su "
"'{' correspondiente."
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr "En la instrucción número %u, una opción contiene un valor no numérico."
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
@@ -372,7 +372,7 @@ msgstr ""
"En la instrucción número %u, una opción contiene un número que no está "
"seguido por '<', '#' o '%s'."
-#: src/format-java.c:715
+#: src/format-java.c:732
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
@@ -381,12 +381,12 @@ msgstr ""
"una especificación de formato para el argumento {%u}, como en '%s', no "
"existe en 'msgid'"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "una especificación de formato para el argumento {%u} no existe en '%s'"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -584,9 +584,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -600,28 +600,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "demasiados argumentos"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pruebe `%s --help' para más información.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr "Modo de empleo: %s [OPCIÓN]\n"
@@ -660,36 +660,36 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr "Salida informativa:\n"
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help muestra esta ayuda y finaliza\n"
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr " -V, --version muestra la versión y finaliza\n"
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
msgid "Report bugs to .\n"
msgstr "Comunicar los `bugs' a .\n"
@@ -699,7 +699,7 @@ msgid "could not get host name"
msgstr "no se pudo obtener el nombre de la máquina"
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, c-format
msgid "at most one input file allowed"
msgstr "sólo se permite un fichero de entrada máximo"
@@ -707,15 +707,15 @@ msgstr "s
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s y %s son mutuamente excluyentes"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
@@ -731,7 +731,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -743,21 +743,21 @@ msgstr ""
# acepto sugerencia de em pero agrego un "el". mm
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, c-format
msgid "Input file location:\n"
msgstr "Localización del fichero de entrada:\n"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " FICHERODEENTRADA fichero PO de entrada\n"
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -767,7 +767,7 @@ msgstr ""
" de entrada\n"
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
@@ -775,24 +775,24 @@ msgstr ""
"estándar.\n"
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr "Localización del fichero de salida:\n"
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
" -o, --output-file=FICHERO escribe la salida al FICHERO especificado\n"
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -906,14 +906,14 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr "Sintáxis del fichero de entrada:\n"
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
@@ -922,7 +922,7 @@ msgstr ""
"properties de Java\n"
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -932,16 +932,16 @@ msgstr ""
"strings de NeXTstep/GNUstep\n"
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr "Detalles de salida:\n"
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
@@ -950,8 +950,8 @@ msgstr ""
"defecto)\n"
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
@@ -960,15 +960,15 @@ msgstr ""
"carácteres extendidos\n"
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
" --force-po escribe un fichero PO aún si está vacío\n"
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
@@ -976,14 +976,14 @@ msgstr ""
"sangrados\n"
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location no escribe las líneas '#: fichero:línea'\n"
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -991,7 +991,7 @@ msgstr ""
" -n, --add-location genera líneas '#: fichero:línea' (por defecto)\n"
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
@@ -999,15 +999,15 @@ msgstr ""
" --strict escribe un fichero .po con Uniforum estricto\n"
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output escribe un fichero .properties de Java\n"
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
@@ -1016,15 +1016,15 @@ msgstr ""
"GNUstep\n"
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NÚMERO pone la anchura de la página de salida\n"
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1036,15 +1036,15 @@ msgstr ""
"salida\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output genera una salida ordenada\n"
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
@@ -1086,20 +1086,20 @@ msgstr ""
"fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
"los ficheros PO se conservarán. \n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr " FICHERODEENTRADA ... ficheros de entrada\n"
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
" -f, --files-from=FICHERO obtiene una lista de ficheros de entrada del "
"FICHERO\n"
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr "Si el fichero de entrada es -, se lee la entrada estándar.\n"
@@ -1134,8 +1134,8 @@ msgstr ""
" -u, --unique abreviatura de --less-than=2, solicita\n"
" que sólo se impriman los mensajes únicos\n"
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
@@ -1143,8 +1143,8 @@ msgstr ""
" -P, --properties-input los ficheros de entrada están en la sintáxis ."
"properties de Java\n"
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1167,17 +1167,17 @@ msgstr ""
" -use-first utiliza la primera traducción disponible para\n"
" cada mensaje, no mezcla varias traducciones\n"
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "no se especificaron ficheros de entrada"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "se requieren exactamente 2 ficheros de entrada"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
@@ -1271,12 +1271,12 @@ msgstr " def.po traducciones\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.po referencias a las fuentes\n"
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificadores de operación:\n"
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
@@ -1285,17 +1285,17 @@ msgstr ""
" -m, --multi-domain aplica ref.pot a cada uno de los dominios en\n"
" def.po\n"
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "este mensaje se usa pero no está definido..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...pero esta definición es parecida"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "este mensaje se usa pero no está definido en %s"
@@ -1371,7 +1371,7 @@ msgstr ""
" número de definiciones, si no se pone,\n"
" el valor por defecto es 0\n"
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1396,20 +1396,20 @@ msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
"La codificación por defecto es la que está en uso por la funcion locale.\n"
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent estilo de salida con sangrías\n"
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
" --no-location no escribe las líneas '#: fichero:línea'\n"
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
@@ -1417,14 +1417,14 @@ msgstr ""
" --add-location genera líneas '#: fichero:línea' (por "
"defecto)\n"
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict escribe en estilo Uniforum estricto\n"
# acepto sugerencia de em pero agrego un "el". mm
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "no se especificó el fichero de entrada"
@@ -1569,7 +1569,7 @@ msgstr ""
" -n, --quiet, --silent elimina la impresión automática del espacio\n"
" de patrones\n"
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
@@ -1577,7 +1577,7 @@ msgstr ""
" --no-escape no utiliza las secuencias de escape tipo C\n"
" en la salida (por defecto)\n"
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1617,66 +1617,66 @@ msgstr "fallo en la lectura del subproceso %s"
msgid "%s subprocess terminated with exit code %d"
msgstr "el subproceso %s terminó con un código de salida %d"
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "el argumento a %s debe ser un solo carácter de puntuación"
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s requiere que se especifique un \"-d directorio\""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr "%s requiere que se especifique un \"-l local\""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s sólo es válido con %s"
-
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s sólo es válido con %s o %s"
-#: src/msgfmt.c:503
+#: src/msgfmt.c:477 src/msgfmt.c:483
+#, fuzzy, c-format
+msgid "%s is only valid with %s, %s or %s"
+msgstr "%s sólo es válido con %s o %s"
+
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensaje traducido"
msgstr[1] "%d mensajes traducidos"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traducción difusa"
msgstr[1] ", %d traducciones difusas"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensaje sin traducir"
msgstr[1] ", %d mensajes sin traducir"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Genera un catálogo binario de mensajes a partir de la descripción de la "
"traducción textual.\n"
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1685,17 +1685,17 @@ msgstr ""
"Los argumentos obligatorios en las opciones largas también lo son para las \n"
"opciones cortas. De forma similar se comportan los argumentos opcionales.\n"
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr " fichero.po ... ficheros de entrada\n"
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr "Modo de operación:\n"
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1704,7 +1704,7 @@ msgstr ""
" -j, --java Modo Java: la entrada es una clase de Java "
"ResourceBundle\n"
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1713,39 +1713,52 @@ msgstr ""
" --java2 como --java, y supone el uso de Java2\n"
" (JDK 1.2 o superior)\n"
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, fuzzy, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr " --qt Modo Qt: genera un fichero .qm de Qt\n"
+
+#: src/msgfmt.c:641
+#, fuzzy, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr " --qt Modo Qt: genera un fichero .qm de Qt\n"
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Modo tcl: genera un fichero .msg tcl/msgcat\n"
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Modo Qt: genera un fichero .qm de Qt\n"
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict escribe en estilo Uniforum estricto\n"
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr "Si el fichero de salida es -, se escribe en la salida estándar.\n"
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Localización del fichero de salida en modo Java:\n"
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=RECURSO nombre del recurso\n"
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
@@ -1753,14 +1766,14 @@ msgid ""
msgstr ""
" -l, --locale=LOCAL nombre local, ya sea idioma o idioma_PAIS\n"
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d DIRECTORIO directorio base de la jerarquía de clases\n"
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1772,19 +1785,41 @@ msgstr ""
"recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n"
"se escribe bajo el directorio especificado.\n"
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "Localización del fichero de salida en modo Tcl:\n"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, fuzzy, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+" -d DIRECTORIO directorio base de la jerarquía de clases\n"
+
+#: src/msgfmt.c:679
+#, fuzzy, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+"Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
+"el directorio especificado.\n"
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Localización del fichero de salida en modo Tcl:\n"
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
" -d DIRECTORIO directorio base de los catálogos de\n"
" mensajes .msg\n"
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
@@ -1793,12 +1828,12 @@ msgstr ""
"Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
"el directorio especificado.\n"
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretación del fichero de entrada:\n"
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1809,7 +1844,7 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
@@ -1817,7 +1852,7 @@ msgstr ""
"del\n"
" idioma\n"
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -1826,7 +1861,7 @@ msgstr ""
" --check-header verifica la presencia y contenido de la\n"
" línea de encabezado\n"
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -1836,7 +1871,7 @@ msgstr ""
"instrucciones\n"
" del dominio y la opción --output-file\n"
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -1846,7 +1881,7 @@ msgstr ""
"el\n"
" msgfmt de X/Open\n"
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1856,13 +1891,13 @@ msgstr ""
" --check-accelerators[=CAR] revisa la presencia de aceleradores de\n"
" teclado para los elementos del menú\n"
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
" -f, --use-fuzzy utiliza entradas difusas para la salida\n"
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -1870,7 +1905,7 @@ msgstr ""
" -a, --alignment=NÚMERO alínea las cadenas al NÚMERO de bytes\n"
" (por defecto es: %d)\n"
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
@@ -1878,41 +1913,41 @@ msgstr ""
" --no-hash el fichero binario no incluirá la tabla de "
"hash\n"
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
" --statistics muestra las estadísticas sobre las "
"traducciones\n"
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose aumenta el cantidad de mensajes\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr "la expresión plural puede producir resultados negativos"
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
"nplurals = %lu pero las expresiones plurales pueden producir valores tan "
"grades como %lu"
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr "la expresión plural puede producir una división por cero"
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr "la expresión plural puede producir un sobreflujo entero"
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
@@ -1921,56 +1956,56 @@ msgstr ""
"la expresión plural puede producir excepciones aritméticas, posiblemente una "
"división por cero"
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr "el catálogo de mensajes tiene formas plurales en las traducciones..."
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, c-format
msgid "invalid nplurals value"
msgstr "valor inválido de nplurals"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, c-format
msgid "invalid plural expression"
msgstr "expresión plural inválida"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr "nplurals = %lu ..."
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "... pero algunos mensajes sólo tienen solo una forma plural"
msgstr[1] "... pero algunos mensajes sólo tienen %lu formas plurales"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "... pero algunos mensajes tienen solo una forma plural"
msgstr[1] "... pero algunos mensajes tienen %lu formas plurales"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr "Pruebe utilizando lo siguiente, válido para %s:\n"
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
@@ -1995,7 +2030,7 @@ msgstr ""
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
@@ -2017,7 +2052,7 @@ msgstr ""
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr ""
@@ -2039,14 +2074,14 @@ msgstr ""
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
# y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
@@ -2054,92 +2089,92 @@ msgstr ""
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
# y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "a alguna de las líneas `msgid' y `msgstr[%u]' les falta el `\\n' final"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
# y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr "el manejo del plural es una extensión del gettext de GNU"
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
"'%s' no es un formato de cadena válido %s, a diferencia de 'msgid'. Razón: %s"
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "no existe el campo `%s' en la cabecera\n"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "el campo de encabezado `%s' debe comenzar al principio de la línea\n"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
msgid "some header fields still have the initial default value\n"
msgstr "algunos campos de cabecera aún tienen el valor inicial por defecto\n"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, c-format
msgid "field `%s' still has initial default value\n"
msgstr "el campo `%s' aún tiene el valor inicial por defecto\n"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "atención: el encabezado del fichero PO no existe o es inválido\n"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "atención: el encabezado del fichero PO está difuso\n"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"atención: las versiones anteriores de msgfmt producirán un error en esto\n"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"el nombre del dominio \"%s\" no es válido como nombre de fichero:\n"
"se utilizará un prefijo"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "la instrucción `domain %s' no tiene efecto"
@@ -2148,31 +2183,31 @@ msgstr "la instrucci
# Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
# Sugerencia: Descartar. sv
# Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "se descarta la línea vacía `msgstr'"
# Lo mismo. sv
# Ok. mm
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "se descarta la línea difusa `msgstr'"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
"la opción '%c' no se puede usar antes de que 'K', 'T' o 'C' hayan sido "
"especificadas"
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2181,7 +2216,7 @@ msgstr ""
"Extrae todos los mensajes de un catálogo de traducción que coincidan con un\n"
"patrón dado o pertenezcan a algunos de los ficheros fuente dados.\n"
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2246,7 +2281,7 @@ msgstr ""
"-f, --file=FICHERO obtiene al PATRÓN del FICHERO\n"
"-i, --ignore-case indistingue si es mayúsculas o minúsculas\n"
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2255,23 +2290,23 @@ msgstr ""
"caracteres\n"
" extendidos\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output genera una salida ordenada\n"
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
" --sort-by-file ordena la salida por localización de ficheros\n"
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr "fallo en la escritura al subproceso grep"
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2281,7 +2316,7 @@ msgstr ""
"de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n"
"es necesario para que se puedan probar las traducciones.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2292,12 +2327,12 @@ msgstr ""
"Favor de especificar el formato local a través de la opción --locale o\n"
"el fichero de salida .po a través de la opción --output-file.\n"
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr "Creado %s.\n"
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2306,12 +2341,12 @@ msgstr ""
"Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
"tomados del entorno del usuario.\n"
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=FICHEROENTRADA fichero de entrada POT\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -2321,13 +2356,13 @@ msgstr ""
"Si no se da el fichero de entrada, el fichero POT se busca en el directorio\n"
"actual. Si es -, se lee la entrada estándar.\n"
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
" -o, --output-file=FICHERO escribe la salida al fichero PO especificado\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2337,13 +2372,13 @@ msgstr ""
"de la selección local del usuario. Si es -, los resultados se escriben en\n"
"la salida estándar.\n"
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
" -o, --output-file=FICHERO escribe la salida al fichero PO especificado\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
@@ -2351,7 +2386,7 @@ msgstr ""
" --no-translator supone que el fichero PO será generado\n"
" automáticamente\n"
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2360,12 +2395,12 @@ msgstr ""
"Favor de especificar el fichero .pot de entrada utilizando la opción --"
"input\n"
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr "error en la lectura del directorio actual"
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2374,24 +2409,24 @@ msgstr ""
"Favor de especificar el fichero .pot de entrada utilizando la opción --"
"input\n"
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr "fallo en fdopen()"
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr "error de E/S en el subproceso %s"
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "fallo en el subproceso %s con código de salida %d"
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -2407,26 +2442,26 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr "Traducciones al español para el paquete %s"
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
"el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
"portátil"
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
"hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de "
"entrada"
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
@@ -2434,7 +2469,7 @@ msgstr ""
"el fichero de entrada `%s' no contiene una línea de encabezado con la "
"especificación del conjunto de caracteres"
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2443,21 +2478,21 @@ msgstr ""
"el dominio \"%s\" en el fichero de entrada `%s' no contiene una línea de\n"
"encabezado con la especificación del conjunto de caracteres"
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
"el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
"portátil."
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr "atención: "
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2466,7 +2501,7 @@ msgstr ""
"Los ficheros de entrada contienen mensajes en distintas codificaciones,\n"
"UTF-8 entre otras. Por ello se convierte la salida a UTF-8.\n"
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2478,7 +2513,7 @@ msgstr ""
"%s y %s entre otras.\n"
"Por ello se convierte la salida a UTF-8.\n"
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2491,12 +2526,12 @@ msgstr ""
"La salida de '%s' podría ser incorrecta.\n"
"Las posibles alternativas son:\n"
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr "- Poner LC_ALL como local con la codificación %s.\n"
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2507,7 +2542,7 @@ msgstr ""
" y luego aplicar '%s',\n"
" y luego reconvertirlo a %s utilizando 'msgconv'.\n"
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2520,7 +2555,7 @@ msgstr ""
" y luego aplicar '%s',\n"
" y luego reconvertirlo a %s utilizando 'msgconv'.\n"
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2532,19 +2567,19 @@ msgstr ""
"La salida de '%s' podría ser incorrecta.\n"
"Una alternativa posible s poner LC_ALL=C.\n"
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr "falla de conversión"
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
"El fichero de entrada no contiene una línea de encabezado que especifique el "
"conjunto de caracteres"
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2553,7 +2588,7 @@ msgstr ""
"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n"
"no soporta este tipo de conversión."
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2562,7 +2597,7 @@ msgstr ""
"La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
"distintos se vuelven iguales."
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2571,11 +2606,16 @@ msgstr ""
"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv().\n"
"Esta versión fue construida sin iconv()."
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr "%s sólo es válido con %s"
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr "tipo de respaldo"
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2598,19 +2638,19 @@ msgstr ""
"haya una coincidencia exacta, se utilizará el método de comparación difusa\n"
"para obtener mejores resultados.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po traducciones que se refieren a las viejas "
"fuentes\n"
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referencias a las nuevas fuentes\n"
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2620,7 +2660,7 @@ msgstr ""
"mensajes,\n"
" puede ser especificada más de una vez\n"
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2629,27 +2669,27 @@ msgstr ""
" -U, --update actualiza def.po,\n"
" no hace nada si def.po ya está actualizado\n"
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Localización del fichero de salida en modo de actualización:\n"
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "El resultado se escribió sobre def.po.\n"
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL hace un respado de def.po\n"
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFIJO sobreescribe el sufijo de respaldo\n"
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2670,7 +2710,7 @@ msgstr ""
" no es así\n"
" simple, never siempre hace backups sencillos\n"
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2680,27 +2720,27 @@ msgstr ""
"El sufijo del respaldo es `~', a menos que se modifique con --suffix o con\n"
"la variable de entorno SIMPLE_BACKUP_SUFFIX\n"
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching no utiliza la coincidencia difusa\n"
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent suprime los indicadores de progreso\n"
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, c-format
msgid "this message should define plural forms"
msgstr "este mensaje debería definir las formas plurales"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, c-format
msgid "this message should not define plural forms"
msgstr "este mensaje no debería definir las formas plurales"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2710,28 +2750,28 @@ msgstr ""
"incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
# Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " terminado.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s y los nombres de ficheros explícitos son mutuamente excluyentes"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
"Convierte el catálogo de mensajes binarios al fichero de estilo Uniforum ."
"po.\n"
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
@@ -2740,7 +2780,23 @@ msgstr ""
" -j, --java Modo Java: la entrada es una clase de Java \n"
" ResourceBundle\n"
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, fuzzy, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+" --tcl Modo Tcl: la entrada es un fichero .msg tcl/"
+"msgcat\n"
+
+#: src/msgunfmt.c:427
+#, fuzzy, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+" --tcl Modo Tcl: la entrada es un fichero .msg tcl/"
+"msgcat\n"
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2748,17 +2804,17 @@ msgstr ""
" --tcl Modo Tcl: la entrada es un fichero .msg tcl/"
"msgcat\n"
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr " FICHERO ... ficheros .mo de entrada\n"
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr "Localización del fichero de entrada en modo Java:\n"
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2769,12 +2825,26 @@ msgstr ""
"recurso, separado por un guión bajo. La clase se localiza utilizando la\n"
"variable de entorno CLASSPATH.\n"
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "Localización del fichero de entrada en modo Tcl:\n"
+
+#: src/msgunfmt.c:458
+#, fuzzy, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+"Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
+"el directorio especificado.\n"
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr "Localización del fichero de entrada en modo Tcl:\n"
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
@@ -2783,13 +2853,13 @@ msgstr ""
"Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
"el directorio especificado.\n"
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
" -i, --indent escribe el fichero .po utilizando sangrías\n"
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr " --strict escribe en estilo Uniforum estricto\n"
@@ -2836,13 +2906,13 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr "%s: atención: "
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2852,15 +2922,15 @@ msgstr ""
"La conversión de mensajes al conjunto de caracteres del usuario podría no "
"funcionar.\n"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr "Se continúa de todas formas, aunque habrá errores de parseo."
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr "Se continúa de todas formas."
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2869,7 +2939,7 @@ msgstr ""
"El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv(),\n"
"e iconv() no soporta \"%s\".\n"
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
@@ -2878,12 +2948,12 @@ msgstr ""
"Instalando GNU libiconv y luego reinstalando GNU gettext\n"
"podría arreglar este problema.\n"
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2892,7 +2962,7 @@ msgstr ""
"El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv().\n"
"Esta versión fue construida sin iconv().\n"
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2971,7 +3041,7 @@ msgstr "la primera forma del plural tiene un
msgid "too many errors, aborting"
msgstr "demasiados errores, programa interrumpido"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr "sucesión de multibyte inválida"
@@ -2992,11 +3062,11 @@ msgid "iconv failure"
msgstr "fallo en iconv"
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "error al leer \"%s\""
@@ -3021,7 +3091,7 @@ msgstr "fin de fichero dentro de una cadena"
msgid "end-of-line within string"
msgstr "fin de línea dentro de una cadena"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, c-format
msgid "file \"%s\" is truncated"
msgstr "el fichero \"%s\" está truncado"
@@ -3031,12 +3101,12 @@ msgstr "el fichero \"%s\" est
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s"
@@ -3072,7 +3142,7 @@ msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s"
# mente el verbo poder en Castellano es mucho más flexible que en otros
# idiomas. De todas maneras siempre se puede mirar otras traducciones. em
# ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "este fichero no puede contener instrucciones de dominio"
@@ -3145,44 +3215,44 @@ msgstr ""
msgid "error writing stdout"
msgstr "error al escribir la salida estándar"
-#: src/write-java.c:977
+#: src/write-java.c:982
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "no se puede encontrar un directorio temporal, pruebe poner $TMPDIR"
-#: src/write-java.c:987
+#: src/write-java.c:992
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr "no es un nombre de clase Java válido: %s"
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr "fallo al crear \"%s\""
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "hubo un error al escribir el fichero \"%s\""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
"fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "error al abrir el fichero \"%s\" para escritura"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
@@ -3190,7 +3260,7 @@ msgstr ""
"Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
"%c'"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3203,7 +3273,7 @@ msgstr ""
"caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
"en ASCII puro. %s\n"
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
@@ -3212,7 +3282,7 @@ msgstr ""
"No se pueden mostrar varios dominios de traducción en un sólo fichero en la\n"
"sintáxis .properties de Java. Intente usar la sintáxis de los ficheros PO."
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
@@ -3221,7 +3291,7 @@ msgstr ""
"No se pueden mostrar varios dominios de traducción en un sólo fichero en la\n"
"sintáxis .strings de NeXTstep/GNUstep."
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -3232,7 +3302,7 @@ msgstr ""
"de salida no lo soporta. Se puede intentar generar una clase Java utilizando "
"\"msgfmt --java\" en vez del fichero de propiedades."
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -3241,12 +3311,12 @@ msgstr ""
"el catálogo de mensajes tiene traducciones con formas plurales, pero el "
"catálogo de mensajes no admite el trato plural"
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "no se puede crear el fichero de salida \"%s\""
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "salida estándar"
@@ -3270,7 +3340,7 @@ msgstr ""
"admite Unicode sólo en las cadenas traducidas, pero no en las que aún\n"
"no lo están\n"
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
@@ -3278,22 +3348,22 @@ msgstr ""
"el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
"catálogo de mensajes de Tcl no soporta el trato plural\n"
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: atención: cadena no finalizada"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: atención: expresión regular no finalizada"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: atención: literal de cadena no finalizada"
@@ -3312,66 +3382,66 @@ msgstr ""
"El lenguaje \"glade\" no está soportado. %s se basa en expat.\n"
"Esta versión fue construida sin expat.\n"
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: atención: cadena no finalizada"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr "%s:%d: cuidado: se encontró un ')' en donde se esperaba un '}'"
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: cuidado: se encontró un '}' en donde se esperaba un ')'"
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
"%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ningún lugar "
"antes del fin del fichero"
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr "%s:%d: falta una llave derecha en \\x{NÚMEROHEX}"
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr "%s:%d: interpolación no válida (\"\\l\") del caracter de 8 bits \"%c\""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr "%s:%d: interpolación no válida (\"\\u\") del caracter de 8 bits \"%c\""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s:%d: interpolación de variable no válida en \"%c\""
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr "%s%d: interpolación no válida (\"\\L\") del caracter de 8 bits \"%c\""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr "%s:%d: interpolación no válida (\"\\U\") del caracter de 8 bits \"%c\""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
"%s:%d: error grave: el mensaje en plural se vió antes del mensaje en "
"singular\n"
-#: src/x-python.c:588
+#: src/x-python.c:596
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: atención: carácter Unicode inválido"
@@ -3391,7 +3461,7 @@ msgstr "%s:%d: falta un n
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: expresión de cadena inválida"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3400,32 +3470,32 @@ msgstr ""
"%s:%lu: cuidado: la sintáxis $\"...\" se desaconseja debido a cuestiones de "
"seguiridad; mejor utilice eval_gettext"
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"no se puede utilizar --join-existing cuando el resultado se escribe en la\n"
"salida estándar (stdout)"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext no puede funcionar sin palabras claves que buscar"
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"atención: el fichero `%s' con extensión `%s'\n"
"es desconocido; se intentará tipo C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
"Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3434,13 +3504,13 @@ msgstr ""
" -d, --default-domain=NOMBRE utiliza NOMBRE.po para la salida (en vez de\n"
" mensajes.po)\n"
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
" -o, --output=FICHERO escribe la salida al fichero especificado\n"
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3449,19 +3519,20 @@ msgstr ""
" directorio DIR\n"
# acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, c-format
msgid "Choice of input file language:\n"
msgstr "Selección del lenguaje del fichero de entrada:\n"
-#: src/xgettext.c:746
-#, c-format
+#: src/xgettext.c:752
+#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
" -L, --language=NOMBRE reconoce el lenguaje especificado\n"
@@ -3471,12 +3542,12 @@ msgstr ""
" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
" fuente-GCC, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ abreviatura de --language=C++\n"
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3485,7 +3556,7 @@ msgstr ""
"Por defecto, el lenguaje se adivina dependiendo de la extensión del fichero "
"de entrada.\n"
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3494,25 +3565,25 @@ msgstr ""
" --from-code=NOMBRE codifica a partir de los ficheros de entrada\n"
" (excepto para Python, Tcl y Glade)\n"
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
"Por defecto, los ficheros de entrada se presupone que están en ASCII.\n"
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing une los mensajes con un fichero existente\n"
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
" -x, --exclude-file=FICHERO.po las líneas del FICHERO.po no son extraidas\n"
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
@@ -3522,21 +3593,22 @@ msgstr ""
" aquellas líneas que preceden a la palabra\n"
" clave) en el fichero de salida\n"
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr "Opciones específicas del lenguaje:\n"
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extrae todas las cadenas\n"
-#: src/xgettext.c:779 src/xgettext.c:786
-#, c-format
+#: src/xgettext.c:785 src/xgettext.c:792
+#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
" (sólo los lenguajes C, C++, ObjectiveC, "
@@ -3545,7 +3617,7 @@ msgstr ""
"awk,\n"
" Tcl, Perl, PHP, fuente-GCC, Glade)\n"
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
@@ -3556,7 +3628,7 @@ msgstr ""
" se deben utilizar las palabras clave por\n"
" defecto)\n"
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3569,11 +3641,12 @@ msgstr ""
"palabra\n"
" clave PALABRA\n"
-#: src/xgettext.c:793
-#, c-format
+#: src/xgettext.c:799
+#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
" (Sólo los lenguajes C, C++, ObjectiveC, "
@@ -3581,30 +3654,30 @@ msgstr ""
" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
" YCP, Tcl, Perl, PHP, fuente-GCC)\n"
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs entiende los trígrafos de ANSI C para la\n"
" entrada\n"
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
" (sólo en lenguajes C, C++, ObjectiveC)\n"
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt reconoce los formatos de cadena Qt\n"
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr " (sólo lenguaje C++)\n"
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -3612,18 +3685,18 @@ msgstr ""
" --debug muestra con más detalle el reconocimiento\n"
" de las cadenas de formato\n"
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output escribe un fichero .properties de Java\n"
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=CADENA pone al dueño del copyright en la salida\n"
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -3631,7 +3704,7 @@ msgstr ""
" --foreign-user omite el copyright de la FSF en la salida\n"
" para los usuarios extranjeros\n"
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -3639,7 +3712,7 @@ msgstr ""
" --msgid-bugs-address=DIRECCION@DECORREO pone la dirección de correo \n"
" para reportar los errores\n"
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
@@ -3649,7 +3722,7 @@ msgstr ""
"las\n"
" líneas del msgstr\n"
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
@@ -3659,7 +3732,7 @@ msgstr ""
"las\n"
" líneas del msgstr\n"
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
@@ -3668,11 +3741,11 @@ msgstr ""
"Un argumento --flag no tiene la sintáxis ::[pass-]"
": %s"
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "entrada estándar"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
@@ -3681,12 +3754,12 @@ msgstr ""
"Hay una cadena que no está en ASCII en %s%s.\n"
"Especifique la codificación de la fuente utilizando --from-code.\n"
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr "%s%s: atención: "
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
@@ -3695,7 +3768,7 @@ msgstr ""
"Aunque se utilizó en una posición de formato de cadena, el %s no se un "
"formato de cadena válido %s. La razón es: %s\n"
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3704,7 +3777,7 @@ msgstr ""
"Aunque así esté declarado, '%s' no es un formato de cadena válido %s. Razón: "
"%s\n"
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -3714,7 +3787,7 @@ msgstr ""
"gettext(\"\") regresa la línea de encabezado con la\n"
"metainformación, no una cadena vacía.\n"
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3726,7 +3799,7 @@ msgstr ""
"allí la variable MSGID_BUGS_ADDRESS; si no lo hace,\n"
"debe se poner la opción --msgid-bugs-address\n"
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "idioma `%s' desconocido"
diff --git a/gettext-tools/po/et.po b/gettext-tools/po/et.po
index 2553991ee..7633aae72 100644
--- a/gettext-tools/po/et.po
+++ b/gettext-tools/po/et.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.37\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 2001-04-30 16:25+0200\n"
"Last-Translator: Ivar Smolin \n"
"Language-Team: Estonian \n"
@@ -33,9 +33,9 @@ msgstr ""
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "viga faili \"%s\" avamisel (lugemiseks)"
@@ -64,10 +64,10 @@ msgstr "viga \"%s\" lugemisel"
msgid "Unknown system error"
msgstr "Tundmatu süsteemne viga"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr ""
@@ -127,12 +127,12 @@ msgstr "%s: v
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: võtmel `-W %s' ei tohi olla argumente\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -160,12 +160,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr ""
@@ -185,7 +185,7 @@ msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -194,24 +194,24 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, fuzzy, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
@@ -270,72 +270,72 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, fuzzy, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -501,9 +501,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -518,28 +518,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Selle programmi on kirjutanud %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "liiga palju argumente"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Täiendava info saamiseks proovi `%s --help'.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr ""
@@ -574,36 +574,36 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
#, fuzzy
msgid "Report bugs to .\n"
msgstr "Vigadest teata aadressile .\n"
@@ -614,7 +614,7 @@ msgid "could not get host name"
msgstr ""
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "vaja läheb täpselt kahte sisendfaili"
@@ -622,15 +622,15 @@ msgstr "vaja l
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ja %s on vastastikku välistavad"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
@@ -644,7 +644,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -653,50 +653,50 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "sisendfail on määramata"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -790,21 +790,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -812,87 +812,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -914,15 +914,15 @@ msgstr ""
" -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -932,7 +932,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
@@ -965,18 +965,18 @@ msgstr ""
"comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
"Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -1002,15 +1002,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1029,17 +1029,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "sisendfailid on määramata"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "vaja läheb täpselt kahte sisendfaili"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1080,29 +1080,29 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
msgstr ""
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "see teade on kasutusel, kuid kirjeldamata..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...kuid see kirjeldus on sarnane"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
@@ -1158,7 +1158,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1179,31 +1179,31 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "sisendfail on määramata"
@@ -1326,13 +1326,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1368,139 +1368,152 @@ msgstr ""
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
-msgid "%s is only valid with %s"
+msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:477 src/msgfmt.c:483
#, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
msgstr ""
-#: src/msgfmt.c:503
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d tõlgitud teade"
msgstr[1] "%d tõlgitud teadet"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d kahtlane tõlge"
msgstr[1] ", %d kahtlast tõlget"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d tõlkimata teade"
msgstr[1] ", %d tõlkimata teadet"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1509,29 +1522,48 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "sisendfail on määramata"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1539,33 +1571,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1573,255 +1605,255 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, fuzzy, c-format
msgid "invalid nplurals value"
msgstr "vigane juhtjada"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, fuzzy, c-format
msgid "invalid plural expression"
msgstr "vigane juhtjada"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, fuzzy, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' ja `msgst_plural' kirjed ei alga sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' ja `msgstr[%u]' kirjed ei alga sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' ja `msgstr' kirjed ei alga sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' ja `msgst_plural' kirjed ei lõppe sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' ja `msgstr[%u]' kirjed ei lõppe sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' ja `msgstr' kirjed ei lõppe sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, fuzzy, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "päise kirjest on puudu väli `%s'"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, fuzzy, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "päise kirjes peab väli `%s' algama rea algusest"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
#, fuzzy
msgid "some header fields still have the initial default value\n"
msgstr "mõned päise kirjes olevad väljad sisaldavad ikka veel algseid väärtusi"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, fuzzy, c-format
msgid "field `%s' still has initial default value\n"
msgstr "väli `%s' sisaldab ikka veel algset väärtust"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, fuzzy, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
"%*s hoiatus: charset conversion will not work"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"Kooditabel on päises kirjeldamata.\n"
"Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, fuzzy, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
"%*s hoiatus: charset conversion will not work"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "ignoreerin `domain %s' direktiivi"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "ignoreerin tühja `msgstr' kirjet"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "ignoreerin kahtlast `msgstr' kirjet"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: hoiatus: lähtefail sisaldab kahtlast tõlget"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1853,35 +1885,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1889,24 +1921,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -1914,64 +1946,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -1983,54 +2015,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, fuzzy, c-format
msgid "warning: "
msgstr "%s: hoiatus: "
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2039,7 +2071,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2048,12 +2080,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2061,7 +2093,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2070,7 +2102,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2078,17 +2110,17 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2097,14 +2129,14 @@ msgstr ""
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt ja iconv() ei toeta \"%s\".\n"
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2113,11 +2145,16 @@ msgstr ""
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2144,51 +2181,51 @@ msgstr ""
"kahtlased. Kui väljundfaili ei ole kirjeldatud, saadetakse tulemus\n"
"standardväljunisse.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2200,7 +2237,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2208,27 +2245,27 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2237,49 +2274,61 @@ msgstr ""
"%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid %"
"ld, vananenuid %ld.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " valmis.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, fuzzy, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s ja %s on vastastikku välistavad"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr ""
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2287,24 +2336,36 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "sisendfail on määramata"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2338,13 +2399,13 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr "%s: hoiatus: "
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2353,15 +2414,15 @@ msgstr ""
"Kooditabel \"%s\" ei ole portaabel kodeerimise nimetus.\n"
"Teadete tõlkimine kasutaja kooditabeli järgi võib mitte toimida.\n"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr "Jätkan siiski, vaatamate parsimisvigadele."
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr "Jätkan siiski."
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2370,7 +2431,7 @@ msgstr ""
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt ja iconv() ei toeta \"%s\".\n"
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
@@ -2380,12 +2441,12 @@ msgstr ""
"GNU libiconv tarkvara ja peale seda teha uus paigaldus tarkvarapakile\n"
"GNU gettext\n"
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2394,7 +2455,7 @@ msgstr ""
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2439,7 +2500,7 @@ msgstr "mitmuse vorm omab vale indeksit"
msgid "too many errors, aborting"
msgstr "liiga palju vigu, katkestan töö"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr "vigane multibait jada"
@@ -2460,11 +2521,11 @@ msgid "iconv failure"
msgstr ""
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "viga \"%s\" lugemisel"
@@ -2489,7 +2550,7 @@ msgstr "Ootamatu faili l
msgid "end-of-line within string"
msgstr "reavahetus asub stringi sees"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, fuzzy, c-format
msgid "file \"%s\" is truncated"
msgstr "faili \"%s\" sai kärbitud"
@@ -2499,17 +2560,17 @@ msgstr "faili \"%s\" sai k
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "fail \"%s\" ei ole GNU .mo vormingus"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL"
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "see fail ei tohi sisaldada domeeni direktiive"
@@ -2576,49 +2637,49 @@ msgstr ""
msgid "error writing stdout"
msgstr "viga faili \"%s\" kirjutamisel"
-#: src/write-java.c:977
+#: src/write-java.c:982
#, fuzzy, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "ei suuda luua väljundfaili \"%s\""
-#: src/write-java.c:987
+#: src/write-java.c:992
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "ei suuda luua väljundfaili \"%s\""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "viga faili \"%s\" kirjutamisel"
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "tõlgitud teated peaksid mitte sisaldama `\\%c' erimärgijada"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2627,21 +2688,21 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2649,19 +2710,19 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "ei suuda luua väljundfaili \"%s\""
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "standardväljund"
@@ -2679,28 +2740,28 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: hoiatus: lõpetamata string"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: hoiatus: lõpetamata string"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: lõpetamata sümbolkonstant"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: hoiatus: lõpetamata string"
@@ -2719,62 +2780,62 @@ msgstr ""
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: hoiatus: lõpetamata string"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s: vigane võti -- %c\n"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
-#: src/x-python.c:588
+#: src/x-python.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: lõpetamata sümbolkonstant"
@@ -2794,136 +2855,138 @@ msgstr ""
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: hoiatus: lõpetamata string"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"võtit `--join-existing' ei ole võimalik pruukida kui väljunit kirjutatakse "
"standardväljundisse"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext ei tööta ilma vajalike võtmesõnadeta"
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "hoiatus: faili `%s' laiend `%s' on tundmatu; proovin C vormingut"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "sisendfail on määramata"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -2931,121 +2994,122 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
msgstr ""
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "standardsisend"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, fuzzy, c-format
msgid "%s%s: warning: "
msgstr "%s: hoiatus: "
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr ""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3053,7 +3117,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "tundmatu keel `%s'"
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index 1b3465a1a..def85ba1a 100644
--- a/gettext-tools/po/fi.po
+++ b/gettext-tools/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext 0.11.2\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 2002-06-05 18:06+0200\n"
"Last-Translator: Sami J. Laine \n"
"Language-Team: Finnish \n"
@@ -35,9 +35,9 @@ msgstr "Kelvolliset argumentit ovat:"
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "virhe avattaessa \"%s\" lukemista varten"
@@ -66,10 +66,10 @@ msgstr "virhe \"%s\" lukemisen j
msgid "Unknown system error"
msgstr "Tuntematon järjestelmän virhe"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr "%s aliprosessi epäonnistui"
@@ -129,12 +129,12 @@ msgstr "%s: valitsin `-W %s' on moniselitteinen\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: valitsin `-W %s' ei salli argumenttia\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java-kääntäjää ei löytynyt, yritä gcj:n asentamista tai aseta $JAVAC"
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -163,12 +163,12 @@ msgstr "%s aliprosessi ep
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr "%s aliprosessi"
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr "%s aliprosessi vastaanotti fataalin signaalin %d"
@@ -188,7 +188,7 @@ msgstr "muotom
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "muotomäärittely argumentille %u ei ole '%s':ssä"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -198,24 +198,24 @@ msgid ""
msgstr ""
"muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä argumentille %u ei ole sama"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä ei täsmää"
@@ -274,72 +274,72 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "muotomäärittely argumentille {%u}, kuten '%s':ssä, ei ole 'msgid':ssä"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "muotomäärittely argumentille {%u} ei ole '%s':ssä"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -512,9 +512,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -528,28 +528,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Kirjoittanut %s\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "liian monta argumenttia"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Yritä `%s --help' saadaksesi lisää tietoja.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr "Käyttö: %s [VALITSIN]\n"
@@ -589,27 +589,27 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, fuzzy, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
@@ -620,9 +620,9 @@ msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
msgid "Report bugs to .\n"
msgstr "Ilmoita ohjelmiston vioista osoitteeseen .\n"
@@ -632,7 +632,7 @@ msgid "could not get host name"
msgstr "ei saatu isäntänimeä"
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, c-format
msgid "at most one input file allowed"
msgstr "enintään yksi syötetiedosto on sallittu"
@@ -640,15 +640,15 @@ msgstr "enint
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ja %s ovat toisensa poissulkevia"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
@@ -662,7 +662,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -671,50 +671,50 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, c-format
msgid "Input file location:\n"
msgstr ""
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -808,21 +808,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -830,87 +830,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -918,15 +918,15 @@ msgid ""
msgstr ""
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -936,7 +936,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, fuzzy, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
@@ -955,18 +955,18 @@ msgid ""
"File positions from all PO files will be cumulated.\n"
msgstr ""
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -992,15 +992,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1019,17 +1019,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr ""
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr ""
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, fuzzy, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Käyttö: %s [VALITSIN]\n"
@@ -1055,29 +1055,29 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
msgstr ""
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr ""
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr ""
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr ""
@@ -1119,7 +1119,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1140,31 +1140,31 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr ""
@@ -1287,13 +1287,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1329,139 +1329,152 @@ msgstr "%s aliprosessi ep
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
-#, c-format
-msgid "%s is only valid with %s"
-msgstr ""
-
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, fuzzy, c-format
msgid "%s is only valid with %s or %s"
msgstr "virheellinen argumentti `%s' `%s':lle"
-#: src/msgfmt.c:503
+#: src/msgfmt.c:477 src/msgfmt.c:483
+#, fuzzy, c-format
+msgid "%s is only valid with %s, %s or %s"
+msgstr "virheellinen argumentti `%s' `%s':lle"
+
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, fuzzy, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Käyttö: %s [VALITSIN]\n"
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1470,29 +1483,48 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, c-format
+msgid "Output file location in C# mode:\n"
+msgstr ""
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1500,33 +1532,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1534,248 +1566,248 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, c-format
msgid "invalid nplurals value"
msgstr ""
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, c-format
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, c-format
msgid "headerfield `%s' missing in header\n"
msgstr ""
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr ""
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
msgid "some header fields still have the initial default value\n"
msgstr ""
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, c-format
msgid "field `%s' still has initial default value\n"
msgstr ""
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr ""
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr ""
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1807,35 +1839,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, fuzzy, c-format
msgid "write to grep subprocess failed"
msgstr "%s aliprosessi epäonnistui"
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1843,24 +1875,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -1868,64 +1900,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, fuzzy, c-format
msgid "%s subprocess I/O error"
msgstr "%s aliprosessi"
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, fuzzy, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s aliprosessi epäonnistui"
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -1937,54 +1969,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -1993,7 +2025,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2002,12 +2034,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2015,7 +2047,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2024,7 +2056,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2032,42 +2064,47 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2081,51 +2118,51 @@ msgid ""
"cannot be found, fuzzy matching is used to produce better results.\n"
msgstr ""
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2137,7 +2174,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2145,76 +2182,88 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, c-format
msgid "this message should define plural forms"
msgstr ""
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, c-format
msgid "this message should not define plural forms"
msgstr ""
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
msgstr ""
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr ""
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, fuzzy, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s ja %s ovat toisensa poissulkevia"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, fuzzy, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2222,24 +2271,36 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, c-format
+msgid "Input file location in C# mode:\n"
+msgstr ""
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2273,54 +2334,54 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2363,7 +2424,7 @@ msgstr ""
msgid "too many errors, aborting"
msgstr ""
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr ""
@@ -2384,11 +2445,11 @@ msgid "iconv failure"
msgstr ""
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, fuzzy, c-format
msgid "error while reading \"%s\""
msgstr "virhe luettaessa \"%s\""
@@ -2413,7 +2474,7 @@ msgstr ""
msgid "end-of-line within string"
msgstr ""
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, c-format
msgid "file \"%s\" is truncated"
msgstr ""
@@ -2423,17 +2484,17 @@ msgstr ""
msgid "file \"%s\" contains a not NUL terminated string"
msgstr ""
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr ""
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr ""
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr ""
@@ -2500,49 +2561,49 @@ msgstr ""
msgid "error writing stdout"
msgstr "virhe kirjoitettaessa \"%s\""
-#: src/write-java.c:977
+#: src/write-java.c:982
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:987
+#: src/write-java.c:992
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr ""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, fuzzy, c-format
msgid "error while writing \"%s\" file"
msgstr "virhe kirjoitettaessa \"%s\""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, fuzzy, c-format
msgid "error while opening \"%s\" for writing"
msgstr "virhe avattaessa \"%s\" lukemista varten"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2551,21 +2612,21 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2573,19 +2634,19 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, fuzzy, c-format
msgid "cannot create output file \"%s\""
msgstr "ei voi luoda putkea"
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr ""
@@ -2603,28 +2664,28 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr ""
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr ""
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
@@ -2641,62 +2702,62 @@ msgid ""
"This version was built without expat.\n"
msgstr ""
-#: src/x-java.c:906
+#: src/x-java.c:829
#, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr ""
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s: virheellinen valitsin -- %c\n"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
-#: src/x-python.c:588
+#: src/x-python.c:596
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr ""
@@ -2716,134 +2777,136 @@ msgstr ""
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, c-format
msgid "Choice of input file language:\n"
msgstr ""
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -2851,121 +2914,122 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
msgstr ""
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr ""
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr ""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -2973,7 +3037,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr ""
diff --git a/gettext-tools/po/gettext-tools.pot b/gettext-tools/po/gettext-tools.pot
index 6e87b10a0..50966ad41 100644
--- a/gettext-tools/po/gettext-tools.pot
+++ b/gettext-tools/po/gettext-tools.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -36,9 +36,9 @@ msgstr ""
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr ""
@@ -67,10 +67,10 @@ msgstr ""
msgid "Unknown system error"
msgstr ""
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr ""
@@ -130,12 +130,12 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -163,12 +163,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr ""
@@ -188,7 +188,7 @@ msgstr ""
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr ""
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -197,24 +197,24 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr ""
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
@@ -273,72 +273,72 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr ""
-#: src/format-java.c:730
+#: src/format-java.c:747
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr ""
-#: src/format-java.c:755
+#: src/format-java.c:772
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -504,9 +504,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -516,28 +516,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr ""
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr ""
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr ""
@@ -572,36 +572,36 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
msgid "Report bugs to .\n"
msgstr ""
@@ -611,7 +611,7 @@ msgid "could not get host name"
msgstr ""
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, c-format
msgid "at most one input file allowed"
msgstr ""
@@ -619,15 +619,15 @@ msgstr ""
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr ""
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
@@ -641,7 +641,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -650,50 +650,50 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, c-format
msgid "Input file location:\n"
msgstr ""
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -787,21 +787,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -809,87 +809,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -897,15 +897,15 @@ msgid ""
msgstr ""
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -915,7 +915,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
@@ -934,18 +934,18 @@ msgid ""
"File positions from all PO files will be cumulated.\n"
msgstr ""
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -971,15 +971,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -998,17 +998,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr ""
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr ""
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1034,29 +1034,29 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
msgstr ""
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr ""
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr ""
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr ""
@@ -1098,7 +1098,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1119,31 +1119,31 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr ""
@@ -1266,13 +1266,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1308,139 +1308,152 @@ msgstr ""
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
-msgid "%s is only valid with %s"
+msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:477 src/msgfmt.c:483
#, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
msgstr ""
-#: src/msgfmt.c:503
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1449,29 +1462,48 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, c-format
+msgid "Output file location in C# mode:\n"
+msgstr ""
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1479,33 +1511,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1513,248 +1545,248 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, c-format
msgid "invalid nplurals value"
msgstr ""
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, c-format
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, c-format
msgid "headerfield `%s' missing in header\n"
msgstr ""
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr ""
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
msgid "some header fields still have the initial default value\n"
msgstr ""
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, c-format
msgid "field `%s' still has initial default value\n"
msgstr ""
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr ""
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr ""
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1786,35 +1818,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1822,24 +1854,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -1847,64 +1879,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -1916,54 +1948,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -1972,7 +2004,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -1981,12 +2013,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -1994,7 +2026,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2003,7 +2035,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2011,42 +2043,47 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2060,51 +2097,51 @@ msgid ""
"cannot be found, fuzzy matching is used to produce better results.\n"
msgstr ""
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2116,7 +2153,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2124,76 +2161,88 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, c-format
msgid "this message should define plural forms"
msgstr ""
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, c-format
msgid "this message should not define plural forms"
msgstr ""
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
msgstr ""
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr ""
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr ""
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr ""
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2201,24 +2250,36 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, c-format
+msgid "Input file location in C# mode:\n"
+msgstr ""
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2252,54 +2313,54 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2342,7 +2403,7 @@ msgstr ""
msgid "too many errors, aborting"
msgstr ""
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr ""
@@ -2363,11 +2424,11 @@ msgid "iconv failure"
msgstr ""
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr ""
@@ -2392,7 +2453,7 @@ msgstr ""
msgid "end-of-line within string"
msgstr ""
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, c-format
msgid "file \"%s\" is truncated"
msgstr ""
@@ -2402,17 +2463,17 @@ msgstr ""
msgid "file \"%s\" contains a not NUL terminated string"
msgstr ""
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr ""
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr ""
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr ""
@@ -2479,49 +2540,49 @@ msgstr ""
msgid "error writing stdout"
msgstr ""
-#: src/write-java.c:977
+#: src/write-java.c:982
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:987
+#: src/write-java.c:992
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr ""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr ""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr ""
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2530,21 +2591,21 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2552,19 +2613,19 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr ""
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr ""
@@ -2582,28 +2643,28 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr ""
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr ""
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
@@ -2620,62 +2681,62 @@ msgid ""
"This version was built without expat.\n"
msgstr ""
-#: src/x-java.c:906
+#: src/x-java.c:829
#, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr ""
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr ""
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
-#: src/x-python.c:588
+#: src/x-python.c:596
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr ""
@@ -2695,134 +2756,136 @@ msgstr ""
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, c-format
msgid "Choice of input file language:\n"
msgstr ""
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -2830,121 +2893,122 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
msgstr ""
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr ""
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr ""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -2952,7 +3016,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr ""
diff --git a/gettext-tools/po/gl.po b/gettext-tools/po/gl.po
index 32fce918d..bbfc336db 100644
--- a/gettext-tools/po/gl.po
+++ b/gettext-tools/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext 0.10.39\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 2001-07-28 17:00+0200\n"
"Last-Translator: Jesús Bravo Álvarez \n"
"Language-Team: Galician \n"
@@ -39,9 +39,9 @@ msgstr ""
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "erro ao abrir \"%s\" para lectura"
@@ -70,10 +70,10 @@ msgstr "erro ao ler \"%s\""
msgid "Unknown system error"
msgstr "Erro de sistema descoñecido"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr ""
@@ -133,12 +133,12 @@ msgstr "%s: a opci
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: a opción `-W %s' non permite ningún argumento\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -166,12 +166,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr ""
@@ -191,7 +191,7 @@ msgstr "as especificaci
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -200,24 +200,24 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, fuzzy, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
@@ -277,72 +277,72 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, fuzzy, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -511,9 +511,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -527,28 +527,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "demasiados argumentos"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Use `%s --help' para máis información.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr ""
@@ -583,36 +583,36 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
#, fuzzy
msgid "Report bugs to .\n"
msgstr "Comunique os erros a .\n"
@@ -623,7 +623,7 @@ msgid "could not get host name"
msgstr ""
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "precísanse exactamente dous ficheiros de entrada"
@@ -631,15 +631,15 @@ msgstr "prec
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s son mutuamente excluíntes"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
@@ -653,7 +653,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -662,50 +662,50 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "non se indicou ningún ficheiro de entrada"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -799,21 +799,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -821,87 +821,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -924,15 +924,15 @@ msgstr ""
" -w, --width=NÚMERO establece-la anchura da páxina de saída\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -942,7 +942,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "o criterio de selección indicado é imposible (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
@@ -977,18 +977,18 @@ msgstr ""
"comentarios e comentarios de extracción mantéñense, pero só do primeiro\n"
"ficheiro para definilos. Mantéñense as posicións de tódolos ficheiros PO.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -1014,15 +1014,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1041,17 +1041,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "non se indicou ningún ficheiro de entrada"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "precísanse exactamente dous ficheiros de entrada"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1092,29 +1092,29 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
msgstr ""
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "esta mensaxe úsase mais non está definida..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...mais esta definición é semellante"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "esta mensaxe úsase mais non está definida en %s"
@@ -1172,7 +1172,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1193,31 +1193,31 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "non se indicou ningún ficheiro de entrada"
@@ -1340,13 +1340,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1382,139 +1382,152 @@ msgstr ""
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
-msgid "%s is only valid with %s"
+msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:477 src/msgfmt.c:483
#, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
msgstr ""
-#: src/msgfmt.c:503
+#: src/msgfmt.c:580
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensaxe traducida"
msgstr[1] "%d mensaxes traducidas"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traducción difusa"
msgstr[1] ", %d traduccións difusas"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensaxe sen traducir"
msgstr[1] ", %d mensaxes sen traducir"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1523,29 +1536,48 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "non se indicou ningún ficheiro de entrada"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1553,33 +1585,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1587,259 +1619,259 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, fuzzy, c-format
msgid "invalid nplurals value"
msgstr "secuencia de control ilegal"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, fuzzy, c-format
msgid "invalid plural expression"
msgstr "secuencia de control ilegal"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, fuzzy, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "esta mensaxe úsase mais non está definida en %s"
msgstr[1] "esta mensaxe úsase mais non está definida en %s"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "esta mensaxe úsase mais non está definida en %s"
msgstr[1] "esta mensaxe úsase mais non está definida en %s"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
"as entradas `msgid' e `msgid_plural' non comezan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "as entradas `msgid' e `msgstr[%u]' non comezan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "as entradas `msgid' e `msgstr' non comezan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
"as entradas `msgid' e `msgid_plural' non rematan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "as entradas `msgid' e `msgstr[%u]' non rematan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "as entradas `msgid' e `msgstr' non rematan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, fuzzy, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "falta o campo `%s' na cabeceira"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, fuzzy, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "o campo `%s' da cabeceira tería que comezar ao principio da liña"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
#, fuzzy
msgid "some header fields still have the initial default value\n"
msgstr "algúns campos da cabeceira aínda teñen o valor inicial por defecto"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, fuzzy, c-format
msgid "field `%s' still has initial default value\n"
msgstr "o campo `%s' aínda ten o valor inicial por defecto"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, fuzzy, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
"%*s aviso: a conversión de código de caracteres non vai funcionar"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"Falta o código de caracteres na cabeceira.\n"
"A conversión da mensaxe ao código do usuario non vai funcionar.\n"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, fuzzy, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
"%*s aviso: a conversión de código de caracteres non vai funcionar"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "o nome de dominio \"%s\" non é axeitado para nome de ficheiro"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"o nome de dominio \"%s\" non é axeitado como nome de ficheiro:\n"
"empregarase un prefixo"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "directiva `domain %s' ignorada"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "entrada `msgstr' baleira ignorada"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "entrada `msgstr' difusa ignorada"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1871,35 +1903,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1907,24 +1939,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -1932,64 +1964,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -2001,54 +2033,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, fuzzy, c-format
msgid "warning: "
msgstr "%s: aviso: "
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2057,7 +2089,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2066,12 +2098,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2079,7 +2111,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2088,7 +2120,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2096,17 +2128,17 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2115,14 +2147,14 @@ msgstr ""
"O código de caracteres \"%s\" non está soportado. %s depende de\n"
"iconv(), e iconv() non soporta \"%s\".\n"
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2131,12 +2163,17 @@ msgstr ""
"O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
"Esta versión foi compilada sen iconv().\n"
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
# src/msgmerge.c:324
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2161,51 +2198,51 @@ msgstr ""
"para producir mellores resultados. Os resultados escríbense na saída\n"
"estándar a menos que se indique un ficheiro de saída.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2217,7 +2254,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2225,27 +2262,27 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "esta mensaxe úsase mais non está definida en %s"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "esta mensaxe úsase mais non está definida en %s"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2254,49 +2291,61 @@ msgstr ""
"%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, faltan %"
"ld, obsoletas %ld.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " rematado.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, fuzzy, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s e %s son mutuamente excluíntes"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr ""
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2304,24 +2353,36 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "non se indicou ningún ficheiro de entrada"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2355,13 +2416,13 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr "%s: aviso: "
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
@@ -2370,15 +2431,15 @@ msgstr ""
"O código de caracteres \"%s\" non ten un nome portable.\n"
"A conversión da mensaxe ao código do usuario podería non funcionar.\n"
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr "Continuando de calquera xeito, espere atopar erros de análise."
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr "Continuando de calquera xeito."
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2387,7 +2448,7 @@ msgstr ""
"O código de caracteres \"%s\" non está soportado. %s depende de\n"
"iconv(), e iconv() non soporta \"%s\".\n"
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
@@ -2396,12 +2457,12 @@ msgstr ""
"Se instala GNU libiconv e logo reinstala o GNU gettext\n"
"podería arranxarse o problema.\n"
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2410,7 +2471,7 @@ msgstr ""
"O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
"Esta versión foi compilada sen iconv().\n"
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2455,7 +2516,7 @@ msgstr "a forma do plural ten un
msgid "too many errors, aborting"
msgstr "demasiados erros, interrompendo"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, c-format
msgid "invalid multibyte sequence"
msgstr "secuencia multibyte non válida"
@@ -2476,11 +2537,11 @@ msgid "iconv failure"
msgstr ""
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "erro ao ler \"%s\""
@@ -2505,7 +2566,7 @@ msgstr "fin de ficheiro nunha cadea"
msgid "end-of-line within string"
msgstr "fin de liña nunha cadea"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, fuzzy, c-format
msgid "file \"%s\" is truncated"
msgstr "ficheiro \"%s\" truncado"
@@ -2515,17 +2576,17 @@ msgstr "ficheiro \"%s\" truncado"
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "o ficheiro \"%s\" contén unha cadea non rematada en NUL"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "o ficheiro \"%s\" non está no formato .mo de GNU"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "o ficheiro \"%s\" contén unha cadea non rematada en NUL"
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "este ficheiro non pode conter directivas de dominio"
@@ -2592,50 +2653,50 @@ msgstr ""
msgid "error writing stdout"
msgstr "erro ao escribi-lo ficheiro \"%s\""
-#: src/write-java.c:977
+#: src/write-java.c:982
#, fuzzy, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "non se pode crea-lo ficheiro de saída \"%s\""
-#: src/write-java.c:987
+#: src/write-java.c:992
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "non se pode crea-lo ficheiro de saída \"%s\""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "erro ao escribi-lo ficheiro \"%s\""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "erro ao abrir \"%s\" para escribir"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\%c'"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2644,21 +2705,21 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2666,19 +2727,19 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "non se pode crea-lo ficheiro de saída \"%s\""
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "saída estándar"
@@ -2696,28 +2757,28 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: aviso: literal de cadea non rematada"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: aviso: literal de cadea non rematada"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: aviso: literal de cadea non rematada"
@@ -2736,62 +2797,62 @@ msgstr ""
"O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
"Esta versión foi compilada sen iconv().\n"
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: aviso: literal de cadea non rematada"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s: opción non válida -- %c\n"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
-#: src/x-python.c:588
+#: src/x-python.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
@@ -2811,134 +2872,136 @@ msgstr ""
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: aviso: literal de cadea non rematada"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "non se pode usar --join-existing cando a saída se escribe en stdout"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext non funciona sen palabras chave polas que buscar"
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "aviso: o ficheiro `%s' coa extensión `%s' é descoñecido; tentaráse C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "non se indicou ningún ficheiro de entrada"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -2946,121 +3009,122 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
msgstr ""
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "entrada estándar"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, fuzzy, c-format
msgid "%s%s: warning: "
msgstr "%s: aviso: "
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr ""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3068,7 +3132,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "linguaxe `%s' descoñecida"
diff --git a/gettext-tools/po/id.po b/gettext-tools/po/id.po
index 995c14f2a..b4ec2b4f1 100644
--- a/gettext-tools/po/id.po
+++ b/gettext-tools/po/id.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 1999-09-19 10:24+07:00\n"
"Last-Translator: Tedi Heriyanto \n"
"Language-Team: Indonesian \n"
@@ -33,9 +33,9 @@ msgstr ""
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "kesalahan saat membuka \"%s\" untuk dibaca"
@@ -64,10 +64,10 @@ msgstr "kesalahan ketika membaca \"%s\""
msgid "Unknown system error"
msgstr "Kesalahan sistem tak dikenal"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr ""
@@ -127,12 +127,12 @@ msgstr "%s: pilihan `-W %s' rancu\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: pilihan `-W %s' tidak membolehkan sebuah argumen\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -160,12 +160,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr ""
@@ -185,7 +185,7 @@ msgstr "spesifikasi format untuk argumen %u tidak sama"
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -194,24 +194,24 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, fuzzy, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
@@ -270,72 +270,72 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, fuzzy, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -502,9 +502,9 @@ msgstr ""
# )
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -517,28 +517,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Ditulis oleh %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "terlalu banyak argumen"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr ""
@@ -573,36 +573,36 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
#, fuzzy
msgid "Report bugs to .\n"
msgstr "Laporkan kesalahan ke .\n"
@@ -613,7 +613,7 @@ msgid "could not get host name"
msgstr ""
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "dibutuhkan tepat 2 file input"
@@ -621,15 +621,15 @@ msgstr "dibutuhkan tepat 2 file input"
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s dan %s adalah mutually exclusive"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
@@ -643,7 +643,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -652,50 +652,50 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "tidak diberikan file input"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -789,21 +789,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -811,87 +811,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -911,15 +911,15 @@ msgstr ""
" -w, --width=NUMBER set lebar halaman output\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -929,7 +929,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "digunakan kriteria pemilihan yang tidak mungkin (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
@@ -962,18 +962,18 @@ msgstr ""
"komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n"
"mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -999,15 +999,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1026,17 +1026,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "tidak diberikan file input"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "dibutuhkan tepat 2 file input"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1075,29 +1075,29 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
msgstr ""
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "pesan ini digunakan tapi tidak didefinisikan..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...tetapi definisi ini serupa"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
@@ -1152,7 +1152,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1173,31 +1173,31 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "tidak diberikan file input"
@@ -1320,13 +1320,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1362,136 +1362,149 @@ msgstr ""
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
-msgid "%s is only valid with %s"
+msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:477 src/msgfmt.c:483
#, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
msgstr ""
-#: src/msgfmt.c:503
+#: src/msgfmt.c:580
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d pesan diterjemahkan"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d terjemahan fuzzy"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d pesan belum diterjemahkan"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1500,29 +1513,48 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "tidak diberikan file input"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1530,33 +1562,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1564,250 +1596,250 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, fuzzy, c-format
msgid "invalid nplurals value"
msgstr "urutan kendali ilegal"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, fuzzy, c-format
msgid "invalid plural expression"
msgstr "urutan kendali ilegal"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, fuzzy, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, fuzzy, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, fuzzy, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, fuzzy, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "headerfield `%s' tidak ada dalam header"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, fuzzy, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "header field `%s' harus dimulai di awal baris"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
#, fuzzy
msgid "some header fields still have the initial default value\n"
msgstr "beberapa field header masih memiliki nilai baku awal"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, fuzzy, c-format
msgid "field `%s' still has initial default value\n"
msgstr "field `%s' masih memiliki nilai baku awal"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nama domain \"%s\" tidak sesuai dengan nama file"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"nama domain \"%s\" tidak sesuai dengan nama file: akan menggunakan prefix"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "direktiv `domain %s' diabaikan"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "masukan `msgstr' kosong diabaikan"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "masukan fuzzy `msgstr' diabaikan"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: peringatan: file source mengandung terjemahan fuzzy"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1839,35 +1871,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1875,24 +1907,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -1900,64 +1932,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -1969,54 +2001,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2025,7 +2057,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2034,12 +2066,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2047,7 +2079,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2056,7 +2088,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2064,42 +2096,47 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2122,51 +2159,51 @@ msgstr ""
"digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n"
"ke stdout kecuali diberikan sebuah output file.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2178,7 +2215,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2186,27 +2223,27 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2215,49 +2252,61 @@ msgstr ""
"%sMembaca %d lama + %d referensi, digabung %d, fuzzy %d, hilang %d, kuno %"
"d.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " selesai.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, fuzzy, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s dan %s adalah mutually exclusive"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr ""
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2265,24 +2314,36 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "tidak diberikan file input"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2316,54 +2377,54 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2406,7 +2467,7 @@ msgstr ""
msgid "too many errors, aborting"
msgstr "terlalu banyak kesalahan, dibatalkan"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, fuzzy, c-format
msgid "invalid multibyte sequence"
msgstr "urutan kendali ilegal"
@@ -2427,11 +2488,11 @@ msgid "iconv failure"
msgstr ""
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "kesalahan ketika membaca \"%s\""
@@ -2456,7 +2517,7 @@ msgstr "end-of-file dalam string"
msgid "end-of-line within string"
msgstr "end-of-line dalam string"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, fuzzy, c-format
msgid "file \"%s\" is truncated"
msgstr "file \"%s\" terpotong"
@@ -2466,17 +2527,17 @@ msgstr "file \"%s\" terpotong"
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "file \"%s\" bukan dalam format GNU .mo"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "file \"%s\" bukan dalam format GNU .mo"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "file \"%s\" bukan dalam format GNU .mo"
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "file ini tidak boleh mengandung direktiv domain"
@@ -2543,49 +2604,49 @@ msgstr ""
msgid "error writing stdout"
msgstr "kesalahan saat menulis file \"%s\""
-#: src/write-java.c:977
+#: src/write-java.c:982
#, fuzzy, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "tidak dapat membuat file output \"%s\""
-#: src/write-java.c:987
+#: src/write-java.c:992
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "tidak dapat membuat file output \"%s\""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "kesalahan saat menulis file \"%s\""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "kesalahan ketika membuka \"%s\" untuk ditulis"
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2594,21 +2655,21 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2616,19 +2677,19 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "tidak dapat membuat file output \"%s\""
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "standard output"
@@ -2646,28 +2707,28 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: peringatan: string literal yang unterminated"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: peringatan: string literal yang unterminated"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: peringatan: string literal yang unterminated"
@@ -2684,62 +2745,62 @@ msgid ""
"This version was built without expat.\n"
msgstr ""
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: peringatan: string literal yang unterminated"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s: pilihan tidak valid -- %c\n"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
-#: src/x-python.c:588
+#: src/x-python.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
@@ -2759,134 +2820,136 @@ msgstr ""
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: peringatan: string literal yang unterminated"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "peringatan: file `%s' ekstensi `%s' tidak dikenal; dicoba C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "tidak diberikan file input"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -2894,121 +2957,122 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
msgstr ""
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr ""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3016,7 +3080,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "bahasa `%s' tidak dikenal"
diff --git a/gettext-tools/po/it.po b/gettext-tools/po/it.po
index 24bed864f..593ddfb72 100644
--- a/gettext-tools/po/it.po
+++ b/gettext-tools/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 2000-02-17 15:30+01:00\n"
"Last-Translator: Giovanni Bortolozzo \n"
"Language-Team: Italian \n"
@@ -34,9 +34,9 @@ msgstr ""
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "errore durante l'apertura in lettura di \"%s\""
@@ -65,10 +65,10 @@ msgstr "errore durante la lettura di \"%s\""
msgid "Unknown system error"
msgstr "Errore di sistema sconosciuto"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr ""
@@ -128,12 +128,12 @@ msgstr "%s: l'opzione `-W %s'
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: l'opzione `-W %s' non ammette un argomento\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -161,12 +161,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr ""
@@ -186,7 +186,7 @@ msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -195,24 +195,24 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, fuzzy, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
@@ -272,72 +272,72 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, fuzzy, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -506,9 +506,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -522,28 +522,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Scritto da %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "troppi argomenti"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Usare `%s --help' per ulteriori informazioni.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr ""
@@ -578,36 +578,36 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
#, fuzzy
msgid "Report bugs to .\n"
msgstr "Segnalare i bug a .\n"
@@ -618,7 +618,7 @@ msgid "could not get host name"
msgstr ""
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "sono richiesti esattamente 2 file d'ingresso"
@@ -626,15 +626,15 @@ msgstr "sono richiesti esattamente 2 file d'ingresso"
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s sono mutuamente esclusive"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
@@ -648,7 +648,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -657,50 +657,50 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "non è specificato nessun file d'ingresso"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -794,21 +794,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -816,87 +816,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -919,15 +919,15 @@ msgstr ""
" -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -937,7 +937,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "il criterio di selezione specificato è impossibile (%d < n < %d)"
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
@@ -972,18 +972,18 @@ msgstr ""
"solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n"
"nei file di tutti i file PO.\n"
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -1009,15 +1009,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1036,17 +1036,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "non sono specificati file d'ingresso"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "sono richiesti esattamente 2 file d'ingresso"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1086,29 +1086,29 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
msgstr ""
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "questo messaggio è usato ma non definito..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...ma questa definizione è simile"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "questo messaggio è usato ma non è definito in %s"
@@ -1165,7 +1165,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1186,31 +1186,31 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "non è specificato nessun file d'ingresso"
@@ -1333,13 +1333,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1375,136 +1375,149 @@ msgstr ""
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
-msgid "%s is only valid with %s"
+msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:477 src/msgfmt.c:483
#, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
msgstr ""
-#: src/msgfmt.c:503
+#: src/msgfmt.c:580
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d messaggi tradotti"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traduzioni approssimative"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d messaggi non tradotti"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1513,29 +1526,48 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "non è specificato nessun file d'ingresso"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1543,33 +1575,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1577,253 +1609,253 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, fuzzy, c-format
msgid "invalid nplurals value"
msgstr "sequenza di controllo illegale"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, fuzzy, c-format
msgid "invalid plural expression"
msgstr "sequenza di controllo illegale"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, fuzzy, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "questo messaggio è usato ma non è definito in %s"
msgstr[1] "questo messaggio è usato ma non è definito in %s"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "questo messaggio è usato ma non è definito in %s"
msgstr[1] "questo messaggio è usato ma non è definito in %s"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, fuzzy, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, fuzzy, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, fuzzy, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "nell'intestazione manca il campo `%s'"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, fuzzy, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr ""
"il campo `%s' dell'intestazione dovrebbe cominciare all'inizio della riga"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
#, fuzzy
msgid "some header fields still have the initial default value\n"
msgstr ""
"alcuni campi dell'intestazione sono ancora al valore iniziale predefinito"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, fuzzy, c-format
msgid "field `%s' still has initial default value\n"
msgstr "il campo `%s' ha ancora il valore iniziale predefinito"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "il nome di dominio \"%s\" non è adatto come nome di file"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"il nome di dominio \"%s\" non è adatto come nome di file: sarà usato\n"
"un prefisso"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s' direttiva ignorata"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "ignorata la voce `msgstr' vuota"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "ignorata la voce `msgstr' approssimativa"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: attenzione: il file sorgente contiene traduzioni approssimative"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1855,35 +1887,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1891,24 +1923,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -1916,64 +1948,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -1985,54 +2017,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2041,7 +2073,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2050,12 +2082,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2063,7 +2095,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2072,7 +2104,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2080,42 +2112,47 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2140,51 +2177,51 @@ msgstr ""
"approssimativa (fuzzy) per ottenere risultati migliori. I risultati sono\n"
"scritti su stdout a meno che non sia specificato un file d'uscita.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2196,7 +2233,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2204,27 +2241,27 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "questo messaggio è usato ma non è definito in %s"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "questo messaggio è usato ma non è definito in %s"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2233,49 +2270,61 @@ msgstr ""
"%sLetti %d vecchi + %d riferimenti, fusi %d, fuzzy %d, persi %d, obsoleti %"
"d.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " fatto.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, fuzzy, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s e %s sono mutuamente esclusive"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr ""
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2283,24 +2332,36 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "non è specificato nessun file d'ingresso"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2334,54 +2395,54 @@ msgstr ""
msgid ""
msgstr ""
-#: src/po-charset.c:224 src/po-charset.c:294 src/po-charset.c:322
-#: src/po-charset.c:348
+#: src/po-charset.c:225 src/po-charset.c:295 src/po-charset.c:323
+#: src/po-charset.c:350
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:225
+#: src/po-charset.c:226
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-#: src/po-charset.c:290 src/po-charset.c:320
+#: src/po-charset.c:291 src/po-charset.c:321
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:292
+#: src/po-charset.c:293
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:296
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:304 src/po-charset.c:330
+#: src/po-charset.c:305 src/po-charset.c:331
#, c-format
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:309 src/po-charset.c:334
+#: src/po-charset.c:310 src/po-charset.c:335
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:323
+#: src/po-charset.c:324
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:349
+#: src/po-charset.c:351
#, c-format
msgid ""
"Charset missing in header.\n"
@@ -2424,7 +2485,7 @@ msgstr ""
msgid "too many errors, aborting"
msgstr "troppi errori, annullato"
-#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:555 src/write-po.c:661
#, fuzzy, c-format
msgid "invalid multibyte sequence"
msgstr "sequenza di controllo illegale"
@@ -2445,11 +2506,11 @@ msgid "iconv failure"
msgstr ""
#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
-#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
-#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
-#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
-#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
-#: src/x-tcl.c:150 src/x-ycp.c:89
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:354 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:176 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:305 src/x-perl.c:398 src/x-php.c:162
+#: src/x-python.c:170 src/x-rst.c:232 src/x-sh.c:159 src/x-smalltalk.c:91
+#: src/x-tcl.c:152 src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "errore durante la lettura di \"%s\""
@@ -2474,7 +2535,7 @@ msgstr "end-of-file all'interno di una stringa"
msgid "end-of-line within string"
msgstr "end-of-line all'interno di una stringa"
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
#, fuzzy, c-format
msgid "file \"%s\" is truncated"
msgstr "file \"%s\" troncato"
@@ -2484,17 +2545,17 @@ msgstr "file \"%s\" troncato"
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "il file \"%s\" non è nel formato GNU .mo"
-#: src/read-mo.c:157 src/read-mo.c:263
+#: src/read-mo.c:158 src/read-mo.c:267
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "il file \"%s\" non è nel formato GNU .mo"
-#: src/read-mo.c:170
+#: src/read-mo.c:171
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "il file \"%s\" non è nel formato GNU .mo"
-#: src/read-po.c:318 src/xgettext.c:869
+#: src/read-po.c:318 src/xgettext.c:875
#, c-format
msgid "this file may not contain domain directives"
msgstr "questo file potrebbe non contenere direttive di dominio"
@@ -2561,43 +2622,43 @@ msgstr ""
msgid "error writing stdout"
msgstr "errore durante la scrittura del file \"%s\""
-#: src/write-java.c:977
+#: src/write-java.c:982
#, fuzzy, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "impossibile creare il file d'uscita \"%s\""
-#: src/write-java.c:987
+#: src/write-java.c:992
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "impossibile creare il file d'uscita \"%s\""
-#: src/write-java.c:1000
+#: src/write-java.c:1005
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1057 src/write-java.c:1070
+#: src/write-java.c:1063 src/write-java.c:1076
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
-#: src/write-qt.c:530 src/write-tcl.c:202
+#: src/write-java.c:1084 src/write-mo.c:726 src/write-po.c:1126
+#: src/write-qt.c:530 src/write-tcl.c:204
#, c-format
msgid "error while writing \"%s\" file"
msgstr "errore durante la scrittura del file \"%s\""
-#: src/write-java.c:1092
+#: src/write-java.c:1098
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
-#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
+#: src/write-mo.c:714 src/write-qt.c:518 src/write-tcl.c:194
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "errore durante l'apertura in scrittura di \"%s\""
-#: src/write-po.c:605
+#: src/write-po.c:606
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
@@ -2605,7 +2666,7 @@ msgstr ""
"i messaggi internazionalizzati non devono contenere la sequenza di escape `\\"
"%c'"
-#: src/write-po.c:851 src/write-po.c:917
+#: src/write-po.c:852 src/write-po.c:918
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -2614,21 +2675,21 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1057
+#: src/write-po.c:1063
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with Java ."
"properties syntax. Try using PO file syntax instead."
msgstr ""
-#: src/write-po.c:1059
+#: src/write-po.c:1065
#, c-format
msgid ""
"Cannot output multiple translation domains into a single file with NeXTstep/"
"GNUstep .strings syntax."
msgstr ""
-#: src/write-po.c:1085
+#: src/write-po.c:1091
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
@@ -2636,19 +2697,19 @@ msgid ""
"of a properties file."
msgstr ""
-#: src/write-po.c:1089
+#: src/write-po.c:1095
#, c-format
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-#: src/write-po.c:1101
+#: src/write-po.c:1107
#, c-format
msgid "cannot create output file \"%s\""
msgstr "impossibile creare il file d'uscita \"%s\""
-#: src/write-po.c:1108
+#: src/write-po.c:1114
#, no-c-format
msgid "standard output"
msgstr "standard output"
@@ -2666,28 +2727,28 @@ msgid ""
"strings, not in the untranslated strings\n"
msgstr ""
-#: src/write-tcl.c:157
+#: src/write-tcl.c:158
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-#: src/x-awk.c:343 src/x-python.c:388
+#: src/x-awk.c:345 src/x-python.c:396
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: attenzione: letterale stringa non terminato"
-#: src/x-awk.c:594
+#: src/x-awk.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: attenzione: letterale stringa non terminato"
-#: src/x-c.c:1078 src/x-java.c:903
+#: src/x-c.c:1093 src/x-java.c:826
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: attenzione: costante carattere non terminata"
-#: src/x-c.c:1102
+#: src/x-c.c:1117
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: attenzione: letterale stringa non terminato"
@@ -2704,62 +2765,62 @@ msgid ""
"This version was built without expat.\n"
msgstr ""
-#: src/x-java.c:906
+#: src/x-java.c:829
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: attenzione: letterale stringa non terminato"
-#: src/x-java.c:1391
+#: src/x-java.c:1323
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr ""
-#: src/x-java.c:1415
+#: src/x-java.c:1347
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-perl.c:310
+#: src/x-perl.c:311
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-#: src/x-perl.c:1036
+#: src/x-perl.c:1038
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
msgstr ""
-#: src/x-perl.c:1156
+#: src/x-perl.c:1158
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1176
+#: src/x-perl.c:1178
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1210
+#: src/x-perl.c:1212
#, fuzzy, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
msgstr "%s: opzione non valida -- %c\n"
-#: src/x-perl.c:1223
+#: src/x-perl.c:1225
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:1240
+#: src/x-perl.c:1242
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr ""
-#: src/x-perl.c:2997
+#: src/x-perl.c:2999
#, c-format
msgid "%s:%d: fatal: plural message seen before singular message\n"
msgstr ""
-#: src/x-python.c:588
+#: src/x-python.c:596
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: attenzione: costante carattere non terminata"
@@ -2779,135 +2840,137 @@ msgstr ""
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: attenzione: letterale stringa non terminato"
-#: src/x-sh.c:1012
+#: src/x-sh.c:1015
#, c-format
msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-#: src/xgettext.c:515
+#: src/xgettext.c:521
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing non può essere usato quando l'output è scritto su stdout"
-#: src/xgettext.c:520
+#: src/xgettext.c:526
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:661
+#: src/xgettext.c:667
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "attenzione: il file `%s' ha estensione `%s' sconosciuta: proverò con C"
-#: src/xgettext.c:712
+#: src/xgettext.c:718
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:735
+#: src/xgettext.c:741
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:737
+#: src/xgettext.c:743
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:739
+#: src/xgettext.c:745
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:744
+#: src/xgettext.c:750
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "non è specificato nessun file d'ingresso"
-#: src/xgettext.c:746
+#: src/xgettext.c:752
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
" EmacsLisp, librep, Smalltalk, Java,\n"
-" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
msgstr ""
-#: src/xgettext.c:752
+#: src/xgettext.c:758
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:754
+#: src/xgettext.c:760
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:759
+#: src/xgettext.c:765
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:762
+#: src/xgettext.c:768
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:767
+#: src/xgettext.c:773
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:769
+#: src/xgettext.c:775
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:771
+#: src/xgettext.c:777
#, c-format
msgid ""
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:775
+#: src/xgettext.c:781
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:777
+#: src/xgettext.c:783
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:779 src/xgettext.c:786
+#: src/xgettext.c:785 src/xgettext.c:792
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" Tcl, Perl, PHP, GCC-source, Glade)\n"
msgstr ""
-#: src/xgettext.c:783
+#: src/xgettext.c:789
#, c-format
msgid ""
" -k, --keyword[=WORD] additional keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
msgstr ""
-#: src/xgettext.c:790
+#: src/xgettext.c:796
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -2915,121 +2978,122 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:793
+#: src/xgettext.c:799
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
-" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Python, Lisp, EmacsLisp, librep, Java, C#, "
+"awk,\n"
" YCP, Tcl, Perl, PHP, GCC-source)\n"
msgstr ""
-#: src/xgettext.c:797
+#: src/xgettext.c:803
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:799
+#: src/xgettext.c:805
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:801
+#: src/xgettext.c:807
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:803
+#: src/xgettext.c:809
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:805
+#: src/xgettext.c:811
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:824
+#: src/xgettext.c:830
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:839
+#: src/xgettext.c:845
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:841
+#: src/xgettext.c:847
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:843
+#: src/xgettext.c:849
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:845
+#: src/xgettext.c:851
#, c-format
msgid ""
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:847
+#: src/xgettext.c:853
#, c-format
msgid ""
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
"entries\n"
msgstr ""
-#: src/xgettext.c:1434
+#: src/xgettext.c:1450
#, c-format
msgid ""
"A --flag argument doesn't have the ::[pass-] syntax: %"
"s"
msgstr ""
-#: src/xgettext.c:1480
+#: src/xgettext.c:1548
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:1592
+#: src/xgettext.c:1660
#, c-format
msgid ""
"Non-ASCII string at %s%s.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/xgettext.c:1651 src/xgettext.c:1706
+#: src/xgettext.c:1719 src/xgettext.c:1774
#, c-format
msgid "%s%s: warning: "
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:1653
+#: src/xgettext.c:1721
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: %"
"s\n"
msgstr ""
-#: src/xgettext.c:1708
+#: src/xgettext.c:1776
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1990
+#: src/xgettext.c:2059
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a `Makevars' file, please specify\n"
@@ -3037,7 +3101,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:2179
+#: src/xgettext.c:2249
#, c-format
msgid "language `%s' unknown"
msgstr "linguaggio `%s' sconosciuto"
diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index 2c18e80a0..90fec421a 100644
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.31\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-12-17 21:25+0100\n"
+"POT-Creation-Date: 2004-01-18 16:24+0100\n"
"PO-Revision-Date: 1997-03-11 22:38 \n"
"Last-Translator: Erick Branderhorst \n"
"Language-Team: Dutch \n"
@@ -34,9 +34,9 @@ msgstr ""
msgid "write error"
msgstr ""
-#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
-#: src/xgettext.c:1512
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:245
+#: src/read-tcl.c:125 src/urlget.c:200 src/xgettext.c:1557 src/xgettext.c:1570
+#: src/xgettext.c:1580
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fout tijdens openen om te lezen van \"%s\""
@@ -65,10 +65,10 @@ msgstr "fout tijdens lezen \"%s\""
msgid "Unknown system error"
msgstr "Onbekende systeemfout"
-#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/execute.c:182 lib/execute.c:258 lib/execute.c:300 lib/pipe-bidi.c:178
#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
-#: lib/wait-process.c:332 lib/wait-process.c:395
+#: lib/wait-process.c:336 lib/wait-process.c:403
#, c-format
msgid "%s subprocess failed"
msgstr ""
@@ -128,12 +128,12 @@ msgstr "%s: optie `-W %s' is dubbelzinnig\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: optie `-W %s' staat geen argument toe\n"
-#: lib/javacomp.c:457
+#: lib/javacomp.c:467
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:407
+#: lib/javaexec.c:420
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
@@ -161,12 +161,12 @@ msgstr ""
msgid "_open_osfhandle failed"
msgstr ""
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:324 lib/wait-process.c:387
+#: lib/wait-process.c:328 lib/wait-process.c:395
#, c-format
msgid "%s subprocess got fatal signal %d"
msgstr ""
@@ -186,7 +186,7 @@ msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:865 src/format-elisp.c:381
#: src/format-gcc-internal.c:283 src/format-librep.c:345
#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
#: src/format-python.c:530 src/format-tcl.c:420
@@ -195,24 +195,24 @@ msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-c.c:177
+#: src/format-c.c:178
#, c-format
msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-#: src/format-c.c:546
+#: src/format-c.c:565
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-#: src/format-c.c:753
+#: src/format-c.c:772
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:851 src/format-gcc-internal.c:269 src/format-python.c:516
#, fuzzy, c-format
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
@@ -271,72 +271,72 @@ msgstr ""
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-#: src/format-java.c:190
+#: src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-#: src/format-java.c:203
+#: src/format-java.c:204
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-#: src/format-java.c:236
+#: src/format-java.c:238
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
+#: src/format-java.c:248 src/format-java.c:280 src/format-java.c:307
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
msgstr ""
-#: src/format-java.c:266
+#: src/format-java.c:270
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-#: src/format-java.c:305
+#: src/format-java.c:315
#, c-format
msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-#: src/format-java.c:322
+#: src/format-java.c:334
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-#: src/format-java.c:546
+#: src/format-java.c:559
#, c-format
msgid "In the directive number %u, a choice contains no number."
msgstr ""
-#: src/format-java.c:557
+#: src/format-java.c:570
#, c-format
msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-#: src/format-java.c:715
+#: src/format-java.c:732
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-java.c:730
+#: src/format-java.c:747
#, fuzzy, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-java.c:755
+#: src/format-java.c:772
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
@@ -502,9 +502,9 @@ msgstr ""
#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
-#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
-#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
-#: src/xgettext.c:492
+#: src/msgfilter.c:270 src/msgfmt.c:360 src/msggrep.c:314 src/msginit.c:266
+#: src/msgmerge.c:297 src/msgunfmt.c:246 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:498
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -518,28 +518,28 @@ msgstr ""
#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
-#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
-#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
-#: src/xgettext.c:497
+#: src/msgfilter.c:275 src/msgfmt.c:365 src/msggrep.c:319 src/msginit.c:271
+#: src/msgmerge.c:302 src/msgunfmt.c:251 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:503
#, c-format
msgid "Written by %s.\n"
msgstr "Geschreven door %s.\n"
-#: src/hostname.c:197 src/msginit.c:280
+#: src/hostname.c:197 src/msginit.c:281
#, c-format
msgid "too many arguments"
msgstr "te veel argumenten"
#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
-#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
-#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
-#: src/xgettext.c:704
+#: src/msgfilter.c:367 src/msgfmt.c:606 src/msggrep.c:433 src/msginit.c:357
+#: src/msgmerge.c:421 src/msgunfmt.c:406 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:710
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie.\n"
-#: src/hostname.c:214 src/msginit.c:360
+#: src/hostname.c:214 src/msginit.c:361
#, c-format
msgid "Usage: %s [OPTION]\n"
msgstr ""
@@ -574,36 +574,36 @@ msgstr ""
#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
-#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
-#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
-#: src/xgettext.c:850
+#: src/msgfilter.c:453 src/msgfmt.c:728 src/msggrep.c:535 src/msginit.c:413
+#: src/msgmerge.c:536 src/msgunfmt.c:504 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:856
#, c-format
msgid "Informative output:\n"
msgstr ""
#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
-#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
-#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
-#: src/xgettext.c:852
+#: src/msgfilter.c:455 src/msgfmt.c:730 src/msggrep.c:537 src/msginit.c:415
+#: src/msgmerge.c:538 src/msgunfmt.c:506 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:858
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
-#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
-#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
-#: src/xgettext.c:854
+#: src/msgfilter.c:457 src/msgfmt.c:732 src/msggrep.c:539 src/msginit.c:417
+#: src/msgmerge.c:540 src/msgunfmt.c:508 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:860
#, c-format
msgid " -V, --version output version information and exit\n"
msgstr ""
#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
-#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
-#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
-#: src/xgettext.c:857
+#: src/msgfilter.c:460 src/msgfmt.c:739 src/msggrep.c:542 src/msginit.c:420
+#: src/msgmerge.c:547 src/msgunfmt.c:513 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:863
#, fuzzy
msgid "Report bugs to .\n"
msgstr "Meld fouten via .\n"
@@ -614,7 +614,7 @@ msgid "could not get host name"
msgstr ""
#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
-#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#: src/msggrep.c:334 src/msginit.c:204 src/msguniq.c:259
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "precies 2 invoerbestanden zijn benodigd"
@@ -622,15 +622,15 @@ msgstr "precies 2 invoerbestanden zijn benodigd"
#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
-#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
-#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
-#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
-#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
+#: src/msgfmt.c:404 src/msgfmt.c:412 src/msgfmt.c:427 src/msgfmt.c:449
+#: src/msggrep.c:340 src/msggrep.c:344 src/msgmerge.c:327 src/msgmerge.c:348
+#: src/msgmerge.c:352 src/msgunfmt.c:282 src/msguniq.c:265 src/msguniq.c:269
+#: src/xgettext.c:513 src/xgettext.c:517
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s en %s zijn mutually exclusive"
-#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:437 src/msguniq.c:304
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
@@ -644,7 +644,7 @@ msgstr ""
#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
-#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msggrep.c:447 src/msginit.c:371 src/msgmerge.c:442 src/msgunfmt.c:418
#: src/msguniq.c:320
#, c-format
msgid ""
@@ -653,50 +653,50 @@ msgstr ""
#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
-#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
-#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#: src/msgfmt.c:624 src/msggrep.c:450 src/msginit.c:374 src/msgmerge.c:445
+#: src/msgunfmt.c:432 src/msguniq.c:323 src/xgettext.c:728
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "geen invoerbestand gegeven"
-#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:452 src/msguniq.c:325
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
-#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
-#: src/xgettext.c:728
+#: src/msgfmt.c:628 src/msggrep.c:454 src/msgmerge.c:451 src/msguniq.c:327
+#: src/xgettext.c:734
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
-#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#: src/msggrep.c:456 src/msgunfmt.c:436 src/msguniq.c:329
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
-#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
-#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
-#: src/xgettext.c:733
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:648 src/msggrep.c:459
+#: src/msginit.c:382 src/msgmerge.c:463 src/msgunfmt.c:472 src/msguniq.c:332
+#: src/xgettext.c:739
#, c-format
msgid "Output file location:\n"
msgstr ""
#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
-#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:650 src/msggrep.c:461
+#: src/msgmerge.c:465 src/msgunfmt.c:474 src/msguniq.c:334
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
-#: src/msgunfmt.c:384 src/msguniq.c:336
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:463 src/msgmerge.c:467
+#: src/msgunfmt.c:476 src/msguniq.c:336
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -790,21 +790,21 @@ msgstr ""
#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
-#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msgfmt.c:693 src/msggrep.c:498 src/msginit.c:390 src/msgmerge.c:498
#: src/msguniq.c:347
#, c-format
msgid "Input file syntax:\n"
msgstr ""
#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
-#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#: src/msgfilter.c:416 src/msggrep.c:500 src/msginit.c:392 src/msguniq.c:349
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
-#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#: src/msgfilter.c:418 src/msggrep.c:502 src/msginit.c:394 src/msguniq.c:351
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
@@ -812,87 +812,87 @@ msgid ""
msgstr ""
#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
-#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
-#: src/xgettext.c:808
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:721 src/msggrep.c:505
+#: src/msginit.c:397 src/msgmerge.c:506 src/msgunfmt.c:480 src/msguniq.c:354
+#: src/xgettext.c:814
#, c-format
msgid "Output details:\n"
msgstr ""
#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
-#: src/xgettext.c:810
+#: src/msgen.c:303 src/msgmerge.c:508 src/msgunfmt.c:482 src/msguniq.c:361
+#: src/xgettext.c:816
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
-#: src/msguniq.c:363 src/xgettext.c:812
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:510 src/msgunfmt.c:484
+#: src/msguniq.c:363 src/xgettext.c:818
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
-#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:511 src/msgmerge.c:512
+#: src/msgunfmt.c:486 src/msguniq.c:365 src/xgettext.c:820
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
-#: src/xgettext.c:816
+#: src/xgettext.c:822
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:818
+#: src/xgettext.c:824
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:820
+#: src/xgettext.c:826
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:822
+#: src/xgettext.c:828
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
-#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
-#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:521 src/msginit.c:403
+#: src/msgmerge.c:522 src/msgunfmt.c:492 src/msguniq.c:375
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
-#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:523 src/msginit.c:405
+#: src/msgmerge.c:524 src/msgunfmt.c:494 src/msguniq.c:377 src/xgettext.c:832
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
-#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:525 src/msginit.c:407
+#: src/msgmerge.c:526 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:834
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
-#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:527 src/msginit.c:409
+#: src/msgmerge.c:528 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:836
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -914,15 +914,15 @@ msgstr ""
" -w, --width=NUMMER stel uitvoer paginabreedte in\n"
#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
-#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
-#: src/msguniq.c:384 src/xgettext.c:833
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:531 src/msgunfmt.c:501
+#: src/msguniq.c:384 src/xgettext.c:839
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
-#: src/xgettext.c:835
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:533 src/msguniq.c:386
+#: src/xgettext.c:841
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
@@ -932,7 +932,7 @@ msgstr ""
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:714
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
@@ -951,18 +951,18 @@ msgid ""
"File positions from all PO files will be cumulated.\n"
msgstr ""
-#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:730
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:732
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
-#: src/xgettext.c:730
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:630
+#: src/xgettext.c:736
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
@@ -988,15 +988,15 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
-#: src/msgmerge.c:496
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:695
+#: src/msgmerge.c:500
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
-#: src/msgmerge.c:498
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:697
+#: src/msgmerge.c:502
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1015,17 +1015,17 @@ msgid ""
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcmp.c:156 src/msgmerge.c:309
+#: src/msgcmp.c:156 src/msgmerge.c:313
#, c-format
msgid "no input files given"
msgstr "geen invoerbestanden gegeven"
-#: src/msgcmp.c:161 src/msgmerge.c:314
+#: src/msgcmp.c:161 src/msgmerge.c:318
#, c-format
msgid "exactly 2 input files required"
msgstr "precies 2 invoerbestanden zijn benodigd"
-#: src/msgcmp.c:180 src/msgmerge.c:421
+#: src/msgcmp.c:180 src/msgmerge.c:425
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1065,29 +1065,29 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:206 src/msgmerge.c:487
+#: src/msgcmp.c:206 src/msgmerge.c:491
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:208 src/msgmerge.c:489
+#: src/msgcmp.c:208 src/msgmerge.c:493
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
msgstr ""
-#: src/msgcmp.c:285 src/msgmerge.c:945
+#: src/msgcmp.c:285 src/msgmerge.c:957
#, c-format
msgid "this message is used but not defined..."
msgstr "deze melding is gebruikt maar is niet gedefinieerd..."
-#: src/msgcmp.c:287 src/msgmerge.c:947
+#: src/msgcmp.c:287 src/msgmerge.c:959
#, c-format
msgid "...but this definition is similar"
msgstr "...maar de definitie is gelijksoortig"
-#: src/msgcmp.c:292 src/msgmerge.c:974
+#: src/msgcmp.c:292 src/msgmerge.c:986
#, c-format
msgid "this message is used but not defined in %s"
msgstr "deze melding is gebruikt maar niet gedefinieerd in %s"
@@ -1128,7 +1128,7 @@ msgid ""
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:424 src/xgettext.c:837
+#: src/msgcomm.c:424 src/xgettext.c:843
#, c-format
msgid ""
" --omit-header don't write header with `msgid \"\"' entry\n"
@@ -1149,31 +1149,31 @@ msgstr ""
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:514
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
-#: src/msgmerge.c:512
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:515
+#: src/msgmerge.c:516
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
-#: src/msgmerge.c:514
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:517
+#: src/msgmerge.c:518
#, c-format
msgid ""
" --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
-#: src/msgmerge.c:516
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:519
+#: src/msgmerge.c:520
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#: src/msgen.c:219 src/msgfmt.c:376 src/xgettext.c:534
#, c-format
msgid "no input file given"
msgstr "geen invoerbestand gegeven"
@@ -1296,13 +1296,13 @@ msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:423 src/msggrep.c:506
+#: src/msgfilter.c:423 src/msggrep.c:507
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:429 src/msggrep.c:512
+#: src/msgfilter.c:429 src/msggrep.c:513
#, c-format
msgid " --indent indented output style\n"
msgstr ""
@@ -1338,136 +1338,149 @@ msgstr ""
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:299
+#: src/msgfmt.c:315
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
+#: src/msgfmt.c:418 src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:313
+#: src/msgunfmt.c:336
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:393 src/msgunfmt.c:258
+#: src/msgfmt.c:433 src/msgfmt.c:455 src/msgunfmt.c:306 src/msgunfmt.c:329
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
-#: src/msgunfmt.c:280
+#: src/msgfmt.c:471 src/msgunfmt.c:345 src/msgunfmt.c:351
#, c-format
-msgid "%s is only valid with %s"
+msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:415 src/msgfmt.c:421
+#: src/msgfmt.c:477 src/msgfmt.c:483
#, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s is only valid with %s, %s or %s"
msgstr ""
-#: src/msgfmt.c:503
+#: src/msgfmt.c:580
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d vertaalde meldingen"
-#: src/msgfmt.c:508
+#: src/msgfmt.c:585
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d vage vertalingen"
-#: src/msgfmt.c:513
+#: src/msgfmt.c:590
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d onvertaalde meldingen"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:610
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:537
+#: src/msgfmt.c:614
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:542 src/xgettext.c:717
+#: src/msgfmt.c:619 src/xgettext.c:723
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:549
+#: src/msgfmt.c:626
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#: src/msgfmt.c:633 src/msgmerge.c:457 src/msgunfmt.c:421 src/xgettext.c:771
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:558
+#: src/msgfmt.c:635
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:560
+#: src/msgfmt.c:637
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:562
+#: src/msgfmt.c:639
+#, c-format
+msgid " --csharp C# mode: generate a .NET .dll file\n"
+msgstr ""
+
+#: src/msgfmt.c:641
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: generate a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:643
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:564
+#: src/msgfmt.c:645
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:571
+#: src/msgfmt.c:652
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:573 src/xgettext.c:741
+#: src/msgfmt.c:654 src/xgettext.c:747
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:576
+#: src/msgfmt.c:657
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:578 src/msgunfmt.c:361
+#: src/msgfmt.c:659 src/msgfmt.c:673 src/msgunfmt.c:441 src/msgunfmt.c:452
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#: src/msgfmt.c:661 src/msgfmt.c:675 src/msgfmt.c:685 src/msgunfmt.c:443
+#: src/msgunfmt.c:454 src/msgunfmt.c:464
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:582
+#: src/msgfmt.c:663
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:584
+#: src/msgfmt.c:665
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1476,29 +1489,48 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:590
+#: src/msgfmt.c:671
+#, fuzzy, c-format
+msgid "Output file location in C# mode:\n"
+msgstr "geen invoerbestand gegeven"
+
+#: src/msgfmt.c:677 src/msgunfmt.c:456
+#, c-format
+msgid ""
+" -d DIRECTORY base directory for locale dependent .dll "
+"files\n"
+msgstr ""
+
+#: src/msgfmt.c:679
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is written in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgfmt.c:683
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:594 src/msgunfmt.c:374
+#: src/msgfmt.c:687 src/msgunfmt.c:466
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:596
+#: src/msgfmt.c:689
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:608 src/xgettext.c:757
+#: src/msgfmt.c:701 src/xgettext.c:763
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:610
+#: src/msgfmt.c:703
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1506,33 +1538,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:613
+#: src/msgfmt.c:706
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:615
+#: src/msgfmt.c:708
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:617
+#: src/msgfmt.c:710
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:620
+#: src/msgfmt.c:713
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:622
+#: src/msgfmt.c:715
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1540,251 +1572,251 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:625
+#: src/msgfmt.c:718
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:630
+#: src/msgfmt.c:723
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:632
+#: src/msgfmt.c:725
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:641
+#: src/msgfmt.c:734
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#: src/msgfmt.c:736 src/msgmerge.c:542 src/msgunfmt.c:510
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:874
#, c-format
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:794
+#: src/msgfmt.c:887
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:821
+#: src/msgfmt.c:914
#, c-format
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:827
+#: src/msgfmt.c:920
#, c-format
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:926
#, c-format
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:911 src/msgfmt.c:923
+#: src/msgfmt.c:1004 src/msgfmt.c:1016
#, c-format
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:914
+#: src/msgfmt.c:1007
#, c-format
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:926
+#: src/msgfmt.c:1019
#, c-format
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:951
+#: src/msgfmt.c:1044
#, fuzzy, c-format
msgid "invalid nplurals value"
msgstr "illegale kontrol sequence"
-#: src/msgfmt.c:965
+#: src/msgfmt.c:1058
#, fuzzy, c-format
msgid "invalid plural expression"
msgstr "illegale kontrol sequence"
-#: src/msgfmt.c:984 src/msgfmt.c:999
+#: src/msgfmt.c:1077 src/msgfmt.c:1092
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1080
#, fuzzy, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "deze melding is gebruikt maar niet gedefinieerd in %s"
msgstr[1] "deze melding is gebruikt maar niet gedefinieerd in %s"
-#: src/msgfmt.c:1002
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "deze melding is gebruikt maar niet gedefinieerd in %s"
msgstr[1] "deze melding is gebruikt maar niet gedefinieerd in %s"
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1125
#, c-format
msgid "Try using the following, valid for %s:\n"
msgstr ""
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1138
#, c-format
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:1079
+#: src/msgfmt.c:1172
#, fuzzy, c-format
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1182
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
-#: src/msgfmt.c:1101
+#: src/msgfmt.c:1194
#, c-format
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
-#: src/msgfmt.c:1118
+#: src/msgfmt.c:1211
#, fuzzy, c-format
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
-#: src/msgfmt.c:1128
+#: src/msgfmt.c:1221
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
-#: src/msgfmt.c:1140
+#: src/msgfmt.c:1233
#, c-format
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
-#: src/msgfmt.c:1152
+#: src/msgfmt.c:1245
#, c-format
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1219
+#: src/msgfmt.c:1312
#, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
msgstr ""
-#: src/msgfmt.c:1261
+#: src/msgfmt.c:1354
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1362
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1303
+#: src/msgfmt.c:1396
#, fuzzy, c-format
msgid "headerfield `%s' missing in header\n"
msgstr "header(??)veld `%s' ontbreekt in header(??)"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1400
#, fuzzy, c-format
msgid "header field `%s' should start at beginning of line\n"
msgstr "header(??)veld `%s' moet starten aan het begin van de regel"
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1411
#, fuzzy
msgid "some header fields still have the initial default value\n"
msgstr ""
"sommige header(??)velden hebben nog de oorspronkelijke standaard waarde"
-#: src/msgfmt.c:1330
+#: src/msgfmt.c:1423
#, fuzzy, c-format
msgid "field `%s' still has initial default value\n"
msgstr "veld `%s' heeft nog de oorspronkelijke standaard waarde"
-#: src/msgfmt.c:1388
+#: src/msgfmt.c:1481
#, fuzzy, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1484
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msgfmt.c:1401
+#: src/msgfmt.c:1494
#, fuzzy, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msgfmt.c:1403
+#: src/msgfmt.c:1496
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1520
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domeinnaam \"%s\" niet bruikbaar als bestandsnaam"
-#: src/msgfmt.c:1431
+#: src/msgfmt.c:1525
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"domeinnaam \"%s\" niet bruikbaar als bestandsnaam: zal voorvoegsel gebruiken"
-#: src/msgfmt.c:1445
+#: src/msgfmt.c:1539
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domein %s' directive genegeerd"
-#: src/msgfmt.c:1499
+#: src/msgfmt.c:1593
#, c-format
msgid "empty `msgstr' entry ignored"
msgstr "lege `msgstr' entry genegeerd"
-#: src/msgfmt.c:1500
+#: src/msgfmt.c:1594
#, c-format
msgid "fuzzy `msgstr' entry ignored"
msgstr "lege `msgstr' ingang genegeerd"
-#: src/msgfmt.c:1558
+#: src/msgfmt.c:1652
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msggrep.c:421
+#: src/msggrep.c:422
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
msgstr ""
-#: src/msggrep.c:441
+#: src/msggrep.c:442
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:467
+#: src/msggrep.c:468
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -1816,35 +1848,35 @@ msgid ""
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:508
+#: src/msggrep.c:509
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:529
+#: src/msggrep.c:530
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:531
+#: src/msggrep.c:532
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:602
+#: src/msggrep.c:603
#, c-format
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:293
+#: src/msginit.c:294
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -1852,24 +1884,24 @@ msgid ""
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:345
+#: src/msginit.c:346
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:365
+#: src/msginit.c:366
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:376
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
@@ -1877,64 +1909,64 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:383
+#: src/msginit.c:384
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:398
+#: src/msginit.c:399
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr ""
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-#: src/msginit.c:456
+#: src/msginit.c:457
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:464 src/msginit.c:469
+#: src/msginit.c:465 src/msginit.c:470
#, c-format
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:477
+#: src/msginit.c:478
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:938 src/msginit.c:1005 src/msginit.c:1163 src/msginit.c:1245
-#: src/read-java.c:71 src/read-tcl.c:108
+#: src/msginit.c:966 src/msginit.c:1033 src/msginit.c:1191 src/msginit.c:1273
+#: src/read-java.c:71 src/read-tcl.c:111
#, c-format
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:946 src/msginit.c:1013 src/msginit.c:1171
+#: src/msginit.c:974 src/msginit.c:1041 src/msginit.c:1199
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:958 src/msginit.c:1025 src/msginit.c:1183 src/msginit.c:1262
-#: src/read-java.c:81 src/read-tcl.c:124
+#: src/msginit.c:986 src/msginit.c:1053 src/msginit.c:1211 src/msginit.c:1290
+#: src/read-java.c:81 src/read-tcl.c:127
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1149
+#: src/msginit.c:1177
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
@@ -1946,54 +1978,54 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1535
+#: src/msginit.c:1563
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
+#: src/msgl-cat.c:176 src/msgl-charset.c:86 src/msgl-iconv.c:305
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:184 src/msgl-iconv.c:315
+#: src/msgl-cat.c:187 src/msgl-iconv.c:316
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:199
+#: src/msgl-cat.c:202
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:206
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:380 src/msgl-iconv.c:403
+#: src/msgl-cat.c:383 src/msgl-iconv.c:405
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
-#: src/xgettext.c:1989
+#: src/msgl-cat.c:433 src/msgl-cat.c:439 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:851 src/write-po.c:917
+#: src/xgettext.c:2058
#, c-format
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:431
+#: src/msgl-cat.c:434
#, c-format
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:437
+#: src/msgl-cat.c:440
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
@@ -2002,7 +2034,7 @@ msgid ""
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:91
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
@@ -2011,12 +2043,12 @@ msgid ""
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:98
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:103
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2024,7 +2056,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:112
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
@@ -2033,7 +2065,7 @@ msgid ""
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:126
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2041,42 +2073,47 @@ msgid ""
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#: src/msgl-iconv.c:187 src/msgl-iconv.c:245
#, c-format
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:337
+#: src/msgl-iconv.c:339
#, c-format
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:356 src/xgettext.c:586
+#: src/msgl-iconv.c:358 src/xgettext.c:592
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:378
+#: src/msgl-iconv.c:380
#, c-format
msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-#: src/msgl-iconv.c:383 src/xgettext.c:593
+#: src/msgl-iconv.c:385 src/xgettext.c:599
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:391
+#: src/msgmerge.c:335 src/msgmerge.c:341
+#, c-format
+msgid "%s is only valid with %s"
+msgstr ""
+
+#: src/msgmerge.c:395
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:426
+#: src/msgmerge.c:430
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2101,51 +2138,51 @@ msgstr ""
"worden om betere resultaten te verkrijgen. De resultaten worden naar \n"
"standaarduitvoer geschreven tenzij een uitvoerbestand is gespecificeerd.\n"
-#: src/msgmerge.c:443
+#: src/msgmerge.c:447
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:445
+#: src/msgmerge.c:449
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:449
+#: src/msgmerge.c:453
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:455
+#: src/msgmerge.c:459
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:467
+#: src/msgmerge.c:471
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:469
+#: src/msgmerge.c:473
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:471
+#: src/msgmerge.c:475
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:473
+#: src/msgmerge.c:477
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:475
+#: src/msgmerge.c:479
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2157,7 +2194,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:482
+#: src/msgmerge.c:486
#, c-format
msgid ""
"The backup suffix is `~', unless set with --suffix or the "
@@ -2165,27 +2202,27 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:491
+#: src/msgmerge.c:495
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
-#: src/msgmerge.c:540
+#: src/msgmerge.c:544
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1024
+#: src/msgmerge.c:1036
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "deze melding is gebruikt maar niet gedefinieerd in %s"
-#: src/msgmerge.c:1047
+#: src/msgmerge.c:1059
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "deze melding is gebruikt maar niet gedefinieerd in %s"
-#: src/msgmerge.c:1213
+#: src/msgmerge.c:1225
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2194,49 +2231,61 @@ msgstr ""
"%sLees %d oud + %d referentie, samengevoegd %d, fuzzied(gevaagd) %d, "
"ontbrekend %d, overbodig %d.\n"
-#: src/msgmerge.c:1221
+#: src/msgmerge.c:1233
msgid " done.\n"
msgstr " done.\n"
-#: src/msgunfmt.c:243 src/msgunfmt.c:252
+#: src/msgunfmt.c:291 src/msgunfmt.c:300 src/msgunfmt.c:323
#, fuzzy, c-format
msgid "%s and explicit file names are mutually exclusive"
msgstr "%s en %s zijn mutually exclusive"
-#: src/msgunfmt.c:334
+#: src/msgunfmt.c:410
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
msgstr ""
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:414
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-#: src/msgunfmt.c:347
+#: src/msgunfmt.c:423
#, c-format
msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:425
+#, c-format
+msgid " --csharp C# mode: input is a .NET .dll file\n"
+msgstr ""
+
+#: src/msgunfmt.c:427
+#, c-format
+msgid ""
+" --csharp-resources C# resources mode: input is a .NET .resources "
+"file\n"
+msgstr ""
+
+#: src/msgunfmt.c:429
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgunfmt.c:354
+#: src/msgunfmt.c:434
#, c-format
msgid " FILE ... input .mo files\n"
msgstr ""
-#: src/msgunfmt.c:359
+#: src/msgunfmt.c:439
#, c-format
msgid "Input file location in Java mode:\n"
msgstr ""
-#: src/msgunfmt.c:365
+#: src/msgunfmt.c:445
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2244,24 +2293,36 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-#: src/msgunfmt.c:370
+#: src/msgunfmt.c:450
+#, fuzzy, c-format
+msgid "Input file location in C# mode:\n"
+msgstr "geen invoerbestand gegeven"
+
+#: src/msgunfmt.c:458
+#, c-format
+msgid ""
+"The -l and -d options are mandatory. The .dll file is located in a\n"
+"subdirectory of the specified directory whose name depends on the locale.\n"
+msgstr ""
+
+#: src/msgunfmt.c:462
#, c-format
msgid "Input file location in Tcl mode:\n"
msgstr ""
-#: src/msgunfmt.c:376
+#: src/msgunfmt.c:468
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgunfmt.c:396
+#: src/msgunfmt.c:488
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-#: src/msgunfmt.c:398
+#: src/msgunfmt.c:490
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
@@ -2295,54 +2356,54 @@ msgstr ""
msgid "