Commits June 2014

commits@gajim.org

1 participants
13 discussions

python-nbxmpp: fix some type comparion error due to py2 and py3 ...
by Python-nbxmpp 29 Jun '14

29 Jun '14

changeset 357755b75a6b in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=357755b75a6b description: fix some type comparion error due to py2 and py3 support diffstat: nbxmpp/auth_nb.py | 5 ++--- nbxmpp/protocol.py | 18 +++++++++--------- nbxmpp/simplexml.py | 5 +++-- 3 files changed, 14 insertions(+), 14 deletions(-) diffs (82 lines): diff -r d1b4a9aedbc9 -r 357755b75a6b nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Sun Jun 29 17:33:32 2014 +0200 +++ b/nbxmpp/auth_nb.py Sun Jun 29 17:35:05 2014 +0200 @@ -452,9 +452,8 @@ chal = _challenge_splitter(data) if not self.realm and 'realm' in chal: self.realm = chal['realm'] - if 'qop' in chal and ((isinstance(chal['qop'], str) and \ - chal['qop'] =='auth') or (isinstance(chal['qop'], list) and 'auth' in \ - chal['qop'])): + if 'qop' in chal and ((chal['qop'] =='auth') or \ + (isinstance(chal['qop'], list) and 'auth' in chal['qop'])): self.resp = {} self.resp['username'] = self.username if self.realm: diff -r d1b4a9aedbc9 -r 357755b75a6b nbxmpp/protocol.py --- a/nbxmpp/protocol.py Sun Jun 29 17:33:32 2014 +0200 +++ b/nbxmpp/protocol.py Sun Jun 29 17:35:05 2014 +0200 @@ -1555,11 +1555,11 @@ """ Add one more label-option pair to this field """ - if isinstance(opt, str): - self.addChild('option').setTagData('value', opt) - else: + if isinstance(opt, list): self.addChild('option', {'label': opt[0]}).setTagData('value', opt[1]) + else: + self.addChild('option').setTagData('value', opt) def getType(self): """ @@ -1626,12 +1626,12 @@ newdata.append(DataField(name, data[name])) data = newdata for child in data: - if isinstance(child, str): + if child.__class__.__name__ == 'DataField': + self.kids.append(child) + elif isinstance(child, Node): + self.kids.append(DataField(node=child)) + else: # Must be a string self.addInstructions(child) - elif child.__class__.__name__ == 'DataField': - self.kids.append(child) - else: - self.kids.append(DataField(node=child)) def getType(self): """ @@ -1700,7 +1700,7 @@ for field in self.getTags('field'): name = field.getAttr('var') typ = field.getType() - if isinstance(typ, str) and typ.endswith('-multi'): + if typ and typ.endswith('-multi'): val = [] for i in field.getTags('value'): val.append(i.getData()) diff -r d1b4a9aedbc9 -r 357755b75a6b nbxmpp/simplexml.py --- a/nbxmpp/simplexml.py Sun Jun 29 17:33:32 2014 +0200 +++ b/nbxmpp/simplexml.py Sun Jun 29 17:35:05 2014 +0200 @@ -144,7 +144,8 @@ self.namespace, self.name = tag.split() else: self.name = tag - if isinstance(payload, str): payload=[payload] + if not isinstance(payload, list): + payload = [payload] for i in payload: if isinstance(i, Node): self.addChild(node=i) @@ -404,7 +405,7 @@ replaces all node's previous content. If you wish just to add child or CDATA - use addData or addChild methods """ - if isinstance(payload, str): + if not isinstance(payload, list): payload = [payload] if add: self.kids += payload

1 0

python-nbxmpp: Added tag nbxmpp-0.4 for changeset 46e9c8c80bac
by Python-nbxmpp 29 Jun '14

29 Jun '14

changeset d1b4a9aedbc9 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=d1b4a9aedbc9 description: Added tag nbxmpp-0.4 for changeset 46e9c8c80bac diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 482579a7fdc3 -r d1b4a9aedbc9 .hgtags --- a/.hgtags Wed Apr 09 18:17:56 2014 +0200 +++ b/.hgtags Sun Jun 29 17:33:32 2014 +0200 @@ -1,3 +1,4 @@ 5d8f5ba88c86ade8294db98db847b2f0a1acbccd nbxmpp-0.1 7d34c8148cee4c6e5e2fceca6cd8f9ea1bc82de4 nbxmpp-0.2 3bf3d313e8693a273fe1a44723606ff5c6a3aba1 nbxmpp-0.3 +46e9c8c80bacac8260245d5d9752ba0c5bddcf89 nbxmpp-0.4

1 0

gajim: updated hebrew translation
by Gajim 28 Jun '14

28 Jun '14

