Commits March 2012

commits@gajim.org

4 participants
56 discussions

gajim: [Niels Felsted Thorsen] updated danish translation
by Yann Leboulanger 12 Mar '12

12 Mar '12

changeset a8184901e74a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a8184901e74a description: [Niels Felsted Thorsen] updated danish translation diffstat: po/da.po | 2137 ++++++++++++++++++++++--------------------------------------- 1 files changed, 792 insertions(+), 1345 deletions(-) diffs (truncated from 4859 to 300 lines): diff -r 9a015a442ff0 -r a8184901e74a po/da.po --- a/po/da.po Sat Mar 10 14:13:08 2012 +0100 +++ b/po/da.po Mon Mar 12 07:17:06 2012 +0100 @@ -2,13 +2,13 @@ # Copyright (C) 2007 GAJIM'S COPYRIGHT HOLDER # This file is distributed under the same license as the Gajim package. # -# Niels Felsted Thorsen <felsted(a)fsfe.org>, 2007, 2009. -msgid "" -msgstr "" -"Project-Id-Version: Gajim 0.13\n" +# Niels Felsted Thorsen <felsted(a)fsfe.org>, 2007, 2008, 2009, 2010, 2011, 2012. +msgid "" +msgstr "" +"Project-Id-Version: Gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" -"PO-Revision-Date: 2009-11-18 19:33+0100\n" +"POT-Creation-Date: 2012-03-10 14:09+0100\n" +"PO-Revision-Date: 2012-03-11 22:14+0100\n" "Last-Translator: Niels Felsted Thorsen <felsted(a)fsfe.org>\n" "Language-Team: <>\n" "Language: \n" @@ -119,10 +119,10 @@ #: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284 #: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746 #: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406 -#: ../src/config.py:2419 ../src/config.py:3699 ../src/config.py:3774 +#: ../src/config.py:2419 ../src/config.py:3703 ../src/config.py:3778 #: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3139 -#: ../src/roster_window.py:3145 ../src/roster_window.py:3150 +#: ../src/dialogs.py:532 ../src/roster_window.py:3156 +#: ../src/roster_window.py:3162 ../src/roster_window.py:3167 msgid "None" msgstr "Ingen" @@ -231,18 +231,16 @@ msgstr "Tilslut automatisk hvis tilslutningen tabes" #: ../data/gui/accounts_window.ui.h:12 -#, fuzzy msgid "Browse..." -msgstr "_Gennemse" +msgstr "Gennemse..." #: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "T_ilslut når Gajim startes" #: ../data/gui/accounts_window.ui.h:14 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Certifikatet afvist" +msgstr "Certifikatet er k_rypteret" #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" @@ -270,9 +268,8 @@ "Tryk for at forespørge om autorisering for alle kontakter af en anden konto" #: ../data/gui/accounts_window.ui.h:20 -#, fuzzy msgid "Client certificate" -msgstr "Selvsigneret certifikat" +msgstr "Klient certifikat" #: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" @@ -312,8 +309,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:27 ../data/gui/preferences_window.ui.h:57 #: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 -#: ../src/roster_window.py:3081 ../src/roster_window.py:4148 -#: ../src/roster_window.py:5738 +#: ../src/roster_window.py:3098 ../src/roster_window.py:4165 +#: ../src/roster_window.py:5755 msgid "General" msgstr "General" @@ -413,7 +410,7 @@ msgstr "Prioritet vil automatisk ændres ifølge din status." #. Rename -#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5688 +#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5705 msgid "Re_name" msgstr "Om_døb" @@ -452,7 +449,6 @@ msgstr "Synk_roniser konto status med global status" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "Synkroniser kontakter" @@ -474,7 +470,7 @@ #: ../data/gui/accounts_window.ui.h:59 msgid "_Client Cert File:" -msgstr "" +msgstr "Klient _Cert Fil:" #: ../data/gui/accounts_window.ui.h:60 msgid "_Edit Personal Information..." @@ -559,9 +555,8 @@ msgstr "Kan _registreres" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "_Abonnement" +msgstr "_Gem abonnementsbesked" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -589,9 +584,8 @@ msgstr "Fejl beskrivelse..." #: ../data/gui/adhoc_commands_window.ui.h:6 -#, fuzzy msgid "F_inish" -msgstr "_Færdig" +msgstr "Færd_ig" #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while retrieving command list..." @@ -637,9 +631,8 @@ msgstr "Slet Dagens Besked" #: ../data/gui/advanced_menuitem_menu.ui.h:3 -#, fuzzy msgid "Edit Archi_ving Preferences" -msgstr "_Indstillinger" +msgstr "Rediger Arki_veringsindstillinger" #: ../data/gui/advanced_menuitem_menu.ui.h:4 msgid "Edit _Privacy Lists..." @@ -679,42 +672,39 @@ #: ../data/gui/archiving_preferences_window.ui.h:1 msgid "Method Auto" -msgstr "" +msgstr "Metode Auto" #: ../data/gui/archiving_preferences_window.ui.h:2 msgid "Method Local" -msgstr "" +msgstr "Metode Lokal" #: ../data/gui/archiving_preferences_window.ui.h:3 msgid "Method Manual" -msgstr "" +msgstr "Metode Manuel" #: ../data/gui/archiving_preferences_window.ui.h:4 -#, fuzzy msgid "Auto" -msgstr "Bliv automatisk med" +msgstr "Automatisk" #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Concede" -msgstr "" +msgstr "Medgive" #: ../data/gui/archiving_preferences_window.ui.h:6 msgid "Forbid" -msgstr "" +msgstr "Forbyde" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "No" -msgstr "Ingen" +msgstr "Nej" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Prefer" -msgstr "Indstillinger" +msgstr "Foretrækker" #: ../data/gui/archiving_preferences_window.ui.h:9 msgid "Yes" -msgstr "" +msgstr "Ja" #: ../data/gui/atom_entry_window.ui.h:1 msgid "Entry:" @@ -742,8 +732,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5707 -#: ../src/roster_window.py:5834 ../src/roster_window.py:5967 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5724 +#: ../src/roster_window.py:5851 ../src/roster_window.py:5984 msgid "_Unblock" msgstr "_Fjern blokering" @@ -836,7 +826,7 @@ #: ../data/gui/chat_control.ui.h:2 msgid "*" -msgstr "" +msgstr "*" #: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1 msgid "0" @@ -844,39 +834,39 @@ #: ../data/gui/chat_control.ui.h:4 msgid "1" -msgstr "" +msgstr "1" #: ../data/gui/chat_control.ui.h:5 msgid "2" -msgstr "" +msgstr "2" #: ../data/gui/chat_control.ui.h:6 msgid "3" -msgstr "" +msgstr "3" #: ../data/gui/chat_control.ui.h:7 msgid "4" -msgstr "" +msgstr "4" #: ../data/gui/chat_control.ui.h:8 msgid "5" -msgstr "" +msgstr "5" #: ../data/gui/chat_control.ui.h:9 msgid "6" -msgstr "" +msgstr "6" #: ../data/gui/chat_control.ui.h:10 msgid "7" -msgstr "" +msgstr "7" #: ../data/gui/chat_control.ui.h:11 msgid "8" -msgstr "" +msgstr "8" #: ../data/gui/chat_control.ui.h:12 msgid "9" -msgstr "" +msgstr "9" #: ../data/gui/chat_control.ui.h:13 msgid "Add this contact to roster (Ctrl+D)" @@ -899,23 +889,22 @@ msgstr "Hvis en liste over følelsesikoner" #: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7 -#, fuzzy msgid "Show a menu of advanced functions (Alt+D)" -msgstr "Vis en menu med avancerede funktioner (Alt+A)" +msgstr "Vis en menu med avancerede funktioner (Alt+D)" #: ../data/gui/chat_control.ui.h:19 msgid "Show the contact's profile (Ctrl+I)" msgstr "Vis kontaktens profil (Ctrl+I)" #: ../data/gui/chat_control.ui.h:20 -#: ../src/command_system/implementation/standard.py:208 +#: ../src/command_system/implementation/standard.py:214 msgid "Toggle audio session" -msgstr "" +msgstr "Slå til/fra lyd session" #: ../data/gui/chat_control.ui.h:21 -#: ../src/command_system/implementation/standard.py:218 +#: ../src/command_system/implementation/standard.py:224 msgid "Toggle video session" -msgstr "" +msgstr "Slå til/fra video session" #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) #: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9 @@ -925,7 +914,7 @@ #: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10 msgid "label" -msgstr "" +msgstr "mærkat" #: ../data/gui/chat_to_muc_window.ui.h:1 msgid "In_vite" @@ -974,8 +963,8 @@ #. Invite to

