Commits July 2010

commits@gajim.org

7 participants
83 discussions

gajim: generate proxy host correctly
by fantasticsid＠lagaule.org 12 Jul '10

12 Jul '10

changeset ad143e6a69e9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ad143e6a69e9 description: generate proxy host correctly diffstat: src/common/jingle_transport.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (22 lines): diff -r c034eadbad06 -r ad143e6a69e9 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Thu Jul 08 16:05:19 2010 +0800 +++ b/src/common/jingle_transport.py Mon Jul 12 10:20:31 2010 +0800 @@ -189,8 +189,7 @@ return type_preference = 10 proxy_cand = [] - socks5conn = ConnectionSocks5Bytestream() - socks5conn.name = self.ourjid + socks5conn = self.connection proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props) if proxyhosts: @@ -204,7 +203,7 @@ c['candidate_id'] = self.connection.connection.getAnID() c['port'] = proxyhost['port'] c['type'] = 'proxy' - c['jid'] = self.ourjid + c['jid'] = proxyhost['jid'] c['priority'] = (2**16) * type_preference proxy_cand.append(c) self.candidates += proxy_cand

1 0

gajim: create ~/.config and ~/.cache folder if they don't exist
by Yann Leboulanger 10 Jul '10

10 Jul '10

changeset 267d49a80c30 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=267d49a80c30 description: create ~/.config and ~/.cache folder if they don't exist diffstat: src/common/check_paths.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (14 lines): diff -r bbb31792de75 -r 267d49a80c30 src/common/check_paths.py --- a/src/common/check_paths.py Fri Jul 09 05:06:56 2010 +0000 +++ b/src/common/check_paths.py Sat Jul 10 11:03:46 2010 +0200 @@ -334,5 +334,10 @@ sys.exit() def create_path(directory): + head, tail = os.path.split(directory) + if not os.path.exists(head): + create_path(head) + if os.path.exists(directory): + return print _('creating %s directory') % directory os.mkdir(directory, 0700)

1 0

gajim: l10n: Updated Kazakh (kk) translation to 94%
by Baurzhan Muftakhidinov 09 Jul '10

09 Jul '10

