Commits August 2013

commits@gajim.org

3 participants
325 discussions

gajim: Set gajim version to 0.16-alpha2
by Gajim 28 Aug '13

28 Aug '13

changeset cbe40841ba1e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cbe40841ba1e description: Set gajim version to 0.16-alpha2 diffstat: autogen.sh | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (10 строк): diff -r 0ec1f7cd1b26 -r cbe40841ba1e autogen.sh --- a/autogen.sh Wed Aug 28 11:31:17 2013 +0400 +++ b/autogen.sh Wed Aug 28 11:55:21 2013 +0400 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.4" + gajimversion="0.16-alpha2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}"

1 0

gajim: Rename acronyms file
by Gajim 28 Aug '13

28 Aug '13

changeset 0ec1f7cd1b26 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0ec1f7cd1b26 description: Rename acronyms file diffstat: plugins/acronyms_expander/acronyms | 69 -------------------------- plugins/acronyms_expander/acronyms.py | 69 ++++++++++++++++++++++++++ plugins/acronyms_expander/acronyms_expander.py | 2 +- 3 файлов изменено, 70 вставок(+), 70 удалений(-) различия (158 строк): diff -r aa9047fb19be -r 0ec1f7cd1b26 plugins/acronyms_expander/acronyms --- a/plugins/acronyms_expander/acronyms Wed Aug 28 10:06:57 2013 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -{"afaik": "as far as I know", -"afaict": "as far as I can tell", -"afk": "away from keyboard", -"atm": "at the moment", -"bbiab": "be back in a bit", -"bbiaf": "be back in a few (minutes)", -"bbl": "be back later", -"bbs": "be back soon", -"b/c": "because", -"bf": "boyfriend", -"bfo": "blinding flash of the obvious", -"brb": "be right back", -"bsod": "blue screen of death", -"btw": "by the way", -"ciao": "Italian for goodbye", -"ctrn": "can't talk right now", -"cul8r": "see you later", -"cya": "see ya", -"dhtb": "don't have the bandwidth", -"f2f": "face to face", -"fubar": "fucked up beyond all recognition", -"fwiw": "for what it's worth", -"fyi": "for your information", -"gmta": "great minds think alike", -"iam": "in a meeting", -"ianal": "I am not a lawyer", -"ihmb": "I hate my boss", -"iirc": "if I recall correctly", -"imho": "in my humble opinion", -"imo": "in my opinion", -"iow": "in other words", -"irl": "in real life", -"<g>": "grin", -"*g*": "grin", -"gf": "girlfriend", -"gmta": "great minds think alike", -"g2g": "got to go", -"jid": "jabber identifier", -"j/k": "just kidding", -"ok": "okay", -"lol": "laugh out loud", -"l8r": "later", -"msg": "message", -"n/m": "never mind", -"n/p": "no problem", -"oAo": "over and out!", -"omg": "oh my god", -"oob": "out of band", -"otoh": "on the other hand", -"oww": "oops, wrong window!", -"otp": "on the phone", -"pita": "pain in the ass", -"pov": "point of view", -"pw": "password", -"rotfl": "rolling on the floor laughing", -"rsn": "real soon now", -"rtfm": "read the friendly manual", -"slap": "sounds like a plan", -"thx": "thanks", -"tia": "thanks in advance", -"tla": "three-letter arconym", -"ttfn": "ta ta for now", -"ttyl": "talk to you later", -"wb": "welcome back", -"wfm": "works for me", -"wtf": "what the fuck?!", -"wtg": "way to go!", -"xfer": "transfer", -"ymmv": "your mileage may vary",} diff -r aa9047fb19be -r 0ec1f7cd1b26 plugins/acronyms_expander/acronyms.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/acronyms_expander/acronyms.py Wed Aug 28 11:31:17 2013 +0400 @@ -0,0 +1,69 @@ +{"afaik": "as far as I know", +"afaict": "as far as I can tell", +"afk": "away from keyboard", +"atm": "at the moment", +"bbiab": "be back in a bit", +"bbiaf": "be back in a few (minutes)", +"bbl": "be back later", +"bbs": "be back soon", +"b/c": "because", +"bf": "boyfriend", +"bfo": "blinding flash of the obvious", +"brb": "be right back", +"bsod": "blue screen of death", +"btw": "by the way", +"ciao": "Italian for goodbye", +"ctrn": "can't talk right now", +"cul8r": "see you later", +"cya": "see ya", +"dhtb": "don't have the bandwidth", +"f2f": "face to face", +"fubar": "fucked up beyond all recognition", +"fwiw": "for what it's worth", +"fyi": "for your information", +"gmta": "great minds think alike", +"iam": "in a meeting", +"ianal": "I am not a lawyer", +"ihmb": "I hate my boss", +"iirc": "if I recall correctly", +"imho": "in my humble opinion", +"imo": "in my opinion", +"iow": "in other words", +"irl": "in real life", +"<g>": "grin", +"*g*": "grin", +"gf": "girlfriend", +"gmta": "great minds think alike", +"g2g": "got to go", +"jid": "jabber identifier", +"j/k": "just kidding", +"ok": "okay", +"lol": "laugh out loud", +"l8r": "later", +"msg": "message", +"n/m": "never mind", +"n/p": "no problem", +"oAo": "over and out!", +"omg": "oh my god", +"oob": "out of band", +"otoh": "on the other hand", +"oww": "oops, wrong window!", +"otp": "on the phone", +"pita": "pain in the ass", +"pov": "point of view", +"pw": "password", +"rotfl": "rolling on the floor laughing", +"rsn": "real soon now", +"rtfm": "read the friendly manual", +"slap": "sounds like a plan", +"thx": "thanks", +"tia": "thanks in advance", +"tla": "three-letter arconym", +"ttfn": "ta ta for now", +"ttyl": "talk to you later", +"wb": "welcome back", +"wfm": "works for me", +"wtf": "what the fuck?!", +"wtg": "way to go!", +"xfer": "transfer", +"ymmv": "your mileage may vary",} diff -r aa9047fb19be -r 0ec1f7cd1b26 plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Wed Aug 28 10:06:57 2013 +0400 +++ b/plugins/acronyms_expander/acronyms_expander.py Wed Aug 28 11:31:17 2013 +0400 @@ -62,7 +62,7 @@ @log_calls('AcronymsExpanderPlugin') def get_own_acronyms_list(self): - data_file = self.local_file_path('acronyms') + data_file = self.local_file_path('acronyms.py') data = open(data_file, 'r') acronyms = eval(data.read()) data.close()

