Commits October 2013

commits@gajim.org

1 participants
48 discussions

gajim: Fix (Un)Block multiple contacts menu. Fixes #7526
by Gajim 25 Oct '13

25 Oct '13

changeset 89989d750b98 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=89989d750b98 description: Fix (Un)Block multiple contacts menu. Fixes #7526 diffstat: src/roster_window.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 1912933596a1 -r 89989d750b98 src/roster_window.py --- a/src/roster_window.py Fri Oct 25 21:49:07 2013 +0400 +++ b/src/roster_window.py Fri Oct 25 22:07:15 2013 +0400 @@ -5888,7 +5888,7 @@ privacy_rules_supported = False contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - if helpers.jid_is_blocked(account, jid): + if not helpers.jid_is_blocked(account, jid): is_blocked = False list_.append((contact, account))

1 0

gajim: Fix transport detection
by Gajim 25 Oct '13

25 Oct '13

changeset 1912933596a1 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=1912933596a1 description: Fix transport detection diffstat: src/gui_menu_builder.py | 6 ++++-- 1 файлов изменено, 4 вставок(+), 2 удалений(-) различия (23 строк): diff -r af546320397a -r 1912933596a1 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Oct 25 20:51:32 2013 +0400 +++ b/src/gui_menu_builder.py Fri Oct 25 21:49:07 2013 +0400 @@ -477,7 +477,8 @@ if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) block_menuitem.hide() - if gajim.get_transport_name_from_jid(jid, use_config_setting=False): + if gajim.get_transport_name_from_jid(jid, use_config_setting=False)\ + and transport != 'jabber': unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() unignore_menuitem.set_no_show_all(False) @@ -489,7 +490,8 @@ else: unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() - if gajim.get_transport_name_from_jid(jid, use_config_setting=False): + if gajim.get_transport_name_from_jid(jid, use_config_setting=False)\ + and transport != 'jabber': block_menuitem.set_no_show_all(True) block_menuitem.hide() ignore_menuitem.set_no_show_all(False)

1 0

gajim: [Darlan] Change mnemonic in roster context menu
by Gajim 25 Oct '13

25 Oct '13

changeset af546320397a in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=af546320397a description: [Darlan] Change mnemonic in roster context menu diffstat: src/roster_window.py | 8 ++++---- 1 файлов изменено, 4 вставок(+), 4 удалений(-) различия (39 строк): diff -r fc7aeb951507 -r af546320397a src/roster_window.py --- a/src/roster_window.py Fri Oct 25 15:24:26 2013 +0400 +++ b/src/roster_window.py Fri Oct 25 20:51:32 2013 +0400 @@ -5796,7 +5796,7 @@ menu.append(item) # Rename - rename_item = gtk.ImageMenuItem(_('Re_name')) + rename_item = gtk.ImageMenuItem(_('_Rename...')) # add a special img for rename menuitem gtkgui_helpers.add_image_to_menuitem(rename_item, 'gajim-kbd_input') menu.append(rename_item) @@ -5833,7 +5833,7 @@ block_menuitem.set_sensitive(False) # Remove group - remove_item = gtk.ImageMenuItem(_('_Remove')) + remove_item = gtk.ImageMenuItem(_('Remo_ve')) icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) remove_item.set_image(icon) @@ -6066,7 +6066,7 @@ item.set_sensitive(False) # Rename - item = gtk.ImageMenuItem(_('_Rename')) + item = gtk.ImageMenuItem(_('_Rename...')) # add a special img for rename menuitem gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') manage_transport_submenu.append(item) @@ -6092,7 +6092,7 @@ item.set_sensitive(False) # Remove - item = gtk.ImageMenuItem(_('_Remove')) + item = gtk.ImageMenuItem(_('Remo_ve')) icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) item.set_image(icon) manage_transport_submenu.append(item)

1 0

gajim: Fix button name. Fixes #7521
by Gajim 25 Oct '13

25 Oct '13

