Commits

commits@gajim.org

17632 discussions

gajim: Disable last message correction for commands. Fixes #7405
by Denis Fomin 11 Aug '13

11 Aug '13

changeset d3f08a194726 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d3f08a194726 description: Disable last message correction for commands. Fixes #7405 diffstat: src/chat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r bd347c3e27dc -r d3f08a194726 src/chat_control.py --- a/src/chat_control.py Sun Aug 04 19:17:55 2013 +0400 +++ b/src/chat_control.py Sun Aug 04 22:08:41 2013 +0400 @@ -1402,7 +1402,8 @@ self.orig_msg = msg_buf.get_text(start_iter, end_iter, 0).decode( 'utf-8') if pos == size and size > 0 and direction == 'up' and \ - msg_type == 'sent' and not self.correcting: + msg_type == 'sent' and not self.correcting and not \ + history[pos - 1].startswith('/'): self.correcting = True self.old_message_tv_color = self.msg_textview.get_style().base[0] self.msg_textview.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(

1 0

gajim: [mrDoctorWhо and Darlan] Fix day and time in RTL message....
by Denis Fomin 11 Aug '13

11 Aug '13

changeset 7b1dfd3b79d5 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7b1dfd3b79d5 description: [mrDoctorWhо and Darlan] Fix day and time in RTL message. see #7284 diffstat: src/conversation_textview.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r d3f08a194726 -r 7b1dfd3b79d5 src/conversation_textview.py --- a/src/conversation_textview.py Sun Aug 04 22:08:41 2013 +0400 +++ b/src/conversation_textview.py Tue Aug 06 23:42:02 2013 +0400 @@ -1302,7 +1302,7 @@ if kind == 'status': direction_mark = i18n.direction_mark if current_print_time == 'always' and kind != 'info' and not simple: - timestamp_str = self.get_time_to_show(tim) + timestamp_str = self.get_time_to_show(tim, direction_mark) timestamp = time.strftime(timestamp_str, tim) timestamp = direction_mark + timestamp buffer_.insert_with_tags_by_name(end_iter, timestamp, @@ -1318,7 +1318,7 @@ ft = self.fc.fuzzy_time(gajim.config.get('print_time_fuzzy'), tim) tim_format = ft.decode(locale.getpreferredencoding()) else: - tim_format = self.get_time_to_show(tim) + tim_format = self.get_time_to_show(tim, direction_mark) buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n', 'time_sometimes') # If there's a displaymarking, print it here. @@ -1373,7 +1373,7 @@ self.just_cleared = False buffer_.end_user_action() - def get_time_to_show(self, tim): + def get_time_to_show(self, tim, direction_mark=''): """ Get the time, with the day before if needed and return it. It DOESN'T format a fuzzy time @@ -1392,7 +1392,7 @@ '%(nb_days)i days ago', diff_day, {'nb_days': diff_day}, {'nb_days': diff_day}) if day_str: - format_ += day_str + ' ' + format_ += i18n.direction_mark + day_str + direction_mark + ' ' timestamp_str = gajim.config.get('time_stamp') timestamp_str = helpers.from_one_line(timestamp_str) format_ += timestamp_str

1 0

gajim: [Darlan] Fix typo
by Denis Fomin 11 Aug '13

11 Aug '13

changeset 06865db4b935 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=06865db4b935 description: [Darlan] Fix typo diffstat: src/groupchat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 7b1dfd3b79d5 -r 06865db4b935 src/groupchat_control.py --- a/src/groupchat_control.py Tue Aug 06 23:42:02 2013 +0400 +++ b/src/groupchat_control.py Tue Aug 06 00:27:15 2013 +0400 @@ -2191,8 +2191,8 @@ # Ask for a reason dialogs.DoubleInputDialog(_('Destroying %s') % u'\u200E' + \ - self.room_jid, _('You are going to definitively destroy this \ - room.\nYou may specify a reason below:'), + self.room_jid, _('You are going to definitively destroy this ' + 'room.\nYou may specify a reason below:'), _('You may also enter an alternate venue:'), ok_handler=on_ok) def _on_bookmark_room_menuitem_activate(self, widget):

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 11 Aug '13