changeset f38e5fd4f8e3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f38e5fd4f8e3 description: updated hebrew translation diffstat: po/he.po | 1273 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 639 insertions(+), 634 deletions(-) diffs (truncated from 2731 to 300 lines): diff -r 24da96c20089 -r f38e5fd4f8e3 po/he.po --- a/po/he.po Sat Jun 21 10:41:13 2014 +0200 +++ b/po/he.po Sat Jun 28 13:22:54 2014 +0200 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-09 07:58+0300\n" -"PO-Revision-Date: 2014-06-19 07:35+0200\n" +"POT-Creation-Date: 2014-06-28 13:21+0200\n" +"PO-Revision-Date: 2014-06-21 16:23+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -190,8 +190,8 @@ #: ../src/config.py:1753 ../src/config.py:2348 ../src/config.py:2430 #: ../src/config.py:2445 ../src/config.py:3740 ../src/config.py:3815 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 -#: ../src/dialogs.py:537 ../src/roster_window.py:3158 -#: ../src/roster_window.py:3164 ../src/roster_window.py:3169 +#: ../src/dialogs.py:537 ../src/roster_window.py:3161 +#: ../src/roster_window.py:3167 ../src/roster_window.py:3172 msgid "None" msgstr "ללא" @@ -378,8 +378,8 @@ #. 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:116 ../src/dialogs.py:128 -#: ../src/roster_window.py:3100 ../src/roster_window.py:4226 -#: ../src/roster_window.py:5871 +#: ../src/roster_window.py:3103 ../src/roster_window.py:4229 +#: ../src/roster_window.py:5874 msgid "General" msgstr "כללית" @@ -777,7 +777,7 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:674 -#: ../src/roster_window.py:5840 ../src/roster_window.py:5974 +#: ../src/roster_window.py:5843 ../src/roster_window.py:5977 msgid "_Unblock" msgstr "_בטל חסימה" @@ -982,8 +982,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5770 -#: ../src/roster_window.py:5941 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5773 +#: ../src/roster_window.py:5944 msgid "In_vite to" msgstr "ה_זמן אל" @@ -1002,7 +1002,7 @@ #. Send Custom Status #: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598 -#: ../src/roster_window.py:5781 +#: ../src/roster_window.py:5784 msgid "Send Cus_tom Status" msgstr "שלח מצב חיבור מו_תאם" @@ -1017,12 +1017,12 @@ #. Rename #: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661 -#: ../src/roster_window.py:5821 +#: ../src/roster_window.py:5824 msgid "_Rename..." msgstr "_שינוי שם..." #. Edit Groups -#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5963 +#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5966 msgid "Edit _Groups..." msgstr "עריכת _קבוצות..." @@ -1056,7 +1056,7 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677 -#: ../src/roster_window.py:5848 ../src/roster_window.py:5980 +#: ../src/roster_window.py:5851 ../src/roster_window.py:5983 msgid "_Block" msgstr "_חסום" @@ -1071,14 +1071,14 @@ #. Remove #. Remove group #: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687 -#: ../src/roster_window.py:5858 +#: ../src/roster_window.py:5861 msgid "Remo_ve" msgstr "הס_ר" #: ../data/gui/contact_context_menu.ui.h:26 #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6056 +#: ../src/roster_window.py:6059 msgid "_History" msgstr "_היסטוריה" @@ -1175,6 +1175,15 @@ msgid "Hides the window" msgstr "הסתרת חלון" +#: ../data/gui/filetransfers.ui.h:16 ../src/filetransfers_window.py:905 +msgid "_Continue" +msgstr "ה_משך" + +#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3386 +#: ../src/filetransfers_window.py:213 +msgid "_Open Containing Folder" +msgstr "_פתח תיקיה מכילה" + #: ../data/gui/gajim_themes_window.ui.h:1 msgid "Account row" msgstr "שורת חשבון" @@ -1284,7 +1293,7 @@ msgid "_Request Voice" msgstr "_בקש ביטוי" -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1850 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1851 msgid "_Bookmark" msgstr "_סמן" @@ -1542,7 +1551,7 @@ msgstr "_עיון ברשימת חדרים" #: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3421 -#: ../src/disco.py:1412 ../src/disco.py:1854 +#: ../src/disco.py:1413 ../src/disco.py:1855 msgid "_Join" msgstr "_כנס" @@ -2368,6 +2377,10 @@ msgid "Advanced" msgstr "מתקדם" +#: ../data/gui/privacy_lists_window.ui.h:1 +msgid "Privacy Lists:" +msgstr "רשימות פרטיות:" + #: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4131 msgid "Privacy List" msgstr "רשימת פרטיות" @@ -2458,10 +2471,6 @@ msgid "to" msgstr "אל" -#: ../data/gui/privacy_lists_window.ui.h:1 -msgid "Privacy Lists:" -msgstr "רשימות פרטיות:" - #. Family Name #: ../data/gui/profile_window.ui.h:3 #: ../data/gui/vcard_information_window.ui.h:17 @@ -2625,7 +2634,7 @@ msgstr "מה ברצונך לעשות?" #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5990 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5993 msgid "_Remove" msgstr "הס_ר" @@ -2660,7 +2669,7 @@ msgid "Add _Contact..." msgstr "הוספת _איש קשר..." -#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1565 +#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1566 msgid "_Edit" msgstr "ע_ריכה" @@ -2747,7 +2756,7 @@ msgid "_Information" msgstr "_מידע" -#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1421 +#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1422 msgid "_Search" msgstr "_חפש" @@ -3145,7 +3154,7 @@ #: ../src/gui_menu_builder.py:318 ../src/gui_menu_builder.py:489 #: ../src/roster_window.py:771 ../src/roster_window.py:1735 #: ../src/roster_window.py:1737 ../src/roster_window.py:2086 -#: ../src/roster_window.py:3629 ../src/roster_window.py:3656 +#: ../src/roster_window.py:3632 ../src/roster_window.py:3659 msgid "Not in Roster" msgstr "לא ברשימה" @@ -3313,11 +3322,10 @@ "lost." msgstr "אם כרטיסייה זו תיסגר וכאשר רשימת היסטוריה מנוטרלת אצלך. הודעה זו תאבד." -#: ../src/chat_control.py:3001 ../src/common/connection.py:533 -#: ../src/common/connection_handlers.py:1145 -#: ../src/common/connection_handlers.py:1270 -#: ../src/common/connection_handlers_events.py:916 -#: ../src/common/logger.py:1161 ../src/gajim.py:245 ../src/session.py:98 +#: ../src/chat_control.py:3001 ../src/common/connection_handlers_events.py:916 +#: ../src/common/connection_handlers.py:1089 +#: ../src/common/connection_handlers.py:1214 ../src/common/connection.py:541 +#: ../src/common/logger.py:1165 ../src/gajim.py:252 ../src/session.py:98 msgid "Database Error" msgstr "שגיאת מסד נתונים" @@ -3331,7 +3339,7 @@ "תאבד)." # כי משהו שיבש אותה -#: ../src/chat_control.py:3240 ../src/gui_interface.py:1164 +#: ../src/chat_control.py:3240 ../src/gui_interface.py:1170 #, python-format msgid "" "Unable to decrypt message from %s\n" @@ -3361,10 +3369,6 @@ msgid "File transfer completed" msgstr "העברת קובץ הושלמה" -#: ../src/chat_control.py:3386 ../src/filetransfers_window.py:213 -msgid "_Open Containing Folder" -msgstr "_פתח תיקיה מכילה" - #: ../src/chat_control.py:3418 ../src/dialogs.py:2935 ../src/dialogs.py:4625 #: ../src/gui_interface.py:646 ../src/notify.py:278 msgid "Groupchat Invitation" @@ -3465,7 +3469,7 @@ #: ../src/command_system/implementation/standard.py:151 #: ../src/common/commands.py:110 ../src/common/helpers.py:249 -#: ../src/tooltips.py:200 +#: ../src/tooltips.py:205 msgid "Away" msgstr "נעדר" @@ -3645,37 +3649,37 @@ msgid "Excessive arguments" msgstr "ארגומנטים מופרזים" -#: ../src/common/check_paths.py:39 +#: ../src/common/check_paths.py:38 msgid "creating logs database" msgstr "כעת יוצר רשומות מסד נתונים" -#: ../src/common/check_paths.py:87 +#: ../src/common/check_paths.py:86 msgid "creating cache database" msgstr "כעת יוצר מטמון מסד נתונים" +#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284 +#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298 +#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312 +#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:326 +#, python-format +msgid "%s is a file but it should be a directory" +msgstr "‏%s הינו קובץ אך אמור להיות מדור" + #: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285 #: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299 #: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313 #: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327 -#, python-format -msgid "%s is a file but it should be a directory" -msgstr "‏%s הינו קובץ אך אמור להיות מדור" - -#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286 -#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300 -#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314 -#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328 -#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346 +#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345 #, fuzzy msgid "Gajim will now exit" msgstr "cli" -#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345 +#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344 #, python-format msgid "%s is a directory but should be a file" msgstr "‏%s הינו מדור אך אמור להיות קובץ" -#: ../src/common/check_paths.py:366 +#: ../src/common/check_paths.py:359 #, python-format msgid "creating %s directory" msgstr "כעת יוצר מדור %s" @@ -3747,7 +3751,7 @@ #: ../src/common/commands.py:216 ../src/common/contacts.py:131 #: ../src/common/helpers.py:67 ../src/roster_window.py:824 #: ../src/roster_window.py:1739 ../src/roster_window.py:1741 -#: ../src/roster_window.py:2625 ../src/roster_window.py:5736 +#: ../src/roster_window.py:2625 ../src/roster_window.py:5739

