changeset e0912fe3fd94 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=e0912fe3fd94
description: merge with default
diffstat:
AUTHORS | 10 +-
data/gui/join_groupchat_window.ui | 80 +-
data/gui/message_window.ui | 2 +-
data/gui/service_discovery_window.ui | 3 +-
po/sk.po | 8216 ++++++++----------
src/command_system/__init__.py | 6 +-
src/command_system/dispatching.py | 7 +-
src/command_system/errors.py | 5 +-
src/command_system/framework.py | 184 +-
src/command_system/implementation/__init__.py | 5 +-
src/command_system/implementation/custom.py | 34 +-
src/command_system/implementation/hosts.py | 16 +-
src/command_system/implementation/middleware.py | 20 +-
src/command_system/implementation/standard.py | 15 +-
src/command_system/mapping.py | 204 +-
src/common/check_paths.py | 7 +-
src/common/connection.py | 4 +-
src/common/connection_handlers.py | 27 +-
src/common/contacts.py | 7 +-
src/common/dbus_support.py | 7 +
src/common/helpers.py | 1 +
src/common/optparser.py | 4 +-
src/common/protocol/bytestream.py | 369 +-
src/common/xmpp/auth_nb.py | 96 +-
src/common/xmpp/client_nb.py | 3 +
src/common/xmpp/dispatcher_nb.py | 4 -
src/common/xmpp/tls_nb.py | 2 +
src/common/zeroconf/connection_handlers_zeroconf.py | 9 +-
src/conversation_textview.py | 5 +-
src/dialogs.py | 52 +-
src/disco.py | 7 +-
src/gtkgui_helpers.py | 3 +-
src/gui_interface.py | 15 +
src/roster_window.py | 2 +-
34 files changed, 4553 insertions(+), 4878 deletions(-)
diffs (truncated from 14250 to 300 lines):
diff -r 0796002940d1 -r e0912fe3fd94 AUTHORS
--- a/AUTHORS Wed Mar 10 13:51:55 2010 +0100
+++ b/AUTHORS Wed Mar 10 13:52:54 2010 +0100
@@ -1,13 +1,8 @@
CURRENT DEVELOPERS:
Alexander Cherniuk (ts33kr AT gmail.com)
-Nikos Kouremenos (kourem AT gmail.com)
Yann Leboulanger (asterix AT lagaule.org)
-Julien Pivotto (roidelapluie AT gmail.com)
Jonathan Schleifer (js-gajim AT webkeks.org)
-Travis Shirk (travis AT pobox.com)
-Brendan Taylor (whateley AT gmail.com)
-Jean-Marie Traissard (jim AT lapin.org)
PAST DEVELOPERS:
@@ -15,3 +10,8 @@
Stephan Erb (steve-e AT h3c.de)
Vincent Hanquez (tab AT snarc.org)
Dimitur Kirov (dkirov AT gmail.com)
+Nikos Kouremenos (kourem AT gmail.com)
+Julien Pivotto (roidelapluie AT gmail.com)
+Travis Shirk (travis AT pobox.com)
+Brendan Taylor (whateley AT gmail.com)
+Jean-Marie Traissard (jim AT lapin.org)
diff -r 0796002940d1 -r e0912fe3fd94 data/gui/join_groupchat_window.ui
--- a/data/gui/join_groupchat_window.ui Wed Mar 10 13:51:55 2010 +0100
+++ b/data/gui/join_groupchat_window.ui Wed Mar 10 13:52:54 2010 +0100
@@ -15,7 +15,7 @@
<child>
<object class="GtkTable" id="table15">
<property name="visible">True</property>
- <property name="n_rows">7</property>
+ <property name="n_rows">8</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
@@ -110,8 +110,8 @@
<property name="label" translatable="yes">Password:</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -126,14 +126,14 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="auto_join_checkbutton">
- <property name="label" translatable="yes">Join this room
automatically when I connect</property>
+ <property name="label" translatable="yes">Join this room
_automatically when I connect</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -143,8 +143,8 @@
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -174,21 +174,69 @@
</child>
<child>
<object class="GtkCheckButton" id="bookmark_checkbutton">
- <property name="label" translatable="yes">Bookmark this
room</property>
+ <property name="label" translatable="yes">_Bookmark this
room</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="on_bookmark_checkbutton_toggled"/>
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Server:</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBoxEntry" id="server_comboboxentry">
+ <property name="visible">True</property>
+ <property name="model">liststore1</property>
+ <property name="text_column">0</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="browse_rooms_button">
+ <property name="label" translatable="yes">Bro_wse
Rooms</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">image1</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="on_browse_rooms_button_clicked"/>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">0</property>
@@ -275,4 +323,14 @@
</object>
</child>
</object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-find</property>
+ </object>
</interface>
diff -r 0796002940d1 -r e0912fe3fd94 data/gui/message_window.ui
--- a/data/gui/message_window.ui Wed Mar 10 13:51:55 2010 +0100
+++ b/data/gui/message_window.ui Wed Mar 10 13:52:54 2010 +0100
@@ -14,6 +14,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="scrollable">True</property>
+ <property name="tab_border">0</property>
</object>
</child>
</object>
@@ -59,7 +60,6 @@
<child>
<object class="GtkImage" id="image1329">
<property name="visible">True</property>
- <property name="ypad">6</property>
<property name="stock">gtk-close</property>
<property name="icon-size">1</property>
</object>
diff -r 0796002940d1 -r e0912fe3fd94 data/gui/service_discovery_window.ui
--- a/data/gui/service_discovery_window.ui Wed Mar 10 13:51:55 2010 +0100
+++ b/data/gui/service_discovery_window.ui Wed Mar 10 13:52:54 2010 +0100
@@ -4,7 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="liststore1">
<columns>
- <!-- column-name item text -->
+ <!-- column-name item -->
<column type="gchararray"/>
</columns>
</object>
@@ -71,7 +71,6 @@
<property name="visible">True</property>
<property name="model">liststore1</property>
<signal name="changed"
handler="on_address_comboboxentry_changed"/>
- <signal name="key_press_event"
handler="on_address_comboboxentry_key_press_event"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
diff -r 0796002940d1 -r e0912fe3fd94 po/sk.po
--- a/po/sk.po Wed Mar 10 13:51:55 2010 +0100
+++ b/po/sk.po Wed Mar 10 13:52:54 2010 +0100
@@ -1,21 +1,21 @@
-# Slovak translation for gajim
-# Copyright (c) (c) 2005-2009 Canonical Ltd, and Rosetta Contributors 2005-2009
-# This file is distributed under the same license as the gajim package.
-# Juraj Michalek <[email protected]>, 2005.
-# Pavol Klačanský <[email protected]>, 2008, 2009.
-#
+# Slovak translation for gajim
+# Copyright (c) 2005, 2008, 2009 Canonical Ltd, and Rosetta Contributors
+# This file is distributed under the same license as the gajim package.
+# Juraj Michalek <[email protected]>, 2005.
+# Pavol Klačanský <[email protected]>, 2008, 2009, 2010.
+#
msgid ""
msgstr ""
"Project-Id-Version: gajim\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
-"PO-Revision-Date: 2009-08-20 00:04+0200\n"
+"POT-Creation-Date: 2010-03-07 19:14+0100\n"
+"PO-Revision-Date: 2010-02-28 20:43+0100\n"
"Last-Translator: Pavol Klačanský <[email protected]>\n"
"Language-Team: Slovak <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
#: ../data/gajim.desktop.in.in.h:1
msgid "A GTK+ Jabber client"
@@ -23,2870 +23,31 @@
#: ../data/gajim.desktop.in.in.h:2
msgid "Gajim Instant Messenger"
-msgstr "Internetový komunikátor Gajim"
+msgstr "Gajim - internetový komunikátor"
#: ../data/gajim.desktop.in.in.h:3
msgid "Jabber IM Client"
msgstr "Jabber IM klient"
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "_Pripojiť sa k diskusnej skupine..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Pridať kontakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Preskúmať služby"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Vykonať príkaz..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Upraviť účet"
-
-#: ../data/glade/account_context_menu.glade.h:6
-msgid "_Open Gmail Inbox"
-msgstr "_Otvoriť Gmail Inbox"
-
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Osobné udalosti"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Začať rozhovor..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Stav"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
-msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
-msgstr ""
-"<b>Pripája sa k serveru</b>\n"
-"\n"
-"Prosím počkajte..."
-
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