1 0

gajim: fix getting vcard in rooms where JIDs are public
by Yann Leboulanger 11 Mar '12

11 Mar '12

changeset c51351d54ac7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c51351d54ac7 description: fix getting vcard in rooms where JIDs are public diffstat: src/vcard.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (41 lines): diff -r 704419e5f5a3 -r c51351d54ac7 src/vcard.py --- a/src/vcard.py Sat Mar 10 13:32:34 2012 +0100 +++ b/src/vcard.py Sun Mar 11 19:38:44 2012 +0100 @@ -242,7 +242,7 @@ return if obj.resource: # It's a muc occupant vcard - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return else: if obj.jid != self.contact.jid: @@ -257,11 +257,15 @@ self.update_progressbar_timeout_id = None def set_last_status_time(self, obj): + if obj.conn.name != self.account: + return if obj.fjid != self.real_jid: return self.fill_status_label() def set_os_info(self, obj): + if obj.conn.name != self.account: + return if self.xml.get_object('information_notebook').get_n_pages() < 5: return if obj.fjid != self.real_jid: @@ -291,9 +295,11 @@ self.test_remove_progressbar() def set_entity_time(self, obj): + if obj.conn.name != self.account: + return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return i = 0 time_s = ''

1 0

gajim: [Sergiy Yegorov] updated Ukrainian translation
by Yann Leboulanger 10 Mar '12