1 0

gajim: continue fixing gobject warnings
by Gajim 21 Jun '14

21 Jun '14

changeset 24da96c20089 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=24da96c20089 description: continue fixing gobject warnings diffstat: src/filetransfers_window.py | 5 +++-- src/groupchat_control.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diffs (41 lines): diff -r 5ee8c7bade89 -r 24da96c20089 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Jun 21 10:39:34 2014 +0200 +++ b/src/filetransfers_window.py Sat Jun 21 10:41:13 2014 +0200 @@ -757,7 +757,7 @@ pointer = self.tree.get_pointer() props = widget.get_path_at_pos(int(event.x), int(event.y)) self.height_diff = pointer[1] - int(event.y) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() if props: @@ -783,7 +783,7 @@ return pointer = self.tree.get_pointer() props = self.tree.get_path_at_pos(pointer[0], pointer[1] - self.height_diff) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip() @@ -951,6 +951,7 @@ self.set_status(file_props, 'stop') def show_tooltip(self, widget): + self.tooltip.timeout = 0 if self.height_diff == 0: self.tooltip.hide_tooltip() return diff -r 5ee8c7bade89 -r 24da96c20089 src/groupchat_control.py --- a/src/groupchat_control.py Sat Jun 21 10:39:34 2014 +0200 +++ b/src/groupchat_control.py Sat Jun 21 10:41:13 2014 +0200 @@ -2721,7 +2721,7 @@ def on_list_treeview_leave_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip()

1 0

gajim: fix gobject warning when hidding tooltips
by Gajim 21 Jun '14

21 Jun '14