changeset bbb31792de75 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bbb31792de75 description: l10n: Updated Kazakh (kk) translation to 94% New status: 1982 messages complete with 0 fuzzies and 119 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/kk.po | 112 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 58 insertions(+), 54 deletions(-) diffs (truncated from 429 to 300 lines): diff -r 9d0e0d8baaf2 -r bbb31792de75 po/kk.po --- a/po/kk.po Fri Jul 09 03:55:29 2010 +0000 +++ b/po/kk.po Fri Jul 09 05:06:56 2010 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim.trunk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-06-30 10:15+0600\n" -"PO-Revision-Date: 2010-07-08 21:56+0600\n" +"PO-Revision-Date: 2010-07-09 11:07+0600\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" "Language: kk\n" @@ -828,12 +828,12 @@ #: ../data/gui/atom_entry_window.ui.h:4 msgid "New entry received" -msgstr "" +msgstr "Жаңа жазба алынды" #: ../data/gui/atom_entry_window.ui.h:5 #: ../src/atom_window.py:128 msgid "You have received new entry:" -msgstr "" +msgstr "Сіз жаңа жазбаны алдыңыз:" #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" @@ -1005,11 +1005,11 @@ #: ../data/gui/chat_to_muc_window.ui.h:3 msgid "MUC server" -msgstr "КПЧ сервері" +msgstr "MUC сервері" #: ../data/gui/chat_to_muc_window.ui.h:4 msgid "Please select a MUC server." -msgstr "КПЧ серверін таңдаңыз" +msgstr "MUC серверін таңдаңыз" #: ../data/gui/chat_to_muc_window.ui.h:5 msgid "" @@ -1229,7 +1229,7 @@ #: ../data/gui/gajim_themes_window.ui.h:1 msgid "Chatstate Tab Colors" -msgstr "" +msgstr "Чаттары бар беттер түсі" #: ../data/gui/gajim_themes_window.ui.h:2 msgid "Account row" @@ -1242,7 +1242,7 @@ #: ../data/gui/gajim_themes_window.ui.h:4 msgid "Chat Banner" -msgstr "" +msgstr "Баннер" #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Composing" @@ -1262,7 +1262,7 @@ #: ../data/gui/gajim_themes_window.ui.h:9 msgid "Gone" -msgstr "" +msgstr "Кетіп қалды" #: ../data/gui/gajim_themes_window.ui.h:10 msgid "Group row" @@ -1283,7 +1283,7 @@ "MUC\n" "Messages" msgstr "" -"КПЧ\n" +"MUC\n" "Хабарламалар" #: ../data/gui/gajim_themes_window.ui.h:15 @@ -1291,6 +1291,8 @@ "MUC Directed\n" "Messages" msgstr "" +"MUC адрестелген\n" +"хабарламалары" #: ../data/gui/gajim_themes_window.ui.h:17 msgid "Paused" @@ -1383,7 +1385,7 @@ #: ../data/gui/groups_post_window.ui.h:1 msgid "Create new post" -msgstr "" +msgstr "Жаңа хабарламаны жасау" #: ../data/gui/groups_post_window.ui.h:2 #: ../src/common/helpers.py:258 @@ -3228,7 +3230,7 @@ #: ../src/common/commands.py:98 msgid "Set the presence type and description" -msgstr "" +msgstr "Бар болудың түрін мен анықтамасын орнату" #: ../src/common/commands.py:104 msgid "Free for chat" @@ -3447,27 +3449,27 @@ #: ../src/common/config.py:165 msgid "Add * and [n] in roster title?" -msgstr "" +msgstr "Ростер атауыны * мен [n] қосу керек пе?" #: ../src/common/config.py:166 msgid "How many lines to remember from previous conversation when a chat tab/window is reopened." -msgstr "" +msgstr "Чат беті/терезесі қайта ашылған кезде алдыңғы сөйлесуден қанша тарих жолын есте сақтау керек." #: ../src/common/config.py:167 msgid "How many minutes should last lines from previous conversation last." -msgstr "" +msgstr "Алдыңғы сөйлесуден қалған соңғы жолдар қанша минут бойы қалуы керек." #: ../src/common/config.py:168 msgid "How many lines to request to server when entering a groupchat." -msgstr "" +msgstr "Топ чатына кірген кезде серверден қанша тарих жолын сұрау керек." #: ../src/common/config.py:169 msgid "How many minutes back to request logs when a entering a groupchat." -msgstr "" +msgstr "Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын сұрау керек." #: ../src/common/config.py:170 msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining." -msgstr "" +msgstr "Конференциядан шыққан кезде қанша минуттан кейін оған авто түрде кіру талабын жасау. Өздігінен кіруді сөндіру үшін 0-ге орнатыңыз." #: ../src/common/config.py:172 msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)." @@ -3488,31 +3490,31 @@ #: ../src/common/config.py:181 msgid "If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection." -msgstr "" +msgstr "Белсенді болса, NetworkManager жіберген D-Bus сигналдарын тыңдау мен тіркелгілердің қалып-күйлерін желілік байланыс күйіне сәйкес орнату (тек оларда listen_to_network_manager сөндірілмеген және олар глобалды қалып-күймен сихрондалса)." #: ../src/common/config.py:182 msgid "Sent chat state notifications. Can be one of all, composing_only, disabled." -msgstr "" +msgstr "Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), composing_only (тек жазу туралы), disabled (сөндірілген)." #: ../src/common/config.py:183 msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled." -msgstr "" +msgstr "Чат терезесінде сөйлесудің күйін көрсету. Мүмкін нұсқалары: all (барлығы), composing_only (тек жазу туралы), disabled (сөндірілген)." #: ../src/common/config.py:185 msgid "When not printing time for every message (print_time==sometimes), print it every x minutes." -msgstr "" +msgstr "Әр хабарлама үшін уақытты көрсетпеу кезде (print_time==sometimes), оны әр x минут сайын көрсету." #: ../src/common/config.py:186 msgid "Ask before closing a group chat tab/window." -msgstr "" +msgstr "Топ чат беті/терезесін жабу алдында сұрау." #: ../src/common/config.py:187 msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids." -msgstr "" +msgstr "Бұл тізімдегі бөлмелерді жабу алдында әрқашан сұрау. Бөлмелер бос аралықпен ажыратылсын." #: ../src/common/config.py:188 msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids." -msgstr "" +msgstr "Бұл тізімдегі бөлмелерді жабу алдында ешқашан сұрамау. Бөлмелер бос аралықпен ажыратылсын." #: ../src/common/config.py:189 msgid "Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)" @@ -3536,7 +3538,7 @@ #: ../src/common/config.py:203 msgid "Show tabbed notebook border in chat windows?" -msgstr "" +msgstr "Чат терезесінде бет шекарасын көрсету керек пе?" #: ../src/common/config.py:204 msgid "Show close button in tab?" @@ -3815,7 +3817,7 @@ #: ../src/common/config.py:323 msgid "Space separated list of ssl errors to ignore." -msgstr "" +msgstr "Елемеу үшін ssl қателер тізімі, бос аралықпен ажыратылсын." #: ../src/common/config.py:332 msgid "Whitespace sent after inactivity" @@ -3970,7 +3972,7 @@ #: ../src/common/config.py:494 msgid "Sound to play when any MUC message arrives." -msgstr "КПЧ хабарламасы келген кезде ойналатын дыбыс." +msgstr "MUC хабарламасы келген кезде ойналатын дыбыс." #: ../src/common/config.py:503 #: ../src/common/optparser.py:304 @@ -4443,7 +4445,7 @@ #: ../src/common/helpers.py:57 #: ../src/gui_interface.py:673 msgid "Observers" -msgstr "" +msgstr "Байқаушылар" #: ../src/common/contacts.py:139 #: ../src/common/contacts.py:366 @@ -5239,7 +5241,7 @@ #: ../src/common/pep.py:69 msgid "Hurt" -msgstr "" +msgstr "Жаралы" #: ../src/common/pep.py:70 msgid "Impressed" @@ -5247,7 +5249,7 @@ #: ../src/common/pep.py:71 msgid "In Awe" -msgstr "" +msgstr "Қастерлеуде" #: ../src/common/pep.py:72 msgid "In Love" @@ -5307,7 +5309,7 @@ #: ../src/common/pep.py:86 msgid "Outraged" -msgstr "" +msgstr "Қорланған" #: ../src/common/pep.py:87 msgid "Playful" @@ -5463,7 +5465,7 @@ #: ../src/common/pep.py:128 msgid "Having a Snack" -msgstr "" +msgstr "Жеңіл тамақтану" #: ../src/common/pep.py:129 msgid "Having Breakfast" @@ -5516,11 +5518,11 @@ #: ../src/common/pep.py:141 msgid "Working out" -msgstr "" +msgstr "Бапталу" #: ../src/common/pep.py:142 msgid "Grooming" -msgstr "" +msgstr "Өз-өзін күту" #: ../src/common/pep.py:143 msgid "At the Spa" @@ -5548,7 +5550,7 @@ #: ../src/common/pep.py:149 msgid "Having an Appointment" -msgstr "" +msgstr "Кездесу" #: ../src/common/pep.py:151 msgid "Day Off" @@ -5556,7 +5558,7 @@ #: ../src/common/pep.py:152 msgid "Hanging out" -msgstr "" +msgstr "Қыдыруда" #: ../src/common/pep.py:153 msgid "Hiding" @@ -5564,11 +5566,11 @@ #: ../src/common/pep.py:154 msgid "On Vacation" -msgstr "" +msgstr "Демалыста" #: ../src/common/pep.py:155 msgid "Praying" -msgstr "" +msgstr "Сиыну" #: ../src/common/pep.py:156 msgid "Scheduled Holiday" @@ -6283,11 +6285,11 @@ #: ../src/config.py:4053 msgid "Next Message Received Focused" -msgstr ""

