merge

po/ru.po

@@ -13,7 +13,7 @@ msgstr ""
 "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 <fominde@mail.ru>\n"
 "Language-Team: Linux Support LLC\n"
 "Language: ru\n"

po/uk.po

@@ -7130,14 +7130,10 @@ msgstr "Пошук у _Тенетах"
 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 тому"

src/conversation_textview.py

@@ -1306,8 +1306,9 @@ class ConversationTextview(gobject.GObject):
             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')