changeset 5ee8c7bade89 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5ee8c7bade89 description: fix gobject warning when hidding tooltips diffstat: src/conversation_textview.py | 15 +++++++++------ src/disco.py | 5 +++-- src/groupchat_control.py | 3 ++- src/htmltextview.py | 5 +++-- src/roster_window.py | 12 ++++++------ src/tooltips.py | 5 +++++ 6 files changed, 28 insertions(+), 17 deletions(-) diffs (219 lines): diff -r 7e1c7ab46c3e -r 5ee8c7bade89 src/conversation_textview.py --- a/src/conversation_textview.py Fri Jun 20 23:16:44 2014 +0400 +++ b/src/conversation_textview.py Sat Jun 21 10:39:34 2014 +0200 @@ -611,6 +611,7 @@ gobject.idle_add(self.scroll_to_end) def show_xep0184_warning_tooltip(self): + self.xep0184_warning_tooltip.timeout = 0 pointer = self.tv.get_pointer() x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer[0], pointer[1]) @@ -624,12 +625,13 @@ if xep0184_warning and not self.xep0184_warning_tooltip.win: # check if the current pointer is still over the line position = self.tv.window.get_origin() - self.xep0184_warning_tooltip.show_tooltip(_('This icon indicates that ' - 'this message has not yet\nbeen received by the remote end. ' - "If this icon stays\nfor a long time, it's likely the message got " - 'lost.'), 8, position[1] + pointer[1]) + self.xep0184_warning_tooltip.show_tooltip(_('This icon indicates ' + 'that this message has not yet\nbeen received by the remote ' + "end. If this icon stays\nfor a long time, it's likely the " + 'message got lost.'), 8, position[1] + pointer[1]) def show_line_tooltip(self): + self.line_tooltip.timeout = 0 pointer = self.tv.get_pointer() x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer[0], pointer[1]) @@ -699,11 +701,12 @@ elif tag == tag_table.lookup('xep0184-warning'): xep0184_warning = True - if self.line_tooltip.timeout != 0: + if self.line_tooltip.timeout != 0 or self.line_tooltip.shown: # Check if we should hide the line tooltip if not over_line: self.line_tooltip.hide_tooltip() - if self.xep0184_warning_tooltip.timeout != 0: + if self.xep0184_warning_tooltip.timeout != 0 or \ + self.xep0184_warning_tooltip.shown: # Check if we should hide the XEP-184 warning tooltip if not xep0184_warning: self.xep0184_warning_tooltip.hide_tooltip() diff -r 7e1c7ab46c3e -r 5ee8c7bade89 src/disco.py --- a/src/disco.py Fri Jun 20 23:16:44 2014 +0400 +++ b/src/disco.py Sat Jun 21 10:39:34 2014 +0200 @@ -1286,6 +1286,7 @@ return statecmp def _show_tooltip(self, state): + self.tooltip.timeout = 0 view = self.window.services_treeview pointer = view.get_pointer() props = view.get_path_at_pos(pointer[0], pointer[1]) @@ -1303,13 +1304,13 @@ # These are all callbacks to make tooltips work def on_treeview_leave_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip() def on_treeview_motion_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() if props: diff -r 7e1c7ab46c3e -r 5ee8c7bade89 src/groupchat_control.py --- a/src/groupchat_control.py Fri Jun 20 23:16:44 2014 +0400 +++ b/src/groupchat_control.py Sat Jun 21 10:39:34 2014 +0200 @@ -2697,7 +2697,7 @@ def on_list_treeview_motion_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() if props: @@ -2726,6 +2726,7 @@ self.tooltip.hide_tooltip() def show_tooltip(self, contact): + self.tooltip.timeout = 0 if not self.list_treeview.window: # control has been destroyed since tooltip was requested return diff -r 7e1c7ab46c3e -r 5ee8c7bade89 src/htmltextview.py --- a/src/htmltextview.py Fri Jun 20 23:16:44 2014 +0400 +++ b/src/htmltextview.py Sat Jun 21 10:39:34 2014 +0200 @@ -840,7 +840,7 @@ self.tagSthAtSth.connect('event', self._hyperlink_handler, 'sth_at_sth') def __destroy_event(self, widget): - if self.tooltip.timeout != 0: + if self.tooltip.timeout != 0 or self.tooltip.shown: self.tooltip.hide_tooltip() def __leave_event(self, widget, event): @@ -850,6 +850,7 @@ self._changed_cursor = False def show_tooltip(self, tag): + self.tooltip.timeout = 0 if not self.tooltip.win: # check if the current pointer is still over the line x, y, _ = self.window.get_pointer() @@ -873,7 +874,7 @@ x, y = widget.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, x, y) tags = widget.get_iter_at_location(x, y).get_tags() anchor_tags = [tag for tag in tags if getattr(tag, 'is_anchor', False)] - if self.tooltip.timeout != 0: + if self.tooltip.timeout != 0 or self.tooltip.shown: # Check if we should hide the line tooltip if not anchor_tags: self.tooltip.hide_tooltip() diff -r 7e1c7ab46c3e -r 5ee8c7bade89 src/roster_window.py --- a/src/roster_window.py Fri Jun 20 23:16:44 2014 +0400 +++ b/src/roster_window.py Sat Jun 21 10:39:34 2014 +0200 @@ -2039,6 +2039,7 @@ vb.set_no_show_all(True) def show_tooltip(self, contact): + self.tooltip.timeout = 0 pointer = self.tree.get_pointer() props = self.tree.get_path_at_pos(pointer[0], pointer[1]) # check if the current pointer is at the same path @@ -2054,7 +2055,6 @@ else: self.tooltip.hide_tooltip() - def authorize(self, widget, jid, account): """ Authorize a contact (by re-sending auth menuitem) @@ -2850,14 +2850,14 @@ def on_roster_treeview_leave_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip() def on_roster_treeview_motion_notify_event(self, widget, event): model = widget.get_model() props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() if props: @@ -2870,7 +2870,7 @@ return if model[titer][C_TYPE] in ('contact', 'self_contact'): # we're on a contact entry in the roster - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + if (not self.tooltip.shown and self.tooltip.timeout == 0) or self.tooltip.id != props[0]: account = model[titer][C_ACCOUNT].decode('utf-8') jid = model[titer][C_JID].decode('utf-8') self.tooltip.id = row @@ -2886,7 +2886,7 @@ self.tooltip.timeout = gobject.timeout_add(500, self.show_tooltip, connected_contacts) elif model[titer][C_TYPE] == 'groupchat': - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + if (not self.tooltip.shown and self.tooltip.timeout == 0) or self.tooltip.id != props[0]: account = model[titer][C_ACCOUNT].decode('utf-8') jid = model[titer][C_JID].decode('utf-8') self.tooltip.id = row @@ -2896,7 +2896,7 @@ self.show_tooltip, contact) elif model[titer][C_TYPE] == 'account': # we're on an account entry in the roster - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + if (not self.tooltip.shown and self.tooltip.timeout == 0) or self.tooltip.id != props[0]: account = model[titer][C_ACCOUNT].decode('utf-8') if account == 'all': self.tooltip.id = row diff -r 7e1c7ab46c3e -r 5ee8c7bade89 src/tooltips.py --- a/src/tooltips.py Fri Jun 20 23:16:44 2014 +0400 +++ b/src/tooltips.py Sat Jun 21 10:39:34 2014 +0200 @@ -71,6 +71,7 @@ self.id = None self.cur_data = None self.check_last_time = None + self.shown = False def populate(self, data): """ @@ -158,6 +159,8 @@ widget_height is the height of the widget on which we show the tooltip. widget_y_position is vertical position of the widget on the screen. """ + if self.shown: + return self.cur_data = data # set tooltip contents self.populate(data) @@ -173,6 +176,7 @@ self.widget_height = widget_height self.win.ensure_style() self.win.show_all() + self.shown = True def hide_tooltip(self): if self.timeout > 0: @@ -184,6 +188,7 @@ self.id = None self.cur_data = None self.check_last_time = None + self.shown = False @staticmethod def colorize_status(status):

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 20 Jun '14

20 Jun '14

