From b3210e6fad66e2459cd83015d45d147174ae53bb30086c26254901ff9f662423 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Sep 2010 10:30:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/translation-update-upstream?expand=0&rev=10 --- create-tlst-step2-create-gnome_gtp.sh | 2 +- lcn-sle.tlst | 4 +- translation-update-mandatory-20100603.tar.bz2 | 3 -- translation-update-mandatory-20100614.tar.bz2 | 3 ++ translation-update-upstream-20100603.tar.bz2 | 3 -- translation-update-upstream-20100614.tar.bz2 | 3 ++ translation-update-upstream.changes | 8 ++++ translation-update-upstream.in | 46 +++++++++++-------- translation-update-upstream.spec | 4 +- upstream-gnome_gtp.tlst | 14 ++++-- 10 files changed, 58 insertions(+), 32 deletions(-) delete mode 100644 translation-update-mandatory-20100603.tar.bz2 create mode 100644 translation-update-mandatory-20100614.tar.bz2 delete mode 100644 translation-update-upstream-20100603.tar.bz2 create mode 100644 translation-update-upstream-20100614.tar.bz2 diff --git a/create-tlst-step2-create-gnome_gtp.sh b/create-tlst-step2-create-gnome_gtp.sh index 86f54a1..8095a44 100644 --- a/create-tlst-step2-create-gnome_gtp.sh +++ b/create-tlst-step2-create-gnome_gtp.sh @@ -21,7 +21,7 @@ done KNOWN_BRANCHES="gnome-2-30" # branches tried apps with the same name base: # Do not forget hardcoded strings in the code below! -APP_BRANCHES="|gimp-2-6|gtk-2-20|gtk-2-90|glib-2-24" +APP_BRANCHES="|gimp-2-6|gtk-2-20|gtk-2-22|gtk-2-90|glib-2-24" # FIXME: support for libgda:release-3-0-branch gnome-background:gnome-2-22 echo "# This file was generated $(LANG=C LC_ALL=C date) by create-tlst-step2-create-gnome_gtp.sh." >upstream-gnome_gtp.tlst diff --git a/lcn-sle.tlst b/lcn-sle.tlst index 0777648..428c905 100644 --- a/lcn-sle.tlst +++ b/lcn-sle.tlst @@ -35,7 +35,7 @@ gnome-panel gnome-panel lcn - gn #TODO phase 2: gnome-patch-translation gnome-patch-translation lcn - gnome-patch-translation/po SLE11 gnome-power-manager gnome-power-manager lcn - gnome-power-manager/po SLE11 gnome-screensaver gnome-screensaver lcn - gnome-screensaver/po SLE11 -gnome-session gnome-session lcn - gnome-session/po SLE11 +gnome-session gnome-session-2.0 lcn - gnome-session/po SLE11 gnome-terminal gnome-terminal lcn - gnome-terminal/po SLE11 gnome-utils gnome-utils-2.0 lcn - gnome-utils-2.0/po SLE11 #NA: html-help-boot html-help-boot lcn - html-help-boot/po SLE11 @@ -55,7 +55,7 @@ krb5-ticket-watcher krb5-ticket-watcher lcn - kr #NA: kryptomedia kryptomedia lcn - kryptomedia/po SLE11 #TODO: kupdateapplet kupdateapplet lcn - kupdateapplet/po SLE11 #TODO: kwin_SUSE2 kwin_SUSE2 lcn - kwin_SUSE2/po SLE11 -libgnomedb libgnomedb-3 lcn - libgnomedb-3/po SLE11 +libgnomedb libgnomedb-4.0 lcn - libgnomedb-3/po SLE11 libgnomesu libgnomesu-1.0 lcn - libgnomesu/po SLE11 libslab libslab lcn - libslab/po SLE11 #NA: libssui libssui lcn - libssui/po SLE11 diff --git a/translation-update-mandatory-20100603.tar.bz2 b/translation-update-mandatory-20100603.tar.bz2 deleted file mode 100644 index aa0cf0f..0000000 --- a/translation-update-mandatory-20100603.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e1a9955bb7cbe1c23fbf75f5c439201ebf810f25fb0fed3f2fa6d2ed420ae37 -size 127 diff --git a/translation-update-mandatory-20100614.tar.bz2 b/translation-update-mandatory-20100614.tar.bz2 new file mode 100644 index 0000000..a74982f --- /dev/null +++ b/translation-update-mandatory-20100614.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06e3d501ec85aa6b3dc6c23ab4d5f0be36bfa0a992ad2ef9a32e4807553572c9 +size 128 diff --git a/translation-update-upstream-20100603.tar.bz2 b/translation-update-upstream-20100603.tar.bz2 deleted file mode 100644 index 6fed057..0000000 --- a/translation-update-upstream-20100603.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16b7e841ceb73bd671ba310ecfaa91655945abb6ee245ad8af63ba08410a7af7 -size 5804401 diff --git a/translation-update-upstream-20100614.tar.bz2 b/translation-update-upstream-20100614.tar.bz2 new file mode 100644 index 0000000..cba5fa4 --- /dev/null +++ b/translation-update-upstream-20100614.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ea426822fc30ae9ed946e90e967650a6d7a71fdd6be47b5075486d5fa899b66 +size 6422499 diff --git a/translation-update-upstream.changes b/translation-update-upstream.changes index b8ffd4e..86195a0 100644 --- a/translation-update-upstream.changes +++ b/translation-update-upstream.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 14 20:22:26 CEST 2010 - sbrabec@suse.cz + +- Fixes of build failures: + * Edit configure* only if po/LINGUAS does not exist. + * Support LINGUAS list in a single line. +- Added the latest upstream and LCN strings. + ------------------------------------------------------------------- Fri Jun 4 12:47:12 CEST 2010 - sbrabec@suse.cz diff --git a/translation-update-upstream.in b/translation-update-upstream.in index 9845e61..334a329 100644 --- a/translation-update-upstream.in +++ b/translation-update-upstream.in @@ -10,26 +10,36 @@ fi # Update all known mechanisms to add language: function linguas_update { - if test -f LINGUAS ; then - echo "Adding $LNG to LINGUAS." - echo $LNG >>LINGUAS - fi - if test -f $OLDPWD/configure.ac ; then - if grep -q 'ALL_LINGUAS=' $OLDPWD/configure.ac ; then - echo "Adding $LNG to configure.ac." - sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure.ac + if test -f LINGUAS -o -f ../po/LINGUAS ; then + if test -f LINGUAS ; then + if sed '/^#/d' >LINGUAS + fi + else + echo "Not adding $LNG to LINGUAS - secondary domain, global LINGUAS." fi - fi - if test -f $OLDPWD/configure.in ; then - if grep -q 'ALL_LINGUAS=' $OLDPWD/configure.in ; then - echo "Adding $LNG to configure.in." - sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure.in + else + if test -f $OLDPWD/configure.ac ; then + if grep -q 'ALL_LINGUAS=' $OLDPWD/configure.ac ; then + echo "Adding $LNG to configure.ac." + sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure.ac + fi fi - fi - if test -f $OLDPWD/configure ; then - if grep -q 'ALL_LINGUAS=' $OLDPWD/configure ; then - echo "Adding $LNG to configure." - sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure + if test -f $OLDPWD/configure.in ; then + if grep -q 'ALL_LINGUAS=' $OLDPWD/configure.in ; then + echo "Adding $LNG to configure.in." + sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure.in + fi + fi + if test -f $OLDPWD/configure ; then + if grep -q 'ALL_LINGUAS=' $OLDPWD/configure ; then + echo "Adding $LNG to configure." + sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure + fi fi fi } diff --git a/translation-update-upstream.spec b/translation-update-upstream.spec index a44b0eb..c852b69 100644 --- a/translation-update-upstream.spec +++ b/translation-update-upstream.spec @@ -1,5 +1,5 @@ # -# spec file for package translation-update-upstream (Version 20100603) +# spec file for package translation-update-upstream (Version 20100614) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: translation-update-upstream License: GPLv2+ Group: System/Localization -Version: 20100603 +Version: 20100614 Release: 1 Summary: Tool for Translation Update from Upstream Provides: translation-update-tool diff --git a/upstream-gnome_gtp.tlst b/upstream-gnome_gtp.tlst index af2b94e..f0682f8 100644 --- a/upstream-gnome_gtp.tlst +++ b/upstream-gnome_gtp.tlst @@ -1,4 +1,4 @@ -# This file was generated Tue Jun 1 18:22:42 CEST 2010 by create-tlst-step2-create-gnome_gtp.sh. +# This file was generated Mon Jun 14 14:36:04 CEST 2010 by create-tlst-step2-create-gnome_gtp.sh. # package domain method repository dir branch NetworkManager NetworkManager gtp l10n.gnome.org/POT NetworkManager/po NetworkManager-gnome nm-applet gtp l10n.gnome.org/POT network-manager-applet/po @@ -20,6 +20,7 @@ banshee-1 banshee-1 gtp l10n.gnome.org/POT beagle beagle gtp l10n.gnome.org/POT beagle/po brasero brasero gtp l10n.gnome.org/POT brasero/po gnome-2-30 brasero brasero gtp l10n.gnome.org/POT brasero/po +bug-buddy bug-buddy gtp l10n.gnome.org/POT bug-buddy/po gnome-2-30 bug-buddy bug-buddy gtp l10n.gnome.org/POT bug-buddy/po byzanz byzanz gtp l10n.gnome.org/POT byzanz/po cheese cheese gtp l10n.gnome.org/POT cheese/po @@ -42,8 +43,8 @@ epiphany epiphany gtp l10n.gnome.org/POT epiphany epiphany gtp l10n.gnome.org/POT epiphany/po epiphany-extensions epiphany-extensions-2.29 gtp l10n.gnome.org/POT epiphany-extensions/po # Two lines added manually: -epiphany-extensions epiphany-extensions-2.30 gtp l10n.gnome.org/POT epiphany-extensions/po gnome-2-30 -epiphany-extensions epiphany-extensions-2.30 gtp l10n.gnome.org/POT epiphany-extensions/po +epiphany-extensions epiphany-extensions-2.29 gtp l10n.gnome.org/POT epiphany-extensions/po gnome-2-30 +epiphany-extensions epiphany-extensions-2.29 gtp l10n.gnome.org/POT epiphany-extensions/po evince evince gtp l10n.gnome.org/POT evince/po gnome-2-30 evince evince gtp l10n.gnome.org/POT evince/po evolution evolution-2.30 gtp l10n.gnome.org/POT evolution/po gnome-2-30 @@ -106,6 +107,7 @@ gnome-control-center gnome-control-center-2.0 gtp l10n.gnome.org/POT gnome-desktop gnome-desktop-2.0 gtp l10n.gnome.org/POT gnome-desktop/po gnome-2-30 gnome-desktop gnome-desktop-2.0 gtp l10n.gnome.org/POT gnome-desktop/po gnome-doc-utils gnome-doc-utils gtp l10n.gnome.org/POT gnome-doc-utils/po +gnome-keyring gnome-keyring gtp l10n.gnome.org/POT gnome-keyring/po gnome-2-30 gnome-keyring gnome-keyring gtp l10n.gnome.org/POT gnome-keyring/po gnome-mag gnome-mag gtp l10n.gnome.org/POT gnome-mag/po gnome-2-30 gnome-mag gnome-mag gtp l10n.gnome.org/POT gnome-mag/po @@ -117,6 +119,7 @@ gnome-netstatus gnome-netstatus gtp l10n.gnome.org/POT gnome-nettool gnome-nettool gtp l10n.gnome.org/POT gnome-nettool/po gnome-packagekit gnome-packagekit gtp l10n.gnome.org/POT gnome-packagekit/po gnome-2-30 gnome-packagekit gnome-packagekit gtp l10n.gnome.org/POT gnome-packagekit/po +gnome-panel gnome-panel-2.0 gtp l10n.gnome.org/POT gnome-panel/po gnome-2-30 gnome-panel gnome-panel-2.0 gtp l10n.gnome.org/POT gnome-panel/po gnome-pilot gnome-pilot gtp l10n.gnome.org/POT gnome-pilot/po gnome-pilot-conduits gnome-pilot-conduits gtp l10n.gnome.org/POT gnome-pilot-conduits/po @@ -155,8 +158,10 @@ gtetrinet gtetrinet gtp l10n.gnome.org/POT gthumb gthumb gtp l10n.gnome.org/POT gthumb/po gtk-vnc gtk-vnc gtp l10n.gnome.org/POT gtk-vnc/po gtk2 gtk20 gtp l10n.gnome.org/POT gtk+/po gtk-2-20 +gtk2 gtk20 gtp l10n.gnome.org/POT gtk+/po gtk-2-22 gtk2 gtk20 gtp l10n.gnome.org/POT gtk+/po gtk2 gtk20-properties gtp l10n.gnome.org/POT gtk+/po-properties gtk-2-20 +gtk2 gtk20-properties gtp l10n.gnome.org/POT gtk+/po-properties gtk-2-22 gtk2 gtk20-properties gtp l10n.gnome.org/POT gtk+/po-properties gtksourceview gtksourceview-2.0 gtp l10n.gnome.org/POT gtksourceview/po gnome-2-30 gtksourceview gtksourceview-2.0 gtp l10n.gnome.org/POT gtksourceview/po @@ -170,11 +175,13 @@ hamster-applet hamster-applet gtp l10n.gnome.org/POT istanbul istanbul gtp l10n.gnome.org/POT istanbul/po jhbuild jhbuild gtp l10n.gnome.org/POT jhbuild/po last-exit last-exit gtp l10n.gnome.org/POT last-exit/po +libbonobo libbonobo-2.0 gtp l10n.gnome.org/POT libbonobo/po gnome-2-30 libbonobo libbonobo-2.0 gtp l10n.gnome.org/POT libbonobo/po libbonoboui libbonoboui-2.0 gtp l10n.gnome.org/POT libbonoboui/po libepc libepc gtp l10n.gnome.org/POT libepc/po libgdata gdata gtp l10n.gnome.org/POT libgdata/po libgnome libgnome-2.0 gtp l10n.gnome.org/POT libgnome/po +libgnome-keyring libgnome-keyring gtp l10n.gnome.org/POT libgnome-keyring/po gnome-2-30 libgnome-keyring libgnome-keyring gtp l10n.gnome.org/POT libgnome-keyring/po libgnomecanvas libgnomecanvas-2.0 gtp l10n.gnome.org/POT libgnomecanvas/po libgnomecups libgnomecups gtp l10n.gnome.org/POT libgnomecups/po @@ -227,6 +234,7 @@ totem totem gtp l10n.gnome.org/POT totem totem gtp l10n.gnome.org/POT totem/po totem-pl-parser totem-pl-parser gtp l10n.gnome.org/POT totem-pl-parser/po tracker tracker gtp l10n.gnome.org/POT tracker/po +vinagre vinagre gtp l10n.gnome.org/POT vinagre/po gnome-2-30 vinagre vinagre gtp l10n.gnome.org/POT vinagre/po vino vino gtp l10n.gnome.org/POT vino/po vte vte gtp l10n.gnome.org/POT vte/po gnome-2-30