10 Mar '12

changeset 9a015a442ff0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9a015a442ff0 description: [Sergiy Yegorov] updated Ukrainian translation diffstat: po/uk.po | 773 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 401 insertions(+), 372 deletions(-) diffs (truncated from 2046 to 300 lines): diff -r 1edc01235c3e -r 9a015a442ff0 po/uk.po --- a/po/uk.po Fri Mar 09 08:45:47 2012 +0100 +++ b/po/uk.po Sat Mar 10 14:13:08 2012 +0100 @@ -2,13 +2,13 @@ # Copyright (C) 2010 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package. # -# Sergiy Yegorov <prapor(a)unixzone.org.ua>, 2010, 2011. +# Sergiy Yegorov <prapor(a)unixzone.org.ua>, 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.0.1-2fa5ddcd1adf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" -"PO-Revision-Date: 2011-10-19 12:08+0300\n" +"POT-Creation-Date: 2012-03-10 14:09+0100\n" +"PO-Revision-Date: 2012-02-03 01:43+0200\n" "Last-Translator: Sergiy Yegorov <prapor(a)unixzone.org.ua>\n" "Language-Team: Ukrainian <kde-i18n-doc(a)kde.org>\n" "Language: uk\n" @@ -122,10 +122,10 @@ #: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284 #: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746 #: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406 -#: ../src/config.py:2419 ../src/config.py:3699 ../src/config.py:3774 +#: ../src/config.py:2419 ../src/config.py:3703 ../src/config.py:3778 #: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3139 -#: ../src/roster_window.py:3145 ../src/roster_window.py:3150 +#: ../src/dialogs.py:532 ../src/roster_window.py:3156 +#: ../src/roster_window.py:3162 ../src/roster_window.py:3167 msgid "None" msgstr "Немає" @@ -313,8 +313,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:27 ../data/gui/preferences_window.ui.h:57 #: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 -#: ../src/roster_window.py:3081 ../src/roster_window.py:4148 -#: ../src/roster_window.py:5738 +#: ../src/roster_window.py:3098 ../src/roster_window.py:4165 +#: ../src/roster_window.py:5755 msgid "General" msgstr "Загальне" @@ -416,7 +416,7 @@ msgstr "Пріоритет змінюватиметься залежно від вашого стану." #. Rename -#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5688 +#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5705 msgid "Re_name" msgstr "Пере_йменувати" @@ -455,7 +455,6 @@ msgstr "_Синхронізувати стан облікового запису з загальним" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "Синхронізувати контакти" @@ -739,8 +738,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5707 -#: ../src/roster_window.py:5834 ../src/roster_window.py:5967 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5724 +#: ../src/roster_window.py:5851 ../src/roster_window.py:5984 msgid "_Unblock" msgstr "_Розблокувати" @@ -904,12 +903,12 @@ msgstr "Показати профіль контакту (Ctrl+I)" #: ../data/gui/chat_control.ui.h:20 -#: ../src/command_system/implementation/standard.py:208 +#: ../src/command_system/implementation/standard.py:214 msgid "Toggle audio session" msgstr "Перемкнути аудіо сессію" #: ../data/gui/chat_control.ui.h:21 -#: ../src/command_system/implementation/standard.py:218 +#: ../src/command_system/implementation/standard.py:224 msgid "Toggle video session" msgstr "Перемкнути відео сессію" @@ -970,8 +969,8 @@ #. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:6 -#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5643 -#: ../src/roster_window.py:5802 +#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5660 +#: ../src/roster_window.py:5819 msgid "In_vite to" msgstr "За_просити до" @@ -987,8 +986,8 @@ msgid "Remo_ve" msgstr "В_илучити" -#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5653 -#: ../src/roster_window.py:5891 +#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5670 +#: ../src/roster_window.py:5908 msgid "Send Cus_tom Status" msgstr "Надіслати не_типовий стан" @@ -1021,8 +1020,8 @@ msgstr "_Дозволити йому/їй бачити мій стан" #: ../data/gui/contact_context_menu.ui.h:19 -#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5715 -#: ../src/roster_window.py:5840 ../src/roster_window.py:5970 +#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5732 +#: ../src/roster_window.py:5857 ../src/roster_window.py:5987 msgid "_Block" msgstr "_Заблокувати" @@ -1033,7 +1032,7 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_control_popup_menu.ui.h:6 #: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23 -#: ../src/roster_window.py:6041 +#: ../src/roster_window.py:6058 msgid "_History" msgstr "_Журнал" @@ -1162,7 +1161,7 @@ msgid "Account row" msgstr "Стрічка облікового запису" -#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1041 +#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1039 msgid "Bold" msgstr "Жирний" @@ -1198,7 +1197,7 @@ msgid "Inactive" msgstr "Неактивний" -#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1042 +#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1040 msgid "Italic" msgstr "Курсив" @@ -1761,14 +1760,12 @@ msgstr "Усі стани балачок" #: ../data/gui/preferences_window.ui.h:25 -#, fuzzy msgid "Allow client / _OS information to be sent" msgstr "Дозволити надсилання інформації про _операційну систему" #: ../data/gui/preferences_window.ui.h:26 -#, fuzzy msgid "Allow local system time information to be sent" -msgstr "Дозволити надсилання інформації про _операційну систему" +msgstr "Дозволити надсилання інформації про місцевий час" #: ../data/gui/preferences_window.ui.h:27 msgid "Allow my _idle time to be sent" @@ -1911,7 +1908,7 @@ #: ../data/gui/preferences_window.ui.h:58 msgid "Global proxy:" -msgstr "" +msgstr "Глобальний проксі:" #: ../data/gui/preferences_window.ui.h:59 msgid "Hide all buttons in chat windows" @@ -1926,11 +1923,10 @@ "операційну систему ви використовуєте" #: ../data/gui/preferences_window.ui.h:61 -#, fuzzy msgid "If checked, Gajim will allow others to detect the time on your system" msgstr "" -"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати, яку " -"операційну систему ви використовуєте" +"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий " +"час" #: ../data/gui/preferences_window.ui.h:62 msgid "" @@ -2586,8 +2582,8 @@ #. Remove group #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5725 -#: ../src/roster_window.py:5850 ../src/roster_window.py:5980 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5742 +#: ../src/roster_window.py:5867 ../src/roster_window.py:5997 msgid "_Remove" msgstr "В_илучити" @@ -2646,7 +2642,6 @@ msgstr "Показувати лише _активні контакти" #: ../data/gui/roster_window.ui.h:12 -#, fuzzy msgid "Show T_ransports" msgstr "Показувати транс_порти" @@ -2701,7 +2696,7 @@ msgstr "Дод_ати контакт" #. Information -#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5992 +#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6009 msgid "_Information" msgstr "_Інформація" @@ -2981,7 +2976,7 @@ msgstr "Служба змінила ідентифікатор сеансу." #: ../src/adhoc_commands.py:418 -#, fuzzy, python-format +#, python-format msgid "%s - Ad-hoc Commands - Gajim" msgstr "Ad-hoc команди — Gajim" @@ -3011,7 +3006,7 @@ msgid "Text" msgstr "Текст" -#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1061 +#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1059 msgid "Color" msgstr "Колір" @@ -3162,90 +3157,90 @@ msgid "Error." msgstr "Помилка." -#: ../src/chat_control.py:573 +#: ../src/chat_control.py:572 msgid "Spelling language" msgstr "Мова перевірки правопису" #. we are not connected -#: ../src/chat_control.py:605 ../src/chat_control.py:821 +#: ../src/chat_control.py:604 ../src/chat_control.py:820 msgid "A connection is not available" msgstr "З'єднання недоступне" -#: ../src/chat_control.py:606 ../src/chat_control.py:822 +#: ../src/chat_control.py:605 ../src/chat_control.py:821 msgid "Your message can not be sent until you are connected." msgstr "Ваше повідомлення не може бути відправлене до встановлення з'єднання." -#: ../src/chat_control.py:1043 +#: ../src/chat_control.py:1041 msgid "Underline" msgstr "Підкреслити" -#: ../src/chat_control.py:1044 +#: ../src/chat_control.py:1042 msgid "Strike" msgstr "Перекреслити" -#: ../src/chat_control.py:1067 +#: ../src/chat_control.py:1065 msgid "Font" msgstr "Шрифт" -#: ../src/chat_control.py:1076 +#: ../src/chat_control.py:1074 msgid "Clear formating" msgstr "Зняти форматування" -#: ../src/chat_control.py:1153 +#: ../src/chat_control.py:1151 msgid "Really send file?" msgstr "Справді надіслати файл?" -#: ../src/chat_control.py:1154 +#: ../src/chat_control.py:1152 #, python-format msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "" "Якщо ви надішлете файл %s, він або вона дізнаються про ваш справжній " "ідентифікатор Jabber." -#: ../src/chat_control.py:1637 ../src/chat_control.py:2182 +#: ../src/chat_control.py:1635 ../src/chat_control.py:2180 msgid "GPG encryption enabled" msgstr "Шифрування GPG увімкнено" -#: ../src/chat_control.py:1658 ../src/chat_control.py:1661 +#: ../src/chat_control.py:1656 ../src/chat_control.py:1659 msgid "Requires python-farsight." msgstr "Потрібен python-farsight." #. Add to roster -#: ../src/chat_control.py:1701 ../src/common/contacts.py:158 +#: ../src/chat_control.py:1699 ../src/common/contacts.py:158 #: ../src/common/contacts.py:277 ../src/common/helpers.py:67

