copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge

Browse source
This commit is contained in:
Yann Leboulanger 2011-03-06 22:18:28 +01:00
parent 0aefaa1fd3
commit f0c59893ed
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
po/ru.po
View file

@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: ru\n" "Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-06 17:04+0300\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 <fominde@mail.ru>\n" "Last-Translator: Fomin Denis <fominde@mail.ru>\n"
"Language-Team: Linux Support LLC\n" "Language-Team: Linux Support LLC\n"
"Language: ru\n" "Language: ru\n"

6
po/uk.po
View file

@ -7130,14 +7130,10 @@ msgstr "Пошук у _Тенетах"
msgid "Open as _Link" msgid "Open as _Link"
msgstr "Відкрити як _посилання" msgstr "Відкрити як _посилання"
#: ../src/conversation_textview.py:1308
msgid "Yesterday"
msgstr "Вчора"
#. %i is day in year (1-365) #. %i is day in year (1-365)
#: ../src/conversation_textview.py:1311 #: ../src/conversation_textview.py:1311
#, python-format #, python-format
msgid "%(nb_days)i day ago" msgid "Yesterday"
msgid_plural "%(nb_days)i days ago" msgid_plural "%(nb_days)i days ago"
msgstr[0] "%(nb_days)i день тому" msgstr[0] "%(nb_days)i день тому"
msgstr[1] "%(nb_days)i днi тому" msgstr[1] "%(nb_days)i днi тому"

5
src/conversation_textview.py
View file

@ -1306,8 +1306,9 @@ class ConversationTextview(gobject.GObject):
day_str = '' day_str = ''
else: else:
#%i is day in year (1-365) #%i is day in year (1-365)
day_str = i18n.ngettext('Yesterday', '%(nb_days)i days ago', day_str = i18n.ngettext('Yesterday',
diff_day, replace_plural={'nb_days': diff_day}) '%(nb_days)i days ago', diff_day, {'nb_days': diff_day},
{'nb_days': diff_day})
if day_str: if day_str:
format_ += day_str + ' ' format_ += day_str + ' '
timestamp_str = gajim.config.get('time_stamp') timestamp_str = gajim.config.get('time_stamp')