changeset 24d2acd6e3d0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=24d2acd6e3d0 description: merge
diffstat: po/ru.po | 2 +- po/uk.po | 6 +----- src/conversation_textview.py | 5 +++-- 3 files changed, 5 insertions(+), 8 deletions(-) diffs (46 lines): diff -r d7429cc0a605 -r 24d2acd6e3d0 po/ru.po --- a/po/ru.po Sun Mar 06 22:10:18 2011 +0100 +++ b/po/ru.po Sun Mar 06 22:18:28 2011 +0100 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-03-06 17:04+0300\n" -"PO-Revision-Date: 2011-03-06 17:49+0300\n" +"PO-Revision-Date: 2011-03-06 23:31+0300\n" "Last-Translator: Fomin Denis <[email protected]>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" diff -r d7429cc0a605 -r 24d2acd6e3d0 po/uk.po --- a/po/uk.po Sun Mar 06 22:10:18 2011 +0100 +++ b/po/uk.po Sun Mar 06 22:18:28 2011 +0100 @@ -7130,14 +7130,10 @@ msgid "Open as _Link" msgstr "Відкрити як _посилання" -#: ../src/conversation_textview.py:1308 -msgid "Yesterday" -msgstr "Вчора" - #. %i is day in year (1-365) #: ../src/conversation_textview.py:1311 #, python-format -msgid "%(nb_days)i day ago" +msgid "Yesterday" msgid_plural "%(nb_days)i days ago" msgstr[0] "%(nb_days)i день тому" msgstr[1] "%(nb_days)i днi тому" diff -r d7429cc0a605 -r 24d2acd6e3d0 src/conversation_textview.py --- a/src/conversation_textview.py Sun Mar 06 22:10:18 2011 +0100 +++ b/src/conversation_textview.py Sun Mar 06 22:18:28 2011 +0100 @@ -1306,8 +1306,9 @@ day_str = '' else: #%i is day in year (1-365) - day_str = i18n.ngettext('Yesterday', '%(nb_days)i days ago', - diff_day, replace_plural={'nb_days': diff_day}) + day_str = i18n.ngettext('Yesterday', + '%(nb_days)i days ago', diff_day, {'nb_days': diff_day}, + {'nb_days': diff_day}) if day_str: format_ += day_str + ' ' timestamp_str = gajim.config.get('time_stamp') _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
