Commits March 2012

commits@gajim.org

4 participants
56 discussions

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

09 Mar '12

changeset f0b060381912 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f0b060381912 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 97675d403519 -r f0b060381912 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 @@ -469,7 +469,6 @@ self.user_nick = None self.smooth = True - self.msg_textview.grab_focus() self.command_hits = [] self.last_key_tabs = False diff -r 97675d403519 -r f0b060381912 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 97675d403519 -r f0b060381912 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: don't mark received message as read until it's really rea...
by Yann Leboulanger 08 Mar '12

08 Mar '12

changeset 97675d403519 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=97675d403519 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 4a8be3052e4c -r 97675d403519 src/chat_control.py --- a/src/chat_control.py Tue Mar 06 11:51:11 2012 +0100 +++ b/src/chat_control.py Thu Mar 08 20:03:17 2012 +0100 @@ -920,10 +920,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 """ @@ -934,9 +933,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) @@ -979,18 +978,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 @@ -2398,8 +2397,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 @@ -2430,21 +2429,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() @@ -2461,8 +2461,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 4a8be3052e4c -r 97675d403519 src/roster_window.py --- a/src/roster_window.py Tue Mar 06 11:51:11 2012 +0100 +++ 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: [Jeff Bailes] updated en_GB translation
by Yann Leboulanger 06 Mar '12

06 Mar '12

changeset 74e958f7f3ba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=74e958f7f3ba description: [Jeff Bailes] updated en_GB translation diffstat: po/en_GB.po | 1192 ++++++++++++++++++++++++++-------------------------------- 1 files changed, 541 insertions(+), 651 deletions(-) diffs (truncated from 3272 to 300 lines): diff -r f7c26111c533 -r 74e958f7f3ba po/en_GB.po --- a/po/en_GB.po Tue Mar 06 11:44:11 2012 +0100 +++ b/po/en_GB.po Tue Mar 06 11:51:05 2012 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" -"PO-Revision-Date: 2009-11-20 20:49+1100\n" +"POT-Creation-Date: 2012-03-06 11:27+0100\n" +"PO-Revision-Date: 2012-03-04 20:59+1100\n" "Last-Translator: Jeff Bailes <thepizzaking(a)gmail.com>\n" "Language-Team: English <en_gb(a)li.org>\n" "Language: en\n" @@ -230,18 +230,16 @@ msgstr "Auto-reconnect when connection is lost" #: ../data/gui/accounts_window.ui.h:12 -#, fuzzy msgid "Browse..." -msgstr "_Browse" +msgstr "Browse..." #: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "C_onnect on Gajim startup" #: ../data/gui/accounts_window.ui.h:14 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Certificate rejected" +msgstr "Certificate is e_ncrypted" #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" @@ -268,9 +266,8 @@ msgstr "Click to request authorisation to all contacts of another account" #: ../data/gui/accounts_window.ui.h:20 -#, fuzzy msgid "Client certificate" -msgstr "Self signed certificate" +msgstr "Client certificate" #: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" @@ -449,7 +446,6 @@ msgstr "Synchroni_se account status with global status" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "Synchronise contacts" @@ -471,7 +467,7 @@ #: ../data/gui/accounts_window.ui.h:59 msgid "_Client Cert File:" -msgstr "" +msgstr "_Client Cert File:" #: ../data/gui/accounts_window.ui.h:60 msgid "_Edit Personal Information..." @@ -556,9 +552,8 @@ msgstr "_Register" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "_Subscription" +msgstr "_Save subscription message" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -586,9 +581,8 @@ msgstr "Error description..." #: ../data/gui/adhoc_commands_window.ui.h:6 -#, fuzzy msgid "F_inish" -msgstr "_Finish" +msgstr "F_inish" #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while retrieving command list..." @@ -632,9 +626,8 @@ msgstr "Deletes Message of the Day" #: ../data/gui/advanced_menuitem_menu.ui.h:3 -#, fuzzy msgid "Edit Archi_ving Preferences" -msgstr "_Preferences" +msgstr "Edit Archi_ving Preferences" #: ../data/gui/advanced_menuitem_menu.ui.h:4 msgid "Edit _Privacy Lists..." @@ -674,42 +667,39 @@ #: ../data/gui/archiving_preferences_window.ui.h:1 msgid "Method Auto" -msgstr "" +msgstr "Method Auto" #: ../data/gui/archiving_preferences_window.ui.h:2 msgid "Method Local" -msgstr "" +msgstr "Method Local" #: ../data/gui/archiving_preferences_window.ui.h:3 msgid "Method Manual" -msgstr "" +msgstr "Method Manual" #: ../data/gui/archiving_preferences_window.ui.h:4 -#, fuzzy msgid "Auto" -msgstr "Auto join" +msgstr "Auto" #: ../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 "Forbid" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "No" -msgstr "None" +msgstr "No" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Prefer" -msgstr "Preferences" +msgstr "Prefer" #: ../data/gui/archiving_preferences_window.ui.h:9 msgid "Yes" -msgstr "" +msgstr "Yes" #: ../data/gui/atom_entry_window.ui.h:1 msgid "Entry:" @@ -831,7 +821,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" @@ -839,39 +829,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)" @@ -894,23 +884,22 @@ msgstr "Show a list of formattings" #: ../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 "Show a menu of advanced functions (Alt+A)" +msgstr "Show a menu of advanced functions (Alt+D)" #: ../data/gui/chat_control.ui.h:19 msgid "Show the contact's profile (Ctrl+I)" msgstr "Show the contact's profile (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 "Toggle audio 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 "Toggle 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 @@ -920,7 +909,7 @@ #: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10 msgid "label" -msgstr "" +msgstr "label" #: ../data/gui/chat_to_muc_window.ui.h:1 msgid "In_vite" @@ -979,9 +968,8 @@ msgstr "Invite _Contacts" #: ../data/gui/contact_context_menu.ui.h:8 -#, fuzzy msgid "M_anage Contact" -msgstr "_Manage Contact" +msgstr "M_anage Contact" #: ../data/gui/contact_context_menu.ui.h:9 msgid "Remo_ve" @@ -1159,9 +1147,8 @@ msgstr "Chatstate Tab Colours" #: ../data/gui/gajim_themes_window.ui.h:2 -#, fuzzy msgid "Account row" -msgstr "Account" +msgstr "Account row" #: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1041 msgid "Bold" @@ -1169,16 +1156,15 @@ #: ../data/gui/gajim_themes_window.ui.h:4 msgid "Chat Banner" -msgstr "" +msgstr "Chat Banner" #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Composing" msgstr "Composing" #: ../data/gui/gajim_themes_window.ui.h:6 -#, fuzzy msgid "Contact row" -msgstr "Contact" +msgstr "Contact row" #: ../data/gui/gajim_themes_window.ui.h:7 msgid "Font style:" @@ -1193,9 +1179,8 @@ msgstr "Gone" #: ../data/gui/gajim_themes_window.ui.h:10 -#, fuzzy msgid "Group row" -msgstr "Group" +msgstr "Group row" #: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150 msgid "Inactive" @@ -1266,9 +1251,8 @@ msgstr "_Minimise on close" #: ../data/gui/gc_control_popup_menu.ui.h:9

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2012