11 Aug '13

changeset 6d42112b1340 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=6d42112b1340 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 979 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 493 insertions(+), 486 deletions(-) diffs (truncated from 2925 to 300 lines): diff -r 06865db4b935 -r 6d42112b1340 po/he.po --- a/po/he.po Tue Aug 06 00:27:15 2013 +0400 +++ b/po/he.po Tue Aug 06 00:29:15 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-26 08:32+0300\n" -"PO-Revision-Date: 2013-07-26 09:49+0200\n" +"POT-Creation-Date: 2013-08-05 13:08+0300\n" +"PO-Revision-Date: 2013-08-05 13:15+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -202,8 +202,8 @@ #: ../src/config.py:1315 ../src/config.py:1418 ../src/config.py:1733 #: ../src/config.py:1738 ../src/config.py:2314 ../src/config.py:2393 #: ../src/config.py:2406 ../src/config.py:3682 ../src/config.py:3757 -#: ../src/dialogs.py:313 ../src/dialogs.py:315 ../src/dialogs.py:521 -#: ../src/dialogs.py:534 ../src/roster_window.py:3148 +#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 +#: ../src/dialogs.py:536 ../src/roster_window.py:3148 #: ../src/roster_window.py:3154 ../src/roster_window.py:3159 msgid "None" msgstr "ללא" @@ -213,14 +213,14 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3466 -#: ../src/dialogs.py:3512 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3509 +#: ../src/dialogs.py:3555 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3470 -#: ../src/dialogs.py:3567 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3513 +#: ../src/dialogs.py:3610 msgid "Delete" msgstr "מחיקה" @@ -402,7 +402,7 @@ #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 -#: ../src/common/contacts.py:135 ../src/dialogs.py:113 ../src/dialogs.py:125 +#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127 #: ../src/roster_window.py:3090 ../src/roster_window.py:4220 #: ../src/roster_window.py:5843 msgid "General" @@ -551,7 +551,7 @@ #: ../data/gui/accounts_window.ui.h:67 #: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1856 -#: ../src/dialogs.py:839 +#: ../src/dialogs.py:841 msgid "Jabber ID:" msgstr "מזהה Jabber:" @@ -904,95 +904,91 @@ msgid "Show a list of emoticons (Alt+M)" msgstr "הצגת רשימת רגשונים (Alt+M)" -#: ../data/gui/chat_control.ui.h:2 ../data/gui/groupchat_control.ui.h:2 -msgid "Show a list of formattings" -msgstr "הצגת רשימת עיצובים" +#: ../data/gui/chat_control.ui.h:2 +msgid "Add this contact to roster (Ctrl+D)" +msgstr "הוספת איש קשר זה לרשימה (Ctrl+D)" #: ../data/gui/chat_control.ui.h:3 -msgid "Add this contact to roster (Ctrl+D)" -msgstr "הוספת איש קשר זה אל רשימה (Ctrl+D)" - -#: ../data/gui/chat_control.ui.h:4 msgid "Invite contacts to the conversation (Ctrl+G)" msgstr "הזמנת אנשי קשר אל הדיון (Ctrl+G)" -#: ../data/gui/chat_control.ui.h:5 +#: ../data/gui/chat_control.ui.h:4 msgid "View contact information (Ctrl+I)" msgstr "צפייה במידע איש קשר (Ctrl+I)" -#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:6 +#: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6 msgid "Browse the chat history (Ctrl+H)" msgstr "עיון בהיסטוריית השיחה (Ctrl+H)" # תפקודיות -#: ../data/gui/chat_control.ui.h:7 ../data/gui/groupchat_control.ui.h:7 +#: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7 msgid "Show advanced functions (Alt+D)" msgstr "הצגת פקדים מתקדמים (Alt+D)" -#: ../data/gui/chat_control.ui.h:8 +#: ../data/gui/chat_control.ui.h:7 msgid "#" msgstr "" -#: ../data/gui/chat_control.ui.h:9 ../data/gui/groupchat_control.ui.h:8 +#: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8 #: ../data/gui/single_message_window.ui.h:6 msgid "Send message" msgstr "שליחת הודעה" #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) -#: ../data/gui/chat_control.ui.h:11 ../data/gui/groupchat_control.ui.h:10 +#: ../data/gui/chat_control.ui.h:10 ../data/gui/groupchat_control.ui.h:10 #: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 msgid "_Send" msgstr "_שלח" +#: ../data/gui/chat_control.ui.h:11 +msgid "1" +msgstr "" + #: ../data/gui/chat_control.ui.h:12 -msgid "1" -msgstr "" - -#: ../data/gui/chat_control.ui.h:13 #, fuzzy msgid "2" msgstr "2 (דהו)" -#: ../data/gui/chat_control.ui.h:14 +#: ../data/gui/chat_control.ui.h:13 #, fuzzy msgid "3" msgstr "3 (אבג)" -#: ../data/gui/chat_control.ui.h:15 +#: ../data/gui/chat_control.ui.h:14 #, fuzzy msgid "4" msgstr "4 (מנ)" -#: ../data/gui/chat_control.ui.h:16 +#: ../data/gui/chat_control.ui.h:15 #, fuzzy msgid "5" msgstr "5 (יכל)" -#: ../data/gui/chat_control.ui.h:17 +#: ../data/gui/chat_control.ui.h:16 #, fuzzy msgid "6" msgstr "6 (זחט)" -#: ../data/gui/chat_control.ui.h:18 +#: ../data/gui/chat_control.ui.h:17 #, fuzzy msgid "7" msgstr "7 (רשת)" -#: ../data/gui/chat_control.ui.h:19 +#: ../data/gui/chat_control.ui.h:18 #, fuzzy msgid "8" msgstr "8 (צק)" -#: ../data/gui/chat_control.ui.h:20 +#: ../data/gui/chat_control.ui.h:19 #, fuzzy msgid "9" msgstr "9 (סעפ)" -#: ../data/gui/chat_control.ui.h:21 +#: ../data/gui/chat_control.ui.h:20 msgid "*" msgstr "" -#: ../data/gui/chat_control.ui.h:22 ../data/gui/single_message_window.ui.h:3 +#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3 msgid "0" msgstr "" @@ -1235,10 +1231,10 @@ msgid "_Continue" msgstr "ה_משך" -#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3345 +#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3385 #: ../src/filetransfers_window.py:213 msgid "_Open Containing Folder" -msgstr "_פתיחת תיקיה מכילה" +msgstr "_פתח תיקיה מכילה" #: ../data/gui/gajim_themes_window.ui.h:1 msgid "Account row" @@ -1276,11 +1272,11 @@ msgid "Font style:" msgstr "סגנון גופן:" -#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1090 +#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1088 msgid "Bold" msgstr "מובלט" -#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1091 +#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1089 msgid "Italic" msgstr "נטוי" @@ -1405,6 +1401,10 @@ msgid "_Add to Roster" msgstr "הו_סף אל רשימה" +#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1759 +msgid "Show a list of formattings" +msgstr "הצגת רשימת עיצובים" + #: ../data/gui/groupchat_control.ui.h:3 msgid "Change your nickname (Ctrl+N)" msgstr "שינוי שם כינוי (Ctrl+N)" @@ -1495,6 +1495,7 @@ msgid "Search:" msgstr "חיפוש:" +# יום _נבחר #: ../data/gui/history_window.ui.h:6 msgid "_In date search" msgstr "חפש בתוך _תאריך" @@ -1574,7 +1575,7 @@ msgid "require" msgstr "דרוש" -#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2399 +#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2401 msgid "Join Group Chat" msgstr "הצטרף אל שיחת קבוצה" @@ -1615,7 +1616,7 @@ msgid "Bro_wse Rooms" msgstr "_עיון ברשימת חדרים" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3380 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3420 #: ../src/disco.py:1392 ../src/disco.py:1843 msgid "_Join" msgstr "_כנס" @@ -1800,7 +1801,7 @@ #: ../data/gui/preferences_window.ui.h:1 msgid "Use default applications" -msgstr "שימוש ביישומים משתמטים" +msgstr "השתמש ביישומים משתמטים" #: ../data/gui/preferences_window.ui.h:2 msgid "Custom" @@ -1921,11 +1922,11 @@ #: ../data/gui/preferences_window.ui.h:26 msgid "in _roster" -msgstr "ב_רשימה" +msgstr "בתוך _רשימה" #: ../data/gui/preferences_window.ui.h:27 msgid "in _group chats" -msgstr "ב_שיחות קבוצה" +msgstr "בתוך _שיחות קבוצה" # <b>Roster Display</b> #: ../data/gui/preferences_window.ui.h:28 @@ -2006,11 +2007,11 @@ #: ../data/gui/preferences_window.ui.h:43 msgid "Notify me about contacts that sign _in" -msgstr "הודע לי אודות אנשי קשר אשר ת_חברים" +msgstr "הודע לי אודות אנשי קשר אשר מת_חברים" #: ../data/gui/preferences_window.ui.h:44 msgid "Notify me about contacts that sign _out" -msgstr "הודע לי אודות אנשי קשר אשר ת_נתקים" +msgstr "הודע לי אודות אנשי קשר אשר מת_נתקים" #: ../data/gui/preferences_window.ui.h:45 msgid "" @@ -2024,10 +2025,9 @@ msgid "Allow popup/notifications when I'm _away/na/busy/invisible" msgstr "התר התראות מוקפצות כאשר אני במצב נעדר/_לא זמין/עסוק/בלתי נראה" -# הודע לי #: ../data/gui/preferences_window.ui.h:47 msgid "Notify on new _GMail email" -msgstr "הודע אודות _דוא״ל GMail חדש" +msgstr "הודע על _דוא״ל GMail חדש" # BUG: a dot at the end # דרך @@ -2036,7 +2036,7 @@ "If checked, Gajim will show a notification when a new e-mail is received via " "GMail" msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יציג התראה כאשר דוא״ל חדש מתקבל באמצעות GMail" +"במידה ואפשרות זו מסומנת, Gajim יציג התראה כאשר דוא״ל חדש מתקבל דרך GMail"