1 0

gajim: don't fail to autogen when there is no plugin
by Yann Leboulanger 10 Mar '12

10 Mar '12

changeset 704419e5f5a3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=704419e5f5a3 description: don't fail to autogen when there is no plugin diffstat: autogen.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r ffb5c38728a5 -r 704419e5f5a3 autogen.sh --- a/autogen.sh Fri Mar 09 08:45:47 2012 +0100 +++ b/autogen.sh Sat Mar 10 13:32:34 2012 +0100 @@ -22,8 +22,10 @@ && ls -1 data/gajim.desktop.in.in \ src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ - && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip \ - && ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip || exit 1 + && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then + ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip + fi if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***" echo "See README.html for build requirements."

1 0

gajim: correctly check JID when creating an anonymous account. F...
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset 1edc01235c3e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1edc01235c3e description: correctly check JID when creating an anonymous account. Fixes #7116 diffstat: src/config.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 2cdc9da8162a -r 1edc01235c3e src/config.py --- a/src/config.py Fri Mar 09 08:40:21 2012 +0100 +++ b/src/config.py Fri Mar 09 08:45:47 2012 +0100 @@ -3655,7 +3655,11 @@ password = self.xml.get_object('password_entry').get_text().decode( 'utf-8') - jid = username + '@' + server + if anonymous: + jid = '' + else: + jid = username + '@' + jid += server # check if jid is conform to RFC and stringprep it try: jid = helpers.parse_jid(jid)