1 0

gajim: l10n: Updated Kazakh (kk) translation to 91%
by Baurzhan Muftakhidinov 09 Jul '10

09 Jul '10

changeset 9d0e0d8baaf2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9d0e0d8baaf2 description: l10n: Updated Kazakh (kk) translation to 91% New status: 1931 messages complete with 0 fuzzies and 170 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/kk.po | 803 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 427 insertions(+), 376 deletions(-) diffs (truncated from 2795 to 300 lines): diff -r 260810201bdf -r 9d0e0d8baaf2 po/kk.po --- a/po/kk.po Wed Jul 07 09:35:38 2010 +0200 +++ b/po/kk.po Fri Jul 09 03:55:29 2010 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim.trunk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-06-30 10:15+0600\n" -"PO-Revision-Date: 2010-07-03 15:38+0600\n" +"PO-Revision-Date: 2010-07-08 21:56+0600\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" "Language: kk\n" @@ -256,7 +256,7 @@ #: ../data/gui/accounts_window.ui.h:14 msgid "Check this so Gajim will ask you before sending your password over an insecure connection." -msgstr "" +msgstr "Қауіпсіз емес байланыс арқылы парольді жіберу алдында Gajim сізді сұрау үшін осыны белгілеңіз." #: ../data/gui/accounts_window.ui.h:15 msgid "Choose Client Cert" @@ -323,29 +323,31 @@ #: ../data/gui/accounts_window.ui.h:26 msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working." -msgstr "" +msgstr "Белгіленген болса, Gajim сіздің IP-ден басқа көбірек IP-ді таратады, файлдармен алмасудың істеп кетудің шансы көбірек болады." #: ../data/gui/accounts_window.ui.h:27 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" -msgstr "" +msgstr "Белгіленген болса, Gajim парольді seahorse сияқты GPG агентінен алып отырады" #: ../data/gui/accounts_window.ui.h:29 msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" -msgstr "" +msgstr "Белгіленген болса, байланыс үзуіне әкелетін күту уақытының бітуін алдын-алу үшін Gajim keep-alive дестелерін жіберіп отырады" #: ../data/gui/accounts_window.ui.h:30 msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" -msgstr "" +msgstr "Белгіленген болса, Gajim қосылған кезде бұл тіркелгі үшін байланысты автоорнатады" #: ../data/gui/accounts_window.ui.h:31 msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" -msgstr "" +msgstr "Белгіленген болса, глобалды қалып-күйіңіздің өзгеруі (ростер терезесі астындағы мәзір) осы тіркелгінің қалып-күйін сәйкес өзгертеді" #: ../data/gui/accounts_window.ui.h:32 msgid "" "If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" "You might consider to change possible firewall settings." msgstr "" +"Кіріс хабарламалары үшін бастапқы порт сізге келмесе, басқа портты осында таңдай аласыз.\n" +"Сонымен қатар файрвол баптауларын өзгертсеңіз де болады." #: ../data/gui/accounts_window.ui.h:34 msgid "Information about you, as stored in the server" @@ -384,11 +386,11 @@ #: ../data/gui/accounts_window.ui.h:42 msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" -msgstr "" +msgstr "Приоритет - Jabber желісіндегі бір тіркелгіден бірнеше жерден серверге қосулы тұрса, қай клиент хабарламаны алатындығын анықтауда қолданылады; Приоритеті жоғарырақ клиент хабарламаны алады" #: ../data/gui/accounts_window.ui.h:43 msgid "Priority will change automatically according to your status." -msgstr "" +msgstr "Приоритет сіздің қалып-күйіңізге байланысты автоөзгертіледі." #. Rename #: ../data/gui/accounts_window.ui.h:44 @@ -402,7 +404,7 @@ #: ../data/gui/accounts_window.ui.h:46 msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "" +msgstr "Ресурс - Jabber желісіндегі бір тіркелгіден бірнеше жерден серверге қосулы тұрса, бір JID-ті ажырату үшін серверге жіберілетін жол. Мысалы, сіз бір тіркелгіге бір уақытта 'Үй' мен 'Жұмыс' ресурстарымен қосыла аласыз. Приоритеті жоғарырақ ресурс хабарламаларды алады (төменнен қараңыз)." #: ../data/gui/accounts_window.ui.h:47 msgid "Save conversation _logs for all contacts" @@ -427,7 +429,7 @@ #: ../data/gui/accounts_window.ui.h:53 msgid "The path to the client certificate and key in PKCS#12 format" -msgstr "" +msgstr "PKCS#12 пішіміндегі клиент сертификатына дейінгі жол" #: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent" @@ -503,12 +505,18 @@ "protocol. Click on register button to\n" "proceed." msgstr "" +"Бұл хаттамадан контактты қосу үшін,\n" +"сізге осы транспортқа тіркелу керек.\n" +"Төмендегі тіркелу батырмасын\n" +"жалғастыру үшін басыңыз." #: ../data/gui/add_new_contact_window.ui.h:9 msgid "" "You must be connected to the transport to be able\n" "to add a contact from this protocol." msgstr "" +"Бұл хаттамадан контактты қосу үшін сізге осы\n" +"транспортқа байланыс орнату керек." #: ../data/gui/add_new_contact_window.ui.h:11 msgid "_Group:" @@ -568,7 +576,7 @@ #: ../data/gui/adhoc_commands_window.ui.h:9 msgid "This jabber entity does not expose any commands." -msgstr "" +msgstr "Бұл jabber нәрсесі ешбір команданы ұсынбай тұр." #: ../data/gui/advanced_configuration_window.ui.h:1 #: ../data/gui/features_window.ui.h:1 @@ -577,7 +585,7 @@ #: ../data/gui/advanced_configuration_window.ui.h:2 msgid "NOTE: You should restart Gajim for some settings to take effect" -msgstr "" +msgstr "ЕСКЕРТУ: Кейбір баптаулар іске асу үшін, Gajim-ді қайта қосуыңыз керек" #: ../data/gui/advanced_configuration_window.ui.h:3 msgid "Advanced Configuration Editor" @@ -601,7 +609,7 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:4 msgid "Sends a message to users currently connected to this server" -msgstr "" +msgstr "Бұл серверге қазір қосулы тұрған барлық пайдаланушыларға хабарлама жібереді" #: ../data/gui/advanced_menuitem_menu.ui.h:5 msgid "Set MOTD..." @@ -633,7 +641,7 @@ #: ../data/gui/advanced_notifications_window.ui.h:1 msgid " a window/tab opened with that contact " -msgstr "" +msgstr " бұл контактпен ашылған терезе/бет" #: ../data/gui/advanced_notifications_window.ui.h:2 msgid "Actions" @@ -641,7 +649,7 @@ #: ../data/gui/advanced_notifications_window.ui.h:3 msgid "Conditions" -msgstr "" +msgstr "Шарттар" #: ../data/gui/advanced_notifications_window.ui.h:4 #: ../data/gui/preferences_window.ui.h:17 @@ -697,11 +705,11 @@ #: ../data/gui/advanced_notifications_window.ui.h:16 msgid "Group Chat Message Highlight " -msgstr "" +msgstr "Топ чат хабарламасының ерекшелеу түсі" #: ../data/gui/advanced_notifications_window.ui.h:17 msgid "Group Chat Message Received " -msgstr "" +msgstr "Топ чат хабарламасы алынған" #: ../data/gui/advanced_notifications_window.ui.h:18 msgid "Have " @@ -724,11 +732,11 @@ #: ../data/gui/advanced_notifications_window.ui.h:22 msgid "One or more special statuses..." -msgstr "" +msgstr "Бір не бірнеше ерекше қалып-күйлер..." #: ../data/gui/advanced_notifications_window.ui.h:23 msgid "Online / Free For Chat" -msgstr "" +msgstr "Желіде / Чатқа дайын" #: ../data/gui/advanced_notifications_window.ui.h:24 msgid "Play a sound" @@ -744,43 +752,43 @@ #: ../data/gui/advanced_notifications_window.ui.h:27 msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash" -msgstr "" +msgstr "_Есептер панелінде чат терезісі жыпылықтауы үшін терезелер басқарушысының UrgencyHint белсенді қылу" #: ../data/gui/advanced_notifications_window.ui.h:28 msgid "_Disable auto opening chat window" -msgstr "" +msgstr "Ча_т терезесінің автоашылуын сөндіру" #: ../data/gui/advanced_notifications_window.ui.h:29 msgid "_Disable existing popup window" -msgstr "" +msgstr "_Бар қалқымалы хабарлама терезелерін сөндіру" #: ../data/gui/advanced_notifications_window.ui.h:30 msgid "_Disable existing sound for this event" -msgstr "" +msgstr "Бұ_л оқиға үшін бар дыбысты сөндіру" #: ../data/gui/advanced_notifications_window.ui.h:31 msgid "_Disable showing event in roster" -msgstr "" +msgstr "_Оқиғаны ростерде көрсетуді сөндіру" #: ../data/gui/advanced_notifications_window.ui.h:32 msgid "_Disable showing event in systray" -msgstr "" +msgstr "Оқ_иғаны трейде көрсетуді сөндіру" #: ../data/gui/advanced_notifications_window.ui.h:33 msgid "_Inform me with a popup window" -msgstr "" +msgstr "М_ені қалқымалы хабарлама терезесімен ескерту" #: ../data/gui/advanced_notifications_window.ui.h:34 msgid "_Open chat window with user" -msgstr "" +msgstr "Па_йдаланушымен чат терезесін ашу" #: ../data/gui/advanced_notifications_window.ui.h:35 msgid "_Show event in roster" -msgstr "" +msgstr "Оқиға_ны ростерде көрсету" #: ../data/gui/advanced_notifications_window.ui.h:36 msgid "_Show event in systray" -msgstr "" +msgstr "Оқиған_ы трейде көрсету" #: ../data/gui/advanced_notifications_window.ui.h:37 msgid "and I " @@ -812,7 +820,7 @@ #: ../data/gui/atom_entry_window.ui.h:2 msgid "Feed name:" -msgstr "" +msgstr "Таспа аты:" #: ../data/gui/atom_entry_window.ui.h:3 msgid "Last modified:" @@ -838,7 +846,7 @@ #: ../src/roster_window.py:5473 #: ../src/roster_window.py:5606 msgid "_Unblock" -msgstr "" +msgstr "Б_локтамау" #: ../data/gui/change_activity_dialog.ui.h:1 msgid "Message: " @@ -846,11 +854,11 @@ #: ../data/gui/change_activity_dialog.ui.h:2 msgid "Set Activity" -msgstr "" +msgstr "Айналасуыңызды орнату" #: ../data/gui/change_activity_dialog.ui.h:3 msgid "Set an activity" -msgstr "" +msgstr "Айналасқан ісіңізді көрсету" #: ../data/gui/change_mood_dialog.ui.h:1 msgid "Message:" @@ -886,11 +894,11 @@ #: ../data/gui/change_status_message_dialog.ui.h:4 msgid "Preset messages:" -msgstr "" +msgstr "Орнатылған хабарламалар:" #: ../data/gui/change_status_message_dialog.ui.h:5 msgid "Save as Preset..." -msgstr "" +msgstr "Орнатылған етіп сақтау..." #: ../data/gui/chat_context_menu.ui.h:1 msgid "Join _Group Chat" @@ -907,7 +915,7 @@ #: ../data/gui/chat_context_menu.ui.h:4 msgid "_Copy Link Location" -msgstr "" +msgstr "_Сілтеме адресін көшіру" #: ../data/gui/chat_context_menu.ui.h:5 msgid "_Open Email Composer" @@ -1071,11 +1079,11 @@ #: ../data/gui/contact_context_menu.ui.h:14 msgid "Toggle End to End Encryption" -msgstr "" +msgstr "End to End шифрлеуін қосу/сөндіру" #: ../data/gui/contact_context_menu.ui.h:15 msgid "Toggle Open_PGP Encryption"