changeset fc7aeb951507 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=fc7aeb951507 description: Fix button name. Fixes #7521 diffstat: src/dialogs.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 1663de4885cc -r fc7aeb951507 src/dialogs.py --- a/src/dialogs.py Thu Oct 24 14:17:30 2013 +0400 +++ b/src/dialogs.py Fri Oct 25 15:24:26 2013 +0400 @@ -5114,7 +5114,7 @@ self.security_image = self.xml.get_object('security_image') self.verify_now_button = self.xml.get_object('verify_now_button') - self.button_label = self.xml.get_object('button_label') + self.button_label = self.xml.get_object('verification_status_label') self.window = self.xml.get_object('esession_info_window') self.update_info() self.window.set_transient_for(transient_for)

1 0

gajim: Set transient_for 'Bookmark already set' and 'Bookmark ha...
by Gajim 24 Oct '13

24 Oct '13

changeset 1663de4885cc in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=1663de4885cc description: Set transient_for 'Bookmark already set' and 'Bookmark has been added successfully' in disco diffstat: src/disco.py | 6 ++++-- 1 файлов изменено, 4 вставок(+), 2 удалений(-) различия (23 строк): diff -r ac6dee81a8f1 -r 1663de4885cc src/disco.py --- a/src/disco.py Wed Oct 23 22:57:48 2013 +0200 +++ b/src/disco.py Thu Oct 24 14:17:30 2013 +0400 @@ -1871,7 +1871,8 @@ for bookmark in gajim.connections[self.account].bookmarks: if bookmark['jid'] == bm['jid']: dialogs.ErrorDialog( _('Bookmark already set'), - _('Group Chat "%s" is already in your bookmarks.') % bm['jid']) + _('Group Chat "%s" is already in your bookmarks.') % bm['jid'], + transient_for=self.window.window) return gajim.connections[self.account].bookmarks.append(bm) @@ -1881,7 +1882,8 @@ dialogs.InformationDialog( _('Bookmark has been added successfully'), - _('You can manage your bookmarks via Actions menu in your roster.')) + _('You can manage your bookmarks via Actions menu in your roster.'), + transient_for=self.window.window) def on_join_button_clicked(self, *args): """

1 0

gajim: [bubble] updated italian translation
by Gajim 23 Oct '13

23 Oct '13

changeset ac6dee81a8f1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ac6dee81a8f1 description: [bubble] updated italian translation diffstat: po/it.po | 5228 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 2574 insertions(+), 2654 deletions(-) diffs (truncated from 11490 to 300 lines): diff -r b9e96fbe6309 -r ac6dee81a8f1 po/it.po --- a/po/it.po Tue Oct 22 23:59:53 2013 +0400 +++ b/po/it.po Wed Oct 23 22:57:48 2013 +0200 @@ -10,15 +10,16 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-29 15:27+0200\n" -"PO-Revision-Date: 2009-08-19 23:53+0200\n" -"Last-Translator: neoex <neoex.dc(a)gmail.com>\n" +"POT-Creation-Date: 2013-10-23 22:34+0200\n" +"PO-Revision-Date: 2013-10-09 22:46+0100\n" +"Last-Translator: v <noway(a)insiberia.net>\n" "Language-Team: Italian <>\n" "Language: it\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: Poedit 1.5.4\n" #: ../data/gui/account_context_menu.ui.h:1 #: ../data/gui/zeroconf_context_menu.ui.h:1 @@ -26,17 +27,16 @@ msgstr "_Stato" #: ../data/gui/account_context_menu.ui.h:2 -#, fuzzy msgid "_Personal Events" -msgstr "Informazioni personali" +msgstr "Eventi _Personali" #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 msgid "_Start Chat..." -msgstr "_Inizia chat..." +msgstr "_Inizia Conversazione..." #: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." -msgstr "Entra in chat di _gruppo..." +msgstr "Entra in una Conversazione di _Gruppo..." #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." @@ -44,23 +44,23 @@ #: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" -msgstr "_Ricerca servizi" +msgstr "_Ricerca Servizi" #: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." -msgstr "_Esegui comando..." +msgstr "_Esegui Comando..." #: ../data/gui/account_context_menu.ui.h:8 msgid "_Open Gmail Inbox" -msgstr "_Apri posta ricevuta" +msgstr "_Apri Posta Ricevuta Gmail" #: ../data/gui/account_context_menu.ui.h:9 msgid "_Modify Account" -msgstr "_Modifica account" +msgstr "_Modifica Account" #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: Assistente creazione account" +msgstr "Gajim: Assistente Creazione Account" #: ../data/gui/account_creation_wizard_window.ui.h:2 msgid "" @@ -71,9 +71,8 @@ "alla rete Jabber." #: ../data/gui/account_creation_wizard_window.ui.h:4 -#, fuzzy msgid "I already have an account I want to _use" -msgstr "Ho già un account da usare" +msgstr "Ho già un account che voglio _utilizzare" #: ../data/gui/account_creation_wizard_window.ui.h:5 msgid "I want to _register for a new account" @@ -84,9 +83,8 @@ msgstr "Scegliere una delle seguenti opzioni:" #: ../data/gui/account_creation_wizard_window.ui.h:7 -#, fuzzy msgid "Please fill in the data for your existing account" -msgstr "Inserire i dati per il nuovo account" +msgstr "Inserire i dati per l'account esistente" #: ../data/gui/account_creation_wizard_window.ui.h:8 #: ../data/gui/accounts_window.ui.h:22 @@ -97,7 +95,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:9 #: ../data/gui/accounts_window.ui.h:20 msgid "Save pass_word" -msgstr "Ricorda la pass_word" +msgstr "Salva la pass_word" #: ../data/gui/account_creation_wizard_window.ui.h:10 #: ../data/gui/accounts_window.ui.h:21 @@ -110,9 +108,8 @@ msgstr "ID _Jabber:" #: ../data/gui/account_creation_wizard_window.ui.h:12 -#, fuzzy msgid "Anon_ymous authentication" -msgstr "Usa autenticazione" +msgstr "Autenticazione anon_ima" #: ../data/gui/account_creation_wizard_window.ui.h:13 msgid "Please select a server" @@ -137,7 +134,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:18 msgid "_Hostname:" -msgstr "Nome dell'_host: " +msgstr "_Hostname:" #: ../data/gui/account_creation_wizard_window.ui.h:19 msgid "_Port:" @@ -146,13 +143,15 @@ #: ../data/gui/account_creation_wizard_window.ui.h:20 #: ../data/gui/roster_window.ui.h:8 msgid "_Advanced" -msgstr "_Avanzato" +msgstr "_Avanzate" #: ../data/gui/account_creation_wizard_window.ui.h:21 msgid "" "Add this certificate to the list of trusted certificates.\n" "SHA1 fingerprint of the certificate:\n" msgstr "" +"Aggiungi questo certificato alla lista dei certificati attendibili.\n" +"Impronta digitale SHA1 del certificato:\n" #: ../data/gui/account_creation_wizard_window.ui.h:24 msgid "" @@ -160,7 +159,7 @@ "\n" "Please wait..." msgstr "" -"Connessione al server\n" +"Connessione al server in corso\n" "\n" "Attendere prego..." @@ -180,10 +179,10 @@ #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 #: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 #: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 -#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 -#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 -#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3147 +#: ../src/config.py:1747 ../src/config.py:2341 ../src/config.py:2422 +#: ../src/config.py:2437 ../src/config.py:3718 ../src/config.py:3793 +#: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 +#: ../src/dialogs.py:537 ../src/roster_window.py:3147 #: ../src/roster_window.py:3153 ../src/roster_window.py:3158 msgid "None" msgstr "Nessuno" @@ -193,33 +192,30 @@ msgstr "Account" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 -#: ../src/dialogs.py:3570 -#, fuzzy +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3530 +#: ../src/dialogs.py:3576 msgid "Add" -msgstr "Indirizzo" +msgstr "Aggiungi" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 -#: ../src/dialogs.py:3625 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3534 +#: ../src/dialogs.py:3631 msgid "Delete" msgstr "Elimina" #. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5799 msgid "Re_name" msgstr "Ri_nomina" #. XML Console enable checkbutton #: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 -#, fuzzy msgid "_Enable" -msgstr "Abilita" +msgstr "_Abilita" #: ../data/gui/accounts_window.ui.h:7 -#, fuzzy msgid "Anonymous authentication" -msgstr "Usa autenticazione" +msgstr "Autenticazione anonima" #: ../data/gui/accounts_window.ui.h:8 msgid "" @@ -244,9 +240,8 @@ msgstr "Gajim" #: ../data/gui/accounts_window.ui.h:10 -#, fuzzy msgid "Synchronize contacts" -msgstr "Sincronizza contatti" +msgstr "Sincronizza i contatti" #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" @@ -255,7 +250,7 @@ #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" -msgstr "_Cambia password" +msgstr "_Cambia la password" #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" @@ -276,9 +271,8 @@ "account; il client con la maggiore priorità riceverà gli eventi" #: ../data/gui/accounts_window.ui.h:16 -#, fuzzy msgid "A_djust to status" -msgstr "_Modifica lo stato" +msgstr "A_degua allo stato" #: ../data/gui/accounts_window.ui.h:17 msgid "Priority will change automatically according to your status." @@ -294,22 +288,19 @@ #: ../data/gui/accounts_window.ui.h:24 msgid "_Client Cert File:" -msgstr "" +msgstr "File Certificato _Client" #: ../data/gui/accounts_window.ui.h:25 -#, fuzzy msgid "Browse..." -msgstr "C_onsulta" +msgstr "Sfoglia..." #: ../data/gui/accounts_window.ui.h:26 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "[Questo messaggio è cifrato]" +msgstr "Il certificato è ci_frato" #: ../data/gui/accounts_window.ui.h:27 -#, fuzzy msgid "Client certificate" -msgstr "Nome utente non valido" +msgstr "Certificato del client" #: ../data/gui/accounts_window.ui.h:28 #: ../data/gui/join_groupchat_window.ui.h:7 @@ -347,7 +338,7 @@ "accordingly" msgstr "" "Se marcato, ogni cambio allo stato globale (gestito dal menu a tendina sotto " -"la lista contatti) cambierà anche lo stato di questo account" +"la finestra contatti) cambierà anche lo stato di questo account" #: ../data/gui/accounts_window.ui.h:35 msgid "Use file transfer proxies" @@ -367,40 +358,39 @@ #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 -#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127 +#: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 #: ../src/roster_window.py:3089 ../src/roster_window.py:4215 -#: ../src/roster_window.py:5842 +#: ../src/roster_window.py:5849 msgid "General" msgstr "Generale" #: ../data/gui/accounts_window.ui.h:38 msgid "_use HTTP__PROXY environment variable" -msgstr "" +msgstr "_usare variabile d'ambiente HTTP__PROXY" #: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134 -#, fuzzy msgid "_Manage..." -msgstr "Gestisci..." +msgstr "_Gestisci..." #: ../data/gui/accounts_window.ui.h:40 -#, fuzzy msgid "Proxy"

1 0

gajim: Use Active instead of Enabled in Account Preferences. Fix...
by Gajim 22 Oct '13

22 Oct '13

changeset b9e96fbe6309 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b9e96fbe6309 description: Use Active instead of Enabled in Account Preferences. Fixes #7424 diffstat: data/gui/accounts_window.ui | 4 ++-- 1 файлов изменено, 2 вставок(+), 2 удалений(-) различия (21 строк): diff -r a204a335af55 -r b9e96fbe6309 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Tue Oct 22 14:27:28 2013 +0400 +++ b/data/gui/accounts_window.ui Tue Oct 22 23:59:53 2013 +0400 @@ -137,7 +137,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="enable_checkbutton1"> - <property name="label" translatable="yes">_Enable</property> + <property name="label" translatable="yes">Active</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1033,7 +1033,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="enable_zeroconf_checkbutton2"> - <property name="label" translatable="yes">_Enable</property> + <property name="label" translatable="yes">Active</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property>

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 22 Oct '13

22 Oct '13

changeset a204a335af55 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a204a335af55 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 1154 ++++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 565 вставок(+), 589 удалений(-) различия (урезанные с 3301 до 300 строк): diff -r adde52611fcc -r a204a335af55 po/he.po --- a/po/he.po Tue Oct 22 13:43:34 2013 +0400 +++ b/po/he.po Tue Oct 22 14:27:28 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-14 10:28+0200\n" -"PO-Revision-Date: 2013-10-08 19:46+0200\n" +"POT-Creation-Date: 2013-10-22 13:06+0200\n" +"PO-Revision-Date: 2013-10-22 13:09+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -28,17 +28,15 @@ msgid "_Personal Events" msgstr "_אירועים אישיים" -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +#: ../data/gui/account_context_menu.ui.h:3 msgid "_Start Chat..." msgstr "התחלת _שיחה..." -# הצטרפות אך/ל -# שיחה מרובת משתתפים -# שיחה קבוצתית -# קבוצת שיחה -#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 -msgid "Join _Group Chat..." -msgstr "שיחת _קבוצה..." +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 +#: ../data/gui/systray_context_menu.ui.h:3 +msgid "Join _Group Chat" +msgstr "הצטרף אל שיחת _קבוצה" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." @@ -58,8 +56,9 @@ msgstr "_פתח תיבת דואר נכנס של GMail" #: ../data/gui/account_context_menu.ui.h:9 -msgid "_Modify Account" -msgstr "ה_תאם חשבון" +#: ../data/gui/zeroconf_context_menu.ui.h:2 +msgid "_Modify Account..." +msgstr "ה_תאמת חשבון..." #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" @@ -184,10 +183,10 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 -#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 -#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 -#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 +#: ../src/config.py:1253 ../src/config.py:1268 ../src/config.py:1273 +#: ../src/config.py:1321 ../src/config.py:1424 ../src/config.py:1743 +#: ../src/config.py:1748 ../src/config.py:2342 ../src/config.py:2424 +#: ../src/config.py:2439 ../src/config.py:3720 ../src/config.py:3795 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 #: ../src/dialogs.py:537 ../src/roster_window.py:3147 #: ../src/roster_window.py:3153 ../src/roster_window.py:3158 @@ -199,19 +198,19 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3528 -#: ../src/dialogs.py:3574 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3534 +#: ../src/dialogs.py:3580 msgid "Add" msgstr "הוסף" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3532 -#: ../src/dialogs.py:3629 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3538 +#: ../src/dialogs.py:3635 msgid "Delete" msgstr "מחק" #. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5797 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5799 msgid "Re_name" msgstr "_שנה שם" @@ -254,7 +253,7 @@ #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" -msgstr "לחץ בכדי לבקש הרשאות עבור כל אנשי קשר של חשבון אחר" +msgstr "לחץ בכדי לבקש הרשאות עבור כל איש קשר של חשבון אחר" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" @@ -339,7 +338,7 @@ #: ../data/gui/accounts_window.ui.h:32 msgid "Save conversation _logs for all contacts" -msgstr "שמור רשו_מות שיחה עבור כל אנשי קשר" +msgstr "שמור רשו_מות שיחה עבור כל איש קשר" #: ../data/gui/accounts_window.ui.h:33 msgid "Synch_ronize account status with global status" @@ -382,7 +381,7 @@ #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 #: ../src/roster_window.py:3089 ../src/roster_window.py:4215 -#: ../src/roster_window.py:5847 +#: ../src/roster_window.py:5849 msgid "General" msgstr "כללית" @@ -445,8 +444,8 @@ msgid "Connection" msgstr "חיבור" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840 -#: ../src/config.py:2436 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1841 +#: ../src/config.py:2440 msgid "No key selected" msgstr "לא נבחר מפתח" @@ -523,7 +522,7 @@ msgstr "דוא״ל:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1868 #: ../src/dialogs.py:842 msgid "Jabber ID:" msgstr "מזהה Jabber:" @@ -778,8 +777,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5816 -#: ../src/roster_window.py:5943 ../src/roster_window.py:6080 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5818 +#: ../src/roster_window.py:5945 ../src/roster_window.py:6082 msgid "_Unblock" msgstr "_בטל חסימה" @@ -852,16 +851,12 @@ msgid "_Open Email Composer" msgstr "_פתח מלחין דוא״ל" -#: ../data/gui/chat_context_menu.ui.h:5 +#: ../data/gui/chat_context_menu.ui.h:5 ../data/gui/roster_window.ui.h:3 #: ../data/gui/subscription_request_popup_menu.ui.h:1 #: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat" msgstr "התחל _שיחה" -#: ../data/gui/chat_context_menu.ui.h:6 -msgid "Join _Group Chat" -msgstr "הצטרף אל שיחת _קבוצה" - #: ../data/gui/chat_context_menu.ui.h:7 #: ../data/gui/contact_context_menu.ui.h:24 msgid "_Add to Roster..." @@ -896,57 +891,56 @@ msgstr "" #: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8 +#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 +msgid "_Send" +msgstr "_שלח" + +#: ../data/gui/chat_control.ui.h:9 ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/single_message_window.ui.h:6 msgid "Send message" msgstr "שליחת הודעה" -#. 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:10 ../data/gui/groupchat_control.ui.h:10 -#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 -msgid "_Send" -msgstr "_שלח" +#: ../data/gui/chat_control.ui.h:10 +msgid "1" +msgstr "" #: ../data/gui/chat_control.ui.h:11 -msgid "1" +msgid "2" msgstr "" #: ../data/gui/chat_control.ui.h:12 -msgid "2" +msgid "3" msgstr "" #: ../data/gui/chat_control.ui.h:13 -msgid "3" +msgid "4" msgstr "" #: ../data/gui/chat_control.ui.h:14 -msgid "4" +msgid "5" msgstr "" #: ../data/gui/chat_control.ui.h:15 -msgid "5" +msgid "6" msgstr "" #: ../data/gui/chat_control.ui.h:16 -msgid "6" +msgid "7" msgstr "" #: ../data/gui/chat_control.ui.h:17 -msgid "7" +msgid "8" msgstr "" #: ../data/gui/chat_control.ui.h:18 -msgid "8" +msgid "9" msgstr "" #: ../data/gui/chat_control.ui.h:19 -msgid "9" -msgstr "" - -#: ../data/gui/chat_control.ui.h:20 msgid "*" msgstr "" -#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3 +#: ../data/gui/chat_control.ui.h:20 ../data/gui/single_message_window.ui.h:3 msgid "0" msgstr "" @@ -978,7 +972,9 @@ msgid "Start _Chat" msgstr "התחל _שיחה" +#. Send single message #: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4 +#: ../data/gui/systray_context_menu.ui.h:4 ../src/roster_window.py:5989 msgid "Send Single _Message..." msgstr "שליחת הודעה _בודדת..." @@ -989,8 +985,8 @@ #. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747 -#: ../src/roster_window.py:5911 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5749 +#: ../src/roster_window.py:5913 msgid "In_vite to" msgstr "ה_זמן אל" @@ -1007,12 +1003,13 @@ msgid "Toggle End to End Encryption" msgstr "הפעל הצפנת קצה אל קצה" -#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757 -#: ../src/roster_window.py:6002 +#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5759 +#: ../src/roster_window.py:6004 msgid "Send Cus_tom Status" msgstr "שלח מצב חיבור מו_תאם" -#: ../data/gui/contact_context_menu.ui.h:9 +#. Execute Command +#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:6040 msgid "E_xecute Command..." msgstr "הרצת _פקודה..." @@ -1057,8 +1054,8 @@ msgstr "_מנע מאיש קשר מלראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:21 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5824 -#: ../src/roster_window.py:5949 ../src/roster_window.py:6083 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5826 +#: ../src/roster_window.py:5951 ../src/roster_window.py:6085 msgid "_Block" msgstr "_חסום" @@ -1077,7 +1074,7 @@ #: ../data/gui/contact_context_menu.ui.h:26 #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6156 +#: ../src/roster_window.py:6158 msgid "_History" msgstr "_היסטוריה" @@ -1135,14 +1132,18 @@

1 0

gajim: [Darlan] Add/Remove ... Fixes #7519
by Gajim 22 Oct '13

22 Oct '13

changeset adde52611fcc in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=adde52611fcc description: [Darlan] Add/Remove ... Fixes #7519 diffstat: data/gui/account_context_menu.ui | 4 ++-- data/gui/roster_window.ui | 4 ++-- data/gui/systray_context_menu.ui | 4 ++-- src/roster_window.py | 4 ++-- 4 файлов изменено, 8 вставок(+), 8 удалений(-) различия (84 строк): diff -r 789fe831dca8 -r adde52611fcc data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Mon Oct 21 23:22:27 2013 +0400 +++ b/data/gui/account_context_menu.ui Tue Oct 22 13:43:34 2013 +0400 @@ -40,7 +40,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="label" translatable="yes">Join _Group Chat...</property> + <property name="label" translatable="yes">Join _Group Chat</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="label" translatable="yes">_Modify Account</property> + <property name="label" translatable="yes">_Modify Account...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image8</property> diff -r 789fe831dca8 -r adde52611fcc data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Oct 21 23:22:27 2013 +0400 +++ b/data/gui/roster_window.ui Tue Oct 22 13:43:34 2013 +0400 @@ -34,7 +34,7 @@ <object class="GtkMenu" id="actions_menu_menu"> <child> <object class="GtkImageMenuItem" id="new_chat_menuitem"> - <property name="label" translatable="yes">_Start Chat...</property> + <property name="label" translatable="yes">_Start Chat</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -53,7 +53,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_gc_menuitem"> - <property name="label" translatable="yes">Join _Group Chat...</property> + <property name="label" translatable="yes">Join _Group Chat</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image3</property> diff -r 789fe831dca8 -r adde52611fcc data/gui/systray_context_menu.ui --- a/data/gui/systray_context_menu.ui Mon Oct 21 23:22:27 2013 +0400 +++ b/data/gui/systray_context_menu.ui Tue Oct 22 13:43:34 2013 +0400 @@ -25,7 +25,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_gc_menuitem"> - <property name="label" translatable="yes">_Group Chat</property> + <property name="label" translatable="yes">Join _Group Chat</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image3</property> @@ -35,7 +35,7 @@ </child> <child> <object class="GtkImageMenuItem" id="single_message_menuitem"> - <property name="label" translatable="yes">Send Single _Message</property> + <property name="label" translatable="yes">Send Single _Message...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> diff -r 789fe831dca8 -r adde52611fcc src/roster_window.py --- a/src/roster_window.py Mon Oct 21 23:22:27 2013 +0400 +++ b/src/roster_window.py Tue Oct 22 13:43:34 2013 +0400 @@ -5986,7 +5986,7 @@ menu = gtk.Menu() # Send single message - item = gtk.ImageMenuItem(_('Send Single Message')) + item = gtk.ImageMenuItem(_('Send Single _Message...')) icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) item.set_image(icon) item.connect('activate', @@ -6037,7 +6037,7 @@ menu.append(item) # Execute Command - item = gtk.ImageMenuItem(_('Execute Command...')) + item = gtk.ImageMenuItem(_('E_xecute Command...')) icon = gtk.image_new_from_stock(gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU) item.set_image(icon) menu.append(item)

1 0

gajim: Set transient_for for 'This file already exists' dialog(FT).
by Gajim 21 Oct '13

21 Oct '13

changeset 789fe831dca8 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=789fe831dca8 description: Set transient_for for 'This file already exists' dialog(FT). diffstat: src/dialogs.py | 6 ++++-- src/filetransfers_window.py | 5 ++--- src/gtkgui_helpers.py | 4 ++-- 3 файлов изменено, 8 вставок(+), 7 удалений(-) различия (46 строк): diff -r e65971276cf2 -r 789fe831dca8 src/dialogs.py --- a/src/dialogs.py Sat Oct 19 14:06:06 2013 +0400 +++ b/src/dialogs.py Mon Oct 21 23:22:27 2013 +0400 @@ -1934,8 +1934,10 @@ """ def __init__(self, pritext, sectext='', propose_resume=True, - on_response=None): - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + on_response=None, transient_for=None): + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None diff -r e65971276cf2 -r 789fe831dca8 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Oct 19 14:06:06 2013 +0400 +++ b/src/filetransfers_window.py Mon Oct 21 23:22:27 2013 +0400 @@ -405,10 +405,9 @@ dialog = dialogs.FTOverwriteConfirmationDialog( _('This file already exists'), _('What do you want to do?'), - propose_resume=not dl_finished, on_response=on_response) - dialog.set_transient_for(dialog2) + propose_resume=not dl_finished, on_response=on_response, + transient_for=dialog2) dialog.set_destroy_with_parent(True) - return else: dirname = os.path.dirname(file_path) if not os.access(dirname, os.W_OK) and os.name != 'nt': diff -r e65971276cf2 -r 789fe831dca8 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sat Oct 19 14:06:06 2013 +0400 +++ b/src/gtkgui_helpers.py Mon Oct 21 23:22:27 2013 +0400 @@ -854,8 +854,8 @@ return dialog2 = dialogs.FTOverwriteConfirmationDialog( _('This file already exists'), _('What do you want to do?'), - propose_resume=False, on_response=(on_continue, file_path)) - dialog2.set_transient_for(dialog) + propose_resume=False, on_response=(on_continue, file_path), + transient_for=dialog) dialog2.set_destroy_with_parent(True) else: dirname = os.path.dirname(file_path)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2013