1 0

gajim: [Darlan] Pep information in tooltip as table. Fixes #7401
by Denis Fomin 11 Aug '13

11 Aug '13

changeset 35ded4fbc86d in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=35ded4fbc86d description: [Darlan] Pep information in tooltip as table. Fixes #7401 diffstat: src/tooltips.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (27 lines): diff -r 6d42112b1340 -r 35ded4fbc86d src/tooltips.py --- a/src/tooltips.py Tue Aug 06 00:29:15 2013 +0400 +++ b/src/tooltips.py Thu Aug 08 01:07:10 2013 +0400 @@ -709,19 +709,19 @@ """ if 'mood' in contact.pep: mood = contact.pep['mood'].asMarkupText() - properties.append((_("Mood: %s") % mood, None)) + properties.append((_('Mood: '), "%s" % mood, None)) if 'activity' in contact.pep: activity = contact.pep['activity'].asMarkupText() - properties.append((_("Activity: %s") % activity, None)) + properties.append((_('Activity: '), "%s" % activity, None)) if 'tune' in contact.pep: tune = contact.pep['tune'].asMarkupText() - properties.append((_("Tune: %s") % tune, None)) + properties.append((_('Tune: '), "%s" % tune, None)) if 'location' in contact.pep: location = contact.pep['location'].asMarkupText() - properties.append((_("Location: %s") % location, None)) + properties.append((_('Location: '), "%s" % location, None)) class FileTransfersTooltip(BaseTooltip):