changeset 7e1c7ab46c3e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7e1c7ab46c3e description: [Darlan] Update Hebrew translation diffstat: po/he.po | 273 ++++++++++++++++++++++++++++++++------------------------------ 1 файлов изменено, 141 вставок(+), 132 удалений(-) различия (урезанные с 986 до 300 строк): diff -r c1a09240fb19 -r 7e1c7ab46c3e po/he.po --- a/po/he.po Mon Jun 16 21:32:01 2014 +0200 +++ b/po/he.po Fri Jun 20 23:16:44 2014 +0400 @@ -9,7 +9,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-09 07:58+0300\n" -"PO-Revision-Date: 2014-04-09 08:21+0200\n" +"PO-Revision-Date: 2014-06-19 07:35+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -167,13 +167,13 @@ "\n" "Please wait..." msgstr "" -"מתחבר כעת אל שרת\n" +"כעת מתחבר אל שרת\n" "\n" "אנא המתן..." #: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" -msgstr "התחבר כאשר אני אלחץ על סיים" +msgstr "התחבר כאשר אני אלחץ על לחצן סיים" #: ../data/gui/account_creation_wizard_window.ui.h:28 msgid "Set my profile when I connect" @@ -361,7 +361,7 @@ # BUG: _underline #: ../data/gui/accounts_window.ui.h:35 msgid "Use file transfer proxies" -msgstr "השתמש במתווכי העברת קובץ" +msgstr "השתמש בצירי העברת קובץ" #: ../data/gui/accounts_window.ui.h:36 msgid "" @@ -369,8 +369,7 @@ "IP, so file transfer has higher chances of working." msgstr "" "כאשר מסומן, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP; ‏Internet Protocol) " -"שלך, מספר כתובות IP נוספות, כך שלפעולת העברת קובץ יהיו סיכויים גדולים יותר " -"לעבוד." +"שלך, מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים גדולים יותר לעבוד." # (קבוצה כללית) #. FIXME: Ugly workaround. @@ -405,7 +404,7 @@ "Check this so Gajim will ask you before sending your password over an " "insecure connection." msgstr "" -"סמן את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא " +"סמן את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמה על פני חיבור לא " "מאובטח." #: ../data/gui/accounts_window.ui.h:43 @@ -674,37 +673,39 @@ msgid "_Administrator" msgstr "ה_נהלה" +# בשורה מסר #: ../data/gui/advanced_menuitem_menu.ui.h:5 msgid "_Send Server Message..." msgstr "_שליחת הודעת שרת..." #: ../data/gui/advanced_menuitem_menu.ui.h:6 msgid "Sends a message to users currently connected to this server" -msgstr "שליחת הודעה למשתמשים המחוברים כעת אל שרת זה" - +msgstr "מסירת הודעה אל משתמשים המחוברים כעת אל שרת זה" + +# הודעת #: ../data/gui/advanced_menuitem_menu.ui.h:7 msgid "Sets Message of the Day" -msgstr "הגדרת הודעת היום (Message of the Day)" +msgstr "הגדרת בשורת היום" #: ../data/gui/advanced_menuitem_menu.ui.h:8 msgid "Set MOTD..." -msgstr "הגדרת MOTD..." +msgstr "הגדרת בשורת היום..." #: ../data/gui/advanced_menuitem_menu.ui.h:9 msgid "Updates Message of the Day" -msgstr "עדכון הודעת היום (Message of the Day)" +msgstr "עדכון בשורת היום" #: ../data/gui/advanced_menuitem_menu.ui.h:10 msgid "Update MOTD..." -msgstr "עדכון MOTD..." +msgstr "עדכון בשורת היום..." #: ../data/gui/advanced_menuitem_menu.ui.h:11 msgid "Delete MOTD" -msgstr "מחק MOTD" +msgstr "מחק את בשורת היום" #: ../data/gui/advanced_menuitem_menu.ui.h:12 msgid "Deletes Message of the Day" -msgstr "מחיקת הודעת היום (Message of the Day)" +msgstr "מחיקת בשורת היום" #: ../data/gui/archiving_preferences_window.ui.h:1 msgid "No" @@ -895,7 +896,7 @@ #: ../data/gui/chat_control.ui.h:9 ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/single_message_window.ui.h:6 msgid "Send message" -msgstr "שליחת הודעה" +msgstr "מסירת הודעה" #: ../data/gui/chat_control.ui.h:10 msgid "1" @@ -1160,7 +1161,7 @@ #: ../data/gui/filetransfers.ui.h:12 msgid "Cancels the selected file transfer and removes incomplete files" -msgstr "ביטול העברת הקובץ הנבחר והסרת קבצים לא שלמים" +msgstr "ביטול העברת קובץ נבחר והסרת קבצים לא שלמים" #: ../data/gui/filetransfers.ui.h:13 msgid "Cancel file transfer" @@ -1168,11 +1169,11 @@ #: ../data/gui/filetransfers.ui.h:14 msgid "Cancels the selected file transfer" -msgstr "ביטול העברת קובץ הנבחרת" +msgstr "ביטול העברת קובץ נבחרת" #: ../data/gui/filetransfers.ui.h:15 msgid "Hides the window" -msgstr "הסתרת החלון" +msgstr "הסתרת חלון" #: ../data/gui/gajim_themes_window.ui.h:1 msgid "Account row" @@ -1847,13 +1848,14 @@ msgid "Roster Appearance" msgstr "הופעת רשימה" +# התנהגות #: ../data/gui/preferences_window.ui.h:29 msgid "_Window behavior:" -msgstr "התנהגות _חלונות:" +msgstr "התנהלות _חלון:" #: ../data/gui/preferences_window.ui.h:30 msgid "Ma_ke message windows compact" -msgstr "השתמש בחלונות שיחה צ_פופים" +msgstr "הפוך חלונות שיחה לצ_פופים" #: ../data/gui/preferences_window.ui.h:31 msgid "Hide all buttons in chat windows" @@ -2258,7 +2260,7 @@ #: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102 msgid "Audio / Video" -msgstr "שמע \\ וידאו" +msgstr "שמע / וידאו" #: ../data/gui/preferences_window.ui.h:118 msgid "_File manager:" @@ -2298,7 +2300,7 @@ #: ../data/gui/preferences_window.ui.h:126 msgid "Allow client / _OS information to be sent" -msgstr "התר שליחת _מידע לקוח \\ מערכת הפעלה" +msgstr "התר שליחת _מידע לקוח / מערכת הפעלה" # BUG: a dot at the end # BUG: add Client too @@ -2306,8 +2308,7 @@ msgid "" "If checked, Gajim will allow others to detect the operation system you are " "using" -msgstr "" -"כאשר מסומן, Gajim יתיר לאחרים לאתר את מערכת ההפעלה אשר מצויה תחת שימושך" +msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את מערכת ההפעלה אשר מצויה בשימוש" #: ../data/gui/preferences_window.ui.h:128 msgid "Allow local system time information to be sent" @@ -2389,7 +2390,7 @@ #: ../data/gui/privacy_list_window.ui.h:6 msgid "Add / Edit a rule" -msgstr "הוספת \\ הסרת כלל" +msgstr "הוספת / הסרת כלל" # להתיר #: ../data/gui/privacy_list_window.ui.h:7 @@ -2637,7 +2638,8 @@ "someone(a)somewhere.com would like you to add some contacts in " "your roster." msgstr "" -"מישהו(a)xn--4dbido9c4a.xn--9dbq2a מעוניין להוסיף כמה אנשי קשר חדשים אל רשימתך." +"מישהו(a)xn--4dbido9c4a.xn--9dbq2a מעוניין להוסיף כמה אנשי קשר חדשים אל הרשימה " +"שלך." #: ../data/gui/roster_item_exchange_window.ui.h:3 #: ../data/gui/service_registration_window.ui.h:3 @@ -2769,7 +2771,7 @@ #: ../data/gui/single_message_window.ui.h:1 msgid "To:" -msgstr "אל:" +msgstr "לכבוד:" #: ../data/gui/single_message_window.ui.h:5 msgid "Sen_d" @@ -2789,7 +2791,7 @@ #: ../data/gui/single_message_window.ui.h:10 msgid "Send message and close window" -msgstr "שליחת הודעה וסגירת החלון" +msgstr "מסירת הודעה וסגירת החלון" #: ../data/gui/subscription_request_window.ui.h:1 msgid "Subscription Request" @@ -3152,7 +3154,7 @@ #: ../src/chat_control.py:1765 #: ../src/command_system/implementation/standard.py:215 msgid "Toggle audio session" -msgstr "הפעלת סשן שמע" +msgstr "הפעלת סשן קולי" #: ../src/chat_control.py:1766 #: ../src/command_system/implementation/standard.py:225 @@ -3393,9 +3395,8 @@ msgstr "חיבור עם עמית לא היה אפשרי לביסוס." #: ../src/command_system/implementation/custom.py:105 -#, fuzzy msgid "The same as using a doc-string, except it supports translation" -msgstr "זהה לניצול doc-string, חוץ מן העובדה שזה תומך תרגום" +msgstr "" #: ../src/command_system/implementation/execute.py:53 msgid "Execute expression inside a shell, show output" @@ -3403,7 +3404,7 @@ #: ../src/command_system/implementation/execute.py:109 msgid "Execute expression inside a shell, send output" -msgstr "הרצת ביטוי בתוך מעטפת, שליחת פלט" +msgstr "הרצת ביטוי בתוך מעטפת, מסירת פלט" #: ../src/command_system/implementation/middleware.py:74 msgid "Error during command execution!" @@ -3421,11 +3422,11 @@ #: ../src/command_system/implementation/standard.py:83 msgid "Send a message to the contact" -msgstr "שליחת הודעה אל איש הקשר" +msgstr "מסירת הודעה אל איש הקשר" #: ../src/command_system/implementation/standard.py:88 msgid "Send action (in the third person) to the current chat" -msgstr "שליחת פעולה (בגוף שלישי) אל השיחה הנוכחית" +msgstr "מסירת פעולה (בגוף השלישי) אל השיחה הנוכחית" #: ../src/command_system/implementation/standard.py:93 msgid "Show logged messages which mention given text" @@ -3487,7 +3488,7 @@ #: ../src/command_system/implementation/standard.py:195 msgid "Send a ping to the contact" -msgstr "שליחת פינג אל איש הקשר" +msgstr "מסירת פינג אל איש הקשר" #: ../src/command_system/implementation/standard.py:198 msgid "Command is not supported for zeroconf accounts" @@ -3495,13 +3496,12 @@ #: ../src/command_system/implementation/standard.py:202 msgid "Send DTMF sequence through an open audio session" -msgstr "שליחת רצף טזמ״ת (DTMF) מבעד סשן שמע פתוח" - -# סשנים של שמע +msgstr "מסירת רצף טזמ״ת (DTMF) מבעד לסשן קולי פתוח" + # הפעלות #: ../src/command_system/implementation/standard.py:205 msgid "No open audio sessions with the contact" -msgstr "לא קיימים סשני שמע פתוחים עם איש הקשר" +msgstr "לא קיימים סשנים קוליים פתוחים עם איש הקשר" #: ../src/command_system/implementation/standard.py:208 #, python-format @@ -3510,16 +3510,18 @@ #: ../src/command_system/implementation/standard.py:218 msgid "Audio sessions are not available" -msgstr "סשן שמע אינו זמין" +msgstr "סשנים קוליים אינם זמינים" #: ../src/command_system/implementation/standard.py:228 msgid "Video sessions are not available" -msgstr "סשן וידאו לא זמין" - +msgstr "סשנים חזותיים אינם זמינים" +