1 0

gajim: fix bug: assign jingle session id as sid in file_props, s...
by fantasticsid＠lagaule.org 08 Jul '10

08 Jul '10

changeset c034eadbad06 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c034eadbad06 description: fix bug: assign jingle session id as sid in file_props, so that file transfer window gets updated correctly for the sender. diffstat: src/common/jingle.py | 4 +++- src/filetransfers_window.py | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diffs (43 lines): diff -r 78da4f8c154d -r c034eadbad06 src/common/jingle.py --- a/src/common/jingle.py Wed Jul 07 23:14:29 2010 +0800 +++ b/src/common/jingle.py Thu Jul 08 16:05:19 2010 +0800 @@ -138,13 +138,15 @@ return jingle.sid def start_file_transfer(self, jid, file_props): - logger.info("start file transfer with file: %s", str(file_props)) + logger.info("start file transfer with file: %s" % file_props) jingle = self.get_jingle_session(jid, media='file') if jingle: + file_props['sid'] = jingle.sid jingle.add_content('file', JingleFileTransfer(jingle, file_props)) else: jingle = JingleSession(self, weinitiate=True, jid=jid) self.__sessions[jingle.sid] = jingle + file_props['sid'] = jingle.sid jingle.add_content('file', JingleFileTransfer(jingle, file_props=file_props)) jingle.start_session() return jingle.sid diff -r 78da4f8c154d -r c034eadbad06 src/filetransfers_window.py --- a/src/filetransfers_window.py Wed Jul 07 23:14:29 2010 +0800 +++ b/src/filetransfers_window.py Thu Jul 08 16:05:19 2010 +0800 @@ -302,13 +302,17 @@ file_path, file_name, file_desc) if file_props is None: return False - self.add_transfer(account, contact, file_props) if contact.supports(NS_JINGLE_FILE_TRANSFER): log.info("contact %s supports jingle file transfer"%(contact.get_full_jid())) - gajim.connections[account].start_file_transfer(contact.get_full_jid(), file_props) + # this call has the side effect of setting file_props['sid'] to the jingle sid, but for the sake of clarity + # make it explicit here + sid = gajim.connections[account].start_file_transfer(contact.get_full_jid(), file_props) + file_props['sid'] = sid + self.add_transfer(account, contact, file_props) else: log.info("contact does not support jingle file transfer") gajim.connections[account].send_file_request(file_props) + self.add_transfer(account, contact, file_props) return True def _start_receive(self, file_path, account, contact, file_props):

