[opensuse-translation] How to merge files?
Hello my friends, I would like to ask you how to merge files. Example: There are 2 files here https://i18n.opensuse.org/stats/trunk/el/lcn/index.php I have an account to svn but I don't know how to do it. To commit files, I prefer to use GUI. So if there are commands, please let me know. Thanks for your help, Stathis -- http://www.iosifidis.gr http://linkedin.iosifidis.gr Great leaders don't tell you what to do...They show you how it's done. Power corrupts. Absolute power corrupts...absolutely. -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
On 2015-01-21 18:04, Efstathios Iosifidis wrote:
Hello my friends,
I would like to ask you how to merge files. Example: There are 2 files here https://i18n.opensuse.org/stats/trunk/el/lcn/index.php
There are a lot of files there. I don't understand what you want to do. The typical operation is to merge the original messages, in English, the .pot file, with the currently translated file, the .po file, in order to add new strings that the developers created (in the .pot file) This I do this way: msgmerge --previous --no-wrap --force-po -U $POFILE $POTFILE -- Cheers / Saludos, Carlos E. R. (from 13.1 x86_64 "Bottle" at Telcontar)
2015-01-21 22:11 GMT+02:00 Carlos E. R. <robin.listas@telefonica.net>:
On 2015-01-21 18:04, Efstathios Iosifidis wrote:
Hello my friends,
I would like to ask you how to merge files. Example: There are 2 files here https://i18n.opensuse.org/stats/trunk/el/lcn/index.php
There are a lot of files there. I don't understand what you want to do.
The typical operation is to merge the original messages, in English, the .pot file, with the currently translated file, the .po file, in order to add new strings that the developers created (in the .pot file)
This I do this way:
msgmerge --previous --no-wrap --force-po -U $POFILE $POTFILE
Thank you Carlos. I'll try it. Well the 2 files that show me need merge is opensuse-org.el.po and zypper.el.po Take care, Stathis -- http://www.iosifidis.gr http://linkedin.iosifidis.gr Great leaders don't tell you what to do...They show you how it's done. Power corrupts. Absolute power corrupts...absolutely. -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2015-01-21 21:25, Efstathios Iosifidis wrote:
2015-01-21 22:11 GMT+02:00 Carlos E. R. <>:
msgmerge --previous --no-wrap --force-po -U $POFILE $POTFILE
Thank you Carlos. I'll try it. Well the 2 files that show me need merge is opensuse-org.el.po and zypper.el.po
Ah, I understand. But notice that you are looking at "trunk", not 13.2. I do that in a script, which is setup for Spanish (es): +++—-—-—-—-—-—-—-—-—-—-—-—-—- #!/bin/bash F=`basename $1 .po` FF=`basename $F .es` POFILE=$FF.es.po POTFILE=../../50-pot/$FF.pot echo "$POFILE and $POTFILE" if test -f $POFILE -a -f $POTFILE; then echo Applying msgmerge to $POFILE #msgmerge --previous --no-wrap --force-po -U $POFILE -C ../../50-memory/memory.es.po $POTFILE msgmerge --previous --no-wrap --force-po -U $POFILE $POTFILE msgfmt --check --stat $POFILE rm messages.mo else echo "Not found: " $POFILE or $POTFILE fi || { echo "msgmerge --no-wrap --force-po for \"$POTFILE\" failed" ; } —-—-—-—-—-—-—-—-—-—-—-—-—-++- This is because I have the tree of files downloaded from the svn, which has this structure: +++—-—-—-—-—-—-—-—-—-—-—-—-—- cer@Telcontar:~/Projects/babel/SuSE/branches/openSUSE-13_2-Branch> tree -d . |-- lcn | |-- 50-etc | |-- 50-html | | |-- help-boot | | `-- help-install | |-- 50-memory | |-- 50-pot | |-- 50-tools | `-- es | `-- po <========= |-- lokalize-scripts |-- packages | |-- 50-etc | |-- 50-pot | |-- 50-tools | `-- es | `-- po <========= `-- yast |-- 50-doc |-- 50-memory |-- 50-pot |-- 50-proof |-- 50-tools `-- es |-- package `-- po <========= —-—-—-—-—-—-—-—-—-—-—-—-—-++- This results from downloading that tree directly from the svn, and uploading to it. The above script is run with the current directory marked with the arrow. For you, with just two files, it is easier to just download those 4, the 2 po and the 2 pot, and do it manually. The problem becomes now how to upload them... - -- Cheers / Saludos, Carlos E. R. (from 13.1 x86_64 "Bottle" at Telcontar) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlTA9TcACgkQtTMYHG2NR9UiYQCeOZYnu6RgsT6mhmMfYvFL0tzi fq0An0QuVOMv4PORcqj2PrNlle/LQIdy =G6Ks -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
Hello Stathis, Did you already resolve successfully your problem? I recently started working on Slovak language and I also have some files marked for merge (1 in yast, 5 in lcn). Best regards Ferdinand -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
Hello, So I finally managed to solve it myself. Example is for https://svn.opensuse.org/svn/opensuse-i18n/trunk/yast/sk/po/installation.sk.... 1. Downloaded installation.pot template from https://svn.opensuse.org/svn/opensuse-i18n/trunk/yast/50-pot/ 2. Merged installation.pot with installation.sk.po in Lokalize and the final file saved like installation.sk.po 3. Made a commit of installation.sk.po Ferdinand 2015-01-30 7:04 GMT+01:00 Ferdinand Galko <galko.ferdinand@gmail.com>:
Hello Stathis,
Did you already resolve successfully your problem?
I recently started working on Slovak language and I also have some files marked for merge (1 in yast, 5 in lcn).
Best regards
Ferdinand -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
Hello Ferdinand, Yesterday I did the same thing. It works as you described. /S 2015-01-31 7:13 GMT+02:00 Ferdinand Galko <galko.ferdinand@gmail.com>:
Hello,
So I finally managed to solve it myself.
Example is for https://svn.opensuse.org/svn/opensuse-i18n/trunk/yast/sk/po/installation.sk....
1. Downloaded installation.pot template from https://svn.opensuse.org/svn/opensuse-i18n/trunk/yast/50-pot/ 2. Merged installation.pot with installation.sk.po in Lokalize and the final file saved like installation.sk.po 3. Made a commit of installation.sk.po
Ferdinand
2015-01-30 7:04 GMT+01:00 Ferdinand Galko <galko.ferdinand@gmail.com>:
Hello Stathis,
Did you already resolve successfully your problem?
I recently started working on Slovak language and I also have some files marked for merge (1 in yast, 5 in lcn).
Best regards
Ferdinand -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
-- http://www.iosifidis.gr http://linkedin.iosifidis.gr Great leaders don't tell you what to do...They show you how it's done. Power corrupts. Absolute power corrupts...absolutely. -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2015-01-31 06:13, Ferdinand Galko wrote:
2. Merged installation.pot with installation.sk.po in Lokalize and the final file saved like installation.sk.po
I forgot that lokalize can merge. - -- Cheers / Saludos, Carlos E. R. (from 13.1 x86_64 "Bottle" at Telcontar) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlTM44UACgkQtTMYHG2NR9V/JgCfbcBit65j5w4fPM/AdnBKSpjP csgAni/mUPvLQsIcWDXj4CnGwnlU7d+k =3D3J -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
Lørdag den 31. januar 2015 15:15:35 skrev Carlos E. R.:
On 2015-01-31 06:13, Ferdinand Galko wrote:
2. Merged installation.pot with installation.sk.po in Lokalize and the final file saved like installation.sk.po
I forgot that lokalize can merge.
And in my experience it's less picky about it than msgmerge. So I also prefer to use the Lokalize sync feature for the job. -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
participants (5)
-
Carlos E. R. -
Carlos E. R. -
Efstathios Iosifidis -
Ferdinand Galko -
Martin Schlander