diff options
authorKim Woelders <kim@woelders.dk>2006-10-31 20:51:32 +0000
committerKim Woelders <kim@woelders.dk>2006-10-31 20:51:32 +0000
commitf0aa9bbbac78cad4d344237a50a5356fb9552c83 (patch)
parent61f85c0e178124354ff8fb944f10c80dd49e80cb (diff)
Trying to sort out the gettext stuff.
Had to disable pl and ko due to problems in make dist. SVN revision: 26887
18 files changed, 437 insertions, 261 deletions
diff --git a/.cvsignore b/.cvsignore
index 1140f5d3f..8d22b2dda 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,9 +1,11 @@
@@ -20,4 +22,4 @@ stamp-h.in
-enlightenment.spec \ No newline at end of file
diff --git a/ABOUT-NLS b/ABOUT-NLS
deleted file mode 100644
index 94cbc428b..000000000
+++ /dev/null
@@ -1,218 +0,0 @@
-Notes on the Free Translation Project
- Free software is going international! The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
- If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site. But you do _not_
-need to install GNU `gettext' prior to configuring, installing or using
-this package with messages translated.
- Installers will find here some useful hints. These notes also
-explain how users should proceed for getting the programs to use the
-available translations. They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
- When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used. The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-Quick configuration advice
- If you want to exploit the full power of internationalization, you
-should configure it using
- ./configure --with-included-gettext
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed. So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias, message inheritance, automatic
-charset conversion or plural form handling) as the implementation here.
-It is also not possible to offer this additional functionality on top
-of a `catgets' implementation. Future versions of GNU `gettext' will
-very likely convey even more functionality. So it might be a good idea
-to change to GNU `gettext' as soon as possible.
- So you need _not_ provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-INSTALL Matters
- Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'. Other packages have their own
-ways to internationalization, predating GNU `gettext'.
- By default, this package will be installed to allow translation of
-messages. It will automatically detect whether the system already
-provides the GNU `gettext' functions. If not, the GNU `gettext' own
-library will be used. This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is _not_ required. Installers may use
-special options at configuration time for changing the default
-behaviour. The commands:
- ./configure --with-included-gettext
- ./configure --disable-nls
-will respectively bypass any pre-existing `gettext' to use the
-internationalizing routines provided within this package, or else,
-_totally_ disable translation of messages.
- When you already have GNU `gettext' installed on your system and run
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this. This might be not what is desirable. You
-should use the more recent version of the GNU `gettext' library. I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
- ./configure --with-included-gettext
-to prevent auto-detection.
- The configuration process will not test for the `catgets' function
-and therefore it will not be used. The reason is that even an
-emulation of `gettext' on top of `catgets' could not provide all the
-extensions of the GNU `gettext' library.
- Internationalized packages have usually many `po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language. Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package. However, the environment variable `LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-Using This Package
- As a user, if your language has been installed for this package, you
-only have to set the `LANG' environment variable to the appropriate
-`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
-and `CC' is an ISO 3166 two-letter country code. For example, let's
-suppose that you speak German and live in Germany. At the shell
-prompt, merely execute `setenv LANG de_DE' (in `csh'),
-`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
-This can be done from your `.login' or `.profile' file, once and for
- You might think that the country code specification is redundant.
-But in fact, some languages have dialects in different countries. For
-example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
-country code serves to distinguish the dialects.
- The locale naming convention of `LL_CC', with `LL' denoting the
-language and `CC' denoting the country, is the one use on systems based
-on GNU libc. On other systems, some variations of this scheme are
-used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
-locales supported by your system for your country by running the command
-`locale -a | grep '^LL''.
- Not all programs have translations for all languages. By default, an
-English message is shown in place of a nonexistent translation. If you
-understand other languages, you can set up a priority list of languages.
-This is done through a different environment variable, called
-`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
-for the purpose of message handling, but you still need to have `LANG'
-set to the primary language; this is required by other parts of the
-system libraries. For example, some Swedish users who would rather
-read translations in German than English for when Swedish is not
-available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
- In the `LANGUAGE' environment variable, but not in the `LANG'
-environment variable, `LL_CC' combinations can be abbreviated as `LL'
-to denote the language's main dialect. For example, `de' is equivalent
-to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
-(Portuguese as spoken in Portugal) in this context.
-Translating Teams
- For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-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/', in the "National teams"
- If you'd like to volunteer to _work_ at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is _not_ the same as the list itself, it has
-`-request' appended. For example, speakers of Swedish can send a
-message to `sv-request@li.org', having this message body:
- subscribe
- Keep in mind that team members are expected to participate
-_actively_ in translations, or at solving translational difficulties,
-rather than merely lurking around. If your team does not exist yet and
-you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
- The English team is special. It works at improving and uniformizing
-the terminology in use. Proven linguistic skill are praised more than
-programming skill, here.
-Available Packages
- Languages are not equally supported in all packages. The following
-matrix shows the current state of internationalization, as of April
-2005. The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination, with a
-translation percentage of at least 50%.
- Ready PO files en fr ja de bg es fi pl pt ru
- +-------------------------------+
- enlightenment | [] [] [] [] [] [] [] [] [] [] |
- Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect. This is because a few extra PO files are
-used for implementing regional variants of languages, or language
- For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-distributed as such by its maintainer. There might be an observable
-lag between the mere existence a PO file and its wide availability in a
- If August 2002 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
-matrix with full percentage details can be found at
-Using `gettext' in new packages
- If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU `gettext' in your
-package. Of course you have to respect the GNU Library General Public
-License which covers the use of the GNU `gettext' library. This means
-in particular that even non-free programs can use `libintl' as a shared
-library, whereas only free software can use `libintl' as a static
-library or use modified versions of `libintl'.
- Once the sources are changed appropriately and the setup can handle
-to use of `gettext' the only thing missing are the translations. The
-Free Translation Project is also available for packages which are not
-developed inside the GNU project. Therefore the information given above
-applies also for every other Free Software Project. Contact
-`translation@iro.umontreal.ca' to make the `.pot' files available to
-the translation teams.
diff --git a/autogen.sh b/autogen.sh
index 4b61a5ba8..96625372d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,24 +5,12 @@ rm -f aclocal.m4 ltmain.sh
touch README
+echo "Running autopoint..." ; autopoint -f || exit 1
echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
-echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1
+echo "Running autoheader..." ; autoheader || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
-echo "Generating gettext enlightenment.pot template"; \
-xgettext \
--n \
--C \
--d enlightenment \
--p po \
---copyright-holder="Enlightenment development team" \
---foreign-user \
---msgid-bugs-address="enlightenment-devel@lists.sourceforge.net" \
--k -k_ -kd_ -kN_ \
---from-code=UTF-8 \
--o enlightenment.pot \
-`find . -name "*.[ch]" -print` || exit 1
if [ -z "$NOCONFIGURE" ]; then
./configure "$@"
diff --git a/configure.in b/configure.in
index 9cccfe219..feb14bfb0 100644
--- a/configure.in
+++ b/configure.in
@@ -146,10 +146,11 @@ CPPFLAGS="${PCPPFLAGS}"
-ALL_LINGUAS="bg de eo es fi fr ja pl pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW ko"
+#ALL_LINGUAS="bg de eo es fi fr ja pl pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW ko"
+ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW"
if test "x$LIBINTL" = "x"; then
@@ -296,7 +297,7 @@ data/backgrounds/Makefile
diff --git a/intl/.cvsignore b/intl/.cvsignore
index 3dda72986..f2068d2b5 100644
--- a/intl/.cvsignore
+++ b/intl/.cvsignore
@@ -1,2 +1,11 @@
diff --git a/po/.cvsignore b/po/.cvsignore
index a17b704b2..7bfc47d3c 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,4 +1,16 @@
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 000000000..22837aba4
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+# Usually the message domain is the same as the package name.
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Enlightenment development team
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = enlightenment-devel@lists.sourceforge.net
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 000000000..19121e618
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,346 @@
diff --git a/po/bg.po b/po/bg.po
index 8e41b16ca..4a2e8dc77 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,11 +1,11 @@
-# English translation of PACKAGE.
+# English translation of Enlightenment.
# This file is put in the public domain.
# Viktor Kojouharov <vkojouharov@abv.bg>, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2006-10-22 17:40+0300\n"
"PO-Revision-Date: 2006-10-24 00:25+0300\n"
@@ -475,13 +475,13 @@ msgstr "Грешка при изпълнение"
#: src/bin/e_apps.c:656
#, c-format
msgid "Enlightenment was unable to process a command line:<br><br>%s %s<br>"
-msgstr "Enlightenment не е могъл да обработи командата:<br><br>%s<br>"
+msgstr "Enlightenment не е могъл да обработи командата:<br><br>%s %s<br>"
#: src/bin/e_apps.c:669
#, c-format
msgid "Enlightenment was unable to fork a child process:<br><br>%s %s<br>"
msgstr ""
-"Enlightenment не е могъл да създаде отделен дъщерен процес:<br><br>%s<br>"
+"Enlightenment не е могъл да създаде отделен дъщерен процес:<br><br>%s %s<br>"
#: src/bin/e_apps.c:2839
msgid "Application run error"
diff --git a/po/de.po b/po/de.po
index fbe9fb06c..2f90ac7f5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,15 +3,14 @@
# vandango <vandango@toenda.com>, 2005, 2005/07/10
# Azundris <edevel@azundris.com>, 2005/06/08.
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2005-04-17 14:47+0200\n"
"PO-Revision-Date: 2005-04-17 14:54+GMZ\n"
"Last-Translator: Jonathan Naumann <vandango@toenda.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: E17-de <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fi.po b/po/fi.po
index 1f1bee655..8eaa001e5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2005-04-17 20:27+0300\n"
"PO-Revision-Date: 2006-01-07\n"
diff --git a/po/fr.po b/po/fr.po
index 520090ef3..e4ebcdef9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,15 +2,14 @@
# This file is put in the public domain.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2005-04-12 06:59+0900\n"
"PO-Revision-Date: 2005-11-19 21:00+0100\n"
"Last-Translator: Maxime BRUNEL <maxtoo@gentoofr.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: E17-fr <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/hu.po b/po/hu.po
index f9c5808af..0570665d0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,10 +4,10 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2006-05-13 14:34+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2006-05-13 14:34+0200\n"
"Last-Translator: Peter Parkanyi \n"
"Language-Team: Hungarian <HU@li.org>\n"
"MIME-Version: 1.0\n"
diff --git a/po/ja.po b/po/ja.po
index 79f8ca975..284259836 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,15 +3,14 @@
# David Stevenson <david.35472@gmail.com>
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2006-10-22 22:22+0900\n"
"PO-Revision-Date: 2006-10-23 01:00+0900\n"
"Last-Translator: Yasufumi Haga <yasufumi.haga@nifty.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: E17-jp <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ko.po b/po/ko.po
index 6dc1225ed..45741ba7d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,12 +5,12 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2006-10-08 17:36+0900\n"
"PO-Revision-Date: 2006-10-08 17:30-0900\n"
"Last-Translator: Jérôme Pinot, 박은리 <ngc891@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: E17-ko <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/nb.po b/po/nb.po
index 08e3c92c4..ac51e228c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,12 +4,12 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2005-09-27 07:14+0200\n"
"PO-Revision-Date: 2006-02-08 04:03+0100\n"
"Last-Translator: Morten Nilsen <morten@nilsen.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: E17-nb <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt.po b/po/pt.po
index f13d86fdd..62b5653c6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,12 +4,12 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Enlightenment DR17\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2005-04-12 17:46+0900\n"
"PO-Revision-Date: 2005-07-29 22:23-0300\n"
"Last-Translator: MDK <mdkcore@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: E17-pt <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ru.po b/po/ru.po
index 595f7c7c4..b52d29b09 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,8 +1,6 @@
# Russian translation of Enlightenment.
# This file is put in the public domain.
# Denis Klykvin <nikon@altlinux.ru>, 2005.
-# , fuzzy
msgid ""
msgstr ""