1 0

gajim: use the 'in' operator on a dict instead of has_key
by fantasticsid＠lagaule.org 07 Jul '10

07 Jul '10

changeset 78da4f8c154d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=78da4f8c154d description: use the 'in' operator on a dict instead of has_key diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 14e23c1a5b5a -r 78da4f8c154d src/gui_interface.py --- a/src/gui_interface.py Wed Jul 07 22:39:01 2010 +0800 +++ b/src/gui_interface.py Wed Jul 07 23:14:29 2010 +0800 @@ -1508,7 +1508,7 @@ img_name = 'gajim-ft_stopped' # if we are the sender of the file and the file transfer was initiated with jingle # send session-terminate stanza - if file_props.has_key('session-type') and file_props['session-type'] == 'jingle': + if 'session-type' in file_props and file_props['session-type'] == 'jingle': sender = gajim.get_jid_without_resource(file_props['sender']) jingle_session = gajim.connections[sender].get_jingle_session(sender, file_props['sid']) jingle_session.end_session()

1 0

gajim: send session-terminate on file transfer completion
by fantasticsid＠lagaule.org 07 Jul '10

07 Jul '10

changeset 14e23c1a5b5a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=14e23c1a5b5a description: send session-terminate on file transfer completion diffstat: src/gui_interface.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (24 lines): diff -r e5dc7dfe5250 -r 14e23c1a5b5a src/gui_interface.py --- a/src/gui_interface.py Tue Jul 06 12:29:21 2010 +0200 +++ b/src/gui_interface.py Wed Jul 07 22:39:01 2010 +0800 @@ -79,6 +79,7 @@ from common import dataforms from common import passwords from common import logging_helpers +from common import jingle import roster_window import profile_window @@ -1505,6 +1506,12 @@ txt = _('File transfer of %(filename)s to %(name)s ' 'stopped.') % {'filename': filename, 'name': name} img_name = 'gajim-ft_stopped' + # if we are the sender of the file and the file transfer was initiated with jingle + # send session-terminate stanza + if file_props.has_key('session-type') and file_props['session-type'] == 'jingle': + sender = gajim.get_jid_without_resource(file_props['sender']) + jingle_session = gajim.connections[sender].get_jingle_session(sender, file_props['sid']) + jingle_session.end_session() path = gtkgui_helpers.get_icon_path(img_name, 48) else: txt = ''

