Commits April 2010

commits@gajim.org

7 participants
72 discussions

gajim: don't request vcard to full JID when we join a room
by Yann Leboulanger 30 Apr '10

30 Apr '10

changeset 809f000a3106 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=809f000a3106 description: don't request vcard to full JID when we join a room diffstat: src/groupchat_control.py | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diffs (53 lines): diff -r 3a8612675a30 -r 809f000a3106 src/groupchat_control.py --- a/src/groupchat_control.py Thu Apr 29 23:27:34 2010 +0200 +++ b/src/groupchat_control.py Fri Apr 30 14:18:06 2010 +0200 @@ -1467,7 +1467,7 @@ self.print_conversation(st, tim=tim, graphics=False) def add_contact_to_roster(self, nick, show, role, affiliation, status, - jid=''): + jid=''): model = self.list_treeview.get_model() role_name = helpers.get_uf_role(role, plural=True) @@ -1485,14 +1485,16 @@ role_iter = self.get_role_iter(role) if not role_iter: role_iter = model.append(None, - (gajim.interface.jabber_state_images['16']['closed'], role, - 'role', role_name, None)) + (gajim.interface.jabber_state_images['16']['closed'], role, + 'role', role_name, None)) self.draw_all_roles() iter_ = model.append(role_iter, (None, nick, 'contact', name, None)) - if not nick in gajim.contacts.get_nick_list(self.account, self.room_jid): - gc_contact = gajim.contacts.create_gc_contact(room_jid=self.room_jid, account=self.account, - name=nick, show=show, status=status, role=role, - affiliation=affiliation, jid=j, resource=resource) + if not nick in gajim.contacts.get_nick_list(self.account, + self.room_jid): + gc_contact = gajim.contacts.create_gc_contact( + room_jid=self.room_jid, account=self.account, + name=nick, show=show, status=status, role=role, + affiliation=affiliation, jid=j, resource=resource) gajim.contacts.add_gc_contact(self.account, gc_contact) self.draw_contact(nick) self.draw_avatar(nick) @@ -1503,13 +1505,11 @@ fake_jid = self.room_jid + '/' + nick pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid) if pixbuf == 'ask': - if j: - fjid = j - if resource: - fjid += '/' + resource - gajim.connections[self.account].request_vcard(fjid, fake_jid) + if j and not self.is_anonymous: + gajim.connections[self.account].request_vcard(j, fake_jid) else: - gajim.connections[self.account].request_vcard(fake_jid, fake_jid) + gajim.connections[self.account].request_vcard(fake_jid, + fake_jid) if nick == self.nick: # we became online self.got_connected() self.list_treeview.expand_row((model.get_path(role_iter)), False)

1 0

gajim: [Dicson] differenciate what we get from geoclue and when ...
by Yann Leboulanger 29 Apr '10

29 Apr '10

changeset 3a8612675a30 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3a8612675a30 description: [Dicson] differenciate what we get from geoclue and when we get from jabber server. It's different. Fixes #5724 diffstat: src/common/location_listener.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (24 lines): diff -r db875400dffe -r 3a8612675a30 src/common/location_listener.py --- a/src/common/location_listener.py Thu Apr 29 22:20:07 2010 +0300 +++ b/src/common/location_listener.py Thu Apr 29 23:27:34 2010 +0200 @@ -79,6 +79,7 @@ accuracy) def start(self): + self.location_info = {} self.get_data() bus = dbus.SessionBus() # Geoclue @@ -124,10 +125,10 @@ continue if not gajim.config.get_per('accounts', acct, 'publish_location'): continue - if gajim.connections[acct].location_info == self._data: + if self.location_info == self._data: continue gajim.connections[acct].send_location(self._data) - gajim.connections[acct].location_info = self._data + self.location_info = self._data.copy() def _timestamp_to_utc(self, timestamp): time = datetime.utcfromtimestamp(timestamp)

1 0

gajim: Correct a timestamp for the XEP-0080 implementation. Than...
by Alexander Cherniuk 29 Apr '10

29 Apr '10

changeset db875400dffe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=db875400dffe description: Correct a timestamp for the XEP-0080 implementation. Thanks to Dicson. Fixes #5727 diffstat: src/common/location_listener.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (41 lines): diff -r 9d1b407c4e72 -r db875400dffe src/common/location_listener.py --- a/src/common/location_listener.py Tue Apr 27 11:31:36 2010 +0200 +++ b/src/common/location_listener.py Thu Apr 29 22:20:07 2010 +0300 @@ -18,6 +18,8 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +from datetime import datetime + from common import gajim from common import pep from common import dbus_support @@ -95,7 +97,7 @@ 'region', 'street']: self._data[field] = address.get(field, None) if timestamp: - self._data['timestamp'] = timestamp + self._data['timestamp'] = self._timestamp_to_utc(timestamp) if accuracy: # in PEP it's horizontal accuracy self._data['accuracy'] = accuracy[1] @@ -109,7 +111,7 @@ if _dict[field] is not None: self._data[field] = _dict[field] if timestamp: - self._data['timestamp'] = timestamp + self._data['timestamp'] = self._timestamp_to_utc(timestamp) if accuracy: # in PEP it's horizontal accuracy self._data['accuracy'] = accuracy[1] @@ -127,6 +129,10 @@ gajim.connections[acct].send_location(self._data) gajim.connections[acct].location_info = self._data + def _timestamp_to_utc(self, timestamp): + time = datetime.utcfromtimestamp(timestamp) + return time.strftime('%Y-%m-%dT%H:%MZ') + def enable(): listener = LocationListener.get() listener.start()

1 0

gajim: add new ad-hoc command to forward unread messages then di...
by Yann Leboulanger 27 Apr '10

27 Apr '10