1 0

gajim: Fix merged accounts.See [574655470339]
by Gajim 28 Aug '13

28 Aug '13

changeset aa9047fb19be in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=aa9047fb19be description: Fix merged accounts.See [574655470339] diffstat: src/roster_window.py | 4 +--- 1 файлов изменено, 1 вставок(+), 3 удалений(-) различия (17 строк): diff -r 61620d0da17a -r aa9047fb19be src/roster_window.py --- a/src/roster_window.py Tue Aug 27 23:35:11 2013 +0400 +++ b/src/roster_window.py Wed Aug 28 10:06:57 2013 +0400 @@ -1456,12 +1456,10 @@ for acct in gajim.contacts.get_accounts(): self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}} - self._before_fill() for acct in gajim.contacts.get_accounts(): self.add_account(acct) - self.add_account_contacts(acct, improve_speed=False, + self.add_account_contacts(acct, improve_speed=True, draw_contacts=False) - self._after_fill() # Recalculate column width for ellipsizing self.tree.columns_autosize()

1 0

gajim: Add account name to SSL Certificate Verification dialog t...
by Gajim 27 Aug '13

27 Aug '13

changeset 61620d0da17a in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=61620d0da17a description: Add account name to SSL Certificate Verification dialog title diffstat: src/gui_interface.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r f46b67dbc11e -r 61620d0da17a src/gui_interface.py --- a/src/gui_interface.py Tue Aug 27 23:21:16 2013 +0400 +++ b/src/gui_interface.py Tue Aug 27 23:35:11 2013 +0400 @@ -1352,7 +1352,7 @@ sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) self.instances[account]['online_dialog']['ssl_error'].set_title( - _('SSL Certificate Verification')) + _('SSL Certificate Verification for %s') % account) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim: [Darlan] Set title for ssl error dialogs
by Gajim 27 Aug '13

27 Aug '13