1 0

gajim: don't mark received message as read until it's really rea...
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset fcbe55925104 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fcbe55925104 description: don't mark received message as read until it's really read by user. Fixes #7094 diffstat: src/chat_control.py | 47 ++++++++++++++++++++++++----------------------- src/roster_window.py | 21 +++++++++++++++++++-- 2 files changed, 43 insertions(+), 25 deletions(-) diffs (146 lines): diff -r dd1c30407de1 -r fcbe55925104 src/chat_control.py --- a/src/chat_control.py Sun Feb 26 20:38:29 2012 +0400 +++ b/src/chat_control.py Thu Mar 08 20:03:17 2012 +0100 @@ -919,10 +919,9 @@ self.received_history_pos = pos def print_conversation_line(self, text, kind, name, tim, - other_tags_for_name=[], other_tags_for_time=[], - other_tags_for_text=[], count_as_new=True, subject=None, - old_kind=None, xhtml=None, simple=False, xep0184_id=None, - graphics=True, displaymarking=None): + other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], + count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, + xep0184_id=None, graphics=True, displaymarking=None, msg_id=None): """ Print 'chat' type messages """ @@ -933,9 +932,9 @@ if self.was_at_the_end or kind == 'outgoing': end = True textview.print_conversation_line(text, jid, kind, name, tim, - other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, simple=simple, graphics=graphics, - displaymarking=displaymarking) + other_tags_for_name, other_tags_for_time, other_tags_for_text, + subject, old_kind, xhtml, simple=simple, graphics=graphics, + displaymarking=displaymarking) if xep0184_id is not None: textview.show_xep0184_warning(xep0184_id) @@ -978,18 +977,18 @@ type_ = 'printed_' + self.type_id event = 'message_received' show_in_roster = notify.get_show_in_roster(event, - self.account, self.contact, self.session) + self.account, self.contact, self.session) show_in_systray = notify.get_show_in_systray(event, - self.account, self.contact, type_) - - event = gajim.events.create_event(type_, (self,), + self.account, self.contact, type_) + + event = gajim.events.create_event(type_, (self, msg_id), show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster if show_in_roster: gajim.interface.roster.draw_contact(self.contact.jid, - self.account) + self.account) if not self.parent_win: return @@ -2425,8 +2424,8 @@ return gajim.nicks[self.account] def print_conversation(self, text, frm='', tim=None, encrypted=False, - subject=None, xhtml=None, simple=False, xep0184_id=None, - displaymarking=None): + subject=None, xhtml=None, simple=False, xep0184_id=None, + displaymarking=None, msg_id=None): """ Print a line in the conversation @@ -2457,21 +2456,22 @@ # ESessions if not encrypted: msg = _('The following message was NOT encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) else: # GPG encryption if encrypted and not self.gpg_is_active: msg = _('The following message was encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) - # turn on OpenPGP if this was in fact a XEP-0027 encrypted message + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) + # turn on OpenPGP if this was in fact a XEP-0027 encrypted + # message if encrypted == 'xep27': self._toggle_gpg() elif not encrypted and self.gpg_is_active: msg = _('The following message was NOT encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', '', - tim) + ChatControlBase.print_conversation_line(self, msg, 'status', + '', tim) if not frm: kind = 'incoming' name = contact.get_shown_name() @@ -2488,8 +2488,9 @@ if xhtml: xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.print_conversation_line(self, text, kind, name, tim, - subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, - simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking) + subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, + simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, + msg_id=msg_id) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: diff -r dd1c30407de1 -r fcbe55925104 src/roster_window.py --- a/src/roster_window.py Sun Feb 26 20:38:29 2012 +0400 +++ b/src/roster_window.py Thu Mar 08 20:03:17 2012 +0100 @@ -1889,6 +1889,18 @@ Only performed if removal was requested before but the contact still had pending events """ + + msg_ids = [] + for ev in event_list: + if ev.type_ != 'printed_chat': + continue + if len(ev.parameters) > 1 and ev.parameters[1]: + # There is a msg_id + msg_ids.append(ev.parameters[1]) + + if msg_ids: + gajim.logger.set_read_messages(msg_ids) + contact_list = ((event.jid.split('/')[0], event.account) for event in \ event_list) @@ -2632,9 +2644,14 @@ obj.session.control.print_conversation(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, - xhtml=obj.xhtml, displaymarking=obj.displaymarking) + xhtml=obj.xhtml, displaymarking=obj.displaymarking, + msg_id=obj.msg_id) if obj.msg_id: - gajim.logger.set_read_messages([obj.msg_id]) + pw = obj.session.control.parent_win + end = obj.session.control.was_at_the_end + if not pw or (pw.get_active_control() and obj.session.control \ + == pw.get_active_control() and pw.is_active() and end): + gajim.logger.set_read_messages([obj.msg_id]) elif obj.popup: contact = gajim.contacts.get_contact(obj.conn.name, obj.jid) obj.session.control = gajim.interface.new_chat(contact,