1 0

gajim: Update russian translation
by Denis Fomin 11 Aug '13

11 Aug '13

changeset 8a6903d2e685 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8a6903d2e685 description: Update russian translation diffstat: po/ru.po | 5637 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 3111 insertions(+), 2526 deletions(-) diffs (truncated from 10373 to 300 lines): diff -r 35ded4fbc86d -r 8a6903d2e685 po/ru.po --- a/po/ru.po Thu Aug 08 01:07:10 2013 +0400 +++ b/po/ru.po Thu Aug 08 01:41:24 2013 +0400 @@ -12,17 +12,18 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-15 14:27+0400\n" -"PO-Revision-Date: 2012-11-15 14:56+0300\n" -"Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" +"POT-Creation-Date: 2013-08-08 01:12+0400\n" +"PO-Revision-Date: 2013-08-08 01:38+0300\n" +"Last-Translator: Fomin Denis <fominde(a)gmail.com>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Basepath: /home/test/gajim\n" -"X-Generator: Virtaal 0.6.1\n" +"X-Generator: Poedit 1.5.4\n" #: ../data/gui/account_context_menu.ui.h:1 #: ../data/gui/zeroconf_context_menu.ui.h:1 @@ -33,13 +34,11 @@ msgid "_Personal Events" msgstr "_Расширенный статус" -#: ../data/gui/account_context_menu.ui.h:3 -#: ../data/gui/roster_window.ui.h:3 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 msgid "_Start Chat..." msgstr "_Начать беседу..." -#: ../data/gui/account_context_menu.ui.h:4 -#: ../data/gui/roster_window.ui.h:5 +#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." msgstr "Войти в _комнату..." @@ -47,8 +46,7 @@ msgid "_Add Contact..." msgstr "_Добавить контакт..." -#: ../data/gui/account_context_menu.ui.h:6 -#: ../data/gui/roster_window.ui.h:7 +#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "_Просмотреть сервисы" @@ -182,27 +180,14 @@ msgstr "_Закончить" #: ../data/gui/account_creation_wizard_window.ui.h:30 -#: ../data/gui/accounts_window.ui.h:1 -#: ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1254 -#: ../src/config.py:1268 -#: ../src/config.py:1273 -#: ../src/config.py:1321 -#: ../src/config.py:1424 -#: ../src/config.py:1739 -#: ../src/config.py:1744 -#: ../src/config.py:2320 -#: ../src/config.py:2399 -#: ../src/config.py:2412 -#: ../src/config.py:3698 -#: ../src/config.py:3773 -#: ../src/dialogs.py:313 -#: ../src/dialogs.py:315 -#: ../src/dialogs.py:521 -#: ../src/dialogs.py:534 -#: ../src/roster_window.py:3214 -#: ../src/roster_window.py:3220 -#: ../src/roster_window.py:3225 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 +#: ../src/config.py:1248 ../src/config.py:1262 ../src/config.py:1267 +#: ../src/config.py:1315 ../src/config.py:1418 ../src/config.py:1733 +#: ../src/config.py:1738 ../src/config.py:2314 ../src/config.py:2393 +#: ../src/config.py:2406 ../src/config.py:3682 ../src/config.py:3757 +#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 +#: ../src/dialogs.py:536 ../src/roster_window.py:3148 +#: ../src/roster_window.py:3154 ../src/roster_window.py:3159 msgid "None" msgstr "Нет" @@ -211,28 +196,24 @@ msgstr "Учётные записи" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3426 -#: ../src/dialogs.py:3472 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3509 +#: ../src/dialogs.py:3555 msgid "Add" msgstr "Добавить" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3430 -#: ../src/dialogs.py:3527 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3513 +#: ../src/dialogs.py:3610 msgid "Delete" msgstr "Удалить" #. Rename -#: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5844 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5793 msgid "Re_name" msgstr "П_ереименовать" #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 -#: ../data/gui/xml_console_window.ui.h:3 +#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 msgid "_Enable" msgstr "_Включить" @@ -241,30 +222,36 @@ msgstr "Анонимная аутентификация" #: ../data/gui/accounts_window.ui.h:8 -msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "Ресурс отправляется Jabber серверу для того, чтобы различать два и более клиентов с одинаковой учетной записью, подключенных к одному и тому же серверу. Таким образом, вы можете одновременно подключиться к одному серверу с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет получать все события. (См. ниже)" +msgid "" +"Resource is sent to the Jabber server in order to separate the same JID in " +"two or more parts depending on the number of the clients connected in the " +"same server with the same account. So you might be connected in the same " +"account with resource 'Home' and 'Work' at the same time. The resource which " +"has the highest priority will get the events. (see below)" +msgstr "" +"Ресурс отправляется Jabber серверу для того, чтобы различать два и более " +"клиентов с одинаковой учетной записью, подключенных к одному и тому же " +"серверу. Таким образом, вы можете одновременно подключиться к одному серверу " +"с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет " +"получать все события. (См. ниже)" #. No configured account -#: ../data/gui/accounts_window.ui.h:9 -#: ../data/gui/roster_window.ui.h:1 -#: ../data/gajim.desktop.in.in.h:1 -#: ../src/common/helpers.py:1168 -#: ../src/common/helpers.py:1180 -#: ../src/notify.py:316 -#: ../src/notify.py:339 -#: ../src/notify.py:389 -#: ../src/notify.py:405 +#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1 +#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168 +#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339 +#: ../src/notify.py:389 ../src/notify.py:405 msgid "Gajim" msgstr "Gajim" #: ../data/gui/accounts_window.ui.h:10 #, fuzzy msgid "Synchronize contacts" -msgstr "Объединить контакты" +msgstr "Заблокированные контакты" #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" -msgstr "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи" +msgstr "" +"Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" @@ -279,8 +266,15 @@ msgstr "Административные операции" #: ../data/gui/accounts_window.ui.h:15 -msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" -msgstr "Приоритет используется в Jabber для определения того, кто будет получать события от jabber сервера когда подсоединены два и более клиента с одной и той же учетной записью. Клиент с наибольшим приоритетом будет получать события" +msgid "" +"Priority is used in Jabber to determine who gets the events from the jabber " +"server when two or more clients are connected using the same account; The " +"client with the highest priority gets the events" +msgstr "" +"Приоритет используется в Jabber для определения того, кто будет получать " +"события от jabber сервера когда подсоединены два и более клиента с одной и " +"той же учетной записью. Клиент с наибольшим приоритетом будет получать " +"события" #: ../data/gui/accounts_window.ui.h:16 msgid "A_djust to status" @@ -309,7 +303,7 @@ #: ../data/gui/accounts_window.ui.h:26 #, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Сертификат отклонен" +msgstr "Недействительный сертификат" #: ../data/gui/accounts_window.ui.h:27 msgid "Client certificate" @@ -325,8 +319,12 @@ msgstr "_Соединяться при запуске Gajim" #: ../data/gui/accounts_window.ui.h:30 -msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" -msgstr "Если отмечено, Gajim после запуска будет автоматически подсоединяться к jabber серверу с использованием этой учетной записи" +msgid "" +"If checked, Gajim, when launched, will automatically connect to jabber using " +"this account" +msgstr "" +"Если отмечено, Gajim после запуска будет автоматически подсоединяться к " +"jabber серверу с использованием этой учетной записи" #: ../data/gui/accounts_window.ui.h:31 msgid "Auto-reconnect when connection is lost" @@ -341,29 +339,35 @@ msgstr "Син_хронизировать статус учетной записи с глобальным статусом" #: ../data/gui/accounts_window.ui.h:34 -msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" -msgstr "Если отмечено, то любые изменения глобального статуса (управляемого из выпадающего списка внизу окна ростера) повлекут за собой изменение статуса этой учетной записи" +msgid "" +"If checked, any change to the global status (handled by the combobox at the " +"bottom of the roster window) will change the status of this account " +"accordingly" +msgstr "" +"Если отмечено, то любые изменения глобального статуса (управляемого из " +"выпадающего списка внизу окна ростера) повлекут за собой изменение статуса " +"этой учетной записи" #: ../data/gui/accounts_window.ui.h:35 msgid "Use file transfer proxies" msgstr "Использовать прокси для передачи файла" #: ../data/gui/accounts_window.ui.h:36 -msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working." -msgstr "Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение к вашему, так что передача файла имеет больше шансов на успех." +msgid "" +"If checked, Gajim will also broadcast some more IPs except from just your " +"IP, so file transfer has higher chances of working." +msgstr "" +"Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение " +"к вашему, так что передача файла имеет больше шансов на успех." #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:37 -#: ../data/gui/preferences_window.ui.h:46 -#: ../src/common/contacts.py:135 -#: ../src/dialogs.py:113 -#: ../src/dialogs.py:125 -#: ../src/roster_window.py:3156 -#: ../src/roster_window.py:4284 -#: ../src/roster_window.py:5894 +#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 +#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127 +#: ../src/roster_window.py:3090 ../src/roster_window.py:4220 +#: ../src/roster_window.py:5843 msgid "General" msgstr "Общие" @@ -371,8 +375,7 @@ msgid "_use HTTP__PROXY environment variable" msgstr "_использовать переменную HTTP_PROXY" -#: ../data/gui/accounts_window.ui.h:39 -#: ../data/gui/preferences_window.ui.h:137 +#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:133 msgid "_Manage..." msgstr "_Управление..." @@ -386,16 +389,24 @@ msgstr "_Предупреждать перед использованием незащищенного соединения" #: ../data/gui/accounts_window.ui.h:42 -msgid "Check this so Gajim will ask you before sending your password over an insecure connection." -msgstr "Если отмечено, то Gajim будет спрашивать вас перед отправкой пароля через незащищенное соединение." +msgid "" +"Check this so Gajim will ask you before sending your password over an " +"insecure connection." +msgstr "" +"Если отмечено, то Gajim будет спрашивать вас перед отправкой пароля через " +"незащищенное соединение." #: ../data/gui/accounts_window.ui.h:43 msgid "Send _keep-alive packets" msgstr "Отправлять _пинг" #: ../data/gui/accounts_window.ui.h:44 -msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" -msgstr "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва соединения по таймауту" +msgid "" +"If checked, Gajim will send keep-alive packets to prevent connection timeout " +"which results in disconnection" +msgstr "" +"Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва " +"соединения по таймауту"