changeset f46b67dbc11e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f46b67dbc11e description: [Darlan] Set title for ssl error dialogs diffstat: src/dialogs.py | 1 + src/gui_interface.py | 2 ++ 2 файлов изменено, 3 вставок(+), 0 удалений(-) различия (20 строк): diff -r 5912786d1485 -r f46b67dbc11e src/dialogs.py --- a/src/dialogs.py Tue Aug 27 20:22:20 2013 +0400 +++ b/src/dialogs.py Tue Aug 27 23:21:16 2013 +0400 @@ -5433,3 +5433,4 @@ def on_cert_clicked(self, button): d = CertificatDialog(self, self.account, self.cert) + d.set_title(_('Certificate')) diff -r 5912786d1485 -r f46b67dbc11e src/gui_interface.py --- a/src/gui_interface.py Tue Aug 27 20:22:20 2013 +0400 +++ b/src/gui_interface.py Tue Aug 27 23:21:16 2013 +0400 @@ -1351,6 +1351,8 @@ dialogs.SSLErrorDialog(obj.conn.name, obj.certificate, pritext, sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) + self.instances[account]['online_dialog']['ssl_error'].set_title( + _('SSL Certificate Verification')) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim-website: fix he translation
by Gajim Website 27 Aug '13

27 Aug '13

changeset 7134a8f6539a in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=7134a8f6539a description: fix he translation diffstat: locale/he_IL/LC_MESSAGES/msg.po | 2 +- msg.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 42732cd95eaf -r 7134a8f6539a locale/he_IL/LC_MESSAGES/msg.po --- a/locale/he_IL/LC_MESSAGES/msg.po Mon Aug 26 18:02:11 2013 +0200 +++ b/locale/he_IL/LC_MESSAGES/msg.po Tue Aug 27 20:04:58 2013 +0200 @@ -647,7 +647,7 @@ # קישוריות מסרים מקומית #: index.php:38 msgid "Link local (bonjour / zeroconf), BOSH" -msgstr "קישורית מקומית (bonjour / zeroconf), $rlm;BOSH" +msgstr "קישורית מקומית (bonjour / zeroconf), &rlm;BOSH" #: index.php:39 msgid "Other features via plugins" diff -r 42732cd95eaf -r 7134a8f6539a msg.pot --- a/msg.pot Mon Aug 26 18:02:11 2013 +0200 +++ b/msg.pot Tue Aug 27 20:04:58 2013 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-26 16:08+0200\n" +"POT-Creation-Date: 2013-08-26 18:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n"

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 27 Aug '13

27 Aug '13

changeset 5912786d1485 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5912786d1485 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 8 ++++---- 1 файлов изменено, 4 вставок(+), 4 удалений(-) различия (39 строк): diff -r 11e7eac368a0 -r 5912786d1485 po/he.po --- a/po/he.po Tue Aug 27 17:24:41 2013 +0200 +++ b/po/he.po Tue Aug 27 20:22:20 2013 +0400 @@ -9,7 +9,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-27 10:18+0300\n" -"PO-Revision-Date: 2013-08-27 10:25+0200\n" +"PO-Revision-Date: 2013-08-27 19:26+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -3246,7 +3246,7 @@ #: ../src/chat_control.py:2283 msgid "is NOT" -msgstr "*אינה*" +msgstr "אינה" #. chat session %s be logged #: ../src/chat_control.py:2285 @@ -3255,7 +3255,7 @@ #: ../src/chat_control.py:2285 msgid "will NOT" -msgstr "*לא* יירשם" +msgstr "לא יירשם" #. About encrypted chat session #: ../src/chat_control.py:2289 @@ -3265,7 +3265,7 @@ #. About encrypted chat session #: ../src/chat_control.py:2293 msgid "and NOT authenticated" -msgstr "ו*אינה* מאומתת" +msgstr "ואינה מאומתת" #. status will become 'is' or 'is not', authentificaed will become #. 'and authentificated' or 'and not authentificated', logged will become

1 0

gajim: don't create a new session when we get an error message i...
by Gajim 27 Aug '13

27 Aug '13

