Commits February 2012

commits@gajim.org

3 participants
51 discussions

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

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

22 Feb '12

changeset 0a5aa768f117 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a5aa768f117 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 8d4593f3997f -r 0a5aa768f117 src/common/connection.py --- a/src/common/connection.py Wed Feb 22 10:07:16 2012 +0100 +++ b/src/common/connection.py Wed Feb 22 15:36:35 2012 +0100 @@ -2349,15 +2349,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: fix missing space in 2 strings
by Yann Leboulanger 22 Feb '12

22 Feb '12

changeset e6fe13f2bfbd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e6fe13f2bfbd description: fix missing space in 2 strings diffstat: po/be.po | 4 ++-- po/be(a)latin.po | 4 ++-- po/bg.po | 4 ++-- po/br.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 4 ++-- po/en_GB.po | 4 ++-- po/eo.po | 4 ++-- po/es.po | 4 ++-- po/eu.po | 4 ++-- po/fr.po | 4 ++-- po/gl.po | 4 ++-- po/hr.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/kk.po | 4 ++-- po/lt.po | 4 ++-- po/nb.po | 4 ++-- po/nl.po | 4 ++-- po/no.po | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ru.po | 4 ++-- po/sk.po | 4 ++-- po/sr.po | 4 ++-- po/sr(a)Latn.po | 4 ++-- po/sv.po | 4 ++-- po/uk.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) diffs (truncated from 693 to 300 lines): diff -r 117e6ac5081a -r e6fe13f2bfbd po/be.po --- a/po/be.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/be.po Wed Feb 22 10:34:15 2012 +0100 @@ -5394,7 +5394,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Праверце звесткі аўтарызацыі." #: ../src/common/connection.py:1475 @@ -5405,7 +5405,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых " "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні." diff -r 117e6ac5081a -r e6fe13f2bfbd po/be(a)latin.po --- a/po/be(a)latin.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/be(a)latin.po Wed Feb 22 10:34:15 2012 +0100 @@ -5417,7 +5417,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Kali łaska, pravier pravilnaść loginu i parolu." #: ../src/common/connection.py:1475 @@ -5428,7 +5428,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Śpis pryvatnaści %s nia vydaleny. Jon vykarystoŭvajecca adnoj z dałučanych " "krynic. Adklučy jaje i paŭtary znoŭ." diff -r 117e6ac5081a -r e6fe13f2bfbd po/bg.po --- a/po/bg.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/bg.po Wed Feb 22 10:34:15 2012 +0100 @@ -5358,7 +5358,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Проверете дали името и паролата са правилни." #: ../src/common/connection.py:1475 @@ -5369,7 +5369,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от " "свързаните ви ресурси. Изключете го и опитайте отново." diff -r 117e6ac5081a -r e6fe13f2bfbd po/br.po --- a/po/br.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/br.po Wed Feb 22 10:34:15 2012 +0100 @@ -5368,7 +5368,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ." #: ../src/common/connection.py:1475 @@ -5380,7 +5380,7 @@ #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" #: ../src/common/connection.py:1858 diff -r 117e6ac5081a -r e6fe13f2bfbd po/cs.po --- a/po/cs.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/cs.po Wed Feb 22 10:34:15 2012 +0100 @@ -5303,7 +5303,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Prosím zkontrolujte správnost jména a hesla." #: ../src/common/connection.py:1475 @@ -5314,7 +5314,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Privacy list %s nebyl odstraněn. Možná je aktivní v jednom z připojených " "zdrojů. Zruště jeho používání a zkuste znovu." diff -r 117e6ac5081a -r e6fe13f2bfbd po/da.po --- a/po/da.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/da.po Wed Feb 22 10:34:15 2012 +0100 @@ -5326,7 +5326,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Venligst kontroller om dit logind og adgangskode er korrekt." #: ../src/common/connection.py:1475 @@ -5337,7 +5337,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Privatlivs liste %s er ikke blevet fjernet. Den er måske aktiv i en af dine " "tilsluttede ressourcer. Deaktivér den og prøv igen." diff -r 117e6ac5081a -r e6fe13f2bfbd po/de.po --- a/po/de.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/de.po Wed Feb 22 10:34:15 2012 +0100 @@ -5379,7 +5379,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Bitte überprüfen Sie Benutzernamen und Passwort." #: ../src/common/connection.py:1475 @@ -5390,7 +5390,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Die Privatsphären-Liste %s wurde nicht entfernt. Möglicherweise ist sie noch " "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie " diff -r 117e6ac5081a -r e6fe13f2bfbd po/el.po --- a/po/el.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/el.po Wed Feb 22 10:34:15 2012 +0100 @@ -5415,7 +5415,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας." #: ../src/common/connection.py:1475 @@ -5427,7 +5427,7 @@ #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" #: ../src/common/connection.py:1858 diff -r 117e6ac5081a -r e6fe13f2bfbd po/en_GB.po --- a/po/en_GB.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/en_GB.po Wed Feb 22 10:34:15 2012 +0100 @@ -5286,7 +5286,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Please check your login and password for correctness." #: ../src/common/connection.py:1475 @@ -5297,7 +5297,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Privacy list %s has not been removed. It is maybe active in one of your " "connected resources. Deactivate it and try again." diff -r 117e6ac5081a -r e6fe13f2bfbd po/eo.po --- a/po/eo.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/eo.po Wed Feb 22 10:34:15 2012 +0100 @@ -5397,7 +5397,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto." #: ../src/common/connection.py:1475 @@ -5408,7 +5408,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj " "konektitaj risurcoj. Malaktivigu ĝin kaj provu denove." diff -r 117e6ac5081a -r e6fe13f2bfbd po/es.po --- a/po/es.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/es.po Wed Feb 22 10:34:15 2012 +0100 @@ -5337,7 +5337,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "" "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos." @@ -5349,7 +5349,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "La lista de privacidad %s no se ha eliminado. Podría estar activa en uno de " "tus recursos conectados. Desactívalo y prueba de nuevo." diff -r 117e6ac5081a -r e6fe13f2bfbd po/eu.po --- a/po/eu.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/eu.po Wed Feb 22 10:34:15 2012 +0100 @@ -5412,7 +5412,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz." #: ../src/common/connection.py:1475 @@ -5424,7 +5424,7 @@ #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" #: ../src/common/connection.py:1858 diff -r 117e6ac5081a -r e6fe13f2bfbd po/fr.po --- a/po/fr.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/fr.po Wed Feb 22 10:34:15 2012 +0100 @@ -5332,7 +5332,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects." #: ../src/common/connection.py:1475 @@ -5343,7 +5343,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une " "des ressources connectées. Désactivez la et réessayez." diff -r 117e6ac5081a -r e6fe13f2bfbd po/gl.po --- a/po/gl.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/gl.po Wed Feb 22 10:34:15 2012 +0100 @@ -5434,7 +5434,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "" "Por favor, comprobe que o seu nome de usuario e o seu contrasinal sexan os " "correctos." @@ -5448,7 +5448,7 @@ #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" #: ../src/common/connection.py:1858 diff -r 117e6ac5081a -r e6fe13f2bfbd po/hr.po --- a/po/hr.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/hr.po Wed Feb 22 10:34:15 2012 +0100 @@ -5316,7 +5316,7 @@ #: ../src/common/connection.py:1400

1 0

gajim: fix some string
by Yann Leboulanger 22 Feb '12

22 Feb '12

changeset 117e6ac5081a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=117e6ac5081a description: fix some string diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 710c1ada0cdf -r 117e6ac5081a src/common/connection.py --- a/src/common/connection.py Tue Feb 21 23:53:49 2012 +0100 +++ b/src/common/connection.py Wed Feb 22 10:07:16 2012 +0100 @@ -1398,7 +1398,7 @@ gajim.nec.push_incoming_event(InformationEvent(None, conn=self, level='error', pri_txt=_('Authentication failed with "%s"') % \ self._hostname, sec_txt=_('Please check your login and password' - 'for correctness.'))) + ' for correctness.'))) if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None @@ -1475,7 +1475,7 @@ level='error', pri_txt=_('Error while removing privacy ' 'list'), sec_txt=_('Privacy list %s has not been removed. ' 'It is maybe active in one of your connected resources. ' - 'Deactivate it and tryagain.') % privacy_list)) + 'Deactivate it and try again.') % privacy_list)) common.xmpp.features_nb.delPrivacyList(self.connection, privacy_list, _on_del_privacy_list_result)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2012