changeset 9d1b407c4e72 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9d1b407c4e72 description: add new ad-hoc command to forward unread messages then disconnect. Thanks Geobert. diffstat: src/common/commands.py | 37 +++++++++++++++++++++++++++++- src/common/connection.py | 9 ++++--- src/common/zeroconf/connection_zeroconf.py | 3 +- 3 files changed, 43 insertions(+), 6 deletions(-) diffs (87 lines): diff -r cec72a668e7b -r 9d1b407c4e72 src/common/commands.py --- a/src/common/commands.py Mon Apr 26 17:47:49 2010 +0200 +++ b/src/common/commands.py Tue Apr 27 11:31:36 2010 +0200 @@ -290,6 +290,41 @@ return False # finish the session +class FwdMsgThenDisconnectCommand(AdHocCommand): + commandnode = 'fwd-msd-disconnect' + commandname = _('Forward unread message then disconnect') + + @staticmethod + def isVisibleFor(samejid): + """ + Change status is visible only if the entity has the same bare jid + """ + return samejid + + def execute(self, request): + account = self.connection.name + # Forward messages + events = gajim.events.get_events(account, types=['chat', 'normal']) + j, resource = gajim.get_room_and_nick_from_fjid(self.jid) + for jid in events: + for event in events[jid]: + self.connection.send_message(j, event.parameters[0], '', + type_=event.type_, subject=event.parameters[1], + resource=resource, forward_from=jid, delayed=event.time_, + now=True) + + response, cmd = self.buildResponse(request, status = 'completed') + cmd.addChild('note', {}, _('The status has been changed.')) + + # if going offline, we need to push response so it won't go into + # queue and disappear + self.connection.connection.send(response, now = True) + + # send new status + gajim.interface.roster.send_status(self.connection.name, 'offline', '') + # finish the session + return False + class ConnectionCommands: """ This class depends on that it is a part of Connection() class @@ -299,7 +334,7 @@ # a list of all commands exposed: node -> command class self.__commands = {} for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand, - LeaveGroupchatsCommand): + LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand): self.__commands[cmdobj.commandnode] = cmdobj # a list of sessions; keys are tuples (jid, sessionid, node) diff -r cec72a668e7b -r 9d1b407c4e72 src/common/connection.py --- a/src/common/connection.py Mon Apr 26 17:47:49 2010 +0200 +++ b/src/common/connection.py Tue Apr 27 11:31:36 2010 +0200 @@ -1606,11 +1606,12 @@ def send_message(self, jid, msg, keyID, type_='chat', subject='', chatstate=None, msg_id=None, composing_xep=None, resource=None, user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, - original_message=None, delayed=None, callback=None, callback_args=[]): + original_message=None, delayed=None, callback=None, callback_args=[], + now=False): - def cb(jid, msg, keyID, forward_from, session, original_message, subject, - type_, msg_iq): - msg_id = self.connection.send(msg_iq) + def cb(jid, msg, keyID, forward_from, session, original_message, + subject, type_, msg_iq): + msg_id = self.connection.send(msg_iq, now=now) jid = helpers.parse_jid(jid) self.dispatch('MSGSENT', (jid, msg, keyID)) if callback: diff -r cec72a668e7b -r 9d1b407c4e72 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Mon Apr 26 17:47:49 2010 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Tue Apr 27 11:31:36 2010 +0200 @@ -310,7 +310,8 @@ def send_message(self, jid, msg, keyID, type_='chat', subject='', chatstate=None, msg_id=None, composing_xep=None, resource=None, user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, - original_message=None, delayed=None, callback=None, callback_args=[]): + original_message=None, delayed=None, callback=None, callback_args=[], + now=True): def on_send_ok(msg_id): self.dispatch('MSGSENT', (jid, msg, keyID))

1 0

gajim: merge with default
by Yann Leboulanger 26 Apr '10

26 Apr '10

