Bug#307681: [INTL: ru_RU] Updated russian translation

2005-05-06 Thread Christian Perrier
Quoting Daniel Burrows ([EMAIL PROTECTED]):

   At the moment I've been ignoring the .po file updates when merging between 
 branches, because they cause lots of conflicts that I can't figure out how to 
 resolve.  Would it work to just copy the .po files directly between branches 
 and then run msgmerge?  (i.e., not try to get svn to merge them)


Unless you have had translators already sending you updates especially
targeted at 0.3, then, yes, you can just pick up files from the stable
branch.

One better solution (in case someone has updated his/her file in 0.3)
would be:

(0.2 files in ~/tmp/0.2, current directory is po/ from 0.3):

for i in *po ; do
  msgcat --use-first $i ~/tmp/0.2/$i $i.new
  msgmerge -U $i.new aptitude.pot
  mv $i.new $i
done

The advantage here is that you give some priority to existing
translations in 0.3 over the translations for the same string in 0.2,
but keep translations of both in the resulting PO file.





Bug#307681: [INTL: ru_RU] Updated russian translation

2005-05-05 Thread Christian Perrier
tags 307681 pending
thanks

Quoting Yuri Kozlov ([EMAIL PROTECTED]):
 Package: aptitude
 Version: 0.2.15.8-1
 Severity: wishlist
 Tags: patch l10n
 
 Please include attached updated russian translation.


I have commited it in the stable branch. There's not guarantee that it
will make it to sarge because of the freeze though. But, anyway, this
update will be used as a base when Daniel will switch to 0.3 versions.




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#307681: [INTL: ru_RU] Updated russian translation

2005-05-05 Thread Daniel Burrows
On Thursday 05 May 2005 03:50 am, Christian Perrier wrote:
 I have commited it in the stable branch. There's not guarantee that it
 will make it to sarge because of the freeze though. But, anyway, this
 update will be used as a base when Daniel will switch to 0.3 versions.

  At the moment I've been ignoring the .po file updates when merging between 
branches, because they cause lots of conflicts that I can't figure out how to 
resolve.  Would it work to just copy the .po files directly between branches 
and then run msgmerge?  (i.e., not try to get svn to merge them)

  Daniel

-- 
/--- Daniel Burrows [EMAIL PROTECTED] --\
|You know you've been sitting in front of your Lisp machine too long|
|when you go out to the junk food machine and start wondering how to|
|make it give you the CADR of Item H so you can get that yummie |
|chocolate cupcake that's stuck behind the disgusting vanilla one.  |
\- Does your computer have Super Cow Powers? --- http://www.debian.org -/


pgpxq2pMV7PzB.pgp
Description: PGP signature


Bug#307681: [INTL: ru_RU] Updated russian translation

2005-05-04 Thread Yuri Kozlov
Package: aptitude
Version: 0.2.15.8-1
Severity: wishlist
Tags: patch l10n

Please include attached updated russian translation.

-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.11.7
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)

Versions of packages aptitude depends on:
ii  apt [libapt-pkg-libc6.3-5-3 0.5.28.1 Advanced front-end for dpkg
ii  libc6   2.3.2.ds1-20 GNU C Library: Shared libraries an
ii  libgcc1 1:3.4.3-12   GCC support library
ii  libncurses5 5.4-4Shared libraries for terminal hand
ii  libsigc++-1.2-5c102 1.2.5-4  type-safe Signal Framework for C++
ii  libstdc++5  1:3.3.5-8The GNU Standard C++ Library v3

-- no debconf information


aptitude_ru.po.gz
Description: Binary data