From b162ab7ebb5decb8839d24a20149ca4daf4dfce7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 May 2010 02:10:12 +0000 Subject: [PATCH] 2.31.2 --- .cvsignore | 2 +- apply-extra-translations | 49 ++++ extra-translations | 609 +++++++++++++++++++++++++++++++++++++++ gnome-terminal.spec | 18 +- sources | 2 +- 5 files changed, 674 insertions(+), 6 deletions(-) create mode 100755 apply-extra-translations create mode 100644 extra-translations diff --git a/.cvsignore b/.cvsignore index c1d283d..2d29626 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-terminal-2.31.1.tar.bz2 +gnome-terminal-2.31.2.tar.bz2 diff --git a/apply-extra-translations b/apply-extra-translations new file mode 100755 index 0000000..d3bd463 --- /dev/null +++ b/apply-extra-translations @@ -0,0 +1,49 @@ +#! /bin/bash + +# This script is a hack to extract translations for some strings from +# the gedit translations and append them to the gnome-terminal translations. +# +# To apply translations, use: +# ./apply-extra-translations --apply gnome-terminal-2.28.0 extra-translations +# +# To update the translations, use: +# ./apply-extra-translations --update gnome-terminal-2.28.0 extra-translations + +if [ $# -ne 3 ]; then + echo "Usage: apply-extra-translations [--update|--apply] DIRECTORY FILE" + exit 1 +fi + +mode=$1 +dir=$2 +translations=$3 +strings=("Find" "_Search for: " "_Match case" "Match _entire word only" "Match as _regular expression" "Search _backwards" "_Wrap around") + +if [ "$mode" = "--update" ]; then + if ! rpm -q gedit >/dev/null ; then + echo "Please install gedit" + exit 1 + fi + for i in `grep -v "^#" $dir/po/LINGUAS`; do + for s in "${strings[@]}"; do + msgstr=`env LANGUAGE="$i.UTF-8" gettext --domain=gedit "$s"` + echo "$i:$s:$msgstr" + done + done >$translations + +elif [ "$mode" = "--apply" ]; then + + for i in `grep -v "^#" $dir/po/LINGUAS`; do + for s in "${strings[@]}"; do + msgstr=`grep "^$i:$s:" $translations | cut -d: -f3` + cat >>$dir/po/$i.po <= %{gconf_version} @@ -49,7 +52,6 @@ clickable URLs. %prep %setup -q %patch2 -p1 -b .338913-revert-336325 -%patch3 -p1 -b .potfiles autoconf @@ -59,6 +61,10 @@ autoconf export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl %configure --with-widget=vte --disable-scrollkeeper + +# patch in translations for extra Search UI strings +%{SOURCE2} --apply . %{SOURCE3} + make %{?_smp_mflags} cp %{SOURCE1} src @@ -114,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas %changelog +* Tue May 4 2010 Matthias Clasen - 2.31.2-1 +- Update to 2.31.2 +- Add translations for search UI + * Tue May 4 2010 Matthias Clasen - 2.31.1-1 - Update to 2.31.1 diff --git a/sources b/sources index 034ab42..fe043bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89d111476f8d303dfd841ea9f8f38e0c gnome-terminal-2.31.1.tar.bz2 +960f97fa3fd868c3245e592a193bce3b gnome-terminal-2.31.2.tar.bz2