1 0

gajim: fix focus behaviour when opening chat / groupchat window....
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset 2cdc9da8162a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2cdc9da8162a description: fix focus behaviour when opening chat / groupchat window. Fixes #7115, see #5740 diffstat: src/chat_control.py | 1 - src/groupchat_control.py | 1 - src/message_window.py | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diffs (33 lines): diff -r fcbe55925104 -r 2cdc9da8162a src/chat_control.py --- a/src/chat_control.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/chat_control.py Fri Mar 09 08:40:21 2012 +0100 @@ -468,7 +468,6 @@ self.user_nick = None self.smooth = True - self.msg_textview.grab_focus() self.command_hits = [] self.last_key_tabs = False diff -r fcbe55925104 -r 2cdc9da8162a src/groupchat_control.py --- a/src/groupchat_control.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/groupchat_control.py Fri Mar 09 08:40:21 2012 +0100 @@ -1307,7 +1307,6 @@ self._update_banner_state_image() if self.parent_win: self.parent_win.redraw_tab(self) - gobject.idle_add(self.msg_textview.grab_focus) def got_disconnected(self): self.list_treeview.set_model(None) diff -r fcbe55925104 -r 2cdc9da8162a src/message_window.py --- a/src/message_window.py Thu Mar 08 20:03:17 2012 +0100 +++ b/src/message_window.py Fri Mar 09 08:40:21 2012 +0100 @@ -307,7 +307,6 @@ # NOTE: we do not call set_control_active(True) since we don't know # whether the tab is the active one. self.show_title() - gobject.idle_add(control.msg_textview.grab_focus) def on_tab_eventbox_button_press_event(self, widget, event, child): if event.button == 3: # right click

