Commits

commits@gajim.org

17632 discussions

python-nbxmpp: add NS_MAM
by Yann Leboulanger 24 Jul '13

24 Jul '13

changeset a70202725728 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a70202725728 description: add NS_MAM diffstat: nbxmpp/protocol.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r f83863a0d5d4 -r a70202725728 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Mon Jul 22 17:07:31 2013 +0200 +++ b/nbxmpp/protocol.py Wed Jul 24 21:32:55 2013 +0200 @@ -101,6 +101,7 @@ NS_JINGLE_IBB = 'urn:xmpp:jingle:transports:ibb:1' # XEP-0261 NS_LAST = 'jabber:iq:last' NS_LOCATION = 'http://jabber.org/protocol/geoloc' # XEP-0080 +NS_MAM = 'urn:xmpp:mam:tmp' # XEP-0313 NS_MESSAGE = 'message' # Jabberd2 NS_MOOD = 'http://jabber.org/protocol/mood' # XEP-0107 NS_MUC = 'http://jabber.org/protocol/muc'

1 0

gajim: apply tags to puny encoded urls. Fixes #7391
by Yann Leboulanger 24 Jul '13

24 Jul '13

changeset 8b27ee155e34 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8b27ee155e34 description: apply tags to puny encoded urls. Fixes #7391 diffstat: src/conversation_textview.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r ffc9d25174bf -r 8b27ee155e34 src/conversation_textview.py --- a/src/conversation_textview.py Wed Jul 24 10:06:58 2013 +0200 +++ b/src/conversation_textview.py Wed Jul 24 12:39:07 2013 +0200 @@ -1234,7 +1234,11 @@ if 'url' in tags: puny_text = puny_encode(special_text) if not puny_text.endswith('-'): - buffer_.insert(end_iter, " (%s)" % puny_text) + puny_tags = [] + if use_other_tags: + puny_tags += other_tags + puny_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in puny_tags] + buffer_.insert_with_tags(end_iter, " (%s)" % puny_text, *puny_tags) def print_empty_line(self): buffer_ = self.tv.get_buffer()

1 0

gajim: more tooltips in chat control
by Yann Leboulanger 24 Jul '13

24 Jul '13

changeset ffc9d25174bf in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ffc9d25174bf description: more tooltips in chat control diffstat: data/gui/chat_control.ui | 168 +++++++++------------------------------------- src/chat_control.py | 2 +- 2 files changed, 36 insertions(+), 134 deletions(-) diffs (truncated from 783 to 300 lines): diff -r 18dad9eb4f83 -r ffc9d25174bf data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Jul 23 20:12:55 2013 +0400 +++ b/data/gui/chat_control.ui Wed Jul 24 10:06:58 2013 +0200 @@ -1,18 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <interface> -  - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">110</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - <property name="page_size">10</property> - </object> - <object class="GtkAdjustment" id="adjustment2"> - <property name="upper">110</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - <property name="page_size">10</property> - </object> + <requires lib="gtk+" version="2.16"/> +  <object class="GtkHBox" id="chat_control_hbox"> <property name="can_focus">True</property> <property name="spacing">1</property> @@ -20,6 +9,7 @@ <object class="GtkVBox" id="chat_control_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> + <property name="orientation">vertical</property> <property name="spacing">1</property> <child> <object class="GtkHPaned" id="hpaned1"> @@ -28,25 +18,21 @@ <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="left_padding">3</property> <property name="right_padding">3</property> <child> <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox3004"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="ypad">5</property> <property name="stock">gtk-missing-image</property> </object> @@ -60,98 +46,78 @@ <child> <object class="GtkVBox" id="banner_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">5</property> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">Contact name</property> <property name="use_markup">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> - <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> + <signal name="populate_popup" handler="on_banner_label_populate_popup"/> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">4</property> <child> <object class="GtkImage" id="mood_image"> - <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkImage" id="activity_image"> - <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkImage" id="tune_image"> - <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkEventBox" id="location_eventbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="location_image"> - <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> @@ -167,26 +133,20 @@ <child> <object class="GtkImage" id="audio_banner_image"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">4</property> </packing> </child> <child> <object class="GtkImage" id="video_banner_image"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">5</property> </packing> </child> @@ -194,14 +154,11 @@ <object class="GtkAlignment" id="alignment3"> <property name="width_request">11</property> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <placeholder/> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">6</property> </packing> </child> @@ -215,12 +172,10 @@ <child> <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">None</property> </object> </child> @@ -245,27 +200,26 @@ <child> <object class="GtkVBox" id="vbox106"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> <property name="can_focus">True</property> <property name="border_width">3</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <placeholder/> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkButton" id="authentication_button"> @@ -277,7 +231,6 @@ <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="lock_image"> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-dialog-authentication</property> <property name="icon-size">1</property> @@ -286,7 +239,6 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -303,43 +255,36 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="actions_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkButton" id="emoticons_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child>

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 23 Jul '13

23 Jul '13

changeset 18dad9eb4f83 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=18dad9eb4f83 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 78 ++++++++++++++++++++++++++++++++-------------------------------- 1 файлов изменено, 39 вставок(+), 39 удалений(-) различия (урезанные с 305 до 300 строк): diff -r 5cbc5b823ae9 -r 18dad9eb4f83 po/he.po --- a/po/he.po Tue Jul 23 19:56:36 2013 +0400 +++ b/po/he.po Tue Jul 23 20:12:55 2013 +0400 @@ -9,7 +9,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-19 09:31+0300\n" -"PO-Revision-Date: 2013-07-22 20:04+0200\n" +"PO-Revision-Date: 2013-07-23 18:46+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -304,7 +304,7 @@ # תשונה #: ../data/gui/accounts_window.ui.h:17 msgid "Priority will change automatically according to your status." -msgstr "העדיפות תשתנה אוטומטית בהתאם למצב חיבורך." +msgstr "העדיפות תשתנה אוטומטית בהתאם אל מצב החיבור שלך." #: ../data/gui/accounts_window.ui.h:18 msgid "Priori_ty:" @@ -3403,14 +3403,14 @@ #: ../src/chat_control.py:1927 #, python-format msgid "%(type)s state : %(state)s, reason: %(reason)s" -msgstr "‏%(type)s מצב : %(state)s, סיבה: %(reason)s" +msgstr "%(type)s מצב : %(state)s, סיבה: %(reason)s" # מן שיחת # מתוך שיחת #: ../src/chat_control.py:2118 #, python-format msgid "%(nickname)s from group chat %(room_name)s" -msgstr "‏%(nickname)s משיחת הקבוצה %(room_name)s" +msgstr "%(nickname)s משיחת הקבוצה %(room_name)s" # לא הוקצה מפתח OpenPGP #. No key assigned nor a key is used by remote contact @@ -3570,11 +3570,10 @@ "אין אפשרות לפענח הודעה מאת %s\n" "ייתכן כי הודעה זו נפגמה." -# See: LRE string PDF #: ../src/chat_control.py:3252 #, python-format msgid "%(name)s is now %(status)s" -msgstr "‏%(name)s מצוי/ה כעת במצב %(status)s " +msgstr "%(name)s מצוי/ה כעת במצב %(status)s" #: ../src/chat_control.py:3311 msgid "File transfer" @@ -3973,7 +3972,7 @@ #: ../src/common/commands.py:200 #, python-format msgid "%(nickname)s on %(room_jid)s" -msgstr "‏%(nickname)s בתוך החדר %(room_jid)s" +msgstr "%(nickname)s בחדר %(room_jid)s" #: ../src/common/commands.py:204 msgid "You have not joined a groupchat." @@ -4913,7 +4912,7 @@ "Priority will change automatically according to your status. Priorities are " "defined in autopriority_* options." msgstr "" -"עדיפות תשונה אוטומטית בהתאם למצב חיבורך. עדיפויות מוגדרות בתוך האפשרות " +"עדיפות תשונה אוטומטית בהתאם אל מצב החיבור שלך. עדיפויות מוגדרות בתוך האפשרות " "autopriority_*." #: ../src/common/config.py:340 @@ -5529,7 +5528,7 @@ # BUG: x2 #: ../src/common/connection.py:1262 ../src/gui_interface.py:542 msgid "Check your connection or try again later." -msgstr "בדוק את חיבורך או נסה שוב מאוחר יותר." +msgstr "בדוק את החיבור שלך או נסה שוב מאוחר יותר." #: ../src/common/connection.py:1267 #, python-format @@ -5591,7 +5590,7 @@ # BUG: x2 #: ../src/common/connection.py:1423 msgid "Check your connection or try again later" -msgstr "בדוק את חיבורך או נסה שוב מאוחר יותר" +msgstr "בדוק את החיבור שלך או נסה שוב מאוחר יותר" #: ../src/common/connection.py:1458 #, python-format @@ -5758,7 +5757,7 @@ #: ../src/common/connection_handlers_events.py:2200 #, python-format msgid "%(nickname)s: %(message)s" -msgstr "‏%(nickname)s: ‏%(message)s" +msgstr "" # [09:02:34 PM] Rodensky: "התקבלה הודעה מ" # [09:08:28 PM] Myself: אני חושב שזה: המסר נשלח על-ידי... @@ -5779,7 +5778,6 @@ msgid "New Message from %(nickname)s" msgstr "הודעה חדשה מאת %(nickname)s" -# ‏%(nick)s שינה/תה מצב #: ../src/common/connection_handlers_events.py:2352 #, python-format msgid "%(nick)s Changed Status" @@ -5790,7 +5788,7 @@ #: ../src/history_window.py:455 #, python-format msgid "%(nick)s is now %(status)s" -msgstr "‏%(nick)s מצוי/ה כעת במצב %(status)s " +msgstr "%(nick)s מצוי/ה כעת במצב %(status)s " #: ../src/common/connection_handlers_events.py:2359 ../src/dialogs.py:2844 #: ../src/notify.py:280 @@ -5800,7 +5798,7 @@ #: ../src/common/connection_handlers_events.py:2361 #, python-format msgid "%(nickname)s Signed In" -msgstr "‏%(nickname)s התחבר/ה" +msgstr "%(nickname)s התחבר/ה" #. default value #: ../src/common/connection_handlers_events.py:2366 ../src/dialogs.py:2828 @@ -5811,7 +5809,7 @@ #: ../src/common/connection_handlers_events.py:2368 #, python-format msgid "%(nickname)s Signed Out" -msgstr "‏%(nickname)s התנתק/ה" +msgstr "%(nickname)s התנתק/ה" #: ../src/common/connection_handlers_events.py:2373 ../src/dialogs.py:2830 #: ../src/notify.py:264 @@ -6221,25 +6219,25 @@ # מקשיב/ה #: ../src/common/helpers.py:361 msgid "is paying attention to the conversation" -msgstr "‪קשוב/ה לשיחה" +msgstr "קשוב/ה לשיחה" #: ../src/common/helpers.py:363 msgid "is doing something else" -msgstr "‪עושה משהו אחר" +msgstr "עושה משהו אחר" # מלחין/נה #: ../src/common/helpers.py:365 msgid "is composing a message..." -msgstr "‪כותב/ת הודעה..." +msgstr "כותב/ת הודעה..." #. paused means he or she was composing but has stopped for a while #: ../src/common/helpers.py:368 msgid "paused composing a message" -msgstr "‪פסק/ה מלהלחין הודעה" +msgstr "פסק/ה מלהלחין הודעה" #: ../src/common/helpers.py:370 msgid "has closed the chat window or tab" -msgstr "‪סגר/ה את כרטיסיית או את חלון השיחה" +msgstr "סגר/ה את כרטיסיית או את חלון השיחה" # גיבי בתים #. GiB means gibibyte @@ -7936,7 +7934,7 @@ #: ../src/conversation_textview.py:808 #, python-format msgid "_Actions for \"%s\"" -msgstr "_פעולות עבור ‏\"%s\"" +msgstr "_פעולות עבור \"%s\"" #: ../src/conversation_textview.py:821 msgid "Read _Wikipedia Article" @@ -8393,10 +8391,11 @@ # טופס #. prepare UI for Receiving #: ../src/dialogs.py:3100 -#, fuzzy, python-format +#, python-format msgid "Form %s" -msgstr "מאת ‏%s" - +msgstr "מאת %s" + +# Is there RE for Hebrew? #. we create a new blank window to send and we preset RE: and to jid #: ../src/dialogs.py:3184 #, python-format @@ -8463,7 +8462,7 @@ #: ../src/dialogs.py:3562 #, python-format msgid "%s suggested me to add you in my roster." -msgstr "‏%s הציע לי להוסיפך אל רשימתי." +msgstr "‏%s הציע לי להוסיף אותך אל הרשימה שלי." # נוספו #: ../src/dialogs.py:3576 @@ -8561,7 +8560,7 @@ #: ../src/dialogs.py:4500 #, python-format msgid "$Contact has invited you to group chat %(room_jid)s" -msgstr "‏$Contact הזמינך אל שיחת הקבוצה %(room_jid)s" +msgstr "‏$Contact הזמינך אל שיחת קבוצה %(room_jid)s" #: ../src/dialogs.py:4508 #, python-format @@ -9945,7 +9944,7 @@ #: ../src/groupchat_control.py:179 ../src/groupchat_control.py:1599 #, python-format msgid "%(nick)s is now known as %(new_nick)s" -msgstr "‏%(nick)s ידוע/ה כעת בכינוי %(new_nick)s" +msgstr "%(nick)s ידוע/ה כעת בכינוי %(new_nick)s" #: ../src/groupchat_control.py:234 msgid "Sending private message failed" @@ -9976,7 +9975,7 @@ #: ../src/groupchat_control.py:1257 #, python-format msgid "%(nick)s has set the subject to %(subject)s" -msgstr "הנושא הוגדר על ידי %(nick)s אל ‎%(subject)s" +msgstr "הנושא הוגדר על ידי %(nick)s אל %(subject)s" # Translated to: Any occupant to All of the occupants # כל נוכח מורשה/יורשה @@ -10050,7 +10049,7 @@ #: ../src/groupchat_control.py:1560 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" -msgstr "%(nick)s נבעט/ה על ידי %(who)s: ‏%(reason)s" +msgstr "%(nick)s נבעט/ה על ידי %(who)s: %(reason)s" #. do not print 'banned by None' #: ../src/groupchat_control.py:1569 @@ -10061,12 +10060,12 @@ #: ../src/groupchat_control.py:1572 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" -msgstr "%(nick)s נחסם/ה על ידי %(who)s: ‏%(reason)s" +msgstr "%(nick)s נחסם/ה על ידי %(who)s: %(reason)s" #: ../src/groupchat_control.py:1583 ../src/groupchat_control.py:1699 #, python-format msgid "You are now known as %s" -msgstr "הכינוי שלך החדש הוא %s" +msgstr "הכינוי החדש שלך הוא %s" # מן #: ../src/groupchat_control.py:1653 ../src/groupchat_control.py:1658 @@ -10183,7 +10182,7 @@ #: ../src/roster_window.py:3317 #, python-format msgid "%(jid)s has been invited in this room" -msgstr "‏%(jid)s הוזמנה בחדר זה" +msgstr "%(jid)s הוזמן/ה אל חדר זה" #. ask for reason #: ../src/groupchat_control.py:2357 @@ -10607,7 +10606,7 @@ "\n" "Do you still want to connect and update the fingerprint of the certificate?" msgstr "" -"נראה שתעודת SSL של חשבון %(account)s שונתה או שחיבורך נפרץ כעת.\n" +"נראה שתעודת SSL של חשבון %(account)s שונתה או שהחיבור שלך נפרץ כעת.\n" "טביעת אצבע קודמת: %(old)s\n" "טביעת אצבע חדשה: %(new)s\n" "\n" @@ -10840,7 +10839,7 @@ #: ../src/history_window.py:451 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" -msgstr "‏%(nick)s מצוי/ה כעת במצב %(status)s: %(status_msg)s" +msgstr "%(nick)s מצוי/ה כעת במצב %(status)s: %(status_msg)s" #: ../src/history_window.py:462 #, python-format @@ -11063,8 +11062,8 @@ "Changing your status to invisible will result in disconnection from those " "group chats. Are you sure you want to go invisible?" msgstr "" -"שינוי מצב חיבורך אל בלתי נראה ינבע בניתוקך מתוך שיחות קבוצה אלו. האם עדיין " -"ברצונך להפוך את מצבך אל בלתי נראה?" +"שינוי מצב החיבור שלך אל בלתי נראה ינבע בניתוקך מתוך שיחות קבוצה אלו. האם " +"עדיין ברצונך להפוך את מצבך אל בלתי נראה?" # If this mean desyncronized then 'לא מסונכרן' is correct, #: ../src/roster_window.py:2355 @@ -11126,7 +11125,8 @@ "You will no longer be able to send and receive messages from contacts using " "this transport." msgstr "" -"לא תעמוד עוד לרשותך האפשרות לקבל ולשלוח הודעות מן אנשי קשר באמצעות מוביל זה." +"לא תעמוד עוד לרשותך האפשרות לקבל ולשלוח הודעות מתוך אנשי קשר באמצעות מוביל " +"זה." #: ../src/roster_window.py:2990 msgid "Transports will be removed" @@ -11265,8 +11265,8 @@ "This contact will temporarily see you as %(status)s, but only until you " "change your status. Then he or she will see your global status." msgstr "" -"איש קשר זה יראה אותך באופן זמני במצב %(status)s, אך רק עד אשר מצבך ישתנה על " -"ידייך. אחרי כן הוא/היא יראו את מצב חיבורך הגלובלי."

1 0

gajim: Add missing tooltips again
by Denis Fomin 23 Jul '13

23 Jul '13

changeset 5cbc5b823ae9 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5cbc5b823ae9 description: Add missing tooltips again diffstat: data/gui/chat_control.ui | 162 ++++++++++++++++++++++++++++++++++++++-------- 1 файлов изменено, 134 вставок(+), 28 удалений(-) различия (урезанные с 765 до 300 строк): diff -r cbb4aa62b91d -r 5cbc5b823ae9 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Jul 23 17:55:24 2013 +0400 +++ b/data/gui/chat_control.ui Tue Jul 23 19:56:36 2013 +0400 @@ -1,7 +1,18 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">110</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">110</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> <object class="GtkHBox" id="chat_control_hbox"> <property name="can_focus">True</property> <property name="spacing">1</property> @@ -9,7 +20,6 @@ <object class="GtkVBox" id="chat_control_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="orientation">vertical</property> <property name="spacing">1</property> <child> <object class="GtkHPaned" id="hpaned1"> @@ -18,21 +28,25 @@ <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">3</property> <property name="right_padding">3</property> <child> <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox3004"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="ypad">5</property> <property name="stock">gtk-missing-image</property> </object> @@ -46,78 +60,98 @@ <child> <object class="GtkVBox" id="banner_vbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">5</property> - <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">Contact name</property> <property name="use_markup">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> - <signal name="populate_popup" handler="on_banner_label_populate_popup"/> + <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">4</property> <child> <object class="GtkImage" id="mood_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkImage" id="activity_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkImage" id="tune_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkEventBox" id="location_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="location_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">None</property> <property name="icon-size">1</property> @@ -133,20 +167,26 @@ <child> <object class="GtkImage" id="audio_banner_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child> <child> <object class="GtkImage" id="video_banner_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">None</property> <property name="icon-size">1</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">5</property> </packing> </child> @@ -154,11 +194,14 @@ <object class="GtkAlignment" id="alignment3"> <property name="width_request">11</property> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <placeholder/> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> @@ -172,10 +215,12 @@ <child> <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">None</property> </object> </child> @@ -200,26 +245,27 @@ <child> <object class="GtkVBox" id="vbox106"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <placeholder/> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkButton" id="authentication_button"> @@ -231,6 +277,7 @@ <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="lock_image"> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-dialog-authentication</property> <property name="icon-size">1</property> @@ -239,6 +286,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -255,34 +303,42 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="actions_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkButton" id="emoticons_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child>

1 0

gajim: [Darlan & I]Improved BiDi support for banner text, popup ...
by Denis Fomin 23 Jul '13

23 Jul '13

changeset cbb4aa62b91d in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cbb4aa62b91d description: [Darlan & I]Improved BiDi support for banner text, popup with presence info and more status messages (kick, ban, change nick) fixes #7284 #7192 diffstat: src/chat_control.py | 16 +++++++++------- src/common/connection_handlers_events.py | 13 ++++++------- src/common/i18n.py | 6 ++++++ src/conversation_textview.py | 5 +---- src/groupchat_control.py | 22 ++++++++++++---------- 5 файлов изменено, 34 вставок(+), 28 удалений(-) различия (214 строк): diff -r 7ad19dd5acb8 -r cbb4aa62b91d src/chat_control.py --- a/src/chat_control.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/chat_control.py Tue Jul 23 17:55:24 2013 +0400 @@ -44,6 +44,7 @@ from common import helpers from common import exceptions from common import ged +from common import i18n from message_control import MessageControl from conversation_textview import ConversationTextview from message_textview import MessageTextView @@ -2117,9 +2118,10 @@ if self.resource: name += '/' + self.resource if self.TYPE_ID == message_control.TYPE_PM: - name = _('%(nickname)s from group chat %(room_name)s') %\ - {'nickname': name, 'room_name': self.room_name} - name = gobject.markup_escape_text(name) + name = i18n.direction_mark + _( + '%(nickname)s from group chat %(room_name)s') % \ + {'nickname': name, 'room_name': self.room_name} + name = i18n.direction_mark + gobject.markup_escape_text(name) # We know our contacts nick, but if another contact has the same nick # in another account we need to also display the account. @@ -2134,7 +2136,7 @@ other_contact_ = \ gajim.contacts.get_first_contact_from_jid(account, jid) if other_contact_.get_shown_name() == self.contact.get_shown_name(): - acct_info = ' (%s)' % \ + acct_info = i18n.direction_mark + ' (%s)' % \ gobject.markup_escape_text(self.account) break @@ -2159,16 +2161,16 @@ chatstate = '' label_text = '%s%s %s' \ - % (font_attrs, name, font_attrs_small, acct_info, chatstate) + % (font_attrs, name, font_attrs_small, acct_info, chatstate) if acct_info: - acct_info = ' ' + acct_info + acct_info = i18n.direction_mark + ' ' + acct_info label_tooltip = '%s%s %s' % (name, acct_info, chatstate) else: # weight="heavy" size="x-large" label_text = '%s%s' % \ (font_attrs, name, font_attrs_small, acct_info) if acct_info: - acct_info = ' ' + acct_info + acct_info = i18n.direction_mark + ' ' + acct_info label_tooltip = '%s%s' % (name, acct_info) if status_escaped: diff -r 7ad19dd5acb8 -r cbb4aa62b91d src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/common/connection_handlers_events.py Tue Jul 23 17:55:24 2013 +0400 @@ -29,6 +29,7 @@ from common import nec from common import helpers from common import gajim +from common import i18n import nbxmpp from common import dataforms from common import exceptions @@ -2351,25 +2352,23 @@ self.popup_timeout = gajim.config.get('notification_timeout') + nick = i18n.direction_mark + gajim.get_name_from_jid(account, self.jid) if event == 'status_change': self.popup_title = _('%(nick)s Changed Status') % \ - {'nick': gajim.get_name_from_jid(account, self.jid)} + {'nick': nick} self.popup_text = _('%(nick)s is now %(status)s') % \ - {'nick': gajim.get_name_from_jid(account, self.jid),\ - 'status': helpers.get_uf_show(pres_obj.show)} + {'nick': nick, 'status': helpers.get_uf_show(pres_obj.show)} if pres_obj.status: self.popup_text = self.popup_text + " : " + pres_obj.status self.popup_event_type = _('Contact Changed Status') elif event == 'contact_connected': - self.popup_title = _('%(nickname)s Signed In') % \ - {'nickname': gajim.get_name_from_jid(account, self.jid)} + self.popup_title = _('%(nickname)s Signed In') % {'nickname': nick} self.popup_text = '' if pres_obj.status: self.popup_text = pres_obj.status self.popup_event_type = _('Contact Signed In') elif event == 'contact_disconnected': - self.popup_title = _('%(nickname)s Signed Out') % \ - {'nickname': gajim.get_name_from_jid(account, self.jid)} + self.popup_title = _('%(nickname)s Signed Out') % {'nickname': nick} self.popup_text = '' if pres_obj.status: self.popup_text = pres_obj.status diff -r 7ad19dd5acb8 -r cbb4aa62b91d src/common/i18n.py --- a/src/common/i18n.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/common/i18n.py Tue Jul 23 17:55:24 2013 +0400 @@ -26,6 +26,12 @@ import os import defs import unicodedata +import gtk + +if gtk.widget_get_default_direction() == gtk.TEXT_DIR_LTR: + direction_mark = u'\u200E' +else: + direction_mark = u'\u200F' def paragraph_direction_mark(text): """ diff -r 7ad19dd5acb8 -r cbb4aa62b91d src/conversation_textview.py --- a/src/conversation_textview.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/conversation_textview.py Tue Jul 23 17:55:24 2013 +0400 @@ -1294,10 +1294,7 @@ direction_mark = i18n.paragraph_direction_mark(unicode(text)) # don't apply direction mark if it's status message if kind == 'status': - if gtk.widget_get_default_direction() == gtk.TEXT_DIR_LTR: - direction_mark = u'\u200E' - else: - direction_mark = u'\u200F' + 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 = time.strftime(timestamp_str, tim) diff -r 7ad19dd5acb8 -r cbb4aa62b91d src/groupchat_control.py --- a/src/groupchat_control.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/groupchat_control.py Tue Jul 23 17:55:24 2013 +0400 @@ -47,6 +47,7 @@ from common import helpers from common import dataforms from common import ged +from common import i18n from chat_control import ChatControl from chat_control import ChatControlBase @@ -1513,7 +1514,8 @@ affiliation = 'none' newly_created = False - nick_jid = obj.nick + nick = i18n.direction_mark + obj.nick + nick_jid = nick # Set to true if role or affiliation have changed right_changed = False @@ -1556,10 +1558,10 @@ if '307' in obj.status_code: if obj.actor is None: # do not print 'kicked by None' s = _('%(nick)s has been kicked: %(reason)s') % { - 'nick': obj.nick, 'reason': obj.reason} + 'nick': nick, 'reason': obj.reason} else: s = _('%(nick)s has been kicked by %(who)s: ' - '%(reason)s') % {'nick': obj.nick, 'who': obj.actor, + '%(reason)s') % {'nick': nick, 'who': obj.actor, 'reason': obj.reason} self.print_conversation(s, 'info', graphics=False) if obj.nick == self.nick and not gajim.config.get( @@ -1568,10 +1570,10 @@ elif '301' in obj.status_code: if obj.actor is None: # do not print 'banned by None' s = _('%(nick)s has been banned: %(reason)s') % { - 'nick': obj.nick, 'reason': obj.reason} + 'nick': nick, 'reason': obj.reason} else: s = _('%(nick)s has been banned by %(who)s: ' - '%(reason)s') % {'nick': obj.nick, 'who': obj.actor, + '%(reason)s') % {'nick': nick, 'who': obj.actor, 'reason': obj.reason} self.print_conversation(s, 'info', graphics=False) if obj.nick == self.nick: @@ -1598,7 +1600,7 @@ ctrl.no_autonegotiation = False else: s = _('%(nick)s is now known as %(new_nick)s') % { - 'nick': obj.nick, 'new_nick': obj.new_nick} + 'nick': nick, 'new_nick': obj.new_nick} tv = self.conv_textview if obj.nick in tv.last_received_message_marks: tv.last_received_message_marks[obj.new_nick] = \ @@ -1652,18 +1654,18 @@ self.print_conversation(s, 'info', graphics=False) elif '321' in obj.status_code: s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % { 'nick': obj.nick, + '(%(reason)s)') % { 'nick': nick, 'reason': _('affiliation changed') } self.print_conversation(s, 'info', graphics=False) elif '322' in obj.status_code: s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % { 'nick': obj.nick, + '(%(reason)s)') % { 'nick': nick, 'reason': _('room configuration changed to ' 'members-only') } self.print_conversation(s, 'info', graphics=False) elif '332' in obj.status_code: s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % {'nick': obj.nick, + '(%(reason)s)') % {'nick': nick, 'reason': _('system shutdown') } self.print_conversation(s, 'info', graphics=False) # Room has been destroyed. @@ -1697,7 +1699,7 @@ if '210' in obj.status_code: # Server changed our nick self.nick = obj.nick - s = _('You are now known as %s') % obj.nick + s = _('You are now known as %s') % nick self.print_conversation(s, 'info', graphics=False) iter_ = self.add_contact_to_roster(obj.nick, obj.show, role, affiliation, obj.status, obj.real_jid)