1 0

gajim: close FT port as soon as we know it won't be used for the...
by Gajim 16 Jun '14

16 Jun '14

changeset c1a09240fb19 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=c1a09240fb19 description: close FT port as soon as we know it won't be used for the transfer. diffstat: src/common/jingle_ft.py | 3 ++- src/common/jingle_ftstates.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-) diffs (30 lines): diff -r a24816ccd98e -r c1a09240fb19 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sun Jun 01 22:32:44 2014 +0200 +++ b/src/common/jingle_ft.py Mon Jun 16 21:32:01 2014 +0200 @@ -282,7 +282,8 @@ streamhost_used = cand break if streamhost_used == None or streamhost_used['type'] == 'proxy': - if not gajim.socks5queue.listener.connections: + if gajim.socks5queue.listener and \ + not gajim.socks5queue.listener.connections: gajim.socks5queue.listener.disconnect() if content.getTag('transport').getTag('activated'): self.state = STATE_TRANSFERING diff -r a24816ccd98e -r c1a09240fb19 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Sun Jun 01 22:32:44 2014 +0200 +++ b/src/common/jingle_ftstates.py Mon Jun 16 21:32:01 2014 +0200 @@ -151,9 +151,13 @@ if self.jft.isOurCandUsed(): mode = 'client' streamhost_used = self.jft.nominated_cand['our-cand'] + gajim.socks5queue.remove_server(self.jft.file_props.sid) else: mode = 'server' streamhost_used = self.jft.nominated_cand['peer-cand'] + gajim.socks5queue.remove_client(self.jft.file_props.sid) +# our_cand = self.jft.nominated_cand['our-cand'] +# gajim.socks5queue.remove_receiver(our_cand['idx']) if streamhost_used['type'] == 'proxy': self.jft.file_props.is_a_proxy = True if self.jft.file_props.type_ == 's' and self.jft.weinitiate:

1 0

gajim-website: added arabic translation to website
by Gajim Website 02 Jun '14

02 Jun '14