1 0

gajim: update demandimport module from mercurial
by Fomin Denis 09 Mar '12

09 Mar '12

changeset dd1c30407de1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd1c30407de1 description: update demandimport module from mercurial diffstat: src/common/demandimport.py | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diffs (86 lines): diff -r 03bb7f66980f -r dd1c30407de1 src/common/demandimport.py --- a/src/common/demandimport.py Fri Feb 24 21:42:50 2012 +0400 +++ b/src/common/demandimport.py Sun Feb 26 20:38:29 2012 +0400 @@ -27,6 +27,17 @@ import __builtin__ _origimport = __import__ +nothing = object() + +try: + _origimport(__builtin__.__name__, {}, {}, None, -1) +except TypeError: # no level argument + def _import(name, globals, locals, fromlist, level): + "call _origimport with no level argument" + return _origimport(name, globals, locals, fromlist) +else: + _import = _origimport + class _demandmod(object): """module demand-loader and proxy""" def __init__(self, name, globals, locals): @@ -50,7 +61,7 @@ h, t = p, None if '.' in p: h, t = p.split('.', 1) - if not hasattr(mod, h): + if getattr(mod, h, nothing) is nothing: setattr(mod, h, _demandmod(p, mod.__dict__, mod.__dict__)) elif t: subload(getattr(mod, h), t) @@ -78,20 +89,17 @@ self._load() setattr(self._module, attr, val) -def _demandimport(name, globals=None, locals=None, fromlist=None, level=None): +def _demandimport(name, globals=None, locals=None, fromlist=None, level=-1): if not locals or name in ignore or fromlist == ('*',): # these cases we can't really delay - if level is None: - return _origimport(name, globals, locals, fromlist) - else: - return _origimport(name, globals, locals, fromlist, level) + return _import(name, globals, locals, fromlist, level) elif not fromlist: # import a [as b] if '.' in name: # a.b base, rest = name.split('.', 1) # email.__init__ loading email.mime if globals and globals.get('__name__', None) == base: - return _origimport(name, globals, locals, fromlist) + return _import(name, globals, locals, fromlist, level) # if a is already demand-loaded, add b to its submodule list if base in locals: if isinstance(locals[base], _demandmod): @@ -99,19 +107,19 @@ return locals[base] return _demandmod(name, globals, locals) else: - if level is not None: + if level != -1: # from . import b,c,d or from .a import b,c,d return _origimport(name, globals, locals, fromlist, level) # from a import b,c,d mod = _origimport(name, globals, locals) # recurse down the module chain for comp in name.split('.')[1:]: - if not hasattr(mod, comp): + if getattr(mod, comp, nothing) is nothing: setattr(mod, comp, _demandmod(comp, mod.__dict__, mod.__dict__)) mod = getattr(mod, comp) for x in fromlist: # set requested submodules for demand load - if not hasattr(mod, x): + if getattr(mod, x, nothing) is nothing: setattr(mod, x, _demandmod(x, mod.__dict__, locals)) return mod @@ -134,6 +142,8 @@ # raise ImportError if x not defined '__main__', '_ssl', # conditional imports in the stdlib, issue1964 + 'rfc822', + 'mimetools', ] def enable():