changeset cec72a668e7b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cec72a668e7b description: merge with default diffstat: po/ru.po | 981 +++++++++++----------- po/uk.po | 2370 +++++++++++++++---------------------------------------- src/dialogs.py | 4 +- 3 files changed, 1175 insertions(+), 2180 deletions(-) diffs (truncated from 7094 to 300 lines): diff -r 4574b7cae546 -r cec72a668e7b po/ru.po --- a/po/ru.po Mon Apr 26 17:46:52 2010 +0200 +++ b/po/ru.po Mon Apr 26 17:47:49 2010 +0200 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-05 23:28+0400\n" -"PO-Revision-Date: 2010-04-05 23:57+0300\n" +"POT-Creation-Date: 2010-04-26 08:28+0400\n" +"PO-Revision-Date: 2010-04-26 08:41+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Русский <ru(a)li.org>\n" "MIME-Version: 1.0\n" @@ -119,7 +119,7 @@ msgstr "Я хочу _зарегистрировать новую учетную запись" #: ../data/gui/account_creation_wizard_window.ui.h:16 -#: ../data/gui/accounts_window.ui.h:25 +#: ../data/gui/accounts_window.ui.h:28 msgid "If checked, Gajim will remember the password for this account" msgstr "Если отмечено, то Gajim запомнит пароль учетной записи" @@ -128,17 +128,17 @@ msgstr "Управление..." #: ../data/gui/account_creation_wizard_window.ui.h:18 -#: ../data/gui/accounts_window.ui.h:36 +#: ../data/gui/accounts_window.ui.h:39 #: ../data/gui/change_mood_dialog.ui.h:3 #: ../src/config.py:1256 #: ../src/config.py:1359 -#: ../src/config.py:1652 -#: ../src/config.py:1657 -#: ../src/config.py:2208 -#: ../src/config.py:2287 -#: ../src/config.py:2300 -#: ../src/config.py:3538 -#: ../src/config.py:3611 +#: ../src/config.py:1670 +#: ../src/config.py:1675 +#: ../src/config.py:2239 +#: ../src/config.py:2318 +#: ../src/config.py:2331 +#: ../src/config.py:3569 +#: ../src/config.py:3642 #: ../src/dialogs.py:308 #: ../src/dialogs.py:310 #: ../src/dialogs.py:513 @@ -154,7 +154,7 @@ msgstr "Про_кси:" #: ../data/gui/account_creation_wizard_window.ui.h:20 -#: ../data/gui/accounts_window.ui.h:45 +#: ../data/gui/accounts_window.ui.h:48 msgid "Save pass_word" msgstr "Сохранить _пароль" @@ -188,12 +188,12 @@ msgstr "_Хост: " #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:57 +#: ../data/gui/accounts_window.ui.h:62 msgid "_Jabber ID:" msgstr "_Jabber ID:" #: ../data/gui/account_creation_wizard_window.ui.h:29 -#: ../data/gui/accounts_window.ui.h:59 +#: ../data/gui/accounts_window.ui.h:64 msgid "_Password:" msgstr "_Пароль:" @@ -248,49 +248,64 @@ msgstr "Автоподключение при разрыве связи" #: ../data/gui/accounts_window.ui.h:11 +#, fuzzy +msgid "Browse..." +msgstr "_Браузер" + +#: ../data/gui/accounts_window.ui.h:12 msgid "C_onnect on Gajim startup" msgstr "_Соединяться при запуске Gajim" -#: ../data/gui/accounts_window.ui.h:12 +#: ../data/gui/accounts_window.ui.h:13 msgid "Chan_ge Password" msgstr "И_зменить пароль" -#: ../data/gui/accounts_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:14 msgid "Check this so Gajim will ask you before sending your password over an insecure connection." msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение." -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:15 +#, fuzzy +msgid "Choose Client Cert" +msgstr "Выбрать файл для отправки..." + +#: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." msgstr "Выбрать _ключ..." -#: ../data/gui/accounts_window.ui.h:15 +#: ../data/gui/accounts_window.ui.h:17 msgid "Click to change account's password" msgstr "Щелкните для изменения пароля" -#: ../data/gui/accounts_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:18 msgid "Click to request authorization to all contacts of another account" msgstr "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи" -#: ../data/gui/accounts_window.ui.h:17 +#: ../data/gui/accounts_window.ui.h:19 +#, fuzzy +msgid "Client certificate" +msgstr "Сертификат подписан самим владельцем." + +#: ../data/gui/accounts_window.ui.h:20 msgid "Co_nnect on Gajim startup" msgstr "_Соединяться при запуске Gajim" -#: ../data/gui/accounts_window.ui.h:18 +#: ../data/gui/accounts_window.ui.h:21 msgid "Connection" msgstr "Соединение" -#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/accounts_window.ui.h:22 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" msgstr "Почта:" -#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:23 #: ../data/gui/zeroconf_information_window.ui.h:3 msgid "First Name:" msgstr "Имя:" #. No configured account -#: ../data/gui/accounts_window.ui.h:21 +#: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/roster_window.ui.h:5 #: ../src/common/helpers.py:1159 #: ../src/common/helpers.py:1171 @@ -304,7 +319,7 @@ #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:22 +#: ../data/gui/accounts_window.ui.h:25 #: ../data/gui/preferences_window.ui.h:61 #: ../src/common/contacts.py:141 #: ../src/dialogs.py:111 @@ -314,27 +329,27 @@ msgid "General" msgstr "Общие" -#: ../data/gui/accounts_window.ui.h:23 +#: ../data/gui/accounts_window.ui.h:26 msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working." msgstr "Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение к вашему, так что передача файла имеет больше шансов на успех." -#: ../data/gui/accounts_window.ui.h:24 +#: ../data/gui/accounts_window.ui.h:27 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "Если отмечено, то Gajim запомнит пароль учетной записи" -#: ../data/gui/accounts_window.ui.h:26 +#: ../data/gui/accounts_window.ui.h:29 msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" msgstr "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва соединения по таймауту" -#: ../data/gui/accounts_window.ui.h:27 +#: ../data/gui/accounts_window.ui.h:30 msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" msgstr "Если отмечено, Gajim после запуска будет автоматически подсоединяться к jabber серверу с использованием этой учетной записи" -#: ../data/gui/accounts_window.ui.h:28 +#: ../data/gui/accounts_window.ui.h:31 msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" msgstr "Если отмечено, то любые изменения глобального статуса (управляемого из выпадающего списка внизу окна ростера) повлекут за собой изменение статуса этой учетной записи" -#: ../data/gui/accounts_window.ui.h:29 +#: ../data/gui/accounts_window.ui.h:32 msgid "" "If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" "You might consider to change possible firewall settings." @@ -342,128 +357,137 @@ "Если порт по умолчанию, который используется для входящих сообщения вас не устраивает, вы можете выбрать другой.\n" "Также, возможно, придется изменить некоторые настройки брандмауэра." -#: ../data/gui/accounts_window.ui.h:31 +#: ../data/gui/accounts_window.ui.h:34 msgid "Information about you, as stored in the server" msgstr "Информация о вас, сохраненная на сервере" -#: ../data/gui/accounts_window.ui.h:32 +#: ../data/gui/accounts_window.ui.h:35 #: ../data/gui/zeroconf_information_window.ui.h:4 -#: ../src/config.py:1775 +#: ../src/config.py:1793 #: ../src/dialogs.py:830 msgid "Jabber ID:" msgstr "Jabber ID:" -#: ../data/gui/accounts_window.ui.h:33 +#: ../data/gui/accounts_window.ui.h:36 #: ../data/gui/zeroconf_information_window.ui.h:5 msgid "Last Name:" msgstr "Фамилия:" -#: ../data/gui/accounts_window.ui.h:34 +#: ../data/gui/accounts_window.ui.h:37 msgid "Mer_ge accounts" msgstr "_Объединить учетные записи" -#: ../data/gui/accounts_window.ui.h:35 -#: ../src/config.py:1748 -#: ../src/config.py:2301 +#: ../data/gui/accounts_window.ui.h:38 +#: ../src/config.py:1766 +#: ../src/config.py:2332 msgid "No key selected" msgstr "Не выбран ключ" -#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/accounts_window.ui.h:40 #: ../data/gui/profile_window.ui.h:35 msgid "Personal Information" msgstr "Личная информация" -#: ../data/gui/accounts_window.ui.h:38 +#: ../data/gui/accounts_window.ui.h:41 msgid "Priori_ty:" msgstr "Приори_тет:" -#: ../data/gui/accounts_window.ui.h:39 +#: ../data/gui/accounts_window.ui.h:42 msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" msgstr "Приоритет используется в Jabber для определения того, кто будет получать события от jabber сервера когда подсоединены два и более клиента с одной и той же учетной записью. Клиент с наибольшим приоритетом будет получать события" -#: ../data/gui/accounts_window.ui.h:40 +#: ../data/gui/accounts_window.ui.h:43 msgid "Priority will change automatically according to your status." msgstr "Изменять приоритет автоматически в соответствии со статусом." #. Rename -#: ../data/gui/accounts_window.ui.h:41 +#: ../data/gui/accounts_window.ui.h:44 #: ../src/roster_window.py:5326 msgid "Re_name" msgstr "П_ереименовать" -#: ../data/gui/accounts_window.ui.h:42 +#: ../data/gui/accounts_window.ui.h:45 msgid "Resour_ce:" msgstr "Ресу_рс: " -#: ../data/gui/accounts_window.ui.h:43 +#: ../data/gui/accounts_window.ui.h:46 msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" msgstr "Ресурс отправляется Jabber серверу для того, чтобы различать два и более клиентов с одинаковой учетной записью, подключенных к одному и тому же серверу. Таким образом, вы можете одновременно подключиться к одному серверу с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет получать все события. (См. ниже)" -#: ../data/gui/accounts_window.ui.h:44 +#: ../data/gui/accounts_window.ui.h:47 msgid "Save conversation _logs for all contacts" msgstr "_Сохранять историю для всех контактов" -#: ../data/gui/accounts_window.ui.h:46 +#: ../data/gui/accounts_window.ui.h:49 msgid "Send _keep-alive packets" msgstr "Отправлять _пинг" -#: ../data/gui/accounts_window.ui.h:47 +#: ../data/gui/accounts_window.ui.h:50 msgid "Synch_ronize account status with global status" msgstr "Син_хронизировать статус учетной записи с глобальным статусом" -#: ../data/gui/accounts_window.ui.h:48 +#: ../data/gui/accounts_window.ui.h:51 msgid "Synchroni_ze account status with global status" msgstr "Син_хронизировать статус учетной записи с глобальным статусом" -#: ../data/gui/accounts_window.ui.h:49 +#: ../data/gui/accounts_window.ui.h:52 #: ../data/gui/synchronise_select_account_dialog.ui.h:2 msgid "Synchronise contacts" msgstr "Объединить контакты" -#: ../data/gui/accounts_window.ui.h:50 +#: ../data/gui/accounts_window.ui.h:53 +msgid "The path to the client certificate and key in PKCS#12 format" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent"

1 0

gajim: one EntryCompletion cannot be used for 2 Entry. So use 2 ...
by Yann Leboulanger 26 Apr '10

26 Apr '10

changeset 4574b7cae546 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4574b7cae546 description: one EntryCompletion cannot be used for 2 Entry. So use 2 EntryCompletion for both server comboboxes in add account wizard. Fixed #5629 diffstat: src/config.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 0f52a653a260 -r 4574b7cae546 src/config.py --- a/src/config.py Mon Apr 26 17:23:35 2010 +0200 +++ b/src/config.py Mon Apr 26 17:46:52 2010 +0200 @@ -3350,6 +3350,7 @@ self.window.set_transient_for(gajim.interface.roster.window) completion = gtk.EntryCompletion() + completion1 = gtk.EntryCompletion() # Connect events from comboboxentry.child server_comboboxentry = self.xml.get_object('server_comboboxentry') entry = server_comboboxentry.child @@ -3359,9 +3360,7 @@ # Do the same for the other server comboboxentry server_comboboxentry1 = self.xml.get_object('server_comboboxentry1') entry = server_comboboxentry1.child - entry.connect('key_press_event', - self.on_server_comboboxentry_key_press_event, server_comboboxentry1) - entry.set_completion(completion) + entry.set_completion(completion1) self.update_proxy_list() @@ -3375,6 +3374,8 @@ completion.set_model(servers_model) completion.set_text_column(0) + completion1.set_model(servers_model) + completion1.set_text_column(0) # Put servers into comboboxentries server_comboboxentry.set_model(servers_model)

1 0

gajim: fix indentation
by Yann Leboulanger 26 Apr '10

26 Apr '10

changeset 0f52a653a260 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f52a653a260 description: fix indentation diffstat: src/config.py | 126 ++++++++++++++++++++++++++++++--------------------------- 1 files changed, 67 insertions(+), 59 deletions(-) diffs (truncated from 331 to 300 lines): diff -r 151a89ce751a -r 0f52a653a260 src/config.py --- a/src/config.py Sun Apr 25 20:44:09 2010 +0200 +++ b/src/config.py Mon Apr 26 17:23:35 2010 +0200 @@ -3354,13 +3354,13 @@ server_comboboxentry = self.xml.get_object('server_comboboxentry') entry = server_comboboxentry.child entry.connect('key_press_event', - self.on_server_comboboxentry_key_press_event, server_comboboxentry) + self.on_server_comboboxentry_key_press_event, server_comboboxentry) entry.set_completion(completion) # Do the same for the other server comboboxentry server_comboboxentry1 = self.xml.get_object('server_comboboxentry1') entry = server_comboboxentry1.child entry.connect('key_press_event', - self.on_server_comboboxentry_key_press_event, server_comboboxentry1) + self.on_server_comboboxentry_key_press_event, server_comboboxentry1) entry.set_completion(completion) self.update_proxy_list() @@ -3391,9 +3391,9 @@ self.advanced_button = self.xml.get_object('advanced_button') self.finish_label = self.xml.get_object('finish_label') self.go_online_checkbutton = self.xml.get_object( - 'go_online_checkbutton') + 'go_online_checkbutton') self.show_vcard_checkbutton = self.xml.get_object( - 'show_vcard_checkbutton') + 'show_vcard_checkbutton') self.progressbar = self.xml.get_object('progressbar') # some vars @@ -3403,33 +3403,33 @@ self.xml.connect_signals(self) self.window.show_all() gajim.ged.register_event_handler('NEW_ACC_CONNECTED', ged.CORE, - self.new_acc_connected) + self.new_acc_connected) gajim.ged.register_event_handler('NEW_ACC_NOT_CONNECTED', ged.CORE, - self.new_acc_not_connected) + self.new_acc_not_connected) gajim.ged.register_event_handler('ACC_OK', ged.CORE, self.acc_is_ok) gajim.ged.register_event_handler('ACC_NOT_OK', ged.CORE, - self.acc_is_not_ok) + self.acc_is_not_ok) def on_wizard_window_destroy(self, widget): page = self.notebook.get_current_page() if page in (4, 5) and self.account in gajim.connections: - # connection instance is saved in gajim.connections and we canceled the - # addition of the account + # connection instance is saved in gajim.connections and we canceled + # the addition of the account del gajim.connections[self.account] if self.account in gajim.config.get_per('accounts'): gajim.config.del_per('accounts', self.account) gajim.ged.remove_event_handler('NEW_ACC_CONNECTED', ged.CORE, - self.new_acc_connected) + self.new_acc_connected) gajim.ged.remove_event_handler('NEW_ACC_NOT_CONNECTED', ged.CORE, - self.new_acc_not_connected) + self.new_acc_not_connected) gajim.ged.remove_event_handler('ACC_OK', ged.CORE, self.acc_is_ok) gajim.ged.remove_event_handler('ACC_NOT_OK', ged.CORE, - self.acc_is_not_ok) + self.acc_is_not_ok) del gajim.interface.instances['account_creation_wizard'] def on_register_server_features_button_clicked(self, widget): helpers.launch_browser_mailer('url', - 'http://www.jabber.org/network/oldnetwork.shtml') + 'http://www.jabber.org/network/oldnetwork.shtml') def on_save_password_checkbutton_toggled(self, widget): self.xml.get_object('password_entry').grab_focus() @@ -3461,7 +3461,8 @@ active = widget.get_active() self.xml.get_object('username_entry').set_sensitive(not active) self.xml.get_object('password_entry').set_sensitive(not active) - self.xml.get_object('save_password_checkbutton').set_sensitive(not active) + self.xml.get_object('save_password_checkbutton').set_sensitive( + not active) def show_finish_page(self): self.cancel_button.hide() @@ -3469,16 +3470,16 @@ self.forward_button.hide() if self.modify: finish_text = '<big>%s</big>\n\n%s' % ( - _('Account has been added successfully'), - _('You can set advanced account options by pressing the ' - 'Advanced button, or later by choosing the Accounts menu item ' - 'under the Edit menu from the main window.')) + _('Account has been added successfully'), + _('You can set advanced account options by pressing the ' + 'Advanced button, or later by choosing the Accounts menu item ' + 'under the Edit menu from the main window.')) else: finish_text = '<big>%s</big>\n\n%s' % ( - _('Your new account has been created successfully'), - _('You can set advanced account options by pressing the Advanced ' - 'button, or later by choosing the Accounts menu item under the Edit' - ' menu from the main window.')) + _('Your new account has been created successfully'), + _('You can set advanced account options by pressing the ' + 'Advanced button, or later by choosing the Accounts menu item ' + 'under the Edit menu from the main window.')) self.finish_label.set_markup(finish_text) self.finish_button.show() self.finish_button.set_property('has-default', True) @@ -3509,21 +3510,22 @@ elif cur_page == 1: # We are adding an existing account - anonymous = self.xml.get_object('anonymous_checkbutton1').get_active() + anonymous = self.xml.get_object('anonymous_checkbutton1').\ + get_active() username = self.xml.get_object('username_entry').get_text().decode( - 'utf-8').strip() + 'utf-8').strip() if not username and not anonymous: pritext = _('Invalid username') sectext = _( - 'You must provide a username to configure this account.') + 'You must provide a username to configure this account.') dialogs.ErrorDialog(pritext, sectext) return - server = self.xml.get_object('server_comboboxentry').child.get_text().\ - decode('utf-8').strip() + server = self.xml.get_object('server_comboboxentry').child.\ + get_text().decode('utf-8').strip() savepass = self.xml.get_object('save_password_checkbutton').\ - get_active() + get_active() password = self.xml.get_object('password_entry').get_text().decode( - 'utf-8') + 'utf-8') jid = username + '@' + server # check if jid is conform to RFC and stringprep it @@ -3548,12 +3550,12 @@ self.show_finish_page() elif cur_page == 2: # We are creating a new account - server = self.xml.get_object('server_comboboxentry1').child.get_text()\ - .decode('utf-8') + server = self.xml.get_object('server_comboboxentry1').child.\ + get_text().decode('utf-8') if not server: dialogs.ErrorDialog(_('Invalid server'), - _('Please provide a server on which you want to register.')) + _('Please provide a server on which you want to register.')) return self.account = server i = 1 @@ -3571,17 +3573,17 @@ config['proxy'] = proxy config['use_custom_host'] = self.xml.get_object( - 'custom_host_port_checkbutton').get_active() + 'custom_host_port_checkbutton').get_active() custom_port = self.xml.get_object('custom_port_entry').get_text() try: custom_port = int(custom_port) except Exception: dialogs.ErrorDialog(_('Invalid entry'), - _('Custom port must be a port number.')) + _('Custom port must be a port number.')) return config['custom_port'] = custom_port config['custom_host'] = self.xml.get_object( - 'custom_host_entry').get_text().decode('utf-8') + 'custom_host_entry').get_text().decode('utf-8') if self.xml.get_object('anonymous_checkbutton2').get_active(): self.modify = True @@ -3592,7 +3594,7 @@ self.back_button.hide() self.forward_button.hide() self.update_progressbar_timeout_id = gobject.timeout_add(100, - self.update_progressbar) + self.update_progressbar) # Get form from serveur con = connection.Connection(self.account) gajim.connections[self.account] = con @@ -3601,7 +3603,7 @@ checked = self.xml.get_object('ssl_checkbutton').get_active() if checked: hostname = gajim.connections[self.account].new_account_info[ - 'hostname'] + 'hostname'] # Check if cert is already in file certs = '' if os.path.isfile(gajim.MY_CACERTS): @@ -3610,14 +3612,15 @@ f.close() if self.ssl_cert in certs: dialogs.ErrorDialog(_('Certificate Already in File'), - _('This certificate is already in file %s, so it\'s not added again.') % gajim.MY_CACERTS) + _('This certificate is already in file %s, so it\'s ' + 'not added again.') % gajim.MY_CACERTS) else: f = open(gajim.MY_CACERTS, 'a') f.write(hostname + '\n') f.write(self.ssl_cert + '\n\n') f.close() gajim.connections[self.account].new_account_info[ - 'ssl_fingerprint_sha1'] = self.ssl_fingerprint + 'ssl_fingerprint_sha1'] = self.ssl_fingerprint self.notebook.set_current_page(4) # show fom page elif cur_page == 4: if self.is_form: @@ -3625,14 +3628,15 @@ else: form = self.data_form_widget.get_infos() gajim.connections[self.account].send_new_account_infos(form, - self.is_form) + self.is_form) self.xml.get_object('form_vbox').remove(self.data_form_widget) - self.xml.get_object('progressbar_label').set_markup('Account is being created\n\nPlease wait...') + self.xml.get_object('progressbar_label').set_markup( + 'Account is being created\n\nPlease wait...') self.notebook.set_current_page(5) # show creating page self.back_button.hide() self.forward_button.hide() self.update_progressbar_timeout_id = gobject.timeout_add(100, - self.update_progressbar) + self.update_progressbar) def update_proxy_list(self): proxies_combobox = self.xml.get_object('proxies_combobox') @@ -3649,10 +3653,11 @@ gajim.interface.instances['manage_proxies'].window.present() else: gajim.interface.instances['manage_proxies'] = \ - ManageProxiesWindow() + ManageProxiesWindow() def on_custom_host_port_checkbutton_toggled(self, widget): - self.xml.get_object('custom_host_hbox').set_sensitive(widget.get_active()) + self.xml.get_object('custom_host_hbox').set_sensitive(widget.\ + get_active()) def update_progressbar(self): self.progressbar.pulse() @@ -3683,13 +3688,16 @@ if ssl_msg: # An SSL warning occured, show it hostname = gajim.connections[self.account].new_account_info['hostname'] - self.xml.get_object('ssl_label').set_markup(_('Security Warning' - '\n\nThe authenticity of the %(hostname)s SSL certificate could be ' - 'invalid.\nSSL Error: %(error)s\n' - 'Do you still want to connect to this server?') % { - 'hostname': hostname, 'error': ssl_msg}) + self.xml.get_object('ssl_label').set_markup(_( + 'Security Warning' + '\n\nThe authenticity of the %(hostname)s SSL certificate could' + ' be invalid.\nSSL Error: %(error)s\n' + 'Do you still want to connect to this server?') % { + 'hostname': hostname, 'error': ssl_msg}) if ssl_err in (18, 27): - text = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % ssl_fingerprint + text = _('Add this certificate to the list of trusted ' + 'certificates.\nSHA1 fingerprint of the certificate:\n%s') \ + % ssl_fingerprint self.xml.get_object('ssl_checkbutton').set_label(text) else: self.xml.get_object('ssl_checkbutton').set_no_show_all(True) @@ -3719,7 +3727,7 @@ img = self.xml.get_object('finish_image') img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) finish_text = '<big>%s</big>\n\n%s' % ( - _('An error occurred during account creation'), reason) + _('An error occurred during account creation'), reason) self.finish_label.set_markup(finish_text) self.notebook.set_current_page(6) # show finish page @@ -3752,8 +3760,8 @@ gajim.config.del_per('accounts', self.account) img = self.xml.get_object('finish_image') img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) - finish_text = '<big>%s</big>\n\n%s' % (_('An error occurred during ' - 'account creation'), reason) + finish_text = '<big>%s</big>\n\n%s' % (_( + 'An error occurred during account creation'), reason) self.finish_label.set_markup(finish_text) self.notebook.set_current_page(6) # show finish page @@ -3765,8 +3773,7 @@ gajim.interface.instances['accounts'].window.present() else: gajim.interface.instances['accounts'] = AccountsWindow() - gajim.interface.instances['accounts'].select_account( - self.account) + gajim.interface.instances['accounts'].select_account(self.account) self.window.destroy() def on_finish_button_clicked(self, widget): @@ -3820,7 +3827,7 @@ def save_account(self, login, server, savepass, password, anonymous=False):

1 0

gajim: l10n: Updates to Russian (ru) translation
by dicson_ 26 Apr '10

26 Apr '10