changeset 6f7a39b665e3 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=6f7a39b665e3 description: added arabic translation to website diffstat: Design.php | 9 +- imgs/ar_flag.png | Bin locale/ar_AE/LC_MESSAGES/msg.po | 917 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 922 insertions(+), 4 deletions(-) diffs (truncated from 970 to 300 lines): diff -r bbf08b2d36b4 -r 6f7a39b665e3 Design.php --- a/Design.php Mon Apr 21 21:12:07 2014 +0200 +++ b/Design.php Mon Jun 02 17:21:00 2014 +0200 @@ -58,7 +58,7 @@ $preflang = get_pref_language_array($_SERVER["HTTP_ACCEPT_LANGUAGE"]); else $preflang = array(0 => 'en'); - $availablelang = array('fr', 'en', 'es', 'bg', 'pt-br', 'eo', 'ru', 'de', 'it', 'pl', 'hu', 'he'); + $availablelang = array('fr', 'en', 'es', 'bg', 'pt-br', 'eo', 'ru', 'de', 'it', 'pl', 'hu', 'he', 'ar'); $result = array_intersect($preflang, $availablelang); if (count($result) != 0) $language = $result[0]; @@ -72,7 +72,7 @@ session_start(); // print_r($_SERVER); $language = get_language(); - $lang_association = array('fr' => 'fr_FR', 'fr_CA' => 'fr_FR', 'en' => 'en_US', 'en-gb' => 'en_US', 'en-us' => 'en_US', 'es' => 'es_ES', 'es_MX' => 'es_ES', 'es_AR' => 'es_ES', 'es_UY' => 'es_ES', 'bg' => 'bg_BG', 'pt' => 'pt_BR', 'pt-br' => 'pt_BR', 'eo_EO' => 'eo', 'eo_XX' => 'eo', 'eo' => 'eo', 'ru' => 'ru_RU', 'ru_SU' => 'ru_RU', 'de' => 'de_DE', 'at' => 'de_DE', 'ch' => 'de_DE', 'it' => 'it_IT', 'pl' => 'pl_PL', 'hu' => 'hu_HU', 'he' => 'he_IL'); + $lang_association = array('fr' => 'fr_FR', 'en' => 'en_US', 'es' => 'es_ES', 'bg' => 'bg_BG', 'pt' => 'pt_BR', 'pt-br' => 'pt_BR', 'eo_EO' => 'eo', 'eo_XX' => 'eo', 'eo' => 'eo', 'ru' => 'ru_RU', 'de' => 'de_DE', 'at' => 'de_DE', 'ch' => 'de_DE', 'it' => 'it_IT', 'pl' => 'pl_PL', 'hu' => 'hu_HU', 'he' => 'he_IL', 'ar' => 'ar_AE'); $lang = $lang_association[$language]; putenv("LANG=$lang"); setlocale(LC_ALL, $lang); @@ -128,7 +128,7 @@ echo " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"; echo " <title>\n $titre\n </title>\n"; echo " <link rel=\"stylesheet\" href=\"css/main.css\" type=\"text/css\" />\n"; - if ($language == "he") + if ($language == "he" or $language == "ar") echo " <link rel=\"stylesheet\" href=\"css/main-rtl.css\" type=\"text/css\" />\n"; echo " <link rel=\"shortcut icon\" href=\"/favicon.ico\" />\n"; if ($page == "dev.php") @@ -162,6 +162,7 @@ echo " <a href = \"$page?lang=pl\"><img src=\"imgs/pl_flag.png\" alt=\"pl_flag\" title=\"Strona w języku Polskim\" /></a>\n"; echo " <a href = \"$page?lang=hu\"><img src=\"imgs/hu_flag.png\" alt=\"hu_flag\" title=\"Weboldal magyarul\" /></a>\n"; echo " <a href = \"$page?lang=he\"><img src=\"imgs/he_flag.png\" alt=\"he_flag\" title=\"אתר הרשת בעברית\" /></a>\n"; + echo " <a href = \"$page?lang=ar\"><img src=\"imgs/ar_flag.png\" alt=\"ar_flag\" title=\"الموقع باللغة العربية\" /></a>\n"; echo " </div> \n</div>\n"; echo "<div class=\"menu\">\n"; while ( list ($libelle, $ancre) = each ($menu)){ @@ -172,7 +173,7 @@ } echo " </div>\n"; echo " <div id=\"inner\""; - if ($language == "he") + if ($language == "he" or $language == "ar") echo " style=\"direction: rtl;\""; echo "> \n"; diff -r bbf08b2d36b4 -r 6f7a39b665e3 imgs/ar_flag.png Binary file imgs/ar_flag.png has changed diff -r bbf08b2d36b4 -r 6f7a39b665e3 locale/ar_AE/LC_MESSAGES/msg.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locale/ar_AE/LC_MESSAGES/msg.po Mon Jun 02 17:21:00 2014 +0200 @@ -0,0 +1,917 @@ +# Arabic translations for PACKAGE package. +# Copyright (C) 2014 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Yann <asterix(a)asterix.lagaule.org>, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: mag\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-02 17:14+0200\n" +"PO-Revision-Date: 2014-06-02 01:08+0300\n" +"Last-Translator: Yann <asterix(a)asterix.lagaule.org>\n" +"Language-Team: Arabic <karrar.kazuya(a)gmail.com>\n" +"Language: ar_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.6.5\n" + +#: Design.php:85 +msgid "Home" +msgstr "الرئيسية" + +#: Design.php:86 +msgid "Screenshots" +msgstr "صور البرنامج" + +#: Design.php:87 +msgid "Download" +msgstr "تحميل" + +#: Design.php:88 +msgid "Documentation" +msgstr "التوثيق" + +#: Design.php:89 +msgid "Wiki" +msgstr "شرح Wiki" + +#: Design.php:90 +msgid "Development" +msgstr "التطوير" + +#: Design.php:94 +msgid "Debian" +msgstr "Debian" + +#: Design.php:95 +msgid "Slackware" +msgstr "stackware" + +#: Design.php:96 +msgid "Ubuntu" +msgstr "Ubuntu" + +#: Design.php:97 +msgid "Fedora" +msgstr "Fedora" + +#: Design.php:98 +msgid "Gentoo" +msgstr "Gentoo" + +#: Design.php:99 +msgid "Archlinux" +msgstr "Archlinux" + +#: Design.php:100 +msgid "SuSE" +msgstr "SuSE" + +#: Design.php:101 +msgid "PLD" +msgstr "PLD" + +#: Design.php:102 +msgid "Sourcemage" +msgstr "صورة مصدرية" + +#: Design.php:103 +msgid "Mandriva" +msgstr "Mandriva" + +#: Design.php:104 +msgid "Zenwalk" +msgstr "Zenwalk" + +#: Design.php:105 +msgid "AgiliaLinux" +msgstr "AgiliaLinux" + +#: Design.php:106 +msgid "FreeBSD" +msgstr "FreeBSD" + +#: Design.php:107 +msgid "Autopackage" +msgstr "Autopackage" + +#: Design.php:108 +msgid "Windows installer" +msgstr "منصب للوندوز" + +#: Design.php:109 +msgid "Source" +msgstr "مصدر" + +#: Design.php:110 +msgid "Mercurial" +msgstr "Mercurial" + +#: Design.php:111 +msgid "Daily snapshots" +msgstr "صور يومية" + +#: Design.php:112 +msgid "Old releases" +msgstr "نسخ قديمة" + +#: Design.php:116 +msgid "Installation" +msgstr "التنصيب" + +#: Design.php:117 +msgid "Jabber" +msgstr "جابر" + +#: Design.php:118 +msgid "Structure" +msgstr "التركيب" + +#: Design.php:151 +msgid " Language:" +msgstr "اللغة:" + +#: Design.php:198 +msgid "" +" Site optimized for W3C Standards and realized with vim editor under GNU/" +"Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" +msgstr "" +" Site optimized for W3C Standards and realized with vim editor under GNU/" +"Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" + +#: dev.php:5 downloads.php:5 screenshots.php:7 +msgid "Gajim, a Jabber client" +msgstr "كاجيم, برنامج جابر" + +#: dev.php:10 +msgid " Our Room" +msgstr "غرفتنا" + +#: dev.php:12 +msgid " Our room is" +msgstr "غرفتنا هي" + +#: dev.php:12 +msgid "You are welcome to join and communicate with us." +msgstr "انت مرحب بك للانضمام و التواصل معنا." + +#: dev.php:17 +msgid " Mailing List" +msgstr "قائمة العناوين" + +#: dev.php:19 +msgid " You may also want to subscribe to our mailing list (low-traffic): " +msgstr "قد ترغب ب الاشتراك ب قائمة العناوين خاصتنا (low-traffic):" + +#: dev.php:19 +msgid "or by visiting" +msgstr "او عن طريق زيارة" + +#: dev.php:20 +msgid " List archives are available " +msgstr "قائمة ارشيفات متوفرة " + +#: dev.php:20 docs.php:39 docs.php:45 downloads.php:24 downloads.php:38 +#: downloads.php:161 downloads.php:163 downloads.php:173 downloads.php:211 +#: downloads.php:231 +msgid "here" +msgstr "هنا" + +#: dev.php:25 +msgid " Repository" +msgstr " المستودع" + +#: dev.php:27 +msgid "To checkout hg do" +msgstr "للخروج قم ب" + +#: dev.php:29 +msgid " You can also" +msgstr " ايضا ب استطاعتك" + +#: dev.php:29 +msgid "browse SVN repository" +msgstr "تصفح مستودع SVN" + +#: dev.php:34 +msgid " How you can help" +msgstr " كيف يمكنك ان تساعد" + +#: dev.php:36 +msgid " Here are some" +msgstr " هنا بعض ال" + +#: dev.php:36 +msgid "to track bugs and plan the development of Gajim.\n" +msgstr "لتعقب المشكلات و خطط التطوير الخاصة ب كاجيم.\n" + +#: dev.php:36 +msgid "wiki pages" +msgstr "صفحات شرح Wiki" + +#: dev.php:38 +msgid " You can help us make Gajim even better by:\n" +msgstr " يمكنك ان تساعدنا بجعل كاجيم افضل عن طريق:\n" + +#: dev.php:41 +msgid "" +" Coding: contact us on our mailing list or in our room gajim@conference." +"gajim.org \n" +msgstr "" +" كتابة الشفرة: تواص معنا من خلال قائمة العناوين او عن طريق غرفتنا " +"التالية gajim(a)conference.gajim.org \n" + +#: dev.php:44 +msgid " Submitting a translation: see" +msgstr " لتفديم ترجمة: انظر ل" + +#: dev.php:44 +msgid "DevTranslate page" +msgstr "صفحة تطوير الترجمة" + +#: dev.php:47 +msgid " Bug reporting: in case you find a bug, do not hesitate to" +msgstr " تقارير المشاكل: في حال اذا ما واجهتك مشكلة, لا تتردد ب" + +#: dev.php:47 +msgid "report it" +msgstr "الاعلام" + +#: dev.php:50 +msgid " Donating: " +msgstr " التبرع: " + +#: dev.php:62 +msgid " Translations status"