1 0

gajim: Fix typo in the russian translation
by Fomin Denis 09 Mar '12

09 Mar '12

changeset 03bb7f66980f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=03bb7f66980f description: Fix typo in the russian translation diffstat: po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 74e958f7f3ba -r 03bb7f66980f po/ru.po --- a/po/ru.po Tue Mar 06 11:51:05 2012 +0100 +++ b/po/ru.po Fri Feb 24 21:42:50 2012 +0400 @@ -2573,7 +2573,7 @@ #: ../data/gui/remove_account_window.ui.h:2 msgid "Remove account _only from Gajim" -msgstr "Удалит учетную запись _только из Gajim" +msgstr "Удалить учетную запись _только из Gajim" #: ../data/gui/remove_account_window.ui.h:3 msgid "Remove account from Gajim and from _server"

1 0

gajim: correctly check JID when creating an anonymous account. F...
by Yann Leboulanger 09 Mar '12

09 Mar '12

changeset ffb5c38728a5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ffb5c38728a5 description: correctly check JID when creating an anonymous account. Fixes #7116 diffstat: src/config.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r f0b060381912 -r ffb5c38728a5 src/config.py --- a/src/config.py Fri Mar 09 08:40:21 2012 +0100 +++ b/src/config.py Fri Mar 09 08:45:47 2012 +0100 @@ -3655,7 +3655,11 @@ password = self.xml.get_object('password_entry').get_text().decode( 'utf-8') - jid = username + '@' + server + if anonymous: + jid = '' + else: + jid = username + '@' + jid += server # check if jid is conform to RFC and stringprep it try: jid = helpers.parse_jid(jid)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2012