1 0

gajim: don't traceback when strange thing happen with keymap, ju...
by Yann Leboulanger 07 Jul '10

07 Jul '10

changeset 260810201bdf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=260810201bdf description: don't traceback when strange thing happen with keymap, just make ctrl+c not work. see #5636 diffstat: src/chat_control.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (20 lines): diff -r 04270cbd7e04 -r 260810201bdf src/chat_control.py --- a/src/chat_control.py Tue Jul 06 22:11:43 2010 +0200 +++ b/src/chat_control.py Wed Jul 07 09:35:38 2010 +0200 @@ -95,8 +95,14 @@ """ keymap = gtk.gdk.keymap_get_default() - keycode_c = keymap.get_entries_for_keyval(gtk.keysyms.c)[0][0] - keycode_ins = keymap.get_entries_for_keyval(gtk.keysyms.Insert)[0][0] + try: + keycode_c = keymap.get_entries_for_keyval(gtk.keysyms.c)[0][0] + except TypeError: + keycode_c = 54 + try: + keycode_ins = keymap.get_entries_for_keyval(gtk.keysyms.Insert)[0][0] + except TypeError: + keycode_ins = 118 def make_href(self, match): url_color = gajim.config.get('urlmsgcolor') url = match.group()

1 0

gajim: don't send a canceld filetransfer. Fixes #3586
by Yann Leboulanger 06 Jul '10