1 0

gajim: don't allow empty string in new chat dialog entry complet...
by Gajim 01 Jun '14

01 Jun '14

changeset a24816ccd98e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a24816ccd98e description: don't allow empty string in new chat dialog entry completion. Fixes #7760 diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3fe9df82f976 -r a24816ccd98e src/common/helpers.py --- a/src/common/helpers.py Sun Jun 01 16:51:51 2014 +0200 +++ b/src/common/helpers.py Sun Jun 01 22:32:44 2014 +0200 @@ -685,7 +685,7 @@ del contacts_dict[name] contacts_dict['%s (%s)' % (name, contact1.jid)] = contact1 contacts_dict['%s (%s)' % (name, jid)] = contact - else: + elif contact.name: if contact.name == gajim.get_nick_from_jid(jid): del contacts_dict[jid] contacts_dict[name] = contact

1 0

gajim: correctly search for contact when doing pm
by Gajim 01 Jun '14

01 Jun '14

changeset 3fe9df82f976 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3fe9df82f976 description: correctly search for contact when doing pm diffstat: src/common/connection.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 2f3fecd07d6a -r 3fe9df82f976 src/common/connection.py --- a/src/common/connection.py Sun Jun 01 15:42:28 2014 +0200 +++ b/src/common/connection.py Sun Jun 01 16:51:51 2014 +0200 @@ -464,7 +464,9 @@ msg_iq = iqs else: msg_iq.setTo(fjid) - r_ = resource or gajim.get_resource_from_jid(fjid) + r_ = resource + if not r_ and jid != fjid: # Only if we're not in a pm + r_ = gajim.get_resource_from_jid(fjid) if r_: contact = gajim.contacts.get_contact(self.name, jid, r_) else:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2014