1 0

gajim: fix more bidi things
by Yann Leboulanger 11 Aug '13

11 Aug '13

changeset e71f24301e03 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e71f24301e03 description: fix more bidi things diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r c54f6c54987b -r e71f24301e03 src/conversation_textview.py --- a/src/conversation_textview.py Sun Aug 11 14:44:46 2013 +0200 +++ b/src/conversation_textview.py Thu Aug 01 22:53:48 2013 +0200 @@ -1448,7 +1448,8 @@ before_str = helpers.from_one_line(before_str) after_str = gajim.config.get('after_nickname') after_str = helpers.from_one_line(after_str) - format_ = direction_mark + before_str + name + after_str + ' ' + format_ = direction_mark + before_str + name + direction_mark + \ + after_str + ' ' buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) def print_subject(self, subject, iter_=None):

1 0

gajim: fix direction mark
by Yann Leboulanger 11 Aug '13

11 Aug '13

changeset 2ccef393f0bd in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=2ccef393f0bd description: fix direction mark diffstat: src/gajim.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r e71f24301e03 -r 2ccef393f0bd src/gajim.py --- a/src/gajim.py Thu Aug 01 22:53:48 2013 +0200 +++ b/src/gajim.py Fri Aug 02 11:44:15 2013 +0200 @@ -208,8 +208,8 @@ if os.name == 'nt': warnings.filterwarnings(action='ignore') -if Gtk.Widget.get_default_direction() == Gtk.TextDirection.LTR: - i18n.direction_mark = '\u200E' +if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: + i18n.direction_mark = '\u200F' pritext = '' from common import exceptions

