Hello community,
here is the log from the commit of package gnome-patch-translation
checked in at Fri Nov 7 15:09:23 CET 2008.
--------
--- GNOME/gnome-patch-translation/gnome-patch-translation.changes 2008-10-22 14:40:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-patch-translation/gnome-patch-translation.changes 2008-11-04 19:16:45.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 4 19:14:00 CET 2008 - sbrabec@suse.cz
+
+- Package updating tools reworked and migrated to osc.
+- Updated pl, pt_BR.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gnome-patch-translation.conf
README
update-solve-upload-conflict
update-step1-update-translations-from-lcn
update-step2-update-strings-from-packages
update-step3-upload-strings-to-lcn
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-patch-translation.spec ++++++
--- /var/tmp/diff_new_pack.G32129/_old 2008-11-07 15:09:11.000000000 +0100
+++ /var/tmp/diff_new_pack.G32129/_new 2008-11-07 15:09:11.000000000 +0100
@@ -23,15 +23,21 @@
Group: System/GUI/GNOME
AutoReqProv: on
Version: 0.1
-Release: 210
+Release: 211
Summary: Collect and Merge Translations From RPM Patches
Source: gnome-patch-translation-files.tar.bz2
Source1: gnome-patch-translation.tar.bz2
-Source2: HOWTO
+Source2: README
Source3: gnome-patch-translation-prepare
Source4: gnome-patch-translation-update
Source5: gnome-patch-translation-merge
Source6: HEADER.pot
+Source7: HOWTO
+Source8: update-step1-update-translations-from-lcn
+Source9: update-step2-update-strings-from-packages
+Source10: update-step3-upload-strings-to-lcn
+Source11: update-solve-upload-conflict
+Source12: gnome-patch-translation.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: intltool
BuildArch: noarch
@@ -64,11 +70,14 @@
%files
%defattr(-,root,root)
-%doc HOWTO
+%doc README
%{_bindir}/*
%{_datadir}/gnome-patch-translation
%changelog
+* Tue Nov 04 2008 sbrabec@suse.cz
+- Package updating tools reworked and migrated to osc.
+- Updated pl, pt_BR.
* Wed Oct 22 2008 sbrabec@suse.cz
- Updated da, de, en_US, es, gl, hr, hu, it, ja, km, ko, nb, nl,
pl, pt_BR, ro, uk, wa, zh_CN.
++++++ gnome-patch-translation.conf ++++++
# gnome-patch-translation.conf: Configuration for
# updating of gnome-patch-translation package.
#
# URI of Novell Forge SVN LCN repository.
# It should contain string "$BRANCH", which will be replaced by the
# $LCN_BRANCH (see below).
FORGESVN_URI='https://forgesvn1.novell.com/svn/suse-i18n/$BRANCH/lcn'
# lcn branch on forgesvn
LCN_BRANCH=trunk
# osc repository with packages
OSC_REPOSITORY=openSUSE:Factory
# list of packages in gnome-patch-translation project
GPT_PACKAGES="gnome-control-center gconf-editor gdm gedit gnome-applets gnome-menus gnome-panel gnome-session gnome-utils gnome-vfs2 gtk gtk2 metacity nautilus xchat"
# osc server, empty for using of the osc default
OSC_APIURL=
++++++ gnome-patch-translation.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-patch-translation/pl.po new/gnome-patch-translation/pl.po
--- old/gnome-patch-translation/pl.po 2008-10-08 19:26:03.000000000 +0200
+++ new/gnome-patch-translation/pl.po 2008-10-25 11:08:00.000000000 +0200
@@ -9,8 +9,8 @@
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-08 12:40+0200\n"
-"PO-Revision-Date: 2008-09-10 12:20+0100\n"
-"Last-Translator: Piotr Krakowiak \n"
+"PO-Revision-Date: 2008-10-23 11:51+0100\n"
+"Last-Translator: Przemysław Bojczuk \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -491,11 +491,11 @@
#: nautilus/libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
msgid "Desktop files (*.desktop) which appear in this directory will be shown on the user's desktop. System administrators can use this feature to define desktop shortcuts which appear for users."
-msgstr ""
+msgstr "Pliki *.desktop zawarte w tym katalou pojawią się na pulpicie użytkownika. Administratorzy mogą je wykorzystywać do określania skrótów, które będą dostępne dla użytkowników."
#: nautilus/libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
msgid "Directory for storing predefined desktop items"
-msgstr ""
+msgstr "Katalog do przechowywania predefiniowanych elementów pulpitu."
#: nautilus/libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
msgid "Disable context menus in file views"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-patch-translation/pt_BR.po new/gnome-patch-translation/pt_BR.po
--- old/gnome-patch-translation/pt_BR.po 2008-10-11 04:44:43.000000000 +0200
+++ new/gnome-patch-translation/pt_BR.po 2008-11-03 03:22:34.000000000 +0100
@@ -3,13 +3,14 @@
# Translation of SuSE patches included in gnome-patch-translation.
#
# Luiz Fernando Ranghetti , 2008.
+# Luiz Fernando Ranghetti , 2008.
msgid ""
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-08 12:40+0200\n"
-"PO-Revision-Date: 2008-10-10 23:12-0300\n"
-"Last-Translator: Luiz Fernando Ranghetti \n"
+"PO-Revision-Date: 2008-11-02 23:25-0200\n"
+"Last-Translator: Luiz Fernando Ranghetti \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -126,15 +127,15 @@
#: gnome-applets-2.0/modemlights/modemlights.schemas.in.h:15
msgid "Status connected color"
-msgstr "Cor do estado conectado"
+msgstr "Cor do status conectado"
#: gnome-applets-2.0/modemlights/modemlights.schemas.in.h:16
msgid "Status not connected color"
-msgstr "Cor do estado não conectado"
+msgstr "Cor do status não conectado"
#: gnome-applets-2.0/modemlights/modemlights.schemas.in.h:17
msgid "Status waiting connection color"
-msgstr "Cor do estado de espera de conexão"
+msgstr "Cor do status de espera de conexão"
#: gnome-applets-2.0/modemlights/modemlights.schemas.in.h:18
msgid "Text background color"
@@ -158,15 +159,15 @@
#: gnome-applets-2.0/modemlights/modemlights.schemas.in.h:23
msgid "The color used to display the status button when the modem is connected."
-msgstr "A cor usada para exibir o botão de estado quando o modem está conectado."
+msgstr "A cor usada para exibir o botão de status quando o modem está conectado."
#: gnome-applets-2.0/modemlights/modemlights.schemas.in.h:24
msgid "The color used to display the status button when the modem is connecting."
-msgstr "A cor usada para exibir o botão de estado quando o modem está se conectando."
+msgstr "A cor usada para exibir o botão de status quando o modem está se conectando."
#: gnome-applets-2.0/modemlights/modemlights.schemas.in.h:25
msgid "The color used to display the status button when the modem is not connected."
-msgstr "A cor usada para exibir o botão de estado quando o modem não está conectado."
+msgstr "A cor usada para exibir o botão de status quando o modem não está conectado."
#: gnome-applets-2.0/modemlights/modemlights.schemas.in.h:26
msgid "The color used to indicate that data has been received."
@@ -276,7 +277,7 @@
#: gnome-applets-2.0/modemlights/properties.c:593
msgid "Connection Status"
-msgstr "Estado da conexão"
+msgstr "Status da conexão"
#: gnome-applets-2.0/modemlights/properties.c:601
msgid "Co_nnected:"
++++++ HOWTO ++++++
--- /var/tmp/diff_new_pack.G32129/_old 2008-11-07 15:09:13.000000000 +0100
+++ /var/tmp/diff_new_pack.G32129/_new 2008-11-07 15:09:13.000000000 +0100
@@ -1,79 +1,73 @@
-This package is intended for collection of translation strings in
-patches and merging translations back to packages.
+scripts for gnome-patch-translation maintainers
+===============================================
-It works only with packages using intltool for translation.
+HOW TO UPDATE TRANSLATIONS
-It contains:
+Scripts for gnome-patch-translation package maintainers are intended to
+update package from forge, then update translations from latest package
+shapshots and then merge them back to forge.
-gnome-patch-translation-prepare: This tool collects strings from
-intact package.
+Note that in difference to all other packages, gnome-patch-translation
+provides fuzzy strings from upstream translations not present in the po
+file.
-gnome-patch-translation-update: Using previously collected strings, this
-tool:
-- Collects actual strings in patches into gnome-patch-translation/
- sub-directory in build directory.
-- Prepares fuzzy translations for existing translations.
- (only if COMPENDIUM_UPDATE_MODE=1)
-- Updates actual translations in po/ using translations from
- gnome-patch-translation package.
+These scripts are intended to be started from inside directory
+containing unpacked sources of gnome-patch-translation. Please also see
+HOWTO in gnome-patch-translation sources.
-gnome-patch-translation-files.tar.bz2: Files created by
-COMPENDIUM_UPDATE_MODE=1 gnome-patch-translation-update collected from
-all needed packages.
-gnome-patch-translation.tar.bz2: Translation files provided by
-translators.
+Run scripts in following order:
-gnome-patch-translation-merged and /usr/share/gnome-patch-translation
-(autogenerated): It contains merged files, which will be used for
-translation. These files should be sent to translators for update.
+./update-step1-update-translations-from-lcn (calls gnome-patch-translation-from-forge):
+Collects translations from LCN and updates gnome-patch-translation.tar.bz2.
-HOW TO PREPARE PACKAGE FOR TRANSLATION
-1) Search for candidates on unpacked source packages:
-( find -name '*patch*' ; find -name '*dif*' ) | xargs fgrep '_("' | less | grep ':[+-]' | less
+./update-step2-update-strings-from-packages (calls gnome-patch-translation-collect):
-2) Include selected packages to gnome-patch-translation.
+Collects strings in patches.
-You have to do following changes in the spec file:
+You need following special tools: osc svn
- ...
-+BuildRequires: gnome-patch-translation
- ...
- %prep
- %setup
-+gnome-patch-translation-prepare
- ...
- %patch
- ...
-+gnome-patch-translation-update
-3) You have to update gnome-patch-translation package, if any
-translatable string is changed in any patch.
+./update-step3-upload-strings-to-lcn (calls gnome-patch-translation-to-forge):
-Call %prep phase of the package, copy contents of
-gnome-patch-translation/ to the gnome-patch-translation package, file
-gnome-patch-translation-files.tar.bz2.
+Picks updated translations and fuzzy files and puts them back to forge.
-4) See Novell Forge LCN repository and update
-gnome-patch-translation-collect from translation collection tools:
-https://forgesvn1.novell.com/svn/suse-i18n/trunk/lcn/50-tools
+After successful call please call
+./update-step1-update-translations-from-lcn
-HOW TO PROVIDE TRANSLATIONS
+once again.
-See Novell Forge LCN repository for more:
-https://forgesvn1.novell.com/svn/suse-i18n
-If you plan to update translations, you should use Novell Forge LCN
-translation tools.
-https://forgesvn1.novell.com/svn/suse-i18n/trunk/lcn/50-tools
-After using tools, submit updated package for Factory.
+If gnome-patch-translation-to-forge fails due to third party commits
+during gnome-patch-translation-collect run, run script:
-Tools performs following steps:
+./update-solve-upload-conflict
+
+Then you can continue with
+
+./update-step3-upload-strings-to-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
+changes and you will have to check manually, which changes were provided
+by translators.
+
+
+After using tools, submit updated packages!
+
+
+DETAILS
+
+Tools perform following steps for you:
1) Collect all files created by COMPENDIUM_UPDATE_MODE=1
gnome-patch-translation-update in all included packages. They are picked
@@ -82,7 +76,7 @@
2) Use upper mentioned files to update
gnome-patch-translation-files.tar.bz2
-3) Build this package (it is enough to unpack archives and call
+3) Prepare this package (it is enough to unpack archives and call
"sh gnome-patch-translation-merge").
4a) If there is not yet any translation for particular language, pick
++++++ README ++++++
This package is intended for collection of translation strings in
patches and merging translations back to packages.
It works only with packages using intltool for translation.
It contains:
gnome-patch-translation-prepare: This tool collects strings from
intact package.
gnome-patch-translation-update: Using previously collected strings, this
tool:
- Collects actual strings in patches into gnome-patch-translation/
sub-directory in build directory.
- Prepares fuzzy translations for existing translations.
(only if COMPENDIUM_UPDATE_MODE=1)
- Updates actual translations in po/ using translations from
gnome-patch-translation package.
gnome-patch-translation-files.tar.bz2: Files created by
COMPENDIUM_UPDATE_MODE=1 gnome-patch-translation-update collected from
all needed packages.
gnome-patch-translation.tar.bz2: Translation files provided by
translators.
gnome-patch-translation-merged and /usr/share/gnome-patch-translation
(autogenerated): It contains merged files, which will be used for
translation. These files should be sent to translators for update.
HOW TO PREPARE PACKAGE FOR TRANSLATION
1) Search for candidates on unpacked source packages:
( find -name '*patch*' ; find -name '*dif*' ) | xargs fgrep '_("' | less | grep ':[+-]' | less
2) Include selected packages to gnome-patch-translation.
You have to do following changes in the spec file:
...
+BuildRequires: gnome-patch-translation
...
%prep
%setup
+gnome-patch-translation-prepare
...
%patch
...
+gnome-patch-translation-update
3) You have to update gnome-patch-translation package, if any
translatable string is changed in any patch.
Call %prep phase of the package, copy contents of
gnome-patch-translation/ to the gnome-patch-translation package, file
gnome-patch-translation-files.tar.bz2.
4) See Novell Forge LCN repository and update
gnome-patch-translation-collect from translation collection tools:
https://forgesvn1.novell.com/svn/suse-i18n/trunk/lcn/50-tools
HOW TO PROVIDE TRANSLATIONS
See HOWTO in this package source.
See Novell Forge LCN repository for more:
https://forgesvn1.novell.com/svn/suse-i18n
++++++ update-solve-upload-conflict ++++++
#!/bin/bash
# Fail on errors:
set -e
if ! test -x 50-tools/gnome-patch-translation-collect ; then
echo "ERROR: 50-tools/gnome-patch-translation-collect is missing.
Please call update-step1-update-translations-from-lcn."
exit 1
fi
. gnome-patch-translation.conf
export CALLING_FROM_G_P_T=1
export FORGESVN_URI LCN_BRANCH OSC_REPOSITORY GPT_PACKAGES OSC_APIURL
# And then run needed scripts:
50-tools/gnome-patch-translation-from-forge
exec 50-tools/gnome-patch-translation-remerge
++++++ update-step1-update-translations-from-lcn ++++++
#!/bin/bash
# Fail on errors:
set -e
# Read the config?
. gnome-patch-translation.conf
BRANCH=$LCN_BRANCH
# First of all, read set of update tools from SVN:
eval svn co $FORGESVN_URI/50-tools
export CALLING_FROM_G_P_T=1
export FORGESVN_URI LCN_BRANCH OSC_REPOSITORY GPT_PACKAGES OSC_APIURL
# And then run gnome-patch-translation-from-forge
exec 50-tools/gnome-patch-translation-from-forge
++++++ update-step2-update-strings-from-packages ++++++
#!/bin/bash
# Fail on errors:
set -e
if ! test -x 50-tools/gnome-patch-translation-collect ; then
echo "ERROR: 50-tools/gnome-patch-translation-collect is missing.
Please call update-step1-update-translations-from-lcn."
exit 1
fi
export CALLING_FROM_G_P_T=1
# And then run gnome-patch-translation-collect
exec 50-tools/gnome-patch-translation-collect
++++++ update-step3-upload-strings-to-lcn ++++++
#!/bin/bash
# Fail on errors:
set -e
if ! test -x 50-tools/gnome-patch-translation-collect ; then
echo "ERROR: 50-tools/gnome-patch-translation-collect is missing.
Please call update-step1-update-translations-from-lcn."
exit 1
fi
export CALLING_FROM_G_P_T=1
# And then run gnome-patch-translation-to-forge
exec 50-tools/gnome-patch-translation-to-forge
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org