changeset 11e7eac368a0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=11e7eac368a0 description: don't create a new session when we get an error message in a pm. Fixes #7435 diffstat: src/common/connection_handlers.py | 11 +++++++++++ src/common/connection_handlers_events.py | 13 +++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diffs (44 lines): diff -r 4ff65caaa912 -r 11e7eac368a0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Aug 27 15:49:08 2013 +0400 +++ b/src/common/connection_handlers.py Tue Aug 27 17:24:41 2013 +0200 @@ -1367,6 +1367,17 @@ else: return None + def get_latest_session(self, jid): + """ + Get the session that we last sent a message to + """ + if jid not in self.sessions: + return None + sessions = self.sessions[jid].values() + if not sessions: + return None + return sorted(sessions, key=operator.attrgetter('last_send'))[-1] + def find_controlless_session(self, jid, resource=None): """ Find an active session that doesn't have a control attached diff -r 4ff65caaa912 -r 11e7eac368a0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Aug 27 15:49:08 2013 +0400 +++ b/src/common/connection_handlers_events.py Tue Aug 27 17:24:41 2013 +0200 @@ -1109,8 +1109,17 @@ self.session = None if self.mtype != 'groupchat': - self.session = self.conn.get_or_create_session(self.fjid, - self.thread_id) + if gajim.interface.is_pm_contact(self.fjid, account) and \ + self.mtype == 'error': + self.session = self.conn.find_session(self.fjid, self.thread_id) + if not self.session: + self.session = self.conn.get_latest_session(self.fjid) + if not self.session: + self.session = self.conn.make_new_session(self.fjid, + self.thread_id, type_='pm') + else: + self.session = self.conn.get_or_create_session(self.fjid, + self.thread_id) if self.thread_id and not self.session.received_thread_id: self.session.received_thread_id = True

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 27 Aug '13

27 Aug '13

