~ubuntu-branches/ubuntu/natty/pytrainer/natty-proposed

« back to all changes in this revision

Viewing changes to locale/ru/LC_MESSAGES/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2010-02-04 06:07:11 UTC
  • mfrom: (4.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100204060711-25n5aw66w5egeiph
Tags: 1.7.1-1ubuntu1
* Merge from debian testing, remaining changes:
  - debian/control:
    + Replace Depends on iceweasel with firefox | abrowser.
    + Bump python-dev,debhelper build-dependencies.
    - Drop dependency on python-glade2 (libglade -> gtkbuilder transition).
  - debian/rules:
    + Append --install-laoyut=deb to setup.py install to prevent a build
      failure with Python 2.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
        msgfmt pytrainer_ru.po -o ./pytrainer.mo
3
3
 
4
4
merge:
5
 
        msgmerge pytrainer_ru.po pytrainer_ru.pot > pytrainer_ru.po.tmp
 
5
        msgmerge pytrainer_ru.po pytrainer_ru.po_new > pytrainer_ru.po.tmp
6
6
        mv pytrainer_ru.po.tmp pytrainer_ru.po
7
 
        
 
7
        rm pytrainer_ru.po_new