changeset 5969885baf28 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5969885baf28 description: l10n: Updates to Russian (ru) translation New status: 2039 messages complete with 27 fuzzies and 28 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 756c7d6408b3 -r 5969885baf28 po/ru.po --- a/po/ru.po Mon Apr 26 04:41:35 2010 +0000 +++ b/po/ru.po Mon Apr 26 04:43:04 2010 +0000 @@ -14,7 +14,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-26 08:28+0400\n" -"PO-Revision-Date: 2010-04-26 08:39+0300\n" +"PO-Revision-Date: 2010-04-26 08:41+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Русский <ru(a)li.org>\n" "MIME-Version: 1.0\n"

1 0

gajim: l10n: Updates to Russian (ru) translation
by dicson_ 26 Apr '10

26 Apr '10

changeset 756c7d6408b3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=756c7d6408b3 description: l10n: Updates to Russian (ru) translation New status: 2039 messages complete with 27 fuzzies and 28 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/ru.po | 981 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 506 insertions(+), 475 deletions(-) diffs (truncated from 2544 to 300 lines): diff -r 983e626da5a2 -r 756c7d6408b3 po/ru.po --- a/po/ru.po Sun Apr 25 21:32:32 2010 +0000 +++ b/po/ru.po Mon Apr 26 04:41:35 2010 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-05 23:28+0400\n" -"PO-Revision-Date: 2010-04-05 23:57+0300\n" +"POT-Creation-Date: 2010-04-26 08:28+0400\n" +"PO-Revision-Date: 2010-04-26 08:39+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Русский <ru(a)li.org>\n" "MIME-Version: 1.0\n" @@ -119,7 +119,7 @@ msgstr "Я хочу _зарегистрировать новую учетную запись" #: ../data/gui/account_creation_wizard_window.ui.h:16 -#: ../data/gui/accounts_window.ui.h:25 +#: ../data/gui/accounts_window.ui.h:28 msgid "If checked, Gajim will remember the password for this account" msgstr "Если отмечено, то Gajim запомнит пароль учетной записи" @@ -128,17 +128,17 @@ msgstr "Управление..." #: ../data/gui/account_creation_wizard_window.ui.h:18 -#: ../data/gui/accounts_window.ui.h:36 +#: ../data/gui/accounts_window.ui.h:39 #: ../data/gui/change_mood_dialog.ui.h:3 #: ../src/config.py:1256 #: ../src/config.py:1359 -#: ../src/config.py:1652 -#: ../src/config.py:1657 -#: ../src/config.py:2208 -#: ../src/config.py:2287 -#: ../src/config.py:2300 -#: ../src/config.py:3538 -#: ../src/config.py:3611 +#: ../src/config.py:1670 +#: ../src/config.py:1675 +#: ../src/config.py:2239 +#: ../src/config.py:2318 +#: ../src/config.py:2331 +#: ../src/config.py:3569 +#: ../src/config.py:3642 #: ../src/dialogs.py:308 #: ../src/dialogs.py:310 #: ../src/dialogs.py:513 @@ -154,7 +154,7 @@ msgstr "Про_кси:" #: ../data/gui/account_creation_wizard_window.ui.h:20 -#: ../data/gui/accounts_window.ui.h:45 +#: ../data/gui/accounts_window.ui.h:48 msgid "Save pass_word" msgstr "Сохранить _пароль" @@ -188,12 +188,12 @@ msgstr "_Хост: " #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:57 +#: ../data/gui/accounts_window.ui.h:62 msgid "_Jabber ID:" msgstr "_Jabber ID:" #: ../data/gui/account_creation_wizard_window.ui.h:29 -#: ../data/gui/accounts_window.ui.h:59 +#: ../data/gui/accounts_window.ui.h:64 msgid "_Password:" msgstr "_Пароль:" @@ -248,49 +248,64 @@ msgstr "Автоподключение при разрыве связи" #: ../data/gui/accounts_window.ui.h:11 +#, fuzzy +msgid "Browse..." +msgstr "_Браузер" + +#: ../data/gui/accounts_window.ui.h:12 msgid "C_onnect on Gajim startup" msgstr "_Соединяться при запуске Gajim" -#: ../data/gui/accounts_window.ui.h:12 +#: ../data/gui/accounts_window.ui.h:13 msgid "Chan_ge Password" msgstr "И_зменить пароль" -#: ../data/gui/accounts_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:14 msgid "Check this so Gajim will ask you before sending your password over an insecure connection." msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение." -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:15 +#, fuzzy +msgid "Choose Client Cert" +msgstr "Выбрать файл для отправки..." + +#: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." msgstr "Выбрать _ключ..." -#: ../data/gui/accounts_window.ui.h:15 +#: ../data/gui/accounts_window.ui.h:17 msgid "Click to change account's password" msgstr "Щелкните для изменения пароля" -#: ../data/gui/accounts_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:18 msgid "Click to request authorization to all contacts of another account" msgstr "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи" -#: ../data/gui/accounts_window.ui.h:17 +#: ../data/gui/accounts_window.ui.h:19 +#, fuzzy +msgid "Client certificate" +msgstr "Сертификат подписан самим владельцем." + +#: ../data/gui/accounts_window.ui.h:20 msgid "Co_nnect on Gajim startup" msgstr "_Соединяться при запуске Gajim" -#: ../data/gui/accounts_window.ui.h:18 +#: ../data/gui/accounts_window.ui.h:21 msgid "Connection" msgstr "Соединение" -#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/accounts_window.ui.h:22 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" msgstr "Почта:" -#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:23 #: ../data/gui/zeroconf_information_window.ui.h:3 msgid "First Name:" msgstr "Имя:" #. No configured account -#: ../data/gui/accounts_window.ui.h:21 +#: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/roster_window.ui.h:5 #: ../src/common/helpers.py:1159 #: ../src/common/helpers.py:1171 @@ -304,7 +319,7 @@ #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:22 +#: ../data/gui/accounts_window.ui.h:25 #: ../data/gui/preferences_window.ui.h:61 #: ../src/common/contacts.py:141 #: ../src/dialogs.py:111 @@ -314,27 +329,27 @@ msgid "General" msgstr "Общие" -#: ../data/gui/accounts_window.ui.h:23 +#: ../data/gui/accounts_window.ui.h:26 msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working." msgstr "Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение к вашему, так что передача файла имеет больше шансов на успех." -#: ../data/gui/accounts_window.ui.h:24 +#: ../data/gui/accounts_window.ui.h:27 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "Если отмечено, то Gajim запомнит пароль учетной записи" -#: ../data/gui/accounts_window.ui.h:26 +#: ../data/gui/accounts_window.ui.h:29 msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" msgstr "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва соединения по таймауту" -#: ../data/gui/accounts_window.ui.h:27 +#: ../data/gui/accounts_window.ui.h:30 msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" msgstr "Если отмечено, Gajim после запуска будет автоматически подсоединяться к jabber серверу с использованием этой учетной записи" -#: ../data/gui/accounts_window.ui.h:28 +#: ../data/gui/accounts_window.ui.h:31 msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" msgstr "Если отмечено, то любые изменения глобального статуса (управляемого из выпадающего списка внизу окна ростера) повлекут за собой изменение статуса этой учетной записи" -#: ../data/gui/accounts_window.ui.h:29 +#: ../data/gui/accounts_window.ui.h:32 msgid "" "If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" "You might consider to change possible firewall settings." @@ -342,128 +357,137 @@ "Если порт по умолчанию, который используется для входящих сообщения вас не устраивает, вы можете выбрать другой.\n" "Также, возможно, придется изменить некоторые настройки брандмауэра." -#: ../data/gui/accounts_window.ui.h:31 +#: ../data/gui/accounts_window.ui.h:34 msgid "Information about you, as stored in the server" msgstr "Информация о вас, сохраненная на сервере" -#: ../data/gui/accounts_window.ui.h:32 +#: ../data/gui/accounts_window.ui.h:35 #: ../data/gui/zeroconf_information_window.ui.h:4 -#: ../src/config.py:1775 +#: ../src/config.py:1793 #: ../src/dialogs.py:830 msgid "Jabber ID:" msgstr "Jabber ID:" -#: ../data/gui/accounts_window.ui.h:33 +#: ../data/gui/accounts_window.ui.h:36 #: ../data/gui/zeroconf_information_window.ui.h:5 msgid "Last Name:" msgstr "Фамилия:" -#: ../data/gui/accounts_window.ui.h:34 +#: ../data/gui/accounts_window.ui.h:37 msgid "Mer_ge accounts" msgstr "_Объединить учетные записи" -#: ../data/gui/accounts_window.ui.h:35 -#: ../src/config.py:1748 -#: ../src/config.py:2301 +#: ../data/gui/accounts_window.ui.h:38 +#: ../src/config.py:1766 +#: ../src/config.py:2332 msgid "No key selected" msgstr "Не выбран ключ" -#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/accounts_window.ui.h:40 #: ../data/gui/profile_window.ui.h:35 msgid "Personal Information" msgstr "Личная информация" -#: ../data/gui/accounts_window.ui.h:38 +#: ../data/gui/accounts_window.ui.h:41 msgid "Priori_ty:" msgstr "Приори_тет:" -#: ../data/gui/accounts_window.ui.h:39 +#: ../data/gui/accounts_window.ui.h:42 msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" msgstr "Приоритет используется в Jabber для определения того, кто будет получать события от jabber сервера когда подсоединены два и более клиента с одной и той же учетной записью. Клиент с наибольшим приоритетом будет получать события" -#: ../data/gui/accounts_window.ui.h:40 +#: ../data/gui/accounts_window.ui.h:43 msgid "Priority will change automatically according to your status." msgstr "Изменять приоритет автоматически в соответствии со статусом." #. Rename -#: ../data/gui/accounts_window.ui.h:41 +#: ../data/gui/accounts_window.ui.h:44 #: ../src/roster_window.py:5326 msgid "Re_name" msgstr "П_ереименовать" -#: ../data/gui/accounts_window.ui.h:42 +#: ../data/gui/accounts_window.ui.h:45 msgid "Resour_ce:" msgstr "Ресу_рс: " -#: ../data/gui/accounts_window.ui.h:43 +#: ../data/gui/accounts_window.ui.h:46 msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" msgstr "Ресурс отправляется Jabber серверу для того, чтобы различать два и более клиентов с одинаковой учетной записью, подключенных к одному и тому же серверу. Таким образом, вы можете одновременно подключиться к одному серверу с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет получать все события. (См. ниже)" -#: ../data/gui/accounts_window.ui.h:44 +#: ../data/gui/accounts_window.ui.h:47 msgid "Save conversation _logs for all contacts" msgstr "_Сохранять историю для всех контактов" -#: ../data/gui/accounts_window.ui.h:46 +#: ../data/gui/accounts_window.ui.h:49 msgid "Send _keep-alive packets" msgstr "Отправлять _пинг" -#: ../data/gui/accounts_window.ui.h:47 +#: ../data/gui/accounts_window.ui.h:50 msgid "Synch_ronize account status with global status" msgstr "Син_хронизировать статус учетной записи с глобальным статусом" -#: ../data/gui/accounts_window.ui.h:48 +#: ../data/gui/accounts_window.ui.h:51 msgid "Synchroni_ze account status with global status" msgstr "Син_хронизировать статус учетной записи с глобальным статусом" -#: ../data/gui/accounts_window.ui.h:49 +#: ../data/gui/accounts_window.ui.h:52 #: ../data/gui/synchronise_select_account_dialog.ui.h:2 msgid "Synchronise contacts" msgstr "Объединить контакты" -#: ../data/gui/accounts_window.ui.h:50 +#: ../data/gui/accounts_window.ui.h:53 +msgid "The path to the client certificate and key in PKCS#12 format" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent"

1 0

gajim: l10n: Updates to Ukrainian (uk) translation
by Sergiy Yegorov 25 Apr '10

25 Apr '10

changeset 983e626da5a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=983e626da5a2 description: l10n: Updates to Ukrainian (uk) translation New status: 2043 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/uk.po | 385 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 160 insertions(+), 225 deletions(-) diffs (truncated from 1169 to 300 lines): diff -r 5ea64376f273 -r 983e626da5a2 po/uk.po --- a/po/uk.po Sun Apr 25 20:33:50 2010 +0000 +++ b/po/uk.po Sun Apr 25 21:32:32 2010 +0000 @@ -2,15 +2,15 @@ # Ukrainian translations for Gajim - A Jabber Instant Messager package. # Copyright (C) 2008 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package. -# -# Sergiy Yegorov <prapor(a)unixzone.org.ua>, 2009. +# +# Sergiy Yegorov <prapor(a)unixzone.org.ua>, 2009, 2010. # Yuri Chornoivan <yurchor(a)ukr.net>, 2008. msgid "" msgstr "" "Project-Id-Version: uk\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: prapor(a)unixzone.org.ua\n" "POT-Creation-Date: 2010-03-19 11:27+0100\n" -"PO-Revision-Date: 2009-10-30 00:24+0200\n" +"PO-Revision-Date: 2010-04-26 00:26+0300\n" "Last-Translator: Sergiy Yegorov <prapor(a)unixzone.org.ua>\n" "Language-Team: Ukrainian <kde-i18n-doc(a)kde.org>\n" "MIME-Version: 1.0\n" @@ -840,19 +840,19 @@ #: ../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 "Mic volume:" -msgstr "" +msgstr "Гучність мікрофону" #: ../data/gui/chat_control.ui.h:14 msgid "Sound volume:" -msgstr "" +msgstr "Гучність звуку" #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is #. supposed to show the Emoticon Selector) @@ -863,7 +863,7 @@ #: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3 msgid "label" -msgstr "" +msgstr "мітка" #: ../data/gui/chat_to_muc_window.ui.h:1 msgid "In_vite" @@ -1092,9 +1092,8 @@ msgstr "Кольори вкладки стану балачки" #: ../data/gui/gajim_themes_window.ui.h:2 -#, fuzzy msgid "Account row" -msgstr "Обліковий запис" +msgstr "Стрічка облікового запису" #: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883 msgid "Bold" @@ -1102,16 +1101,15 @@ #: ../data/gui/gajim_themes_window.ui.h:4 msgid "Chat Banner" -msgstr "" +msgstr "Шапка балачки" #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Composing" msgstr "Створення" #: ../data/gui/gajim_themes_window.ui.h:6 -#, fuzzy msgid "Contact row" -msgstr "Контакт" +msgstr "Стрічка контакту" #: ../data/gui/gajim_themes_window.ui.h:7 msgid "Font style:" @@ -1126,9 +1124,8 @@ msgstr "Пішов" #: ../data/gui/gajim_themes_window.ui.h:10 -#, fuzzy msgid "Group row" -msgstr "Група" +msgstr "Стрічка групи" #: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150 msgid "Inactive" @@ -1255,23 +1252,20 @@ msgstr "_Шукати у базі даних" #: ../data/gui/history_window.ui.h:1 -#, fuzzy msgid "All Chat Histories" -msgstr "Усі стани" +msgstr "Усі журнали балачок" #: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323 msgid "Conversation History" msgstr "Журнал спілкування" #: ../data/gui/history_window.ui.h:3 -#, fuzzy msgid "Enter JID or Contact name" -msgstr "Ім'я контакту" +msgstr "Введіть JID або ім’я контакту" #: ../data/gui/history_window.ui.h:4 -#, fuzzy msgid "Groupchat Histories" -msgstr "Групові балачки" +msgstr "Історія групових балачок" #: ../data/gui/history_window.ui.h:5 msgid "Search:" @@ -1283,16 +1277,14 @@ msgstr "_Зберігати журнал спілкування" #: ../data/gui/join_groupchat_window.ui.h:2 -#, fuzzy msgid "Bro_wse Rooms" -msgstr "_Перегляд" +msgstr "_Перегляд кімнат" #: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171 msgid "Join Group Chat" msgstr "Приєднатись до групової балачки" #: ../data/gui/join_groupchat_window.ui.h:4 -#, fuzzy msgid "Join this room _automatically when I connect" msgstr "Автоматично заходити до цієї кімнати після з’єднання" @@ -1321,7 +1313,6 @@ msgstr "Сервер:" #: ../data/gui/join_groupchat_window.ui.h:10 -#, fuzzy msgid "_Bookmark this room" msgstr "Зробити закладку на цій кімнаті" @@ -1372,15 +1363,11 @@ #: ../data/gui/manage_proxies_window.ui.h:3 msgid "BOSH" -msgstr "" +msgstr "BOSH" #: ../data/gui/manage_proxies_window.ui.h:4 -#, fuzzy msgid "HTTP Connect" -msgstr "" -"HTTP-з’єднання\n" -"SOCKS5\n" -"BOSH" +msgstr "HTTP-з’єднання" #: ../data/gui/manage_proxies_window.ui.h:5 msgid "Manage Proxy Profiles" @@ -1400,7 +1387,7 @@ #: ../data/gui/manage_proxies_window.ui.h:9 msgid "SOCKS5" -msgstr "" +msgstr "SOCKS5" #: ../data/gui/manage_proxies_window.ui.h:10 msgid "Use HTTP prox_y" @@ -1439,9 +1426,8 @@ msgstr "Програми" #: ../data/gui/preferences_window.ui.h:3 -#, fuzzy msgid "Audio" -msgstr "Дії" +msgstr "Аудіо" #: ../data/gui/preferences_window.ui.h:4 msgid "Auto Status" @@ -1460,9 +1446,8 @@ msgstr "Сповіщення про стан у балачці" #: ../data/gui/preferences_window.ui.h:8 -#, fuzzy msgid "Connection" -msgstr "Умови" +msgstr "З’єднання" #. a header for custom browser/client/file manager. so translate sth like: #. Custom Settings @@ -1499,9 +1484,8 @@ msgstr "Теми" #: ../data/gui/preferences_window.ui.h:20 -#, fuzzy msgid "Video" -msgstr "По батькові:" +msgstr "Відео" #: ../data/gui/preferences_window.ui.h:21 msgid "Visual Notifications" @@ -1509,7 +1493,7 @@ #: ../data/gui/preferences_window.ui.h:22 msgid "(example: stunserver.org)" -msgstr "" +msgstr "(приклад: stunserver.org)" #: ../data/gui/preferences_window.ui.h:23 msgid "Advanced" @@ -1520,18 +1504,16 @@ msgstr "Додатково..." #: ../data/gui/preferences_window.ui.h:25 -#, fuzzy msgid "All chat states" -msgstr "Усі стани" +msgstr "Усі стани балачок" #: ../data/gui/preferences_window.ui.h:26 msgid "Allow _OS information to be sent" msgstr "Дозволити надсилання інформації про _операційну систему" #: ../data/gui/preferences_window.ui.h:27 -#, fuzzy msgid "Allow my _idle time to be sent" -msgstr "Дозволити надсилання інформації про _операційну систему" +msgstr "Дозволити надсилання часу бездіяльності" #: ../data/gui/preferences_window.ui.h:28 msgid "Allow popup/notifications when I'm _away/na/busy/invisible" @@ -1542,24 +1524,20 @@ msgstr "Дозволити звуки у стані _зайнятий." #: ../data/gui/preferences_window.ui.h:30 -#, fuzzy msgid "Always" -msgstr "Далеко" +msgstr "Завжди" #: ../data/gui/preferences_window.ui.h:31 -#, fuzzy msgid "Always use GNOME default applications" -msgstr "Завжди використовувати типові програми OS/X" +msgstr "Завжди використовувати типові програми GNOME" #: ../data/gui/preferences_window.ui.h:32 -#, fuzzy msgid "Always use KDE default applications" -msgstr "Завжди використовувати типові програми OS/X" +msgstr "Завжди використовувати типові програми KDE" #: ../data/gui/preferences_window.ui.h:33 -#, fuzzy msgid "Always use Xfce default applications" -msgstr "Завжди використовувати типові програми OS/X" +msgstr "Завжди використовувати типові програми Xfce" #: ../data/gui/preferences_window.ui.h:34 msgid "Ask status message when I:" @@ -1567,20 +1545,19 @@ #: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104 msgid "Audio / Video" -msgstr "" +msgstr "Аудіо/Відео" #: ../data/gui/preferences_window.ui.h:36 msgid "Audio input device" -msgstr "" +msgstr "Пристрій введення звуку" #: ../data/gui/preferences_window.ui.h:37 msgid "Audio output device" -msgstr "" +msgstr "Пристрій відтворення звуку" #: ../data/gui/preferences_window.ui.h:38 -#, fuzzy msgid "Autodetect on every Gajim startup" -msgstr "_З'єднуватись після запуску Gajim" +msgstr "Автоматично визначати при кожному старті Gajim" #: ../data/gui/preferences_window.ui.h:39 msgid "Chat message:" @@ -1591,23 +1568,20 @@ msgstr "Перевіряти при запуску, чи є Gajim _типовим клієнтом Jabber" #: ../data/gui/preferences_window.ui.h:41 -#, fuzzy msgid "Composing only"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2010