diff --git a/HEADER.pot b/HEADER.pot index ec9ce71..6dbd99b 100644 --- a/HEADER.pot +++ b/HEADER.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-03-08 20:14+0100\n" +"POT-Creation-Date: 2009-10-27 18:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/HOWTO b/HOWTO index f5588a0..e24084c 100644 --- a/HOWTO +++ b/HOWTO @@ -4,8 +4,8 @@ scripts for gnome-patch-translation maintainers HOW TO UPDATE TRANSLATIONS Scripts for gnome-patch-translation package maintainers are intended to -update package from LCN, then update translations from latest package -shapshots and then merge them back to LCN. +update package from forge, then update translations from latest package +shapshots and then merge them back to forge. Note that in difference to all other packages, gnome-patch-translation provides fuzzy strings from upstream translations not present in the po @@ -19,7 +19,7 @@ HOWTO in gnome-patch-translation sources. Run scripts in following order: -./update-step1-update-translations-from-lcn (calls gnome-patch-translation-from-lcn): +./update-step1-update-translations-from-lcn (calls gnome-patch-translation-from-forge): Collects translations from LCN and updates gnome-patch-translation.tar.bz2. @@ -40,9 +40,9 @@ Return back, press Ctrl+Q and the tool will continue with sources you need. -./update-step3-upload-strings-to-lcn (calls gnome-patch-translation-to-lcn): +./update-step3-upload-strings-to-lcn (calls gnome-patch-translation-to-forge): -Picks updated translations and fuzzy files and puts them back to LCN. +Picks updated translations and fuzzy files and puts them back to forge. After successful call please call @@ -52,7 +52,7 @@ once again. -If gnome-patch-translation-to-lcn fails due to third party commits +If gnome-patch-translation-to-forge fails due to third party commits during gnome-patch-translation-collect run, run script: ./update-solve-upload-conflict @@ -63,7 +63,7 @@ Then you can continue with -gnome-patch-translation-from-lcn: +gnome-patch-translation-from-forge: You can optionally repeat its run to merge new strings to the package. If you will not do it, next changelog checker will consider files as diff --git a/README b/README index 47c5339..8aad893 100644 --- a/README +++ b/README @@ -3,8 +3,6 @@ patches and merging translations back to packages. It works only with packages that can use intltool for translation. - - It contains: gnome-patch-translation-prepare: This tool collects strings from @@ -31,29 +29,6 @@ gnome-patch-translation-merged and /usr/share/gnome-patch-translation translation. These files are sent to translators by the update process. -THE WORK FLOW SUMMARY: - -Update of gnome-patch-translation string is done manually. You need to -check-out gnome-patch-translation source package and read HOWTO. The -package contains update script wrappers. Update scripts themselves -reside in LCN SVN and they are downloaded during the update run. - -1. Package with gnome-patch-translation infrastructure is checked-in. -2. Package is added to gnome-patch-translation.conf in - gnome-patch-translation package and in LCN SVN. -3. Next time of update-strings-from-packages (in gnome-patch-translation - sources), strings are collected. -4. After run of upload-strings-to-lcn (in gnome-patch-translation - sources), pot files (and string proposals) are uploaded to the LCN - SVN. -5. Translators need some time to pick new pot file and complete - translations. -6. Next time of update-translations-from-lcn (in gnome-patch-translation - sources), translations appear in gnome-patch-translation. -7. gnome-patch-translation is checked-in, packages are recompiled and - translations will appear in its place. -8. Next translation round everything repeats from step 3. - HOW TO PREPARE PACKAGE FOR TRANSLATION diff --git a/gnome-patch-translation-files.tar.bz2 b/gnome-patch-translation-files.tar.bz2 index c2e6efd..ab54906 100644 --- a/gnome-patch-translation-files.tar.bz2 +++ b/gnome-patch-translation-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21a5dcb6d5a4a030d75b99ef11c333d69a4a444a53b2586dc295278ae0661216 -size 150714 +oid sha256:30b74df6f8899395f384518df07fd5cd9ddff047e6fbaba4ba821310599f40f2 +size 111014 diff --git a/gnome-patch-translation-update b/gnome-patch-translation-update index 0692cbb..333f3a0 100644 --- a/gnome-patch-translation-update +++ b/gnome-patch-translation-update @@ -51,9 +51,10 @@ if test "$COMPENDIUM_UPDATE_MODE" = 1 ; then done echo "=================================================================" echo " Translatable strings from patches were written to" - echo " gnome-patch-translation/. If you did any translatable string" - echo " change in any patch, please follow HOWTO in" - echo " gnome-patch-translation package source." + echo " gnome-patch-translation/. If you did any translabable string" + echo " change in any patch, please copy contents of this directory" + echo " to the gnome-patch-translation package, file" + echo " gnome-patch-translation-files.tar.bz2." echo "=================================================================" else echo " Skipping compendium update. Use COMPENDIUM_UPDATE_MODE=1 to force it." diff --git a/gnome-patch-translation.changes b/gnome-patch-translation.changes index bda4e12..b637712 100644 --- a/gnome-patch-translation.changes +++ b/gnome-patch-translation.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Mon Mar 8 20:29:20 CET 2010 - sbrabec@suse.cz - -- Updated gl, lt, pt_BR, ro, wa, zh_TW. -- Updated list of packages with patches. -- Updated strings from the latest Factory (19 new strings). -- LCN migrated to Berlios. - ------------------------------------------------------------------- Thu Oct 29 17:12:00 CET 2009 - sbrabec@suse.cz diff --git a/gnome-patch-translation.conf b/gnome-patch-translation.conf index eafe955..8bc4b82 100644 --- a/gnome-patch-translation.conf +++ b/gnome-patch-translation.conf @@ -2,22 +2,19 @@ # updating of gnome-patch-translation package. # -# Your account at Berlios. Empty means your local id. -NAME= - -# URI of LCN SVN repository. +# URI of Novell Forge SVN LCN repository. # It should contain string "$BRANCH_PATH", which will be replaced by the -# BRANCH path (see below) and may contain NAME, which will be replaced by user name above. -LCN_SVN_URI='https://$NAME@svn.berlios.de/svnroot/repos/opensuse-i18n/$BRANCH_PATH/lcn' +# BRANCH path (see below). +FORGESVN_URI='https://forgesvn1.novell.com/svn/suse-i18n/$BRANCH_PATH/lcn' -# lcn branch on LCN SVN +# lcn branch on forgesvn LCN_BRANCH=trunk -# osc repositories with packages (space separated list in parentheses, first takes precedence) -OSC_REPOSITORIES=( GNOME:Factory openSUSE:Factory ) +# osc repository with packages +OSC_REPOSITORY=openSUSE:Factory # list of packages in gnome-patch-translation project -GPT_PACKAGES="evolution gdm gnome-control-center gnome-panel gnome-session gnome-vfs2 gtk gtk2 nautilus xchat" +GPT_PACKAGES="bluez-gnome evolution gnome-control-center gconf-editor gdm gnome-applets gnome-menus gnome-panel gnome-session gnome-utils gnome-vfs2 gtk gtk2 libgnomesu metacity nautilus xchat" # osc server, empty for using of the osc default OSC_APIURL= diff --git a/gnome-patch-translation.spec b/gnome-patch-translation.spec index 054a048..f1d7d0a 100644 --- a/gnome-patch-translation.spec +++ b/gnome-patch-translation.spec @@ -22,8 +22,8 @@ Name: gnome-patch-translation License: GPL v2 or later Group: System/GUI/GNOME AutoReqProv: on -Version: 11.3 -Release: 0 +Version: 11.2 +Release: 3 Summary: Collect and Merge Translations From RPM Patches Source: gnome-patch-translation-files.tar.bz2 Source1: gnome-patch-translation.tar.bz2 diff --git a/gnome-patch-translation.tar.bz2 b/gnome-patch-translation.tar.bz2 index f31d3d7..0c28657 100644 --- a/gnome-patch-translation.tar.bz2 +++ b/gnome-patch-translation.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f4a64d3f26d5e4ddf6363d4b28f1ddc7cd65fc4488b659a88537c70869eb01c -size 359499 +oid sha256:549a1f974ca47d5edfe5771a522e21f473de6300a6aa77a2cb642492535a93f5 +size 354458 diff --git a/update-solve-upload-conflict b/update-solve-upload-conflict index 0b62be1..757d8b3 100644 --- a/update-solve-upload-conflict +++ b/update-solve-upload-conflict @@ -12,11 +12,8 @@ fi . ./gnome-patch-translation.conf export CALLING_FROM_G_P_T=1 -RPM_OSC_REPOSITORIES="${OSC_REPOSITORIES[*]}" -export LCN_SVN_URI LCN_BRANCH RPM_OSC_REPOSITORIES GPT_PACKAGES OSC_APIURL +export FORGESVN_URI LCN_BRANCH OSC_REPOSITORY GPT_PACKAGES OSC_APIURL -# Delete the old LCN snapshot. -rm -r LCN-${BRANCH//\//-} # And then run needed scripts: -50-tools/gnome-patch-translation-from-lcn +50-tools/gnome-patch-translation-from-forge exec 50-tools/gnome-patch-translation-remerge diff --git a/update-step1-update-translations-from-lcn b/update-step1-update-translations-from-lcn index 6757116..f68845f 100644 --- a/update-step1-update-translations-from-lcn +++ b/update-step1-update-translations-from-lcn @@ -11,16 +11,12 @@ if test "$BRANCH" = trunk ; then else BRANCH_PATH="branches/$BRANCH" fi -if test -z "$NAME" ; then - NAME="$USER" -fi # First of all, read set of update tools from SVN: -eval svn co $LCN_SVN_URI/50-tools +eval svn co $FORGESVN_URI/50-tools export CALLING_FROM_G_P_T=1 -RPM_OSC_REPOSITORIES="${OSC_REPOSITORIES[*]}" -export LCN_SVN_URI LCN_BRANCH RPM_OSC_REPOSITORIES GPT_PACKAGES OSC_APIURL +export FORGESVN_URI LCN_BRANCH OSC_REPOSITORY GPT_PACKAGES OSC_APIURL -# And then run gnome-patch-translation-from-lcn -exec 50-tools/gnome-patch-translation-from-lcn +# And then run gnome-patch-translation-from-forge +exec 50-tools/gnome-patch-translation-from-forge diff --git a/update-step3-upload-strings-to-lcn b/update-step3-upload-strings-to-lcn index 4a2640d..c2eaf6b 100644 --- a/update-step3-upload-strings-to-lcn +++ b/update-step3-upload-strings-to-lcn @@ -11,5 +11,5 @@ fi export CALLING_FROM_G_P_T=1 -# And then run gnome-patch-translation-to-lcn -exec 50-tools/gnome-patch-translation-to-lcn +# And then run gnome-patch-translation-to-forge +exec 50-tools/gnome-patch-translation-to-forge