1 0

gajim: correctly find JID column in search result window. Fixes ...
by Yann Leboulanger 22 Jul '13

22 Jul '13

changeset 7ad19dd5acb8 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7ad19dd5acb8 description: correctly find JID column in search result window. Fixes #7347 diffstat: src/search_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0a7ee840d299 -r 7ad19dd5acb8 src/search_window.py --- a/src/search_window.py Mon Jul 22 21:40:59 2013 +0400 +++ b/src/search_window.py Mon Jul 22 20:36:03 2013 +0200 @@ -228,7 +228,7 @@ self.on_result_treeview_cursor_changed) counter = 0 - for field in self.dataform.items[0].fields: + for field in self.dataform.reported.iter_fields(): if field.var == 'jid': self.jid_column = counter break

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 22 Jul '13

22 Jul '13

changeset 0a7ee840d299 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0a7ee840d299 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 63 ++++++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 32 вставок(+), 31 удалений(-) различия (266 строк): diff -r df1ad38561be -r 0a7ee840d299 po/he.po --- a/po/he.po Mon Jul 22 21:10:54 2013 +0400 +++ b/po/he.po Mon Jul 22 21:40:59 2013 +0400 @@ -9,7 +9,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-19 09:31+0300\n" -"PO-Revision-Date: 2013-07-21 07:57+0200\n" +"PO-Revision-Date: 2013-07-22 20:04+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -1128,7 +1128,7 @@ #: ../data/gui/features_window.ui.h:2 msgid "List of possible features in Gajim:" -msgstr "רשימה של תכונות אפשריות אצל Gajim:" +msgstr "רשימה של תכונות אפשריות בתוך Gajim:" #: ../data/gui/filetransfers.ui.h:1 msgid "File Transfers" @@ -1381,7 +1381,7 @@ #: ../data/gui/groupchat_control.ui.h:3 msgid "Change your nickname (Ctrl+N)" -msgstr "שינוי שם כינוייך (Ctrl+N)" +msgstr "שינוי שם כינוי (Ctrl+N)" #: ../data/gui/groupchat_control.ui.h:4 msgid "Change the room's subject (Alt+T)" @@ -2259,7 +2259,7 @@ #: ../data/gui/preferences_window.ui.h:94 msgid "Your nickname:" -msgstr "שם כינוייך:" +msgstr "שם כינוי:" #: ../data/gui/preferences_window.ui.h:95 msgid "_Status message:" @@ -2712,11 +2712,11 @@ #: ../data/gui/remove_account_window.ui.h:1 msgid "Remove account _only from Gajim" -msgstr "להסיר חשבון מתוך Gajim _בלבד" +msgstr "להסיר חשבון מתוך Gajim _בלבד" #: ../data/gui/remove_account_window.ui.h:2 msgid "Remove account from Gajim and from _server" -msgstr "להסיר חשבון מתוך Gajim וגם מתוך _שרת" +msgstr "להסיר חשבון מתוך Gajim וגם מתוך _שרת" #: ../data/gui/remove_account_window.ui.h:3 msgid "What do you want to do?" @@ -3759,7 +3759,7 @@ #: ../src/command_system/implementation/standard.py:273 msgid "Change your nickname in a group chat" -msgstr "שינוי שם כינוייך בשיחת קבוצה" +msgstr "שינוי שם הכינוי שלך בשיחת קבוצה" #. invalid char #: ../src/command_system/implementation/standard.py:278 ../src/config.py:3371 @@ -4738,7 +4738,7 @@ "account modification window. BE CAREFUL, when you are logged in with a " "negative priority, you will NOT receive any message from your server." msgstr "" -"במידה והעדפה זו מופעלת, תהיה ביכולתך להגדיר עדיפות שלילית עבור חשבונך בתוך " +"במידה והעדפה זו מופעלת, תהיה באפשרותך להגדיר עדיפות שלילית עבור חשבונך בתוך " "חלון התאמת חשבון. יש להיזהר, בעת התחברותך יחד עם עדיפות שלילית, לא תתקבלנה " "שום הודעה מתוך שרתך." @@ -5261,7 +5261,7 @@ "muc_highlight_words, or when a group chat message contains your nickname." msgstr "" "צליל לניגון כאשר הודעת שיחת קבוצה מכילה אחת מתוך המילים אשר מצוינות בתוך " -"muc_highlight_words, או כאשר הודעת שיחת קבוצה מכילה אח שם כינוייך." +"muc_highlight_words, או כאשר הודעת שיחת קבוצה מכילה אח שם הכינוי שלך." #: ../src/common/config.py:527 msgid "Sound to play when any MUC message arrives." @@ -5449,7 +5449,7 @@ #: ../src/common/connection.py:292 #, python-format msgid "The contact's key (%s) does not match the key assigned in Gajim." -msgstr "המפתח של איש קשר (%s) לא תואם את המפתח שמוקצה אצל Gajim." +msgstr "המפתח של איש קשר (%s) לא תואם את המפתח שמוקצה בתוך Gajim." # Needs to be tested #. we're not english: one in locale and one en @@ -5647,7 +5647,7 @@ #: ../src/common/connection.py:2799 #, python-format msgid "Unregistration with server %(server)s failed: %(error)s" -msgstr "אי רישום אצל שרת %(server)s נכשל: %(error)s" +msgstr "אי רישום בתוך שרת %(server)s נכשל: %(error)s" #: ../src/common/connection_handlers.py:92 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53 @@ -7519,7 +7519,7 @@ #: ../src/config.py:2444 msgid "Without a connection, you can not edit your personal information." -msgstr "ללא חיבור, אין ביכולתך לערוך את המידע האישי שלך." +msgstr "ללא חיבור, אין באפשרותך לערוך את המידע האישי שלך." # Vcard form #: ../src/config.py:2448 @@ -7772,7 +7772,7 @@ "later by choosing the Accounts menu item under the Edit menu from the main " "window." msgstr "" -"ביכולתך להגדיר אפשרויות חשבון מתקדמות על ידי לחיצה על הכפתור מתקדם, או לאחר " +"באפשרותך להגדיר אפשרויות חשבון מתקדמות על ידי לחיצה על הכפתור מתקדם, או לאחר " "מכן בבוחרך בתפריט חשבונות תחת התפריט עריכה מתוך החלון הראשי." #: ../src/config.py:3586 @@ -7926,7 +7926,7 @@ "Text below this line is what has been said since the\n" "last time you paid attention to this group chat" msgstr "" -"תמליל תחת שורה זו מכיל דברים אשר נאמרו מאז הפעם\n" +"תמליל תחת שורה זו הוא דברים אשר נאמרו מאז הפעם\n" "האחרונה בה הסבת את צומת לבך לשיחת קבוצה זו" #: ../src/conversation_textview.py:801 @@ -8257,7 +8257,7 @@ #: ../src/dialogs.py:2578 msgid "Without a connection, you can not synchronise your contacts." -msgstr "ללא חיבור, אין ביכולתך לסנכרן את אנשי הקשר שלך." +msgstr "ללא חיבור, אין באפשרותך לסנכרן את אנשי הקשר שלך." #: ../src/dialogs.py:2591 msgid "Server" @@ -8273,7 +8273,7 @@ # עד אשר זה לא יחובר #: ../src/dialogs.py:2628 msgid "You cannot synchronize with an account unless it is connected." -msgstr "אין ביכולתך להסתנכרן עם חשבון אלא אם כן החשבון הינו מחובר." +msgstr "אין באפשרותך להסתנכרן עם חשבון אלא אם כן החשבון הינו מחובר." #: ../src/dialogs.py:2653 msgid "Synchronise" @@ -8319,7 +8319,7 @@ #: ../src/dialogs.py:2766 msgid "Without a connection, you can not change your password." -msgstr "ללא חיבור, אין ביכולתך לשנות את סיסמתך." +msgstr "ללא חיבור, אין באפשרותך לשנות את סיסמתך." #: ../src/dialogs.py:2785 msgid "Invalid password" @@ -8696,7 +8696,7 @@ #: ../src/dialogs.py:5101 #, python-format msgid "The contact's key (%s) does not match the key assigned in Gajim." -msgstr "המפתח של איש קשר (%s) לא תואם את המפתח המוקצה אצל Gajim." +msgstr "המפתח של איש קשר (%s) לא תואם את המפתח אשר מוקצה בתוך Gajim." # כך שאין #: ../src/dialogs.py:5107 @@ -8803,7 +8803,7 @@ # BUG: Dot #: ../src/disco.py:516 msgid "Without a connection, you can not browse available services" -msgstr "ללא חיבור, אין ביכולתך לעיין בשירותים זמינים" +msgstr "ללא חיבור, אין באפשרותך לעיין בשירותים זמינים" #: ../src/disco.py:602 #, python-format @@ -10044,36 +10044,36 @@ #: ../src/groupchat_control.py:1557 #, python-format msgid "%(nick)s has been kicked: %(reason)s" -msgstr "‏%(nick)s נבעט/ה: %(reason)s" +msgstr "%(nick)s נבעט/ה: %(reason)s" # סולק #: ../src/groupchat_control.py:1560 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" -msgstr "‏%(nick)s נבעט/ה על ידי %(who)s: ‏%(reason)s" +msgstr "%(nick)s נבעט/ה על ידי %(who)s: ‏%(reason)s" #. do not print 'banned by None' #: ../src/groupchat_control.py:1569 #, python-format msgid "%(nick)s has been banned: %(reason)s" -msgstr "‏%(nick)s נחסם/ה: %(reason)s" +msgstr "%(nick)s נחסם/ה: %(reason)s" #: ../src/groupchat_control.py:1572 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" -msgstr "‏%(nick)s נחסם/ה על ידי %(who)s: ‏%(reason)s" +msgstr "%(nick)s נחסם/ה על ידי %(who)s: ‏%(reason)s" #: ../src/groupchat_control.py:1583 ../src/groupchat_control.py:1699 #, python-format msgid "You are now known as %s" -msgstr "כינוייך החדש הוא %s" +msgstr "הכינוי שלך החדש הוא %s" # מן #: ../src/groupchat_control.py:1653 ../src/groupchat_control.py:1658 #: ../src/groupchat_control.py:1664 #, python-format msgid "%(nick)s has been removed from the room (%(reason)s)" -msgstr "‏%(nick)s הוסר/ה מתוך החדר (%(reason)s)" +msgstr "%(nick)s הוסר/ה מתוך החדר (%(reason)s)" #: ../src/groupchat_control.py:1655 msgid "affiliation changed" @@ -10114,13 +10114,13 @@ #: ../src/groupchat_control.py:1802 #, python-format msgid "%s has left" -msgstr "‏%s עזב/ה את החדר" +msgstr "%s עזב/ה את החדר" # הצטרף אל שיחת הקבוצה #: ../src/groupchat_control.py:1807 #, python-format msgid "%s has joined the group chat" -msgstr "‏%s נכנס/ה אל החדר" +msgstr "%s נכנס/ה אל החדר" #: ../src/groupchat_control.py:2077 #, python-format @@ -10282,7 +10282,8 @@ "occupant.\n" "Please specify another nickname below:" msgstr "" -"שם כינוייך המבוקש בשיחת הקבוצה %s הינו בשימוש או רשום בידי נוכח אחר.\n" +"שם הכינוי אשר מבוקש על ידך בשיחת הקבוצה %s מצוי בשימוש או רשום בידי נוכח " +"אחר.\n" "אנא ציין שם כינוי אחר למטה:" #: ../src/gui_interface.py:138 @@ -10688,7 +10689,7 @@ #: ../src/gui_interface.py:2073 ../src/roster_window.py:3895 msgid "You cannot join a group chat while you are invisible" -msgstr "אין ביכולתך להשתתף בשיחת קבוצה כאשר הינך במצב בלתי נראה" +msgstr "אין באפשרותך להשתתף בשיחת קבוצה כאשר הינך במצב בלתי נראה" #. it is good to notify the user #. in case he or she cannot see the output of the console @@ -10777,7 +10778,7 @@ "\n" "In case you click YES, please wait..." msgstr "" -"בדרך כלל הגודל המוקצה של מסד נתונים לא יהיה חופשי, הוא רק יהפוך לכזה אשר " +"בדרך כלל הגודל אשר מוקצה של מסד נתונים לא יהיה חופשי, הוא רק יהפוך לכזה אשר " "ניתן לשימוש חוזר. אם באמת ברצונך להקטין את הגודל של קובץ מסד הנתונים, עליך " "להקיש כן, אחרת עליך להקיש לא.\n" "\n" @@ -10990,7 +10991,7 @@ # ללא חיבור זמין #: ../src/profile_window.py:370 msgid "Without a connection you can not publish your contact information." -msgstr "ללא חיבור, אין ביכולתך לפרסם את מידע איש הקשר שלך." +msgstr "ללא חיבור, אין באפשרותך לפרסם את מידע איש הקשר שלך." #: ../src/profile_window.py:383 msgid "Sending profile..."

1 0

gajim: [Darlan] Improved BiDi support for status messages
by Denis Fomin 22 Jul '13

22 Jul '13

changeset df1ad38561be in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=df1ad38561be description: [Darlan] Improved BiDi support for status messages diffstat: src/conversation_textview.py | 5 ++++- 1 файлов изменено, 4 вставок(+), 1 удалений(-) различия (15 строк): diff -r c05a63821060 -r df1ad38561be src/conversation_textview.py --- a/src/conversation_textview.py Mon Jul 22 11:17:24 2013 +0400 +++ b/src/conversation_textview.py Mon Jul 22 21:10:54 2013 +0400 @@ -1294,7 +1294,10 @@ direction_mark = i18n.paragraph_direction_mark(unicode(text)) # don't apply direction mark if it's status message if kind == 'status': - direction_mark = '' + if gtk.widget_get_default_direction() == gtk.TEXT_DIR_LTR: + direction_mark = u'\u200E' + else: + direction_mark = u'\u200F' if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim) timestamp = time.strftime(timestamp_str, tim)

1 0

python-nbxmpp: fix connection with BOSH
by Yann Leboulanger 22 Jul '13

22 Jul '13

changeset f83863a0d5d4 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=f83863a0d5d4 description: fix connection with BOSH diffstat: nbxmpp/bosh.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 1fd84376949e -r f83863a0d5d4 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Thu Jul 18 14:02:48 2013 +0200 +++ b/nbxmpp/bosh.py Mon Jul 22 17:07:31 2013 +0200 @@ -88,6 +88,12 @@ self.proxy_dict['xmpp_server'] = (host, port) self.proxy_dict['credentials'] = self.proxy_creds + # ssl variables + self.ssl_fingerprint_sha1 = [] + self.ssl_certificate = [] + self.ssl_errnum = [] + self.ssl_cert_pem = [] + def connect(self, conn_5tuple, on_connect, on_connect_failure): NonBlockingTransport.connect(self, conn_5tuple, on_connect, on_connect_failure)

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