fpdb/pyfpdb/locale/ru
Steffen Schaumburg 28dead2905 Merge branch 'next'
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/locale/de/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/es/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/fpdb-de_DE.po
	pyfpdb/locale/fpdb-en_GB.pot
	pyfpdb/locale/fpdb-es_ES.po
	pyfpdb/locale/fpdb-fr_FR.po
	pyfpdb/locale/fpdb-hu_HU.po
	pyfpdb/locale/fpdb-it_IT.po
	pyfpdb/locale/fpdb-pl_PL.po
	pyfpdb/locale/fpdb-pt_BR.po
	pyfpdb/locale/fpdb-ru_RU.po
	pyfpdb/locale/fpdb-zh_CN.po
	pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/it/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/pl/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/pt/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/ru/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/zh/LC_MESSAGES/fpdb.mo
2011-04-10 19:14:20 +02:00
..
LC_MESSAGES Merge branch 'next' 2011-04-10 19:14:20 +02:00