1 0

gajim: Disable last message correction for commands. Fixes #7405
by Denis Fomin 11 Aug '13

11 Aug '13

changeset 30ab0f36e90b in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=30ab0f36e90b description: Disable last message correction for commands. Fixes #7405 diffstat: src/chat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 2ccef393f0bd -r 30ab0f36e90b src/chat_control.py --- a/src/chat_control.py Fri Aug 02 11:44:15 2013 +0200 +++ b/src/chat_control.py Sun Aug 04 22:08:41 2013 +0400 @@ -1437,7 +1437,8 @@ end_iter = msg_buf.get_end_iter() self.orig_msg = msg_buf.get_text(start_iter, end_iter, False) if pos == size and size > 0 and direction == 'up' and \ - msg_type == 'sent' and not self.correcting: + msg_type == 'sent' and not self.correcting and not \ + history[pos - 1].startswith('/'): self.correcting = True context = self.msg_textview.get_style_context() state = Gtk.StateFlags.NORMAL

1 0

gajim: [mrDoctorWhо and Darlan] Fix day and time in RTL message....
by Denis Fomin 11 Aug '13

11 Aug '13

changeset c787695f609d in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c787695f609d description: [mrDoctorWhо and Darlan] Fix day and time in RTL message. see #7284 diffstat: src/conversation_textview.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r 30ab0f36e90b -r c787695f609d src/conversation_textview.py --- a/src/conversation_textview.py Sun Aug 04 22:08:41 2013 +0400 +++ b/src/conversation_textview.py Tue Aug 06 23:42:02 2013 +0400 @@ -1319,7 +1319,7 @@ if kind == 'status': direction_mark = i18n.direction_mark if current_print_time == 'always' and kind != 'info' and not simple: - timestamp_str = self.get_time_to_show(tim) + timestamp_str = self.get_time_to_show(tim, direction_mark) timestamp = time.strftime(timestamp_str, tim) timestamp = direction_mark + timestamp if other_tags_for_time: @@ -1338,7 +1338,7 @@ ft = self.fc.fuzzy_time(gajim.config.get('print_time_fuzzy'), tim) tim_format = ft.decode(locale.getpreferredencoding()) else: - tim_format = self.get_time_to_show(tim) + tim_format = self.get_time_to_show(tim, direction_mark) buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n', 'time_sometimes') # If there's a displaymarking, print it here. @@ -1393,7 +1393,7 @@ self.just_cleared = False buffer_.end_user_action() - def get_time_to_show(self, tim): + def get_time_to_show(self, tim, direction_mark=''): """ Get the time, with the day before if needed and return it. It DOESN'T format a fuzzy time @@ -1412,7 +1412,7 @@ '%(nb_days)i days ago', diff_day, {'nb_days': diff_day}, {'nb_days': diff_day}) if day_str: - format_ += day_str + ' ' + format_ += i18n.direction_mark + day_str + direction_mark + ' ' timestamp_str = gajim.config.get('time_stamp') timestamp_str = helpers.from_one_line(timestamp_str) format_ += timestamp_str

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits