Re: [opensuse-translation] How to merge files?

22 Jan 2015

      -----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