06 Jul '10

changeset 04270cbd7e04 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=04270cbd7e04 description: don't send a canceld filetransfer. Fixes #3586 diffstat: src/common/protocol/bytestream.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (34 lines): diff -r 7e8221d8bb7f -r 04270cbd7e04 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Jul 03 10:40:10 2010 +0000 +++ b/src/common/protocol/bytestream.py Tue Jul 06 22:11:43 2010 +0200 @@ -596,7 +596,7 @@ raise xmpp.NodeProcessed if real_id.startswith('au_'): - if 'stopped' in file and file_props['stopped']: + if 'stopped' in file_props and file_props['stopped']: self.remove_transfer(file_props) else: gajim.socks5queue.send_file(file_props, self.name) @@ -608,6 +608,9 @@ if proxyhost['jid'] == jid: proxy = proxyhost + if 'stopped' in file_props and file_props['stopped']: + self.remove_transfer(file_props) + raise xmpp.NodeProcessed if proxy is not None: file_props['streamhost-used'] = True if 'streamhosts' not in file_props: @@ -622,10 +625,7 @@ raise xmpp.NodeProcessed else: - if 'stopped' in file_props and file_props['stopped']: - self.remove_transfer(file_props) - else: - gajim.socks5queue.send_file(file_props, self.name) + gajim.socks5queue.send_file(file_props, self.name) if 'fast' in file_props: fasts = file_props['fast'] if len(fasts) > 0:

1 0

gajim: correctly get connection object in JingleTransportSocks5
by Yann Leboulanger 06 Jul '10

06 Jul '10

changeset e5dc7dfe5250 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e5dc7dfe5250 description: correctly get connection object in JingleTransportSocks5 diffstat: src/common/jingle_ft.py | 2 ++ src/common/jingle_transport.py | 31 ++++++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diffs (110 lines): diff -r 27018b6e8f67 -r e5dc7dfe5250 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Jul 05 19:54:59 2010 +0800 +++ b/src/common/jingle_ft.py Tue Jul 06 12:29:21 2010 +0200 @@ -66,6 +66,7 @@ self.transport = JingleTransportSocks5() self.transport.set_file_props(self.file_props) self.transport.set_our_jid(session.ourjid) + self.transport.set_connection(session.connection) log.info('ourjid: %s' % session.ourjid) self.session = session @@ -101,6 +102,7 @@ if self.transport is None: self.transport = JingleTransportSocks5() self.transport.set_our_jid(self.session.ourjid) + self.transport.set_connection(self.session.connection) self.transport.set_file_props(self.file_props) if self.file_props.has_key("streamhosts"): self.file_props['streamhosts'].extend(self.transport.remote_candidates) diff -r 27018b6e8f67 -r e5dc7dfe5250 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Mon Jul 05 19:54:59 2010 +0800 +++ b/src/common/jingle_transport.py Tue Jul 06 12:29:21 2010 +0200 @@ -85,6 +85,7 @@ """ def __init__(self): JingleTransport.__init__(self, TransportType.streaming) + self.connection = None self.remote_candidates = [] def set_file_props(self, file_props): @@ -92,6 +93,9 @@ def set_our_jid(self, jid): self.ourjid = jid + + def set_connection(self, conn): + self.connection = conn def make_candidate(self, candidate): import logging @@ -134,13 +138,13 @@ def _add_local_ips_as_candidates(self): + if not self.connection: + return local_ip_cand = [] port = gajim.config.get('file_transfers_port') type_preference = 126 #type preference of connection type. XEP-0260 section 2.2 - jid_wo_resource = gajim.get_jid_without_resource(self.ourjid) - conn = gajim.connections[jid_wo_resource] - c = {'host': conn.peerhost[0]} - c['candidate_id'] = conn.connection.getAnID() + c = {'host': self.connection.peerhost[0]} + c['candidate_id'] = self.connection.connection.getAnID() c['port'] = port c['type'] = 'direct' c['jid'] = self.ourjid @@ -161,18 +165,18 @@ self.candidates += local_ip_cand def _add_additional_candidates(self): + if not self.connection: + return type_preference = 126 additional_ip_cand = [] port = gajim.config.get('file_transfers_port') ft_add_hosts = gajim.config.get('ft_add_hosts_to_send') - jid_wo_resource = gajim.get_jid_without_resource(self.ourjid) - conn = gajim.connections[jid_wo_resource] if ft_add_hosts: hosts = [e.strip() for e in ft_add_hosts.split(',')] for h in hosts: c = {'host': h} - c['candidate_id'] = conn.connection.getAnID() + c['candidate_id'] = self.connection.connection.getAnID() c['port'] = port c['type'] = 'direct' c['jid'] = self.ourjid @@ -181,22 +185,23 @@ self.candidates += additional_ip_cand def _add_proxy_candidates(self): + if not self.connection: + return type_preference = 10 proxy_cand = [] socks5conn = ConnectionSocks5Bytestream() socks5conn.name = self.ourjid proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props) - jid_wo_resource = gajim.get_jid_without_resource(self.ourjid) - conn = gajim.connections[jid_wo_resource] if proxyhosts: - file_props['proxy_receiver'] = unicode(file_props['receiver']) - file_props['proxy_sender'] = unicode(file_props['sender']) - file_props['proxyhosts'] = proxyhosts + self.file_props['proxy_receiver'] = unicode( + self.file_props['receiver']) + self.file_props['proxy_sender'] = unicode(self.file_props['sender']) + self.file_props['proxyhosts'] = proxyhosts for proxyhost in proxyhosts: c = {'host': proxyhost['host']} - c['candidate_id'] = conn.connection.getAnID() + c['candidate_id'] = self.connection.connection.getAnID() c['port'] = proxyhost['port'] c['type'] = 'proxy' c['jid'] = self.ourjid

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2010