changeset 4ff65caaa912 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4ff65caaa912 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 491 ++++++++++++++++++++++++++++++++++---------------------------- 1 файлов изменено, 267 вставок(+), 224 удалений(-) различия (урезанные с 1366 до 300 строк): diff -r 618cda1142ae -r 4ff65caaa912 po/he.po --- a/po/he.po Mon Aug 26 20:34:58 2013 +0200 +++ b/po/he.po Tue Aug 27 15:49:08 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-24 08:22+0300\n" -"PO-Revision-Date: 2013-08-24 08:34+0200\n" +"POT-Creation-Date: 2013-08-27 10:18+0300\n" +"PO-Revision-Date: 2013-08-27 10:25+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -184,10 +184,10 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1248 ../src/config.py:1262 ../src/config.py:1267 -#: ../src/config.py:1315 ../src/config.py:1418 ../src/config.py:1737 -#: ../src/config.py:1742 ../src/config.py:2334 ../src/config.py:2415 -#: ../src/config.py:2430 ../src/config.py:3711 ../src/config.py:3786 +#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 +#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 +#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 +#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 #: ../src/dialogs.py:536 ../src/roster_window.py:3149 #: ../src/roster_window.py:3155 ../src/roster_window.py:3160 @@ -390,7 +390,7 @@ msgid "_use HTTP__PROXY environment variable" msgstr "השתמש במשת_ני סביבת HTTP__PROXY" -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:133 +#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134 msgid "_Manage..." msgstr " ניהו_ל... " @@ -436,7 +436,7 @@ msgid "_Port: " msgstr "_פורט: " -#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:137 +#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138 msgid "Miscellaneous" msgstr "שונות" @@ -444,8 +444,8 @@ msgid "Connection" msgstr "חיבור" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1835 -#: ../src/config.py:2431 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840 +#: ../src/config.py:2436 msgid "No key selected" msgstr "לא נבחר מפתח" @@ -522,7 +522,7 @@ msgstr "דוא״ל:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1862 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867 #: ../src/dialogs.py:841 msgid "Jabber ID:" msgstr "מזהה Jabber:" @@ -1002,12 +1002,9 @@ msgstr "הפעל הצפנת Open_PGP" # BUG: No _underline -# I need another word for Toggle -# [ x ] Activate -# קצה אל קצה #: ../data/gui/contact_context_menu.ui.h:7 msgid "Toggle End to End Encryption" -msgstr "הפעל הצפנת E2E" +msgstr "הפעל הצפנת קצה אל קצה" #: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5759 #: ../src/roster_window.py:5997 @@ -1403,8 +1400,8 @@ "Generally avoid deletions with contacts you currently chat with." msgstr "" "אזהרה:\n" -"אם בכוונתך לבצע מחיקה בקנה מידה גדול, אנא ודא כי היישום Gajim אינו מורץ. " -"באופן כללי מוטב להימנע ממחיקות עם אנשי קשר אשר משוחחים עמך כעת." +"אם בכוונתך לבצע מחיקה בקנה מידה גדול, אנא ודא כי Gajim אינו מורץ. באופן כללי " +"מוטב להימנע ממחיקות עם אנשי קשר אשר משוחחים עמך כעת." #: ../data/gui/history_manager.ui.h:8 msgid "_Search Database" @@ -1543,7 +1540,7 @@ msgid "_Bookmark this room" msgstr "_סמן את חדר זה" -#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1852 +#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857 msgid "Server:" msgstr "שרת:" @@ -2204,59 +2201,63 @@ msgstr "הודעתך:" #: ../data/gui/preferences_window.ui.h:100 +msgid "Group chat highlight:" +msgstr "הבלטת שיחת קבוצה:" + +#: ../data/gui/preferences_window.ui.h:101 msgid "Chat Line Colors" msgstr "צבעי שורות שיחה" -#: ../data/gui/preferences_window.ui.h:101 +#: ../data/gui/preferences_window.ui.h:102 msgid "Style" msgstr "סגנון" # התקן -#: ../data/gui/preferences_window.ui.h:102 +#: ../data/gui/preferences_window.ui.h:103 msgid "Audio input device" msgstr "מכשיר קלט שמע" -#: ../data/gui/preferences_window.ui.h:103 +#: ../data/gui/preferences_window.ui.h:104 msgid "Audio output device" msgstr "מכשיר פלט שמע" -#: ../data/gui/preferences_window.ui.h:104 +#: ../data/gui/preferences_window.ui.h:105 msgid "Audio" msgstr "שמע" -#: ../data/gui/preferences_window.ui.h:105 +#: ../data/gui/preferences_window.ui.h:106 msgid "Video input device" msgstr "מכשיר קלט וידאו" -#: ../data/gui/preferences_window.ui.h:106 +#: ../data/gui/preferences_window.ui.h:107 msgid "Video output device" msgstr "מכשיר פלט וידאו" -#: ../data/gui/preferences_window.ui.h:107 +#: ../data/gui/preferences_window.ui.h:108 msgid "Video framerate" msgstr "תדר וידאו" -#: ../data/gui/preferences_window.ui.h:108 +#: ../data/gui/preferences_window.ui.h:109 msgid "Video size" msgstr "גודל וידאו" -#: ../data/gui/preferences_window.ui.h:109 +#: ../data/gui/preferences_window.ui.h:110 msgid "View own video source" msgstr "הצג מקור וידאו עצמי" -#: ../data/gui/preferences_window.ui.h:110 +#: ../data/gui/preferences_window.ui.h:111 msgid "Video" msgstr "וידאו" -#: ../data/gui/preferences_window.ui.h:111 +#: ../data/gui/preferences_window.ui.h:112 msgid "STUN server:" msgstr "שרת STUN:" -#: ../data/gui/preferences_window.ui.h:112 +#: ../data/gui/preferences_window.ui.h:113 msgid "(example: stunserver.org)" msgstr "(דוגמא: stunserver.org)" -#: ../data/gui/preferences_window.ui.h:113 +#: ../data/gui/preferences_window.ui.h:114 msgid "" "STUN server hostname. If none given, Gajim will try\n" "to discover one from server." @@ -2264,41 +2265,41 @@ "שם מארח של שרת STUN. במידה ולא ניתן, Gajim ינסה\n" "למצוא אחד מתוך שרת." -#: ../data/gui/preferences_window.ui.h:115 +#: ../data/gui/preferences_window.ui.h:116 msgid "Connection" msgstr "חיבור" -#: ../data/gui/preferences_window.ui.h:116 ../src/features_window.py:102 +#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102 msgid "Audio / Video" msgstr "שמע \\ וידאו" -#: ../data/gui/preferences_window.ui.h:117 +#: ../data/gui/preferences_window.ui.h:118 msgid "_File manager:" msgstr "מנהל _קבצים:" -#: ../data/gui/preferences_window.ui.h:118 +#: ../data/gui/preferences_window.ui.h:119 msgid "_Mail client:" msgstr "לקוח _דואר:" -#: ../data/gui/preferences_window.ui.h:119 +#: ../data/gui/preferences_window.ui.h:120 msgid "_Browser:" msgstr "דפדפן:" #. a header for custom browser/client/file manager. so translate sth like: Custom Settings -#: ../data/gui/preferences_window.ui.h:121 +#: ../data/gui/preferences_window.ui.h:122 msgid "Custom" msgstr "התאמה אישית" -#: ../data/gui/preferences_window.ui.h:122 +#: ../data/gui/preferences_window.ui.h:123 msgid "Applications" msgstr "יישומים" -#: ../data/gui/preferences_window.ui.h:123 +#: ../data/gui/preferences_window.ui.h:124 msgid "_Ignore events from contacts not in the roster" msgstr "הת_עלם מן אירועים מאת אנשי קשר אשר לא נוכחים ברשימה" # BUG: a dot at the end -#: ../data/gui/preferences_window.ui.h:124 +#: ../data/gui/preferences_window.ui.h:125 msgid "" "If checked, Gajim will ignore incoming events from unauthorized contacts. " "Use with caution, because it blocks all messages from any contact that is " @@ -2308,13 +2309,13 @@ "מורשים. יש לעשות שימוש זהיר באפשרות זו, משום שזו חוסמת את כל ההודעות מכל איש " "קשר אשר לא מצוי ברשימה" -#: ../data/gui/preferences_window.ui.h:125 +#: ../data/gui/preferences_window.ui.h:126 msgid "Allow client / _OS information to be sent" msgstr "התר שליחת _מידע לקוח \\ מערכת הפעלה" # BUG: a dot at the end # BUG: add Client too -#: ../data/gui/preferences_window.ui.h:126 +#: ../data/gui/preferences_window.ui.h:127 msgid "" "If checked, Gajim will allow others to detect the operation system you are " "using" @@ -2322,61 +2323,61 @@ "במידה ואפשרות זו מסומנת, Gajim יתיר לאחרים לאתר את מערכת ההפעלה אשר מצויה " "תחת שימושך" -#: ../data/gui/preferences_window.ui.h:127 +#: ../data/gui/preferences_window.ui.h:128 msgid "Allow local system time information to be sent" msgstr "התר שליחת _זמן מערכת מקומי" # BUG: a dot at the end -#: ../data/gui/preferences_window.ui.h:128 +#: ../data/gui/preferences_window.ui.h:129 msgid "If checked, Gajim will allow others to detect the time on your system" msgstr "במידה ואפשרות זו מסומנת, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך" -#: ../data/gui/preferences_window.ui.h:129 +#: ../data/gui/preferences_window.ui.h:130 msgid "Log _encrypted chat session" msgstr "רשום סשן שיחה מו_צפן ברשומות ההיסטוריה" # BUG: encryption, the # אלמלא כן -#: ../data/gui/preferences_window.ui.h:130 +#: ../data/gui/preferences_window.ui.h:131 msgid "" "If checked, Gajim will keep logs for encrypted messages. Please note that " "when using E2E encryption the remote party has to agree on logging, else the " "messages will not be logged." msgstr "" "במידה ואפשרות זו מסומנת, Gajim ישמור רשומות עבור הודעות מוצפנות. אנא קח " -"לתשומת לבך כי כאשר הצפנת קצה אל קצה (E2E) נמצאת בשימוש, הצד המרוחק מוכרח " +"לתשומת לבך כי כאשר הצפנת E2E (קצה אל קצה) נמצאת בשימוש, הצד המרוחק מוכרח " "להסכים לרישום השיחה, אחרת ההודעות לא יירשמו." # חוסר מעש -#: ../data/gui/preferences_window.ui.h:131 +#: ../data/gui/preferences_window.ui.h:132 msgid "Allow my _idle time to be sent" msgstr "התר שליחת משך זמן _חוסר פעילות" -#: ../data/gui/preferences_window.ui.h:132 +#: ../data/gui/preferences_window.ui.h:133 msgid "Global proxy:" msgstr "ציר גלובלי:" -#: ../data/gui/preferences_window.ui.h:134 +#: ../data/gui/preferences_window.ui.h:135 msgid "Privacy" msgstr "פרטיות" -#: ../data/gui/preferences_window.ui.h:135 +#: ../data/gui/preferences_window.ui.h:136 msgid "_Log status changes of contacts" msgstr "רשום _שינויים של מצב חיבור של אנשי קשר"

1 0

gajim: fix traceback with new fileprops.
by Gajim 26 Aug '13

26 Aug '13

changeset 618cda1142ae in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=618cda1142ae description: fix traceback with new fileprops. diffstat: src/common/jingle_ft.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2e4d14f22026 -r 618cda1142ae src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Aug 26 10:01:00 2013 +0400 +++ b/src/common/jingle_ft.py Mon Aug 26 20:34:58 2013 +0200 @@ -95,7 +95,7 @@ if gajim.contacts.is_gc_contact(session.connection.name, session.peerjid): roomjid = session.peerjid.split('/')[0] - dstaddr = hashlib.sha1('%s%s%s' % (self.file_props['sid'], + dstaddr = hashlib.sha1('%s%s%s' % (self.file_props.sid, session.ourjid, roomjid)).hexdigest() self.file_props.dstaddr = dstaddr self.state = STATE_NOT_STARTED

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
33
Older →

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 August 2013