From e518fd7f50cda0991ec75dd305afea7ecb69379e Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Mon, 17 Sep 2001 09:59:23 +0000 Subject: [PATCH] Use xml-i18n-tools to collect translatable strings. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5380 57a11ea4-9604-0410-9ed3-97b8803252fd --- .cvsignore | 6 ++++++ Makefile.am | 6 ++++-- configure.in | 2 ++ macros/autogen.sh | 4 ++++ po/POTFILES.in | 3 +++ po/de.po | 8 ++++++++ po/fr.po | 8 ++++++++ po/pt_PT.po | 4 ++++ po/sv.po | 8 ++++++++ src/gnome/.cvsignore | 1 + src/gnome/Makefile.am | 6 ++++-- src/gnome/gnucash.desktop | 15 --------------- src/gnome/gnucash.desktop.in | 8 ++++++++ 13 files changed, 60 insertions(+), 19 deletions(-) delete mode 100644 src/gnome/gnucash.desktop create mode 100644 src/gnome/gnucash.desktop.in diff --git a/.cvsignore b/.cvsignore index 4f4f55e7e7..48b7006a82 100644 --- a/.cvsignore +++ b/.cvsignore @@ -29,6 +29,12 @@ stamp-h stamp-h.in install-stamp tags +xml-i18n-extract +xml-i18n-extract.in +xml-i18n-merge +xml-i18n-merge.in +xml-i18n-update +xml-i18n-update.in *.tar.gz *.log *.patch diff --git a/Makefile.am b/Makefile.am index d4dbb83459..36e1d5fc3a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,8 +43,10 @@ EXTRA_DIST = \ po/README \ po/glossary/de.po \ po/glossary/gnc-glossary.txt \ - po/glossary/txt-to-pot.sh - + po/glossary/txt-to-pot.sh \ + xml-i18n-extract.in \ + xml-i18n-merge.in \ + xml-i18n-update.in bin_SCRIPTS = gnucash-config diff --git a/configure.in b/configure.in index 682a5c01a2..4579d1d26a 100644 --- a/configure.in +++ b/configure.in @@ -105,6 +105,8 @@ dnl Set of available languages. ALL_LINGUAS="da de en_GB es fr it ja no pt_PT ru sv" AM_GNU_GETTEXT +AM_PROG_XML_I18N_TOOLS + ### -------------------------------------------------------------------------- ### Variables diff --git a/macros/autogen.sh b/macros/autogen.sh index 845d5555b5..a3eece2ed9 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -138,6 +138,10 @@ do echo "Making $dr/aclocal.m4 writable ..." test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi + if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then + echo "Running xml-i18n-toolize ..." + xml-i18n-toolize --copy --force --automake + fi if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then if test -z "$NO_LIBTOOLIZE" ; then echo "Running libtoolize..." diff --git a/po/POTFILES.in b/po/POTFILES.in index 9fcde84d89..8eac4ee73e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -282,3 +282,6 @@ src/report/report-system/gncmod-report-system.c src/report/standard-reports/gncmod-standard-reports.c src/report/stylesheets/gncmod-stylesheets.c src/report/utility-reports/gncmod-utility-reports.c +# files added by xml-i18n-prepare +src/gnome/gnucash.desktop.in +src/gnome/gnucash.keys.in diff --git a/po/de.po b/po/de.po index 1414171a65..54bcb3341d 100644 --- a/po/de.po +++ b/po/de.po @@ -8732,3 +8732,11 @@ msgstr "" #: src/scm/report/guile-strings.c:754 msgid "Transaction Report" msgstr "Buchungsbericht" + +#: src/gnome/gnucash.desktop.in:3 +msgid "GnuCash" +msgstr "GnuCash" + +#: src/gnome/gnucash.desktop.in:4 +msgid "GnuCash Personal Finance" +msgstr "GnuCash Persönlicher Finanzmanager" diff --git a/po/fr.po b/po/fr.po index 4045ce3955..8971e881d3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8745,3 +8745,11 @@ msgstr "Bienvenu dans GnuCash 1.6" + +#: src/gnome/gnucash.desktop.in:3 +msgid "GnuCash" +msgstr "GnuCash" + +#: src/gnome/gnucash.desktop.in:4 +msgid "GnuCash Personal Finance" +msgstr "GnuCash Finances personnelles" diff --git a/po/pt_PT.po b/po/pt_PT.po index 813f1af1a5..4cf13dfbfa 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -11009,3 +11009,7 @@ msgstr "Relat # src/scm/report/guile-strings.c:404 #~ msgid "Headers" #~ msgstr "Cabeçalhos" + +#: src/gnome/gnucash.desktop.in:4 +msgid "GnuCash Personal Finance" +msgstr "GnuCash Finanças Pessoais" diff --git a/po/sv.po b/po/sv.po index b38809c176..871c9e783e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7757,3 +7757,11 @@ msgstr "V #: src/scm/report/guile-strings.c:724 msgid "GnuCash 1.6 has lots of nice features. Here are a few." msgstr "GnuCash 1.6 har ett antal trevliga finesser. Här är nċgra." + +#: src/gnome/gnucash.desktop.in:3 +msgid "GnuCash" +msgstr "GnuCash" + +#: src/gnome/gnucash.desktop.in:4 +msgid "GnuCash Personal Finance" +msgstr "GnuCash Personliga Finanser" diff --git a/src/gnome/.cvsignore b/src/gnome/.cvsignore index 786d4e961b..7868cf5009 100644 --- a/src/gnome/.cvsignore +++ b/src/gnome/.cvsignore @@ -3,4 +3,5 @@ Makefile.in .deps *.diff gnc-dir.h +gnucash.desktop gnucash.keys diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am index 0810fc8207..de735db73f 100644 --- a/src/gnome/Makefile.am +++ b/src/gnome/Makefile.am @@ -45,7 +45,9 @@ libgncgnome_a_SOURCES = \ gnomeappdir = ${datadir}/gnome/apps/Applications -gnomeapp_DATA = gnucash.desktop +gnomeapp_in_files = gnucash.desktop.in +gnomeapp_DATA = $(gnomeapp_in_files:.desktop.in=.desktop) +@XML_I18N_MERGE_DESKTOP_RULE@ appicondir = $(datadir)/pixmaps @@ -87,7 +89,7 @@ noinst_HEADERS = \ EXTRA_DIST = \ .cvsignore \ - gnucash.desktop \ + gnucash.desktop.in \ gnucash.keys.in \ gnucash.mime diff --git a/src/gnome/gnucash.desktop b/src/gnome/gnucash.desktop deleted file mode 100644 index 72bff55810..0000000000 --- a/src/gnome/gnucash.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Name=GnuCash -Name[sv]=GnuCash -Name[fr]=GnuCash -Name[de]=GnuCash -Comment=GnuCash Personal Finance -Comment[sv]=GnuCash Personliga Finanser -Comment[fr]=GnuCash Finances personnelles -Comment[pt_PT]=GnuCash Finanças Pessoais -Comment[de]=GnuCash Persönlicher Finanzmanager -TryExec=gnucash -Exec=gnucash -Icon=gnome-money.png -Terminal=0 -Type=Application diff --git a/src/gnome/gnucash.desktop.in b/src/gnome/gnucash.desktop.in new file mode 100644 index 0000000000..1f1355d4f4 --- /dev/null +++ b/src/gnome/gnucash.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +_Name=GnuCash +_Comment=GnuCash Personal Finance +TryExec=gnucash +Exec=gnucash +Icon=gnome-money.png +Terminal=0 +Type=Application