summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-06-23 08:56:58 +0000
committerTails developers <amnesia@boum.org>2013-06-23 15:44:11 +0200
commitdcca0352e97281c2dae72611f49916b0fb84ecf8 (patch)
treef311e79cc7a0406253390d4fc4bac829cd0eaba0
parent47043900c0dc53091fd78e395ce3c358857daeaf (diff)
Have intltool merge all POT files and update all PO files.
The only thing left to "manual" (non-intltool) operation is now updating of POT files for custom programs.
-rw-r--r--po/POTFILES.in12
-rwxr-xr-xrefresh-translations10
2 files changed, 11 insertions, 11 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5295436..638b5ea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,15 @@
+# files updated without intltool-update
+config/chroot_local-includes/usr/share/config.py/messages.pot
+config/chroot_local-includes/usr/share/gpgApplet/messages.pot
+config/chroot_local-includes/usr/share/shutdown_helper_applet/messages.pot
+config/chroot_local-includes/usr/share/tails-about/messages.pot
+config/chroot_local-includes/usr/share/tails-additional-software/messages.pot
+config/chroot_local-includes/usr/share/tails-htp-notify-user/messages.pot
+config/chroot_local-includes/usr/share/tails-security-check/messages.pot
+config/chroot_local-includes/usr/share/tails-start-i2p/messages.pot
+config/chroot_local-includes/usr/share/tails-virt-notify-user/messages.pot
+config/chroot_local-includes/usr/share/unsafe-browser/messages.pot
# files added by intltool-prepare
-config/chroot_local-includes/usr/share/tails/messages.pot
config/chroot_local-includes/etc/xdg/autostart/add-bookmark-for-persistent-directory.desktop.in
config/chroot_local-includes/etc/xdg/autostart/gpgApplet.desktop.in
config/chroot_local-includes/etc/xdg/autostart/save-im-environment.desktop.in
diff --git a/refresh-translations b/refresh-translations
index 84d137d..a846eb6 100755
--- a/refresh-translations
+++ b/refresh-translations
@@ -12,7 +12,6 @@ SHELL_PROGS="/usr/local/sbin/unsafe-browser"
LANGUAGES=$(for po in po/*.po ; do rel="${po%.po}" ; echo "${rel#po/}"; done)
LOCALE_BASEDIR=config/chroot_local-includes/usr/share/locale
-POTFILE=config/chroot_local-includes/usr/share/tails/messages.pot
### Functions
@@ -55,11 +54,6 @@ mo_file () {
echo "${LOCALE_BASEDIR}/${locale}/LC_MESSAGES/tails.mo"
}
-concat_pot_files () {
- msgcat --to-code=UTF-8 \
- $(for prog in $@ ; do echo -n "$(prog_potfile $prog) " ; done)
-}
-
refresh_po () {
pot=$1 ; shift
for locale in "$@" ; do
@@ -115,8 +109,6 @@ intltool_report () {
### Main
-mkdir -p $(dirname $POTFILE)
-
# If left out files are detected, intltool-update --maintain writes
# them to po/missing.
no_left_out_files || exit 3
@@ -126,10 +118,8 @@ for prog in $PERL_PROGS ; do refresh_pot $prog Perl ; done
for prog in $PYTHON_PROGS ; do refresh_pot $prog Python ; done
for prog in $SHELL_PROGS ; do refresh_pot $prog Shell ; done
intltool_update_pot
-concat_pot_files $PERL_PROGS $PYTHON_PROGS $SHELL_PROGS > $POTFILE
# Update PO files
-refresh_po $POTFILE $LANGUAGES
intltool_update_po $LANGUAGES
# Update files that are actually used at runtime