From b20b6146fb236833c4e67b569e937efe16d696c6ea9503a4c941b49017abc101 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 5 Sep 2014 10:53:20 +0000 Subject: [PATCH] Accepting request 247585 from home:sbrabec:branches:Base:System - upstream-collect.sh supplementary script: Fixed inverted po file age check (bnc#889513). - create-tlst-step2-create-gnome_gtp.sh: Add support for udisks. - Reset translation tarballs: use only packaged translations. OBS-URL: https://build.opensuse.org/request/show/247585 OBS-URL: https://build.opensuse.org/package/show/Base:System/translation-update-upstream?expand=0&rev=59 --- create-tlst-step2-create-gnome_gtp.sh | 1 + translation-update-mandatory-20130214.tar.bz2 | 3 --- translation-update-mandatory-20140905.tar.bz2 | 3 +++ translation-update-upstream-20130214.tar.bz2 | 3 --- translation-update-upstream-20140905.tar.bz2 | 3 +++ translation-update-upstream.changes | 8 ++++++++ translation-update-upstream.spec | 6 +++--- upstream-collect.sh | 4 +++- 8 files changed, 21 insertions(+), 10 deletions(-) delete mode 100644 translation-update-mandatory-20130214.tar.bz2 create mode 100644 translation-update-mandatory-20140905.tar.bz2 delete mode 100644 translation-update-upstream-20130214.tar.bz2 create mode 100644 translation-update-upstream-20140905.tar.bz2 diff --git a/create-tlst-step2-create-gnome_gtp.sh b/create-tlst-step2-create-gnome_gtp.sh index 9306d97..6b43c23 100644 --- a/create-tlst-step2-create-gnome_gtp.sh +++ b/create-tlst-step2-create-gnome_gtp.sh @@ -61,6 +61,7 @@ curl https://l10n.gnome.org/POT/ | sed -n 's:^.*href="\([^"]*\)/".*$:\1:p' | sed echo gnome-phone-manager phonemgr gnome-phone-manager gnome-3-10 echo gnome-phone-manager phonemgr gnome-phone-manager master echo network-manager-applet NetworkManager-gnome nm-applet master + echo udisks udisks2 udisks2 master # For other versions than sles10: # echo network-manager-applet NetworkManager nm-applet ) | diff --git a/translation-update-mandatory-20130214.tar.bz2 b/translation-update-mandatory-20130214.tar.bz2 deleted file mode 100644 index f3ca8f1..0000000 --- a/translation-update-mandatory-20130214.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c58290d79545a1aba4922ab22342ce1dda2975cb076594da76a8ed48dd92dad0 -size 253 diff --git a/translation-update-mandatory-20140905.tar.bz2 b/translation-update-mandatory-20140905.tar.bz2 new file mode 100644 index 0000000..7c12dc6 --- /dev/null +++ b/translation-update-mandatory-20140905.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26a0cc4224d02770d798ae00f6bed1908a17145e1c9e8005f8c95ddb06680453 +size 248 diff --git a/translation-update-upstream-20130214.tar.bz2 b/translation-update-upstream-20130214.tar.bz2 deleted file mode 100644 index 43819e6..0000000 --- a/translation-update-upstream-20130214.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe72b6aaa2ca5b6d4217ffe61ff7d4f4dc24c95fc4357f0aeaf7ff698ca0fa4b -size 6578201 diff --git a/translation-update-upstream-20140905.tar.bz2 b/translation-update-upstream-20140905.tar.bz2 new file mode 100644 index 0000000..d73470a --- /dev/null +++ b/translation-update-upstream-20140905.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f725f520e6d846c020c6a5de0a2a62591d051f37d0b08b4ea739734699163ff3 +size 3982 diff --git a/translation-update-upstream.changes b/translation-update-upstream.changes index 687e292..3053838 100644 --- a/translation-update-upstream.changes +++ b/translation-update-upstream.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 4 17:32:24 CEST 2014 - sbrabec@suse.cz + +- upstream-collect.sh supplementary script: Fixed inverted po file + age check (bnc#889513). +- create-tlst-step2-create-gnome_gtp.sh: Add support for udisks. +- Reset translation tarballs: use only packaged translations. + ------------------------------------------------------------------- Tue May 6 23:37:37 CEST 2014 - sbrabec@suse.cz diff --git a/translation-update-upstream.spec b/translation-update-upstream.spec index fc9a5e7..d78f1e1 100644 --- a/translation-update-upstream.spec +++ b/translation-update-upstream.spec @@ -17,7 +17,7 @@ Name: translation-update-upstream -Version: 20130214 +Version: 20140905 Release: 0 Summary: Tool for Translation Update from Upstream License: GPL-2.0+ @@ -122,8 +122,8 @@ rm -fv $RPM_BUILD_ROOT%{_datadir}/%{name}/po/*/en_IGID.po # short form of these locales should be used rm -fv $RPM_BUILD_ROOT%{_datadir}/%{name}/po/*/my_MM.po # these are nonsenses -rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib-networking/master.po -rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib20/glib.glib-2-30.gu.po +#rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib-networking/master.po +#rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib20/glib.glib-2-30.gu.po # # go through valid locales and fail in invalid ones # diff --git a/upstream-collect.sh b/upstream-collect.sh index 218a70a..305ca5a 100644 --- a/upstream-collect.sh +++ b/upstream-collect.sh @@ -149,6 +149,7 @@ done export PATH=~/.upstream-collect.tmp:$PATH +# FIXME: Even in incremental mode, we should drop all updates that generate empty update file after the run. These files are obsolete, included into package, and may even degrade translation quality. if $INCREMENTAL ; then # more tarballs are available => use the latest one # FIXME: Fix 20090213.10 < 20090213.9 @@ -559,10 +560,11 @@ for TLST in *.tlst ; do OLD_UPDATE=false PLURAL_FAILURE=false if test -f $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO ; then - if $WORK_DIR/msgheadermerge $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO $PO ${PO%.po}-uheader.po --mergemode --continue ; then + if ! $WORK_DIR/msgheadermerge $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO $PO ${PO%.po}-uheader.po --mergemode --continue ; then echo >>$WORK_DIR/upstream-collect.log "package=$PACKAGE domain=$DOMAIN gettext-package=$REAL_DOMAIN repository=$REPO directory=$RPMPODIR branch=${BRANCH:(default)} po=$PO: old po file, skipping fixes" OLD_UPDATE=true fi + # FIXME: There could be an exotic case, where obsolete update adds new strings that contain plurals, and plural number changed. In such case, exclusion of updates may cause plural clash. In such case we have to validate additions only with the new or old plural-form header, and if both fails, skip additions as well. (bnc#894913) msgcat --force-po --use-first ${PO%.po}-uheader.po ${PO%.po}-backport.po~ $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO -o ${PO%.po}-upstream.po if ! validate_po_with_plural_check ${PO%.po}-upstream.po ; then if $PLURAL_FAILURE ; then