Commits

commits@gajim.org

17632 discussions

gajim: [Jeff Bailes] updated strings
by Yann Leboulanger 06 Mar '12

06 Mar '12

changeset 4a8be3052e4c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a8be3052e4c description: [Jeff Bailes] updated strings diffstat: src/command_system/implementation/standard.py | 2 +- src/common/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r a8dfa0ad61e0 -r 4a8be3052e4c src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Mar 01 11:10:33 2012 +0400 +++ b/src/command_system/implementation/standard.py Tue Mar 06 11:51:11 2012 +0100 @@ -127,7 +127,7 @@ @command(raw=True, empty=True) @doc(_(""" - Set current the status + Set the current the status Status can be given as one of the following values: online, away, chat, xa, dnd. diff -r a8dfa0ad61e0 -r 4a8be3052e4c src/common/config.py --- a/src/common/config.py Thu Mar 01 11:10:33 2012 +0400 +++ b/src/common/config.py Tue Mar 06 11:51:11 2012 +0100 @@ -169,7 +169,7 @@ 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')], 'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')], - 'muc_restore_lines': [opt_int, 20, _('How many lines to request to server when entering a groupchat. -1 means no limit')], + 'muc_restore_lines': [opt_int, 20, _('How many lines to request from server when entering a groupchat. -1 means no limit')], 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')], 'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')],

1 0

gajim: [Fran Alburquerque] updated spanish translation
by Yann Leboulanger 06 Mar '12

06 Mar '12

changeset f7c26111c533 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f7c26111c533 description: [Fran Alburquerque] updated spanish translation diffstat: po/es.po | 1295 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 586 insertions(+), 709 deletions(-) diffs (truncated from 3576 to 300 lines): diff -r d31d9ab30b88 -r f7c26111c533 po/es.po --- a/po/es.po Thu Feb 23 13:47:33 2012 +0100 +++ b/po/es.po Tue Mar 06 11:44:11 2012 +0100 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" +"POT-Creation-Date: 2012-03-06 11:27+0100\n" "PO-Revision-Date: 2009-08-19 23:49+0200\n" -"Last-Translator: Membris Khan <frank(a)giingo.org>\n" +"Last-Translator: Fran Alburquerque <fran(a)franalburquerque.info>\n" "Language-Team: none <>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." -msgstr "Entrar a un grupo de charla" +msgstr "Entrar a un _grupo de charla" #: ../data/gui/account_context_menu.ui.h:2 msgid "_Add Contact..." @@ -229,18 +229,16 @@ msgstr "Autoreconectar si se pierde la conexión" #: ../data/gui/accounts_window.ui.h:12 -#, fuzzy msgid "Browse..." -msgstr "_Navegar" +msgstr "Examinar..." #: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "C_onectar al inicio de Gajim" #: ../data/gui/accounts_window.ui.h:14 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Certificado rechazado" +msgstr "El certificado es_tá cifrado" #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" @@ -269,9 +267,8 @@ "nueva cuenta" #: ../data/gui/accounts_window.ui.h:20 -#, fuzzy msgid "Client certificate" -msgstr "Certificado autofirmado" +msgstr "Certificado de cliente" #: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" @@ -453,7 +450,6 @@ msgstr "Sincroni_zar el estado de la cuenta con el estado global" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "Sincronizar contactos" @@ -475,7 +471,7 @@ #: ../data/gui/accounts_window.ui.h:59 msgid "_Client Cert File:" -msgstr "" +msgstr " Ar_chivo de certificado de cliente:" #: ../data/gui/accounts_window.ui.h:60 msgid "_Edit Personal Information..." @@ -560,9 +556,8 @@ msgstr "_Registrar" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "_Subscripción" +msgstr " Guardar el mensaje de _suscripción" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -590,9 +585,8 @@ msgstr "Descripción del error..." #: ../data/gui/adhoc_commands_window.ui.h:6 -#, fuzzy msgid "F_inish" -msgstr "_Finalizar" +msgstr "F_inalizar" #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while retrieving command list..." @@ -637,9 +631,8 @@ msgstr "Elimiina mensaje del día" #: ../data/gui/advanced_menuitem_menu.ui.h:3 -#, fuzzy msgid "Edit Archi_ving Preferences" -msgstr "_Preferencias" +msgstr "Editar preferencias de archi_vado" #: ../data/gui/advanced_menuitem_menu.ui.h:4 msgid "Edit _Privacy Lists..." @@ -679,43 +672,39 @@ #: ../data/gui/archiving_preferences_window.ui.h:1 msgid "Method Auto" -msgstr "" +msgstr "Método auto" #: ../data/gui/archiving_preferences_window.ui.h:2 msgid "Method Local" -msgstr "" +msgstr "Método local" #: ../data/gui/archiving_preferences_window.ui.h:3 msgid "Method Manual" -msgstr "" +msgstr "Método manual" #: ../data/gui/archiving_preferences_window.ui.h:4 -#, fuzzy msgid "Auto" -msgstr "Auto conectar" +msgstr "Auto" #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Concede" -msgstr "" +msgstr "Conceder" #: ../data/gui/archiving_preferences_window.ui.h:6 msgid "Forbid" -msgstr "" +msgstr "Prohibir" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "No" -msgstr "Ninguno" +msgstr "No" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Prefer" -msgstr "Preferencias" +msgstr "Preferir" #: ../data/gui/archiving_preferences_window.ui.h:9 -#, fuzzy msgid "Yes" -msgstr "español" +msgstr "Sí" #: ../data/gui/atom_entry_window.ui.h:1 msgid "Entry:" @@ -833,11 +822,11 @@ #: ../data/gui/chat_control.ui.h:1 msgid "#" -msgstr "" +msgstr "#" #: ../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" @@ -845,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)" @@ -900,23 +889,22 @@ msgstr "Mostrar una lista de formateos" #: ../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 "Muestra un menú de funciones avanzadas (Alt+A)" +msgstr "Muestra un menú de funciones avanzadas (Alt+D)" #: ../data/gui/chat_control.ui.h:19 msgid "Show the contact's profile (Ctrl+I)" msgstr "Muestra el perfil del contacto (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 "Activar sesión de audio" #: ../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 "Activar sesión de vídeo" #. 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 @@ -926,7 +914,7 @@ #: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10 msgid "label" -msgstr "" +msgstr "etiqueta" #: ../data/gui/chat_to_muc_window.ui.h:1 msgid "In_vite" @@ -965,9 +953,8 @@ msgstr "Asignar clave Open_PGP..." #: ../data/gui/contact_context_menu.ui.h:4 -#, fuzzy msgid "E_xecute Command..." -msgstr "Ejecutar comando..." +msgstr "E_jecutar comando..." #: ../data/gui/contact_context_menu.ui.h:5 msgid "Edit _Groups..." @@ -986,9 +973,8 @@ msgstr "Invitar _Contactos" #: ../data/gui/contact_context_menu.ui.h:8 -#, fuzzy msgid "M_anage Contact" -msgstr "_Gestionar contacto" +msgstr "Gestion_ar contacto" #: ../data/gui/contact_context_menu.ui.h:9 msgid "Remo_ve" @@ -1170,9 +1156,8 @@ msgstr "Colores de la pestaña para los estados de conversación" #: ../data/gui/gajim_themes_window.ui.h:2 -#, fuzzy msgid "Account row" -msgstr "Cuenta" +msgstr "Fila de cuenta" #: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1041 msgid "Bold" @@ -1180,16 +1165,15 @@ #: ../data/gui/gajim_themes_window.ui.h:4 msgid "Chat Banner" -msgstr "" +msgstr "Banner de la conversación"

1 0

gajim: Update ru.po
by Fomin Denis 01 Mar '12

01 Mar '12

changeset a8dfa0ad61e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a8dfa0ad61e0 description: Update ru.po diffstat: po/ru.po | 2262 +++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 1240 insertions(+), 1022 deletions(-) diffs (truncated from 5215 to 300 lines): diff -r efbeb9a05155 -r a8dfa0ad61e0 po/ru.po --- a/po/ru.po Sun Feb 26 20:38:29 2012 +0400 +++ b/po/ru.po Thu Mar 01 11:10:33 2012 +0400 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-11 00:06+0400\n" -"PO-Revision-Date: 2012-02-24 21:41+0300\n" +"POT-Creation-Date: 2012-03-01 11:01+0400\n" +"PO-Revision-Date: 2012-03-01 11:08+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -126,25 +126,25 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:41 #: ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1264 -#: ../src/config.py:1278 -#: ../src/config.py:1283 -#: ../src/config.py:1331 -#: ../src/config.py:1434 -#: ../src/config.py:1745 -#: ../src/config.py:1750 -#: ../src/config.py:2326 -#: ../src/config.py:2405 -#: ../src/config.py:2418 -#: ../src/config.py:3697 -#: ../src/config.py:3772 +#: ../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/dialogs.py:311 #: ../src/dialogs.py:313 #: ../src/dialogs.py:519 #: ../src/dialogs.py:532 -#: ../src/roster_window.py:3096 -#: ../src/roster_window.py:3102 -#: ../src/roster_window.py:3107 +#: ../src/roster_window.py:3139 +#: ../src/roster_window.py:3145 +#: ../src/roster_window.py:3150 msgid "None" msgstr "Нет" @@ -238,8 +238,8 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:8 -#: ../src/dialogs.py:3382 -#: ../src/dialogs.py:3428 +#: ../src/dialogs.py:3387 +#: ../src/dialogs.py:3433 msgid "Add" msgstr "Добавить" @@ -302,8 +302,8 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:23 -#: ../src/dialogs.py:3386 -#: ../src/dialogs.py:3483 +#: ../src/dialogs.py:3391 +#: ../src/dialogs.py:3488 msgid "Delete" msgstr "Удалить" @@ -320,8 +320,8 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:26 #: ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 -#: ../src/common/helpers.py:1171 +#: ../src/common/helpers.py:1168 +#: ../src/common/helpers.py:1180 #: ../src/notify.py:314 #: ../src/notify.py:337 #: ../src/notify.py:387 @@ -338,8 +338,9 @@ #: ../src/common/contacts.py:132 #: ../src/dialogs.py:112 #: ../src/dialogs.py:124 -#: ../src/roster_window.py:3038 -#: ../src/roster_window.py:5656 +#: ../src/roster_window.py:3081 +#: ../src/roster_window.py:4148 +#: ../src/roster_window.py:5738 msgid "General" msgstr "Общие" @@ -377,7 +378,7 @@ #: ../data/gui/accounts_window.ui.h:37 #: ../data/gui/zeroconf_information_window.ui.h:4 -#: ../src/config.py:1868 +#: ../src/config.py:1869 #: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -392,8 +393,8 @@ msgstr "_Объединить учетные записи" #: ../data/gui/accounts_window.ui.h:40 -#: ../src/config.py:1841 -#: ../src/config.py:2419 +#: ../src/config.py:1842 +#: ../src/config.py:2420 msgid "No key selected" msgstr "Не выбран ключ" @@ -416,7 +417,7 @@ #. Rename #: ../data/gui/accounts_window.ui.h:46 -#: ../src/roster_window.py:5606 +#: ../src/roster_window.py:5688 msgid "Re_name" msgstr "П_ереименовать" @@ -445,8 +446,8 @@ msgstr "Син_хронизировать статус учетной записи с глобальным статусом" #: ../data/gui/accounts_window.ui.h:54 -#: ../data/gui/synchronise_select_account_dialog.ui.h:2 -msgid "Synchronise contacts" +#, fuzzy +msgid "Synchronize contacts" msgstr "Объединить контакты" #: ../data/gui/accounts_window.ui.h:55 @@ -514,7 +515,7 @@ msgstr "Добавить новый контакт" #: ../data/gui/add_new_contact_window.ui.h:4 -#: ../src/common/helpers.py:1350 +#: ../src/common/helpers.py:1359 msgid "I would like to add you to my contact list." msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?" @@ -571,7 +572,9 @@ msgid "Choose command to execute:" msgstr "Выберите команду:" +#. displaying the window #: ../data/gui/adhoc_commands_window.ui.h:3 +#: ../src/adhoc_commands.py:102 msgid "Ad-hoc Commands - Gajim" msgstr "Специальные команды — Gajim" @@ -735,9 +738,9 @@ #: ../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:5625 -#: ../src/roster_window.py:5752 -#: ../src/roster_window.py:5885 +#: ../src/roster_window.py:5707 +#: ../src/roster_window.py:5834 +#: ../src/roster_window.py:5967 msgid "_Unblock" msgstr "_Разблокировать" @@ -906,10 +909,12 @@ msgstr "Показать информацию о контакте (Ctrl+I)" #: ../data/gui/chat_control.ui.h:20 +#: ../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:224 msgid "Toggle video session" msgstr "Переключить видео сеанс" @@ -974,8 +979,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:6 #: ../data/gui/gc_occupants_menu.ui.h:1 -#: ../src/roster_window.py:5561 -#: ../src/roster_window.py:5720 +#: ../src/roster_window.py:5643 +#: ../src/roster_window.py:5802 msgid "In_vite to" msgstr "_Пригласить в" @@ -992,8 +997,8 @@ msgstr "_Удалить" #: ../data/gui/contact_context_menu.ui.h:10 -#: ../src/roster_window.py:5571 -#: ../src/roster_window.py:5809 +#: ../src/roster_window.py:5653 +#: ../src/roster_window.py:5891 msgid "Send Cus_tom Status" msgstr "Установи_ть статус" @@ -1028,9 +1033,9 @@ #: ../data/gui/contact_context_menu.ui.h:19 #: ../data/gui/gc_occupants_menu.ui.h:8 -#: ../src/roster_window.py:5633 -#: ../src/roster_window.py:5758 -#: ../src/roster_window.py:5888 +#: ../src/roster_window.py:5715 +#: ../src/roster_window.py:5840 +#: ../src/roster_window.py:5970 msgid "_Block" msgstr "_Блокировать" @@ -1042,7 +1047,7 @@ #: ../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:5959 +#: ../src/roster_window.py:6041 msgid "_History" msgstr "_История" @@ -1148,7 +1153,7 @@ msgstr "_Уведомить меня, когда передача файлов закончится" #: ../data/gui/filetransfers.ui.h:15 -#: ../src/chat_control.py:3228 +#: ../src/chat_control.py:3236 #: ../src/filetransfers_window.py:206 msgid "_Open Containing Folder" msgstr "_Открыть папку с принятым файлом" @@ -1384,7 +1389,7 @@ msgstr "Вся история" #: ../data/gui/history_window.ui.h:2 -#: ../src/history_window.py:323 +#: ../src/history_window.py:324 msgid "Conversation History" msgstr "История" @@ -1401,10 +1406,18 @@ msgstr "Поиск:" #: ../data/gui/history_window.ui.h:6 +msgid "_In date search" +msgstr "" + +#: ../data/gui/history_window.ui.h:7 #: ../data/gui/zeroconf_information_window.ui.h:10 msgid "_Log conversation history" msgstr "_Сохранять историю переписки" +#: ../data/gui/history_window.ui.h:8 +msgid "searching only in the selected day " +msgstr "" + #: ../data/gui/item_archiving_preferences_window.ui.h:1 msgid "approve" msgstr "" @@ -1475,7 +1488,7 @@ msgstr "Просмотр конферен_ций" #: ../data/gui/join_groupchat_window.ui.h:3 -#: ../src/dialogs.py:2333 +#: ../src/dialogs.py:2337 msgid "Join Group Chat" msgstr "Войти в комнату" @@ -1500,7 +1513,7 @@ msgstr "Комната:" #: ../data/gui/join_groupchat_window.ui.h:9 -#: ../src/config.py:1858 +#: ../src/config.py:1859 msgid "Server:" msgstr "Сервер:" @@ -1849,8 +1862,8 @@ msgstr "Окно контактов и окно с беседами" #: ../data/gui/preferences_window.ui.h:46 -#: ../src/config.py:170 -#: ../src/config.py:682 +#: ../src/config.py:171 +#: ../src/config.py:683 msgid "Disabled" msgstr "Отключены" @@ -2075,7 +2088,7 @@ msgstr "Сортировать контакты по статусу" #: ../data/gui/preferences_window.ui.h:103 -#: ../src/config.py:400

1 0

gajim: update demandimport module from mercurial
by Fomin Denis 26 Feb '12

26 Feb '12

changeset efbeb9a05155 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=efbeb9a05155 description: update demandimport module from mercurial diffstat: src/common/demandimport.py | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diffs (86 lines): diff -r 86e10430a900 -r efbeb9a05155 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 24 Feb '12

24 Feb '12

changeset 86e10430a900 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=86e10430a900 description: Fix typo in the russian translation diffstat: po/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 0a5aa768f117 -r 86e10430a900 po/ru.po --- a/po/ru.po Wed Feb 22 15:36:35 2012 +0100 +++ b/po/ru.po Fri Feb 24 21:42:50 2012 +0400 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-11-11 00:06+0400\n" -"PO-Revision-Date: 2011-11-15 23:22+0300\n" +"PO-Revision-Date: 2012-02-24 21:41+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -2483,7 +2483,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: [Baurzhan Muftakhidinov] Updated Kazakh translation
by Yann Leboulanger 23 Feb '12

23 Feb '12

changeset d31d9ab30b88 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d31d9ab30b88 description: [Baurzhan Muftakhidinov] Updated Kazakh translation diffstat: po/kk.po | 483 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 248 insertions(+), 235 deletions(-) diffs (truncated from 1153 to 300 lines): diff -r 9439d7b828e8 -r d31d9ab30b88 po/kk.po --- a/po/kk.po Thu Feb 23 13:46:12 2012 +0100 +++ b/po/kk.po Thu Feb 23 13:47:33 2012 +0100 @@ -1,14 +1,14 @@ # Kazakh translation for gajim. -# Copyright (C) 2009 gajim team -# This file is distributed under the same license as the PACKAGE package. -# Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>, 2010. +# Copyright (C) 2012 The Gajim team +# This file is distributed under the same license as the gajim package. +# Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>, 2010-2012. # msgid "" msgstr "" "Project-Id-Version: gajim.trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" -"PO-Revision-Date: 2011-02-03 14:51+0600\n" +"POT-Creation-Date: 2012-02-23 13:42+0100\n" +"PO-Revision-Date: 2012-02-23 13:32+0600\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" "Language: kk\n" @@ -25,7 +25,7 @@ #: ../data/gui/account_context_menu.ui.h:2 msgid "_Add Contact..." -msgstr "_Контакт қосу..." +msgstr "_Контактты қосу..." #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" @@ -240,9 +240,8 @@ msgstr "Gajim қосылғанда, байланыс _орнату" #: ../data/gui/accounts_window.ui.h:14 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Сертификат тайдырылған" +msgstr "Сертификат шифр_ленген" #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" @@ -449,7 +448,6 @@ msgstr "Тіркел_гі күйін ортақ күймен тең ұстау" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "Контакттарды синхрондау" @@ -898,12 +896,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 "Видео сессияны ауыстыру" @@ -974,9 +972,8 @@ msgstr "Контакттарды _шақыру" #: ../data/gui/contact_context_menu.ui.h:8 -#, fuzzy msgid "M_anage Contact" -msgstr "_Контактты басқару" +msgstr "Контактты _басқару" #: ../data/gui/contact_context_menu.ui.h:9 msgid "Remo_ve" @@ -1259,9 +1256,8 @@ msgstr "_Жабылғанда, ростерге орналастыру" #: ../data/gui/gc_control_popup_menu.ui.h:9 -#, fuzzy msgid "_Request Voice" -msgstr "_Даусы бар" +msgstr "_Даусты сұрау" #: ../data/gui/gc_occupants_menu.ui.h:2 msgid "Mo_derator" @@ -1626,9 +1622,8 @@ msgstr "Үй парағы:" #: ../data/gui/plugins_window.ui.h:7 -#, fuzzy msgid "Install from zip" -msgstr "Орнату" +msgstr "zip ішінен орнату" #: ../data/gui/plugins_window.ui.h:8 msgid "Installed" @@ -1756,14 +1751,12 @@ msgstr "Барлық чат күйлері" #: ../data/gui/preferences_window.ui.h:25 -#, fuzzy msgid "Allow client / _OS information to be sent" -msgstr "_ОЖ ақпаратын жіберуге рұқсат ету" +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" @@ -1904,7 +1897,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" @@ -1919,11 +1912,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 "" @@ -2051,9 +2043,8 @@ "сурет смайликтерімен алмастырады" #: ../data/gui/preferences_window.ui.h:78 -#, fuzzy msgid "Last state" -msgstr "Соңғы қалып-күйі: %s" +msgstr "Соңғы қалып-күйі" #: ../data/gui/preferences_window.ui.h:79 msgid "Log _encrypted chat session" @@ -2293,7 +2284,7 @@ #: ../data/gui/preferences_window.ui.h:138 msgid "_Show roster on startup:" -msgstr "" +msgstr "І_ске қосылғанда ростерді көрсету:" #: ../data/gui/preferences_window.ui.h:139 msgid "_Status message:" @@ -2633,7 +2624,6 @@ msgstr "Те_к белсенді контакттарды көрсету" #: ../data/gui/roster_window.ui.h:12 -#, fuzzy msgid "Show T_ransports" msgstr "Транс_порттарды көрсету" @@ -2810,9 +2800,8 @@ msgstr "Клиент:" #: ../data/gui/vcard_information_window.ui.h:8 -#, fuzzy msgid "Configured avatar:" -msgstr "Бапталған аватар:" +msgstr "Бапталған аватар:" #: ../data/gui/vcard_information_window.ui.h:9 msgid "Contact time:" @@ -2840,9 +2829,8 @@ msgstr "Жүйе:" #: ../data/gui/vcard_information_window.ui.h:40 -#, fuzzy msgid "User avatar:" -msgstr "Аватар:" +msgstr "Пайдаланушы аватары:" #: ../data/gui/vcard_information_window.ui.h:43 msgid "Comments" @@ -2969,9 +2957,9 @@ msgstr "Қызмет сессия анықтағышын өзгерткен." #: ../src/adhoc_commands.py:418 -#, fuzzy, python-format +#, python-format msgid "%s - Ad-hoc Commands - Gajim" -msgstr "Ad-hoc командалары - Gajim" +msgstr "%s - Ad-hoc командалары - Gajim" #. when stanza doesn't have error description #: ../src/adhoc_commands.py:513 @@ -3350,8 +3338,8 @@ "жоғалтылады." #: ../src/chat_control.py:2924 ../src/common/connection_handlers_events.py:898 -#: ../src/common/connection_handlers.py:943 -#: ../src/common/connection_handlers.py:1055 ../src/common/connection.py:467 +#: ../src/common/connection_handlers.py:949 +#: ../src/common/connection_handlers.py:1061 ../src/common/connection.py:467 #: ../src/common/logger.py:1131 ../src/gajim.py:210 ../src/session.py:100 msgid "Database Error" msgstr "Дерекқор қатесі" @@ -3380,19 +3368,16 @@ msgstr "%(name)s қазір %(status)s" #: ../src/chat_control.py:3253 -#, fuzzy msgid "File transfer" msgstr "Файлдармен алмасу" #: ../src/chat_control.py:3256 -#, fuzzy msgid "Size" -msgstr "Өлшемі: %s" +msgstr "Өлшемі" #: ../src/chat_control.py:3258 -#, fuzzy msgid "_Accept" -msgstr "_Тіркелгілер" +msgstr "Қаб_ылдау" #: ../src/chat_control.py:3281 ../src/filetransfers_window.py:204 msgid "File transfer completed" @@ -3424,48 +3409,49 @@ #: ../src/command_system/implementation/custom.py:105 msgid "The same as using a doc-string, except it supports translation" -msgstr "" +msgstr "doc-string қоллданғаны тура сияқты, тек бұл аударуды қолдайды" #: ../src/command_system/implementation/execute.py:53 msgid "Execute expression inside a shell, show output" -msgstr "" +msgstr "Қоршам ішінде өрнекті орындау, шығысын көрсету" #: ../src/command_system/implementation/execute.py:109 msgid "Execute expression inside a shell, send output" -msgstr "" +msgstr "Қоршам ішінде өрнекті орындау, шығысын жіберу" #: ../src/command_system/implementation/standard.py:50 msgid "Hide the chat buttons" -msgstr "" +msgstr "Чат батырмаларын жасыру" #: ../src/command_system/implementation/standard.py:56 msgid "" "Show help on a given command or a list of available commands if -a is given" msgstr "" +"Көрсетілген команда үшін көмекті көрсету, -a берілсе, барлық қолжетерлік " +"командаларды шығару" #: ../src/command_system/implementation/standard.py:83 -#, fuzzy msgid "Send a message to the contact" -msgstr "Контактқа файлды жібереді" +msgstr "Контактқа хабарламаны жіберу" #: ../src/command_system/implementation/standard.py:88 msgid "Send action (in the third person) to the current chat" -msgstr "" +msgstr "Ағымдағы чатқа әрекетті жіберу (үшінші жақта)" #: ../src/command_system/implementation/standard.py:93 msgid "Show logged messages which mention given text" -msgstr "" +msgstr "Тарихтан көрсетілген мәтіні бар хабарламаларды көрсету" #: ../src/command_system/implementation/standard.py:99 -#, fuzzy, python-format +#, python-format msgid "%s: Nothing found" -msgstr "%s табылмады" +msgstr "%s: Ешнәрсе табылмады" #: ../src/command_system/implementation/standard.py:105 msgid "Limit must be an integer" -msgstr "" - -#: ../src/command_system/implementation/standard.py:140 +msgstr "Лимит бүтін сан болуы тиіс" + +#: ../src/command_system/implementation/standard.py:129 msgid "" "\n" " Set current the status\n" @@ -3474,12 +3460,18 @@ " chat, xa, dnd.\n" " "

1 0

gajim: [Djavan Fagundes] updatedBrazilian Portuguese translation
by Yann Leboulanger 23 Feb '12

23 Feb '12

changeset 9439d7b828e8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9439d7b828e8 description: [Djavan Fagundes] updatedBrazilian Portuguese translation diffstat: po/pt_BR.po | 2342 ++++++++++++++-------------------------------------------- 1 files changed, 566 insertions(+), 1776 deletions(-) diffs (truncated from 4433 to 300 lines): diff -r 715310a136e2 -r 9439d7b828e8 po/pt_BR.po --- a/po/pt_BR.po Wed Feb 22 15:36:35 2012 +0100 +++ b/po/pt_BR.po Thu Feb 23 13:46:12 2012 +0100 @@ -4,24 +4,21 @@ # This file is distributed under the same license as the Gajim package. # junix <junix(a)targetlinux.org>, 2005. # Gajim <gajim-devel(a)gajim.org>, 2007. -# Djavan Fagundes <djavan(a)comum.org>, 2009, 2010. -# +# Djavan Fagundes <djavan(a)comum.org>, 2009, 2010, 2012. msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" -"PO-Revision-Date: 2009-12-31 23:22-0300\n" -"Last-Translator: Djavan Fagundes <dnoway(a)gmail.com>\n" +"POT-Creation-Date: 2012-02-23 13:42+0100\n" +"PO-Revision-Date: 2012-02-16 14:59-0200\n" +"Last-Translator: Djavan Fagundes <djavan(a)comum.org>\n" "Language-Team: Brazilian Portuguese <gnome-pt_br-list(a)gnome.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.5.0\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: BRAZIL\n" +"X-Generator: Virtaal 0.7.1\n" #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." @@ -33,7 +30,7 @@ #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" -msgstr "_Descubra serviços" +msgstr "_Descobrir serviços" #: ../data/gui/account_context_menu.ui.h:4 msgid "_Execute Command..." @@ -68,11 +65,11 @@ msgstr "" "Conectando ao servidor\n" "\n" -"Por favor aguarde..." +"Por favor, aguarde..." #: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "Please choose one of the options below:" -msgstr "Por favor escolha uma das opções abaixo:" +msgstr "Por favor, escolha uma das opções abaixo:" #: ../data/gui/account_creation_wizard_window.ui.h:5 msgid "Please fill in the data for your existing account" @@ -236,18 +233,16 @@ msgstr "Reconectar automaticamente quando a conexão cair" #: ../data/gui/accounts_window.ui.h:12 -#, fuzzy msgid "Browse..." -msgstr "_Navegar" +msgstr "Navegar..." #: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "C_onectar na inicialização do Gajim" #: ../data/gui/accounts_window.ui.h:14 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Certificado rejeitado" +msgstr "Certificado está cri_ptografado" #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" @@ -275,9 +270,8 @@ "Clique para requisitar autorização para todos os contatos de outra conta" #: ../data/gui/accounts_window.ui.h:20 -#, fuzzy msgid "Client certificate" -msgstr "Certificado próprio" +msgstr "Certificado de cliente" #: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" @@ -456,7 +450,6 @@ msgstr "Sincroni_zar status da conta com status global" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "Sincronizar contatos" @@ -478,7 +471,7 @@ #: ../data/gui/accounts_window.ui.h:59 msgid "_Client Cert File:" -msgstr "" +msgstr "Arquivo de certificado do _cliente:" #: ../data/gui/accounts_window.ui.h:60 msgid "_Edit Personal Information..." @@ -491,7 +484,7 @@ #: ../data/gui/accounts_window.ui.h:62 msgid "_Hostname: " -msgstr "_Nome do computador:" +msgstr "_Nome do computador: " #: ../data/gui/accounts_window.ui.h:64 ../data/gui/preferences_window.ui.h:133 msgid "_Manage..." @@ -499,7 +492,7 @@ #: ../data/gui/accounts_window.ui.h:66 msgid "_Port: " -msgstr "_Porta:" +msgstr "_Porta: " #: ../data/gui/accounts_window.ui.h:67 msgid "_Warn before using an insecure connection" @@ -563,9 +556,8 @@ msgstr "_Registrar" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "_Inscrição" +msgstr "_Salvar mensagem de inscrição" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -593,21 +585,20 @@ msgstr "Descrição do erro..." #: ../data/gui/adhoc_commands_window.ui.h:6 -#, fuzzy msgid "F_inish" -msgstr "_Concluir" +msgstr "Conclu_ir" #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while retrieving command list..." -msgstr "Por favor aguarde enquanto a lista de comandos é recuperada..." +msgstr "Por favor, aguarde enquanto a lista de comandos é recuperada..." #: ../data/gui/adhoc_commands_window.ui.h:8 msgid "Please wait while the command is sending..." -msgstr "Por favor aguarde enquanto a lista de comandos é enviada..." +msgstr "Por favor, aguarde enquanto a lista de comandos é enviada..." #: ../data/gui/adhoc_commands_window.ui.h:9 msgid "Please wait..." -msgstr "Por favor aguarde..." +msgstr "Por favor, aguarde..." #: ../data/gui/adhoc_commands_window.ui.h:10 msgid "This jabber entity does not expose any commands." @@ -626,7 +617,7 @@ #: ../data/gui/advanced_configuration_window.ui.h:3 msgid "Advanced Configuration Editor" -msgstr "Editor de configurações avançado" +msgstr "Editor de configurações avançadas" #: ../data/gui/advanced_configuration_window.ui.h:4 msgid "Filter:" @@ -641,9 +632,8 @@ msgstr "Excluir mensagem do dia" #: ../data/gui/advanced_menuitem_menu.ui.h:3 -#, fuzzy msgid "Edit Archi_ving Preferences" -msgstr "_Preferências" +msgstr "Editar preferências de arqui_vamento" #: ../data/gui/advanced_menuitem_menu.ui.h:4 msgid "Edit _Privacy Lists..." @@ -684,42 +674,39 @@ #: ../data/gui/archiving_preferences_window.ui.h:1 msgid "Method Auto" -msgstr "" +msgstr "Método automático" #: ../data/gui/archiving_preferences_window.ui.h:2 msgid "Method Local" -msgstr "" +msgstr "Método local" #: ../data/gui/archiving_preferences_window.ui.h:3 msgid "Method Manual" -msgstr "" +msgstr "Método manual" #: ../data/gui/archiving_preferences_window.ui.h:4 -#, fuzzy msgid "Auto" -msgstr "Ingresso automático" +msgstr "Automático" #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Concede" -msgstr "" +msgstr "Concede" #: ../data/gui/archiving_preferences_window.ui.h:6 msgid "Forbid" -msgstr "" +msgstr "Nega" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "No" -msgstr "Nenhum" +msgstr "Não" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Prefer" -msgstr "Preferências" +msgstr "Preferir" #: ../data/gui/archiving_preferences_window.ui.h:9 msgid "Yes" -msgstr "" +msgstr "Sim" #: ../data/gui/atom_entry_window.ui.h:1 msgid "Entry:" @@ -798,7 +785,7 @@ #: ../data/gui/change_status_message_dialog.ui.h:4 msgid "Preset messages:" -msgstr "Modelos de mensagens" +msgstr "Modelos de mensagens:" #: ../data/gui/change_status_message_dialog.ui.h:5 msgid "Save as Preset..." @@ -841,7 +828,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" @@ -849,39 +836,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)" @@ -912,12 +899,12 @@

1 0

gajim: simplify code to compute how many logs do we request when...
by Yann Leboulanger 22 Feb '12

22 Feb '12

changeset 715310a136e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=715310a136e2 description: simplify code to compute how many logs do we request when we re-join a room diffstat: src/common/connection.py | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diffs (20 lines): diff -r caa4a9bb69bf -r 715310a136e2 src/common/connection.py --- a/src/common/connection.py Sat Feb 18 23:06:08 2012 +0400 +++ b/src/common/connection.py Wed Feb 22 15:36:35 2012 +0100 @@ -2361,15 +2361,11 @@ last_date = self.last_history_time[room_jid] if last_date == 0: last_date = time.time() - timeout - else: + elif not rejoin: last_date = min(last_date, time.time() - timeout) last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date - if rejoin: - tags['since'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', - time.gmtime(gajim.logger.get_last_date_that_has_logs( - room_jid, is_room=True))) nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb

1 0

gajim: Quick fix [6de66f624e71]. print last message in room then...
by Fomin Denis 22 Feb '12

22 Feb '12

changeset caa4a9bb69bf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=caa4a9bb69bf description: Quick fix [6de66f624e71]. print last message in room then reconnect diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1290feb6745c -r caa4a9bb69bf src/common/connection.py --- a/src/common/connection.py Sat Feb 18 22:48:03 2012 +0400 +++ b/src/common/connection.py Sat Feb 18 23:06:08 2012 +0400 @@ -2369,7 +2369,7 @@ if rejoin: tags['since'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(gajim.logger.get_last_date_that_has_logs( - room_jid, is_room=True) + 1)) + room_jid, is_room=True))) nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb

1 0

gajim: do not duplicate messages in the room when the connection...
by Fomin Denis 22 Feb '12

22 Feb '12

changeset 1290feb6745c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1290feb6745c description: do not duplicate messages in the room when the connection is lost diffstat: src/common/connection.py | 7 ++++++- src/groupchat_control.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diffs (45 lines): diff -r e6fe13f2bfbd -r 1290feb6745c src/common/connection.py --- a/src/common/connection.py Wed Feb 22 10:34:15 2012 +0100 +++ b/src/common/connection.py Sat Feb 18 22:48:03 2012 +0400 @@ -2316,7 +2316,8 @@ room_id=resp.getTag('unique').getData())) self.connection.SendAndCallForResponse(iq, _on_response) - def join_gc(self, nick, room_jid, password, change_nick=False): + def join_gc(self, nick, room_jid, password, change_nick=False, + rejoin=False): # FIXME: This room JID needs to be normalized; see #1364 if not gajim.account_is_connected(self.name): return @@ -2365,6 +2366,10 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date + if rejoin: + tags['since'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(gajim.logger.get_last_date_that_has_logs( + room_jid, is_room=True) + 1)) nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb diff -r e6fe13f2bfbd -r 1290feb6745c src/groupchat_control.py --- a/src/groupchat_control.py Wed Feb 22 10:34:15 2012 +0100 +++ b/src/groupchat_control.py Sat Feb 18 22:48:03 2012 +0400 @@ -1274,7 +1274,7 @@ gajim.gc_connected[obj.conn.name][self.room_jid]: return password = gajim.gc_passwords.get(self.room_jid, '') - obj.conn.join_gc(self.nick, self.room_jid, password) + obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.account: @@ -1351,7 +1351,7 @@ return False password = gajim.gc_passwords.get(self.room_jid, '') gajim.connections[self.account].join_gc(self.nick, self.room_jid, - password) + password, rejoin=True) return True def draw_roster(self):

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits