Author: js
Date: 2009-02-14 14:00:24 +0100 (Sat, 14 Feb 2009)
New Revision: 11097
Modified:
branches/osx_newbuildsys/src/statusicon.py
Log:
statusicon.py was incompatible with r11080. Fixed.
Modified: branches/osx_newbuildsys/src/statusicon.py
===================================================================
--- branches/osx_newbuildsys/src/statusicon.py 2009-02-14 12:17:41 UTC (rev 11096)
+++ branches/osx_newbuildsys/src/statusicon.py 2009-02-14 13:00:24 UTC (rev 11097)
@@ -64,10 +64,7 @@
self.unsubscribe_events()
def on_status_icon_left_clicked(self, widget):
- if len(gajim.events.get_systray_events()) == 0:
- self.on_left_click()
- else:
- self.on_middle_click()
+ self.on_left_click()
def set_img(self):
'''apart from image, we also update tooltip text here'''
1
0
Author: js
Date: 2009-02-14 13:17:41 +0100 (Sat, 14 Feb 2009)
New Revision: 11096
Modified:
branches/osx_newbuildsys/configure.ac
Log:
Remove a line I forgot.
Modified: branches/osx_newbuildsys/configure.ac
===================================================================
--- branches/osx_newbuildsys/configure.ac 2009-02-14 12:09:23 UTC (rev 11095)
+++ branches/osx_newbuildsys/configure.ac 2009-02-14 12:17:41 UTC (rev 11096)
@@ -161,7 +161,6 @@
echo "
*****************************
Build features:
- spell check ...... ${have_gtkspell}
remote control ... ${have_remote}
trayicon ......... ${have_trayicon}
idle module OSX .. ${have_idle_osx}
1
0
[commit-gajim] r11095 - in branches/osx_newbuildsys: data/glade data/pixmaps/events src src/common src/common/xmpp
by js＠gajim.org 14 Feb '09
by js＠gajim.org 14 Feb '09
14 Feb '09
Author: js
Date: 2009-02-14 13:09:23 +0100 (Sat, 14 Feb 2009)
New Revision: 11095
Added:
branches/osx_newbuildsys/data/pixmaps/events/subscription_request.png
branches/osx_newbuildsys/data/pixmaps/events/unsubscribed.png
Modified:
branches/osx_newbuildsys/data/glade/preferences_window.glade
branches/osx_newbuildsys/src/common/config.py
branches/osx_newbuildsys/src/common/connection.py
branches/osx_newbuildsys/src/common/events.py
branches/osx_newbuildsys/src/common/helpers.py
branches/osx_newbuildsys/src/common/xmpp/auth_nb.py
branches/osx_newbuildsys/src/common/xmpp/transports_nb.py
branches/osx_newbuildsys/src/config.py
branches/osx_newbuildsys/src/dialogs.py
branches/osx_newbuildsys/src/gajim.py
branches/osx_newbuildsys/src/network_manager_listener.py
branches/osx_newbuildsys/src/notify.py
branches/osx_newbuildsys/src/roster_window.py
Log:
Merge trunk r10089.
Modified: branches/osx_newbuildsys/data/glade/preferences_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/preferences_window.glade 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/data/glade/preferences_window.glade 2009-02-14 12:09:23 UTC (rev 11095)
@@ -211,55 +211,45 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="one_window_type_combobox">
- <property name="width_request">50</property>
+ <widget class="GtkLabel" id="label379">
<property name="visible">True</property>
- <property name="items" translatable="yes">Detached roster with detached chats
-Detached roster with single chat
-Single window for everything
-Detached roster with chat grouped by account
-Detached roster with chat grouped by type</property>
- <signal name="changed" handler="on_one_window_type_combo_changed"/>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Window behavior:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">one_window_type_combobox</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="speller_checkbutton">
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property>
- <property name="label" translatable="yes">_Highlight misspelled words</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_speller_checkbutton_toggled"/>
+ <widget class="GtkComboBox" id="emoticons_combobox">
+ <property name="visible">True</property>
+ <signal name="changed" handler="on_emoticons_combobox_changed"/>
</widget>
<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="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="xhtml_checkbutton">
+ <widget class="GtkEventBox" id="eventbox5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property>
- <property name="label" translatable="yes">_Ignore rich content in incoming messages</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/>
+ <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property>
+ <child>
+ <widget class="GtkLabel" id="label381">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Emoticons:</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -281,46 +271,56 @@
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox5">
+ <widget class="GtkCheckButton" id="xhtml_checkbutton">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property>
- <child>
- <widget class="GtkLabel" id="label381">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">_Emoticons:</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property>
+ <property name="label" translatable="yes">_Ignore rich content in incoming messages</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/>
</widget>
<packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="emoticons_combobox">
- <property name="visible">True</property>
- <signal name="changed" handler="on_emoticons_combobox_changed"/>
+ <widget class="GtkCheckButton" id="speller_checkbutton">
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property>
+ <property name="label" translatable="yes">_Highlight misspelled words</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_speller_checkbutton_toggled"/>
</widget>
<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="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label379">
+ <widget class="GtkComboBox" id="one_window_type_combobox">
+ <property name="width_request">50</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">_Window behavior:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">one_window_type_combobox</property>
+ <property name="items" translatable="yes">Detached roster with detached chats
+Detached roster with single chat
+Single window for everything
+Detached roster with chat grouped by account
+Detached roster with chat grouped by type</property>
+ <signal name="changed" handler="on_one_window_type_combo_changed"/>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -614,35 +614,55 @@
<property name="border_width">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="play_sounds_checkbutton">
+ <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Play _sounds</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_play_sounds_checkbutton_toggled"/>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkCheckButton" id="play_sounds_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Play _sounds</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_play_sounds_checkbutton_toggled"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="manage_sounds_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">Ma_nage...</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_manage_sounds_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
- <packing>
- <property name="expand">False</property>
- </packing>
</child>
<child>
- <widget class="GtkButton" id="manage_sounds_button">
+ <widget class="GtkCheckButton" id="sound_dnd_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">Ma_nage...</property>
+ <property name="label" translatable="yes">Allow sound when I'm _busy</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
- <signal name="clicked" handler="on_manage_sounds_button_clicked"/>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_sound_dnd_checkbutton_toggled"/>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -710,67 +730,67 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="outgoing_chat_states_combobox">
+ <widget class="GtkComboBox" id="displayed_chat_states_combobox">
<property name="visible">True</property>
<property name="items" translatable="yes">All chat states
Composing only
Disabled</property>
- <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/>
+ <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox9">
+ <widget class="GtkEventBox" id="eventbox8">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property>
+ <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Send chat state notifications:</property>
+ <property name="label" translatable="yes">_Display chat state notifications:</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="eventbox8">
+ <widget class="GtkEventBox" id="eventbox9">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property>
+ <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property>
<child>
- <widget class="GtkLabel" id="label33">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Display chat state notifications:</property>
+ <property name="label" translatable="yes">_Send chat state notifications:</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="displayed_chat_states_combobox">
+ <widget class="GtkComboBox" id="outgoing_chat_states_combobox">
<property name="visible">True</property>
<property name="items" translatable="yes">All chat states
Composing only
Disabled</property>
- <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/>
+ <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
@@ -834,60 +854,65 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="auto_xa_message_entry">
+ <widget class="GtkCheckButton" id="auto_away_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message
-$S will be replaced by previous status message
-$T will be replaced by auto-not-available timeout</property>
- <signal name="changed" handler="on_auto_xa_message_entry_changed"/>
+ <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property>
+ <property name="label" translatable="yes">_Away after:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="auto_xa_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property>
+ <property name="label" translatable="yes">_Not available after:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/>
+ </widget>
+ <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="auto_away_message_entry">
+ <widget class="GtkLabel" id="label77">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message
-$S will be replaced by previous status message
-$T will be replaced by auto-away timeout</property>
- <signal name="changed" handler="on_auto_away_message_entry_changed"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">minutes</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment34">
+ <widget class="GtkLabel" id="label78">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <child>
- <widget class="GtkSpinButton" id="auto_xa_time_spinbutton">
- <property name="width_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">20 1 1440 1 10 10</property>
- <property name="climb_rate">1</property>
- <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">minutes</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -914,67 +939,62 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label78">
+ <widget class="GtkAlignment" id="alignment34">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">minutes</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkSpinButton" id="auto_xa_time_spinbutton">
+ <property name="width_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">20 1 1440 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label77">
+ <widget class="GtkEntry" id="auto_away_message_entry">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">minutes</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message
+$S will be replaced by previous status message
+$T will be replaced by auto-away timeout</property>
+ <signal name="changed" handler="on_auto_away_message_entry_changed"/>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="auto_xa_checkbutton">
+ <widget class="GtkEntry" id="auto_xa_message_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property>
- <property name="label" translatable="yes">_Not available after:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/>
+ <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message
+$S will be replaced by previous status message
+$T will be replaced by auto-not-available timeout</property>
+ <signal name="changed" handler="on_auto_xa_message_entry_changed"/>
</widget>
<packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkCheckButton" id="auto_away_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property>
- <property name="label" translatable="yes">_Away after:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -1132,24 +1152,40 @@
<placeholder/>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow23">
+ <widget class="GtkVButtonBox" id="vbuttonbox3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="spacing">5</property>
+ <property name="layout_style">GTK_BUTTONBOX_START</property>
<child>
- <widget class="GtkTextView" id="msg_textview">
+ <widget class="GtkButton" id="new_msg_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">3</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-new</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_new_msg_button_clicked"/>
</widget>
</child>
+ <child>
+ <widget class="GtkButton" id="delete_msg_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-delete</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_delete_msg_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -1172,40 +1208,24 @@
</widget>
</child>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox3">
+ <widget class="GtkScrolledWindow" id="scrolledwindow23">
<property name="visible">True</property>
- <property name="spacing">5</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkButton" id="new_msg_button">
+ <widget class="GtkTextView" id="msg_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-new</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_new_msg_button_clicked"/>
+ <property name="border_width">3</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
</widget>
</child>
- <child>
- <widget class="GtkButton" id="delete_msg_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-delete</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_delete_msg_button_clicked"/>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -1271,14 +1291,15 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkFontButton" id="conversation_fontbutton">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Chat message:</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
+ <signal name="font_set" handler="on_conversation_fontbutton_font_set"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
@@ -1299,15 +1320,14 @@
</packing>
</child>
<child>
- <widget class="GtkFontButton" id="conversation_fontbutton">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
- <signal name="font_set" handler="on_conversation_fontbutton_font_set"/>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Chat message:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -1357,43 +1377,35 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label249">
+ <widget class="GtkCheckButton" id="transports_iconsets_checkbutton">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">T_heme:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">theme_combobox</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="manage_theme_button">
- <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Configure color and font of the interface</property>
- <property name="label" translatable="yes">Ma_nage...</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property>
+ <property name="label" translatable="yes">Use _transports icons</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
- <signal name="clicked" handler="on_manage_theme_button_clicked"/>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/>
</widget>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="theme_combobox">
+ <widget class="GtkComboBox" id="iconset_combobox">
<property name="visible">True</property>
- <signal name="changed" handler="on_theme_combobox_changed"/>
+ <signal name="changed" handler="on_iconset_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1412,37 +1424,45 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="iconset_combobox">
+ <widget class="GtkComboBox" id="theme_combobox">
<property name="visible">True</property>
- <signal name="changed" handler="on_iconset_combobox_changed"/>
+ <signal name="changed" handler="on_theme_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="transports_iconsets_checkbutton">
+ <widget class="GtkButton" id="manage_theme_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property>
- <property name="label" translatable="yes">Use _transports icons</property>
+ <property name="tooltip" translatable="yes">Configure color and font of the interface</property>
+ <property name="label" translatable="yes">Ma_nage...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/>
+ <signal name="clicked" handler="on_manage_theme_button_clicked"/>
</widget>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label249">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">T_heme:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">theme_combobox</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -1482,119 +1502,65 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox3022">
+ <widget class="GtkLabel" id="label72">
<property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label383">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="reset_colors_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_reset_colors_button_clicked"/>
- <child>
- <widget class="GtkAlignment" id="alignment52">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox2936">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image439">
- <property name="visible">True</property>
- <property name="stock">gtk-revert-to-saved</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label217">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Reset to Default Colors</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Incoming message:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ <property name="mnemonic_widget">incoming_msg_colorbutton</property>
</widget>
<packing>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="url_msg_colorbutton">
+ <widget class="GtkColorButton" id="incoming_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label371">
+ <widget class="GtkLabel" id="label70">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_URL highlight:</property>
+ <property name="label" translatable="yes">_Outgoing message:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">url_msg_colorbutton</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ <property name="mnemonic_widget">outgoing_msg_colorbutton</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="status_msg_colorbutton">
+ <widget class="GtkColorButton" id="outgoing_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1616,66 +1582,120 @@
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="outgoing_msg_colorbutton">
+ <widget class="GtkColorButton" id="status_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label70">
+ <widget class="GtkLabel" id="label371">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Outgoing message:</property>
+ <property name="label" translatable="yes">_URL highlight:</property>
<property name="use_underline">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="mnemonic_widget">outgoing_msg_colorbutton</property>
+ <property name="mnemonic_widget">url_msg_colorbutton</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="incoming_msg_colorbutton">
+ <widget class="GtkColorButton" id="url_msg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="response_id">0</property>
- <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
+ <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label72">
+ <widget class="GtkHBox" id="hbox3022">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Incoming message:</property>
- <property name="use_underline">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="mnemonic_widget">incoming_msg_colorbutton</property>
+ <child>
+ <widget class="GtkLabel" id="label383">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="reset_colors_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_reset_colors_button_clicked"/>
+ <child>
+ <widget class="GtkAlignment" id="alignment52">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2936">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image439">
+ <property name="visible">True</property>
+ <property name="stock">gtk-revert-to-saved</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label217">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Reset to Default Colors</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -1762,85 +1782,85 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label199">
+ <widget class="GtkEntry" id="custom_file_manager_entry">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Browser:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_browser_entry</property>
+ <property name="can_focus">True</property>
+ <signal name="changed" handler="on_custom_file_manager_entry_changed"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label200">
+ <widget class="GtkLabel" id="label355">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Mail client:</property>
+ <property name="label" translatable="yes">_File manager:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_mail_client_entry</property>
+ <property name="mnemonic_widget">custom_file_manager_entry</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="custom_mail_client_entry">
+ <widget class="GtkEntry" id="custom_browser_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_mail_client_entry_changed"/>
+ <signal name="changed" handler="on_custom_browser_entry_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="custom_browser_entry">
+ <widget class="GtkEntry" id="custom_mail_client_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_browser_entry_changed"/>
+ <signal name="changed" handler="on_custom_mail_client_entry_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label355">
+ <widget class="GtkLabel" id="label200">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_File manager:</property>
+ <property name="label" translatable="yes">_Mail client:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">custom_file_manager_entry</property>
+ <property name="mnemonic_widget">custom_mail_client_entry</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="custom_file_manager_entry">
+ <widget class="GtkLabel" id="label199">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_custom_file_manager_entry_changed"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Browser:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">custom_browser_entry</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1904,19 +1924,18 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
+ <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property>
- <property name="label" translatable="yes">Log _encrypted chat session</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property>
+ <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1936,18 +1955,19 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
+ <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property>
- <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
+ <property name="tooltip" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property>
+ <property name="label" translatable="yes">Log _encrypted chat session</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
</widget>
Copied: branches/osx_newbuildsys/data/pixmaps/events/subscription_request.png (from rev 11089, trunk/data/pixmaps/events/subscription_request.png)
===================================================================
(Binary files differ)
Copied: branches/osx_newbuildsys/data/pixmaps/events/unsubscribed.png (from rev 11089, trunk/data/pixmaps/events/unsubscribed.png)
===================================================================
(Binary files differ)
Modified: branches/osx_newbuildsys/src/common/config.py
===================================================================
--- branches/osx_newbuildsys/src/common/config.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/common/config.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -79,6 +79,7 @@
'notify_on_signout': [ opt_bool, False ],
'notify_on_new_message': [ opt_bool, True ],
'autopopupaway': [ opt_bool, False ],
+ 'sounddnd': [ opt_bool, False, _('Play sound when user is busy')],
'use_notif_daemon': [ opt_bool, True , _('Use D-Bus and Notification-Daemon to show notifications') ],
'showoffline': [ opt_bool, False ],
'show_only_chat_and_online': [ opt_bool, False, _('Show only online and free for chat contacts in roster.')],
Modified: branches/osx_newbuildsys/src/common/connection.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/common/connection.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -167,6 +167,7 @@
# request vcard or os info... to a real JID but act as if it comes from
# the fake jid
self.groupchat_jids = {} # {ID : groupchat_jid}
+ self.pasword_callback = None
self.on_connect_success = None
self.on_connect_failure = None
@@ -1815,6 +1816,19 @@
q.setTagData('password',password)
self.connection.send(iq)
+ def get_password(self, callback):
+ if self.password:
+ callback(self.password)
+ return
+ self.pasword_callback = callback
+ self.dispatch('PASSWORD_REQUIRED', None)
+
+ def set_password(self, password):
+ self.password = password
+ if self.pasword_callback:
+ self.pasword_callback(password)
+ self.pasword_callback = None
+
def unregister_account(self, on_remove_success):
# no need to write this as a class method and keep the value of
# on_remove_success as a class property as pass it as an argument
Modified: branches/osx_newbuildsys/src/common/events.py
===================================================================
--- branches/osx_newbuildsys/src/common/events.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/common/events.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -28,11 +28,12 @@
class Event:
'''Information concerning each event'''
- def __init__(self, type_, time_, parameters, show_in_roster = False,
- show_in_systray = True):
+ def __init__(self, type_, time_, parameters, show_in_roster=False,
+ show_in_systray=True):
''' type_ in chat, normal, file-request, file-error, file-completed,
file-request-error, file-send-error, file-stopped, gc_msg, pm,
- printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm
+ printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm,
+ gc-invitation, subscription_request, unsubscribed
parameters is (per type_):
chat, normal, pm: [message, subject, kind, time, encrypted, resource,
msg_id]
@@ -41,7 +42,11 @@
gc_msg: None
printed_chat: control
printed_*: None
- messages that are already printed in chat, but not read'''
+ messages that are already printed in chat, but not read
+ gc-invitation: [room_jid, reason, password, is_continued]
+ subscription_request: [text, nick]
+ unsubscribed: contact
+ '''
self.type_ = type_
self.time_ = time_
self.parameters = parameters
Modified: branches/osx_newbuildsys/src/common/helpers.py
===================================================================
--- branches/osx_newbuildsys/src/common/helpers.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/common/helpers.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -1022,7 +1022,7 @@
return True
return False
-def allow_sound_notification(sound_event, advanced_notif_num = None):
+def allow_sound_notification(account, sound_event, advanced_notif_num=None):
if advanced_notif_num is not None:
sound = gajim.config.get_per('notifications', str(advanced_notif_num),
'sound')
@@ -1030,7 +1030,9 @@
return True
if sound == 'no':
return False
- if gajim.config.get_per('soundevents', sound_event, 'enabled'):
+ if gajim.config.get('sounddnd') or gajim.connections[account].connected != \
+ gajim.SHOW_LIST.index('dnd') and gajim.config.get_per('soundevents',
+ sound_event, 'enabled'):
return True
return False
Modified: branches/osx_newbuildsys/src/common/xmpp/auth_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/auth_nb.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/common/xmpp/auth_nb.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -212,13 +212,10 @@
self.mechanism = 'DIGEST-MD5'
elif 'PLAIN' in self.mecs:
self.mecs.remove('PLAIN')
- sasl_data = u'%s\x00%s\x00%s' % (self.username + '@' + \
- self._owner.Server, self.username, self.password)
- sasl_data = sasl_data.encode('utf-8').encode('base64').replace(
- '\n','')
- node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'},
- payload=[sasl_data])
self.mechanism = 'PLAIN'
+ self._owner._caller.get_password(self.set_password)
+ self.startsasl = SASL_IN_PROCESS
+ raise NodeProcessed
else:
self.startsasl = SASL_FAILURE
log.error('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.')
@@ -297,36 +294,21 @@
if 'qop' in chal and ((isinstance(chal['qop'], str) and \
chal['qop'] =='auth') or (isinstance(chal['qop'], list) and 'auth' in \
chal['qop'])):
- resp = {}
- resp['username'] = self.username
+ self.resp = {}
+ self.resp['username'] = self.username
if self.realm:
- resp['realm'] = self.realm
+ self.resp['realm'] = self.realm
else:
- resp['realm'] = self._owner.Server
- resp['nonce'] = chal['nonce']
- resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint in
+ self.resp['realm'] = self._owner.Server
+ self.resp['nonce'] = chal['nonce']
+ self.resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint in
itertools.repeat(random.randint, 7))
- resp['nc'] = ('00000001')
- resp['qop'] = 'auth'
- resp['digest-uri'] = 'xmpp/' + self._owner.Server
- A1=C([H(C([resp['username'], resp['realm'], self.password])),
- resp['nonce'], resp['cnonce']])
- A2=C(['AUTHENTICATE',resp['digest-uri']])
- response= HH(C([HH(A1), resp['nonce'], resp['nc'], resp['cnonce'],
- resp['qop'], HH(A2)]))
- resp['response'] = response
- resp['charset'] = 'utf-8'
- sasl_data = u''
- for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce',
- 'digest-uri', 'response', 'qop'):
- if key in ('nc','qop','response','charset'):
- sasl_data += u"%s=%s," % (key, resp[key])
- else:
- sasl_data += u'%s="%s",' % (key, resp[key])
- sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace(
- '\r','').replace('\n','')
- node = Node('response', attrs={'xmlns':NS_SASL}, payload=[sasl_data])
- self._owner.send(str(node))
+ self.resp['nc'] = ('00000001')
+ self.resp['qop'] = 'auth'
+ self.resp['digest-uri'] = 'xmpp/' + self._owner.Server
+ self.resp['charset'] = 'utf-8'
+ # Password is now required
+ self._owner._caller.get_password(self.set_password)
elif 'rspauth' in chal:
self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL})))
else:
@@ -335,6 +317,34 @@
if self.on_sasl:
self.on_sasl()
raise NodeProcessed
+
+ def set_password(self, password):
+ self.password = password
+ if self.mechanism == 'DIGEST-MD5':
+ A1 = C([H(C([self.resp['username'], self.resp['realm'],
+ self.password])), self.resp['nonce'], self.resp['cnonce']])
+ A2 = C(['AUTHENTICATE', self.resp['digest-uri']])
+ response= HH(C([HH(A1), self.resp['nonce'], self.resp['nc'],
+ self.resp['cnonce'], self.resp['qop'], HH(A2)]))
+ self.resp['response'] = response
+ sasl_data = u''
+ for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce',
+ 'digest-uri', 'response', 'qop'):
+ if key in ('nc','qop','response','charset'):
+ sasl_data += u"%s=%s," % (key, self.resp[key])
+ else:
+ sasl_data += u'%s="%s",' % (key, self.resp[key])
+ sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace(
+ '\r', '').replace('\n', '')
+ node = Node('response', attrs={'xmlns':NS_SASL}, payload=[sasl_data])
+ elif self.mechanism == 'PLAIN':
+ sasl_data = u'%s\x00%s\x00%s' % (self.username + '@' + \
+ self._owner.Server, self.username, self.password)
+ sasl_data = sasl_data.encode('utf-8').encode('base64').replace(
+ '\n', '')
+ node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'},
+ payload=[sasl_data])
+ self._owner.send(str(node))
class NonBlockingNonSASL(PlugIn):
Modified: branches/osx_newbuildsys/src/common/xmpp/transports_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -529,7 +529,7 @@
return
if errnum:
- log.error("Connection to %s:%s lost: %s %s" % (self.server, self.port,
+ log.info("Connection to %s:%s lost: %s %s" % (self.server, self.port,
errnum, errstr), exc_info=True)
self.disconnect()
return
Modified: branches/osx_newbuildsys/src/config.py
===================================================================
--- branches/osx_newbuildsys/src/config.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/config.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -87,6 +87,7 @@
'notify_on_signout_checkbutton')
self.auto_popup_away_checkbutton = self.xml.get_widget(
'auto_popup_away_checkbutton')
+ self.sound_dnd_checkbutton = self.xml.get_widget('sound_dnd_checkbutton')
self.auto_away_checkbutton = self.xml.get_widget('auto_away_checkbutton')
self.auto_away_time_spinbutton = self.xml.get_widget(
'auto_away_time_spinbutton')
@@ -301,6 +302,10 @@
st = gajim.config.get('autopopupaway')
self.auto_popup_away_checkbutton.set_active(st)
+ # sounddnd
+ st = gajim.config.get('sounddnd')
+ self.sound_dnd_checkbutton.set_active(st)
+
# Systray
systray_combobox = self.xml.get_widget('systray_combobox')
if gajim.config.get('trayicon') == 'never':
@@ -764,6 +769,9 @@
def on_auto_popup_away_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'autopopupaway')
+ def on_sound_dnd_checkbutton_toggled(self, widget):
+ self.on_checkbutton_toggled(widget, 'sounddnd')
+
def on_systray_combobox_changed(self, widget):
active = widget.get_active()
if active == 0:
Modified: branches/osx_newbuildsys/src/dialogs.py
===================================================================
--- branches/osx_newbuildsys/src/dialogs.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/dialogs.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -1644,6 +1644,9 @@
def on_deny_button_clicked(self, widget):
'''refuse the request'''
gajim.connections[self.account].refuse_authorization(self.jid)
+ contact = gajim.contacts.get_contact(self.account, self.jid)
+ if contact and _('Not in Roster') in contact.get_shown_groups():
+ gajim.interface.roster.remove_contact(self.jid, self.account)
self.window.destroy()
def on_actions_button_clicked(self, widget):
Modified: branches/osx_newbuildsys/src/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/gajim.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/gajim.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -272,6 +272,7 @@
from common import helpers
from common import optparser
from common import dataforms
+from common import passwords
if verbose: gajim.verbose = True
del verbose
@@ -966,10 +967,26 @@
def handle_event_subscribe(self, account, array):
#('SUBSCRIBE', account, (jid, text, user_nick)) user_nick is JEP-0172
- dialogs.SubscriptionRequestWindow(array[0], array[1], account, array[2])
if self.remote_ctrl:
self.remote_ctrl.raise_signal('Subscribe', (account, array))
+ jid = array[0]
+ text = array[1]
+ nick = array[2]
+ if helpers.allow_popup_window(account) or not self.systray_enabled:
+ dialogs.SubscriptionRequestWindow(jid, text, account, nick)
+ return
+
+ self.add_event(account, jid, 'subscription_request', (text, nick))
+
+ if helpers.allow_showing_notification(account):
+ path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
+ 'subscription_request.png')
+ path = gtkgui_helpers.get_path_to_generic_or_avatar(path)
+ event_type = _('Subscription request')
+ notify.popup(event_type, jid, account, 'subscription_request', path,
+ event_type, jid)
+
def handle_event_subscribed(self, account, array):
#('SUBSCRIBED', account, (jid, resource))
jid = array[0]
@@ -999,7 +1016,20 @@
if self.remote_ctrl:
self.remote_ctrl.raise_signal('Subscribed', (account, array))
+ def show_unsubscribed_dialog(self, account, contact):
+ def on_yes(is_checked, list_):
+ self.roster.on_req_usub(None, list_)
+ list_ = [(contact, account)]
+ dialogs.YesNoDialog(
+ _('Contact "%s" removed subscription from you') % contact.jid,
+ _('You will always see him or her as offline.\nDo you want to '
+ 'remove him or her from your contact list?'),
+ on_response_yes=(on_yes, list_))
+ # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does
+ # not show deny
+
def handle_event_unsubscribed(self, account, jid):
+ #('UNSUBSCRIBED', account, jid)
gajim.connections[account].ack_unsubscribed(jid)
if self.remote_ctrl:
self.remote_ctrl.raise_signal('Unsubscribed', (account, jid))
@@ -1007,15 +1037,20 @@
contact = gajim.contacts.get_first_contact_from_jid(account, jid)
if not contact:
return
- def on_yes(is_checked, list_):
- self.roster.on_req_usub(None, list_)
- list_ = [(contact, account)]
- dialogs.YesNoDialog(
- _('Contact "%s" removed subscription from you') % jid,
- _('You will always see him or her as offline.\nDo you want to remove him or her from your contact list?'),
- on_response_yes=(on_yes, list_))
- # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does not show deny
+ if helpers.allow_popup_window(account) or not self.systray_enabled:
+ self.show_unsubscribed_dialog(account, contact)
+
+ self.add_event(account, jid, 'unsubscribed', contact)
+
+ if helpers.allow_showing_notification(account):
+ path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
+ 'unsubscribed.png')
+ path = gtkgui_helpers.get_path_to_generic_or_avatar(path)
+ event_type = _('Unsubscribed')
+ notify.popup(event_type, jid, account, 'unsubscribed', path,
+ event_type, jid)
+
def handle_event_agent_info_error(self, account, agent):
#('AGENT_ERROR_INFO', account, (agent))
try:
@@ -1495,6 +1530,28 @@
self.gpg_passphrase[keyid] = request
request.add_callback(account, callback)
+ def handle_event_password_required(self, account, array):
+ #('PASSWORD_REQUIRED', account, None)
+ text = _('Enter your password for account %s') % account
+ if passwords.USER_HAS_GNOMEKEYRING and \
+ not passwords.USER_USES_GNOMEKEYRING:
+ text += '\n' + _('Gnome Keyring is installed but not \
+ correctly started (environment variable probably not \
+ correctly set)')
+
+ def on_ok(passphrase, save):
+ if save:
+ gajim.config.set_per('accounts', account, 'savepass', True)
+ passwords.save_password(account, passphrase)
+ gajim.connections[account].set_password(passphrase)
+
+ def on_cancel():
+ self.roster.set_state(account, 'offline')
+ self.roster.update_status_combobox()
+
+ dialogs.PassphraseDialog(_('Password Required'), text, _('Save password'),
+ ok_handler=on_ok, cancel_handler=on_cancel)
+
def handle_event_roster_info(self, account, array):
#('ROSTER_INFO', account, (jid, name, sub, ask, groups))
jid = array[0]
@@ -2235,6 +2292,7 @@
self.handle_event_unique_room_id_unsupported,
'UNIQUE_ROOM_ID_SUPPORTED': self.handle_event_unique_room_id_supported,
'GPG_PASSWORD_REQUIRED': self.handle_event_gpg_password_required,
+ 'PASSWORD_REQUIRED': self.handle_event_password_required,
'SSL_ERROR': self.handle_event_ssl_error,
'FINGERPRINT_ERROR': self.handle_event_fingerprint_error,
'PLAIN_CONNECTION': self.handle_event_plain_connection,
@@ -2263,8 +2321,8 @@
show_in_roster = notify.get_show_in_roster(event_type, account, jid)
show_in_systray = notify.get_show_in_systray(event_type, account, jid)
event = gajim.events.create_event(type_, event_args,
- show_in_roster = show_in_roster,
- show_in_systray = show_in_systray)
+ show_in_roster=show_in_roster,
+ show_in_systray=show_in_systray)
gajim.events.add_event(account, jid, event)
self.roster.show_title()
@@ -2396,6 +2454,18 @@
data[1], data[3])
gajim.events.remove_events(account, jid, event)
self.roster.draw_contact(jid, account)
+ elif type_ == 'subscription_request':
+ event = gajim.events.get_first_event(account, jid, type_)
+ data = event.parameters
+ dialogs.SubscriptionRequestWindow(jid, data[0], account, data[1])
+ gajim.events.remove_events(account, jid, event)
+ self.roster.draw_contact(jid, account)
+ elif type_ == 'unsubscribed':
+ event = gajim.events.get_first_event(account, jid, type_)
+ contact = event.parameters
+ self.show_unsubscribed_dialog(account, contact)
+ gajim.events.remove_events(account, jid, event)
+ self.roster.draw_contact(jid, account)
if w:
w.set_active_tab(ctrl)
w.window.window.focus()
Modified: branches/osx_newbuildsys/src/network_manager_listener.py
===================================================================
--- branches/osx_newbuildsys/src/network_manager_listener.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/network_manager_listener.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -25,17 +25,32 @@
from common import gajim
def device_now_active(self, *args):
+ '''For Network Manager 0.6'''
for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.time_to_reconnect:
connection._reconnect()
def device_no_longer_active(self, *args):
+ '''For Network Manager 0.6'''
for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.connected > 1:
connection._disconnectedReconnCB()
+def state_changed(state):
+ '''For Network Manager 0.7'''
+ if props.Get("org.freedesktop.NetworkManager", "State") == 3:
+ for connection in gajim.connections.itervalues():
+ if gajim.config.get_per('accounts', connection.name,
+ 'listen_to_network_manager') and connection.time_to_reconnect:
+ connection._reconnect()
+ else:
+ for connection in gajim.connections.itervalues():
+ if gajim.config.get_per('accounts', connection.name,
+ 'listen_to_network_manager') and connection.connected > 1:
+ connection._disconnectedReconnCB()
+
supported = False
if sys.platform == 'darwin':
@@ -44,22 +59,36 @@
try:
from common.dbus_support import system_bus
- bus = system_bus.SystemBus()
+ bus = system_bus.bus()
if 'org.freedesktop.NetworkManager' in bus.list_names():
+ nm_object = bus.get_object('org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+ props = dbus.Interface(nm_object,"org.freedesktop.DBus.Properties")
+ bus.add_signal_receiver(state_changed,
+ 'StateChanged',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
supported = True
- bus.add_signal_receiver(device_no_longer_active,
- 'DeviceNoLongerActive',
- 'org.freedesktop.NetworkManager',
- 'org.freedesktop.NetworkManager',
- '/org/freedesktop/NetworkManager')
- bus.add_signal_receiver(device_now_active,
- 'DeviceNowActive',
- 'org.freedesktop.NetworkManager',
- 'org.freedesktop.NetworkManager',
- '/org/freedesktop/NetworkManager')
except Exception:
- pass
+ try:
+ if 'org.freedesktop.NetworkManager' in bus.list_names():
+ supported = True
+ bus.add_signal_receiver(device_no_longer_active,
+ 'DeviceNoLongerActive',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+
+ bus.add_signal_receiver(device_now_active,
+ 'DeviceNowActive',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+ except Exception:
+ pass
+
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/notify.py
===================================================================
--- branches/osx_newbuildsys/src/notify.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/notify.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -186,16 +186,16 @@
if helpers.allow_showing_notification(account, 'notify_on_new_message',
advanced_notif_num, is_first_message):
do_popup = True
- if is_first_message and helpers.allow_sound_notification(
+ if is_first_message and helpers.allow_sound_notification(account,
'first_message_received', advanced_notif_num):
do_sound = True
elif not is_first_message and focused and \
- helpers.allow_sound_notification('next_message_received_focused',
+ helpers.allow_sound_notification(account, 'next_message_received_focused',
advanced_notif_num):
do_sound = True
elif not is_first_message and not focused and \
- helpers.allow_sound_notification('next_message_received_unfocused',
- advanced_notif_num):
+ helpers.allow_sound_notification(account,
+ 'next_message_received_unfocused', advanced_notif_num):
do_sound = True
if not focused:
do_bounce = True
@@ -500,6 +500,10 @@
ntype = 'presence.status'
elif event_type == _('Connection Failed'):
ntype = 'connection.failed'
+ elif event_type == _('Subscription request'):
+ ntype = 'subscription.request'
+ elif event_type == _('Unsubscribed'):
+ ntype = 'unsubscribed'
else:
# default failsafe values
self.path_to_image = os.path.abspath(
Modified: branches/osx_newbuildsys/src/roster_window.py
===================================================================
--- branches/osx_newbuildsys/src/roster_window.py 2009-02-14 12:06:05 UTC (rev 11094)
+++ branches/osx_newbuildsys/src/roster_window.py 2009-02-14 12:09:23 UTC (rev 11095)
@@ -54,7 +54,6 @@
from common import gajim
from common import helpers
-from common import passwords
from common.exceptions import GajimGeneralException
from common import i18n
from common import pep
@@ -1832,6 +1831,14 @@
data[1])
gajim.events.remove_events(account, jid, event)
return True
+ elif event.type_ == 'subscription_request':
+ dialogs.SubscriptionRequestWindow(jid, data[0], account, data[1])
+ gajim.events.remove_events(account, jid, event)
+ return True
+ elif event.type_ == 'unsubscribed':
+ gajim.interface.show_unsubscribed_dialog(account, data)
+ gajim.events.remove_events(account, jid, event)
+ return True
return False
################################################################################
@@ -1901,16 +1908,19 @@
dialogs.InformationDialog(_('Authorization has been removed'),
_('Now "%s" will always see you as offline.') %jid)
- def set_connecting_state(self, account):
+ def set_state(self, account, state):
child_iterA = self._get_account_iter(account, self.model)
if child_iterA:
self.model[child_iterA][0] = \
- gajim.interface.jabber_state_images['16']['connecting']
+ gajim.interface.jabber_state_images['16'][state]
if gajim.interface.systray_enabled:
- gajim.interface.systray.change_status('connecting')
+ gajim.interface.systray.change_status(state)
if sys.platform == 'darwin':
gajim.interface.dock.change_status('connecting')
+ def set_connecting_state(self, account):
+ self.set_state(account, 'connecting')
+
def send_status(self, account, status, txt, auto=False, to=None):
child_iterA = self._get_account_iter(account, self.model)
if status != 'offline':
1
0
Author: js
Date: 2009-02-14 13:06:05 +0100 (Sat, 14 Feb 2009)
New Revision: 11094
Modified:
branches/osx_newbuildsys/configure.ac
branches/osx_newbuildsys/extra.mk.in
Log:
Forgot to commit those.
Modified: branches/osx_newbuildsys/configure.ac
===================================================================
--- branches/osx_newbuildsys/configure.ac 2009-02-14 12:02:37 UTC (rev 11093)
+++ branches/osx_newbuildsys/configure.ac 2009-02-14 12:06:05 UTC (rev 11094)
@@ -60,29 +60,7 @@
fi
AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote)
-dnl ****
-dnl gtkspell
-dnl ****
-AC_ARG_ENABLE(gtkspell,
- [ --disable-gtkspell do not build spell checking support [default auto]],
- enable_gtkspell=$enableval, enable_gtkspell=auto)
-
-if test "x$enable_gtkspell" = "xauto";then
- PKG_CHECK_EXISTS([gtkspell-2.0], [enable_gtkspell=yes], [enable_gtkspell=no])
-fi
-if test "x$enable_gtkspell" = "xyes";then
- PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0])
- AC_SUBST(GTKSPELL_CFLAGS)
- AC_SUBST(GTKSPELL_LIBS)
- AC_SUBST(SPELLMODULE, spellmodule)
- have_gtkspell=true
-else
- AC_SUBST(SPELLMODULE,)
- have_gtkspell=false
-fi
-
-
-AM_PATH_PYTHON([2.4])
+AM_PATH_PYTHON([2.5])
if test "x$PYTHON" = "x:"; then
AC_MSG_ERROR([Python not found])
fi
Modified: branches/osx_newbuildsys/extra.mk.in
===================================================================
--- branches/osx_newbuildsys/extra.mk.in 2009-02-14 12:02:37 UTC (rev 11093)
+++ branches/osx_newbuildsys/extra.mk.in 2009-02-14 12:06:05 UTC (rev 11094)
@@ -1,5 +1,4 @@
TRAYMODULE = @TRAYMODULE@
-SPELLMODULE = @SPELLMODULE@
OSX_IDLEMODULE = @OSX_IDLEMODULE@
OSX_MODULES = @OSX_MODULES@
PYTHON_CFLAGS = @PYTHON_INCLUDES@
@@ -10,6 +9,4 @@
PYGTK_CFLAGS = @PYGTK_CFLAGS@
PYGTK_DEFS = @PYGTK_DEFS@
PYGTK_LIBS = @PYGTK_LIBS@
-GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
-GTKSPELL_LIBS = @GTKSPELL_LIBS@
XSCRNSAVER_LIBS = @XSCRNSAVER_LIBS@
1
0
Author: js
Date: 2009-02-14 13:02:37 +0100 (Sat, 14 Feb 2009)
New Revision: 11093
Removed:
branches/osx_newbuildsys/src/spellmodule/
Modified:
branches/osx_newbuildsys/src/Makefile
branches/osx_newbuildsys/src/chat_control.py
branches/osx_newbuildsys/src/config.py
branches/osx_newbuildsys/src/dialogs.py
branches/osx_newbuildsys/src/features_window.py
branches/osx_newbuildsys/src/gajim.py
branches/osx_newbuildsys/src/groupchat_control.py
branches/osx_newbuildsys/src/roster_window.py
Log:
Merge trunk r11083.
Modified: branches/osx_newbuildsys/src/Makefile
===================================================================
--- branches/osx_newbuildsys/src/Makefile 2009-02-14 11:58:51 UTC (rev 11092)
+++ branches/osx_newbuildsys/src/Makefile 2009-02-14 12:02:37 UTC (rev 11093)
@@ -1,6 +1,6 @@
include ../extra.mk
-SUBDIRS = common ${TRAYMODULE} ${SPELLMODULE} osx
+SUBDIRS = common ${TRAYMODULE} osx
SRCS = adhoc_commands.py \
advanced.py \
@@ -43,16 +43,13 @@
systray.py \
tooltips.py \
vcard.py
-DISTCLEAN = gtkspell.so trayicon.so
+DISTCLEAN = trayicon.so
include ../buildsys.mk
-all: ${OBJS} gtkspell.so trayicon.so
+all: ${OBJS} trayicon.so
# Don't depend on the actual file, we can create the symlink anyway
-gtkspell.so:
- rm -f gtkspell.so
- ln -s spellmodule/gtkspell.so gtkspell.so
trayicon.so:
rm -f trayicon.so
ln -s traymodule/trayicon.so trayicon.so
Modified: branches/osx_newbuildsys/src/chat_control.py
===================================================================
--- branches/osx_newbuildsys/src/chat_control.py 2009-02-14 11:58:51 UTC (rev 11092)
+++ branches/osx_newbuildsys/src/chat_control.py 2009-02-14 12:02:37 UTC (rev 11093)
@@ -54,7 +54,7 @@
try:
import gtkspell
HAS_GTK_SPELL = True
-except Exception:
+except ImportError:
HAS_GTK_SPELL = False
HAVE_MARKUP_TOOLTIPS = gtk.pygtk_version >= (2, 12, 0)
@@ -300,7 +300,7 @@
for lang in dict(langs):
try:
spell.set_language(langs[lang])
- except Exception:
+ except OSError:
del langs[lang]
# now set the one the user selected
per_type = 'contacts'
@@ -314,7 +314,7 @@
if lang:
self.msg_textview.lang = lang
spell.set_language(lang)
- except (gobject.GError, RuntimeError):
+ except (gobject.GError, RuntimeError, TypeError):
dialogs.AspellDictError(lang)
def on_msg_textview_populate_popup(self, textview, menu):
Modified: branches/osx_newbuildsys/src/config.py
===================================================================
--- branches/osx_newbuildsys/src/config.py 2009-02-14 11:58:51 UTC (rev 11092)
+++ branches/osx_newbuildsys/src/config.py 2009-02-14 12:02:37 UTC (rev 11093)
@@ -48,7 +48,7 @@
try:
import gtkspell
HAS_GTK_SPELL = True
-except Exception:
+except ImportError:
HAS_GTK_SPELL = False
from common import helpers
@@ -631,7 +631,7 @@
if isinstance(ctrl, chat_control.ChatControlBase):
try:
spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
- except Exception:
+ except (TypeError, RuntimeError):
spell_obj = None
if not spell_obj:
@@ -642,7 +642,7 @@
if isinstance(ctrl, chat_control.ChatControlBase):
try:
spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
- except Exception:
+ except (TypeError, RuntimeError):
spell_obj = None
if spell_obj:
spell_obj.detach()
@@ -658,7 +658,7 @@
tv = gtk.TextView()
try:
gtkspell.Spell(tv, lang)
- except Exception:
+ except (TypeError, RuntimeError):
dialogs.ErrorDialog(
_('Dictionary for lang %s not available') % lang,
_('You have to install %s dictionary to use spellchecking, or '
Modified: branches/osx_newbuildsys/src/dialogs.py
===================================================================
--- branches/osx_newbuildsys/src/dialogs.py 2009-02-14 11:58:51 UTC (rev 11092)
+++ branches/osx_newbuildsys/src/dialogs.py 2009-02-14 12:02:37 UTC (rev 11093)
@@ -45,7 +45,7 @@
try:
import gtkspell
HAS_GTK_SPELL = True
-except Exception:
+except ImportError:
HAS_GTK_SPELL = False
# those imports are not used in this file, but in files that 'import dialogs'
@@ -2200,7 +2200,7 @@
lang = gajim.LANG
gtkspell.Spell(self.conversation_textview.tv, lang)
gtkspell.Spell(self.message_textview, lang)
- except gobject.GError:
+ except (gobject.GError, TypeError, RuntimeError):
AspellDictError(lang)
self.prepare_widgets_for(self.action)
Modified: branches/osx_newbuildsys/src/features_window.py
===================================================================
--- branches/osx_newbuildsys/src/features_window.py 2009-02-14 11:58:51 UTC (rev 11092)
+++ branches/osx_newbuildsys/src/features_window.py 2009-02-14 12:02:37 UTC (rev 11093)
@@ -76,7 +76,7 @@
_('Requires nslookup to use SRV records.')),
_('Spell Checker'): (self.speller_available,
_('Spellchecking of composed messages.'),
- _('Requires python-gnome2-extras or compilation of gtkspell module from Gajim sources.'),
+ _('Requires libgtkspell.'),
_('Feature not available under Windows.')),
_('Notification'): (self.notification_available,
_('Passive popups notifying for new events.'),
@@ -217,7 +217,7 @@
return False
try:
import gtkspell
- except Exception:
+ except ImportError:
return False
return True
Modified: branches/osx_newbuildsys/src/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/gajim.py 2009-02-14 11:58:51 UTC (rev 11092)
+++ branches/osx_newbuildsys/src/gajim.py 2009-02-14 12:02:37 UTC (rev 11093)
@@ -3348,7 +3348,7 @@
try:
import gtkspell
spell = gtkspell.Spell(tv, lang)
- except Exception:
+ except (ImportError, TypeError, RuntimeError):
dialogs.AspellDictError(lang)
if gajim.config.get('soundplayer') == '':
Modified: branches/osx_newbuildsys/src/groupchat_control.py
===================================================================
--- branches/osx_newbuildsys/src/groupchat_control.py 2009-02-14 11:58:51 UTC (rev 11092)
+++ branches/osx_newbuildsys/src/groupchat_control.py 2009-02-14 12:02:37 UTC (rev 11093)
@@ -1047,6 +1047,21 @@
name += ('\n<span size="small" style="italic" foreground="%s">'
'%s</span>') % (colorstring, gobject.markup_escape_text(status))
+ if image.get_storage_type() == gtk.IMAGE_PIXBUF:
+ pixbuf1 = image.get_pixbuf().copy()
+ pixbuf2 = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 4, 4)
+ if gc_contact.affiliation == 'owner':
+ pixbuf2.fill(0xff0000ff) # Red
+ elif gc_contact.affiliation == 'admin':
+ pixbuf2.fill(0xffb200ff) # Oragne
+ elif gc_contact.affiliation == 'member':
+ pixbuf2.fill(0x00ff00ff) # Green
+ else:
+ pixbuf2.fill(0x000000ff) # Green
+ pixbuf2.composite(pixbuf1, 12, 12, pixbuf2.get_property('width'),
+ pixbuf2.get_property('height'), 0, 0, 1.0, 1.0,
+ gtk.gdk.INTERP_HYPER, 127)
+ image = gtk.image_new_from_pixbuf(pixbuf1)
model[iter_][C_IMG] = image
model[iter_][C_TEXT] = name
Modified: branches/osx_newbuildsys/src/roster_window.py
===================================================================
--- branches/osx_newbuildsys/src/roster_window.py 2009-02-14 11:58:51 UTC (rev 11092)
+++ branches/osx_newbuildsys/src/roster_window.py 2009-02-14 12:02:37 UTC (rev 11093)
@@ -3126,17 +3126,20 @@
contact = list_[0][0]
pritext = _('Contact "%s" will be removed from your roster') % \
contact.get_shown_name()
+ sectext = _('You are about to remove "%(name)s" (%(jid)s) from your '
+ 'roster.\n') % {'name': contact.get_shown_name(),
+ 'jid': contact.jid}
if contact.sub == 'to':
- dialogs.ConfirmationDialog(pritext,
+ dialogs.ConfirmationDialog(pritext, sectext + \
_('By removing this contact you also remove authorization '
'resulting in him or her always seeing you as offline.'),
on_response_ok = (on_ok2, list_))
elif _('Not in Roster') in contact.get_shown_groups():
# Contact is not in roster
- dialogs.ConfirmationDialog(pritext, _('Do you want to continue?'),
- on_response_ok = (on_ok2, list_))
+ dialogs.ConfirmationDialog(pritext, sectext + \
+ _('Do you want to continue?'), on_response_ok = (on_ok2, list_))
else:
- dialogs.ConfirmationDialogCheck(pritext,
+ dialogs.ConfirmationDialogCheck(pritext, sectext + \
_('By removing this contact you also by default remove '
'authorization resulting in him or her always seeing you as '
'offline.'),
@@ -3147,7 +3150,8 @@
pritext = _('Contacts will be removed from your roster')
jids = ''
for (contact, account) in list_:
- jids += '\n ' + contact.get_shown_name() + ','
+ jids += '\n ' + contact.get_shown_name() + ' (%s)' % contact.jid +\
+ ','
sectext = _('By removing these contacts:%s\nyou also remove '
'authorization resulting in them always seeing you as offline.') % \
jids
1
0
[commit-gajim] r11092 - in branches/osx_newbuildsys: . data data/glade src src/common
by js＠gajim.org 14 Feb '09
by js＠gajim.org 14 Feb '09
14 Feb '09
Author: js
Date: 2009-02-14 12:58:51 +0100 (Sat, 14 Feb 2009)
New Revision: 11092
Modified:
branches/osx_newbuildsys/configure.ac
branches/osx_newbuildsys/data/defs.py.in
branches/osx_newbuildsys/data/glade/data_form_window.glade
branches/osx_newbuildsys/data/glade/vcard_information_window.glade
branches/osx_newbuildsys/src/common/connection_handlers.py
branches/osx_newbuildsys/src/common/contacts.py
branches/osx_newbuildsys/src/common/defs.py
branches/osx_newbuildsys/src/common/i18n.py
branches/osx_newbuildsys/src/gajim.py
branches/osx_newbuildsys/src/roster_window.py
branches/osx_newbuildsys/src/systray.py
Log:
Merge trunk r11080.
Modified: branches/osx_newbuildsys/configure.ac
===================================================================
--- branches/osx_newbuildsys/configure.ac 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/configure.ac 2009-02-14 11:58:51 UTC (rev 11092)
@@ -163,6 +163,7 @@
AS_AC_EXPAND(DATADIR, "${datadir}")
AS_AC_EXPAND(LIBDIR, "${libdir}")
AS_AC_EXPAND(DOCDIR, "${docdir}")
+AS_AC_EXPAND(LOCALEDIR, "${localedir}")
AC_SUBST(VERSION)
AC_SUBST(PACKAGE, gajim)
Modified: branches/osx_newbuildsys/data/defs.py.in
===================================================================
--- branches/osx_newbuildsys/data/defs.py.in 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/data/defs.py.in 2009-02-14 11:58:51 UTC (rev 11092)
@@ -5,3 +5,5 @@
datadir = "@DATADIR@"
version = "@VERSION@"
+
+localedir = "@LOCALEDIR@"
Modified: branches/osx_newbuildsys/data/glade/data_form_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/data_form_window.glade 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/data/glade/data_form_window.glade 2009-02-14 11:58:51 UTC (rev 11092)
@@ -1,551 +1,800 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
<glade-interface>
- <widget class="GtkWindow" id="data_form_window">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Room Configuration</property>
- <property name="default_width">650</property>
- <property name="default_height">450</property>
- <signal name="destroy" handler="on_data_form_window_destroy"/>
- <child>
- <widget class="GtkVBox" id="vbox68">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow35">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox110">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="config_vbox">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="instructions_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator15">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator14">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="add_on_vbox">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox32">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="cancel_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_cancel_button_clicked"/>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="ok_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_ok_button_clicked"/>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkWindow" id="data_form_old_fake_window">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <child>
- <widget class="GtkVBox" id="vbox111">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkScrolledWindow" id="data_form_scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkViewport" id="viewport2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="container_vbox">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="form_instructions_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="form_instructions_hseparator">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkTable" id="item_list_table">
- <property name="visible">True</property>
- <property name="n_rows">1</property>
- <property name="n_columns">2</property>
- <child>
- <widget class="GtkVBox" id="vbox112">
- <property name="visible">True</property>
- <child>
- <widget class="GtkButton" id="add_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="edit_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-edit</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkButton" id="remove_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="clear_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow36">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTreeView" id="item_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkWindow" id="data_form_fake_window">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <child>
- <widget class="GtkVBox" id="data_form_vbox">
- <property name="visible">True</property>
- <property name="border_width">3</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkEventBox" id="eventbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="instructions_label1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Fill in the form.</property>
- <property name="wrap">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkNotebook" id="data_form_types_notebook">
- <property name="visible">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <child>
- <widget class="GtkScrolledWindow" id="single_form_scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <child>
- <widget class="GtkViewport" id="single_form_viewport">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="multiple_form_hbox">
- <property name="visible">True</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow38">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTreeView" id="records_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkVBox" id="buttons_vbox">
- <property name="visible">True</property>
- <child>
- <widget class="GtkButton" id="add_button1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_add_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="remove_button1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_remove_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator17">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="edit_button1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-edit</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_edit_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator18">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="up_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_up_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="down_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_down_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator19">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="clear_button1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_clear_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">8</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <child>
- <widget class="GtkTextView" id="instructions_label2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
- <property name="cursor_visible">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
+
+<widget class="GtkWindow" id="data_form_window">
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Room Configuration</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="default_width">650</property>
+ <property name="default_height">450</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <signal name="destroy" handler="on_data_form_window_destroy" last_modification_time="Thu, 19 Jan 2006 12:55:13 GMT"/>
+
+ <child>
+ <widget class="GtkVBox" id="vbox68">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow35">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkViewport" id="viewport1">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox110">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="config_vbox">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+
+ <child>
+ <widget class="GtkLabel" id="instructions_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="hseparator15">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="hseparator14">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="add_on_vbox">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox32">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkButton" id="cancel_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Thu, 19 Jan 2006 12:47:07 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="ok_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Thu, 19 Jan 2006 20:57:04 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkWindow" id="data_form_old_fake_window">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox111">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">10</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="data_form_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkViewport" id="viewport2">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+
+ <child>
+ <widget class="GtkVBox" id="container_vbox">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+
+ <child>
+ <widget class="GtkLabel" id="form_instructions_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="form_instructions_hseparator">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkTable" id="item_list_table">
+ <property name="visible">True</property>
+ <property name="n_rows">1</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">0</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow36">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="item_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox112">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkButton" id="clear_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="remove_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="add_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="edit_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-edit</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkWindow" id="data_form_fake_window">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="data_form_vbox">
+ <property name="border_width">3</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">3</property>
+
+ <child>
+ <widget class="GtkLabel" id="instructions_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Fill in the form.</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkNotebook" id="data_form_types_notebook">
+ <property name="visible">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <property name="tab_pos">GTK_POS_TOP</property>
+ <property name="scrollable">False</property>
+ <property name="enable_popup">False</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="single_form_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkViewport" id="single_form_viewport">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="tab_expand">True</property>
+ <property name="tab_fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="multiple_form_hbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow38">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="records_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="buttons_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkButton" id="add_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_add_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:45 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="remove_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:50 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="hseparator17">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="edit_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-edit</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_edit_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:54 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="hseparator18">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">3</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="up_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-up</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_up_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:59 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="down_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-down</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_down_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:33:03 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="hseparator19">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">3</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="clear_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_clear_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:33:07 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="tab_expand">False</property>
+ <property name="tab_fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
Modified: branches/osx_newbuildsys/data/glade/vcard_information_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/vcard_information_window.glade 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/data/glade/vcard_information_window.glade 2009-02-14 11:58:51 UTC (rev 11092)
@@ -43,85 +43,80 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="time_label">
+ <widget class="GtkLabel" id="label51">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Jabber ID:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</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>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkLabel" id="label53">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Contact time:</b></property>
+ <property name="label" translatable="yes"><b>Resource:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="status_label_eventbox">
+ <widget class="GtkLabel" id="label54">
<property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="status_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
- </widget>
- </child>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Status:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="os_label">
+ <widget class="GtkLabel" id="label55">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Client:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label56">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>System:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="client_name_version_label">
+ <widget class="GtkLabel" id="jid_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -129,13 +124,10 @@
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
@@ -164,7 +156,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="jid_label">
+ <widget class="GtkLabel" id="client_name_version_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -172,83 +164,92 @@
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label56">
+ <widget class="GtkLabel" id="os_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>System:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label55">
+ <widget class="GtkEventBox" id="status_label_eventbox">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Client:</b></property>
- <property name="use_markup">True</property>
+ <child>
+ <widget class="GtkLabel" id="status_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label54">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Status:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label53">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Resource:</b></property>
+ <property name="label" translatable="yes"><b>Contact time:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</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>
</child>
<child>
- <widget class="GtkLabel" id="label51">
+ <widget class="GtkLabel" id="time_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Jabber ID:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
@@ -337,34 +338,26 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="ask_title_label">
+ <widget class="GtkEventBox" id="subscription_label_eventbox">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Given Name"><b>Ask:</b></property>
- <property name="use_markup">True</property>
+ <property name="visible_window">False</property>
+ <child>
+ <widget class="GtkLabel" id="subscription_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="subscription_title_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Family Name"><b>Subscription:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<widget class="GtkEventBox" id="ask_label_eventbox">
<property name="visible">True</property>
<property name="visible_window">False</property>
@@ -385,25 +378,33 @@
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="subscription_label_eventbox">
+ <widget class="GtkLabel" id="subscription_title_label">
<property name="visible">True</property>
- <property name="visible_window">False</property>
- <child>
- <widget class="GtkLabel" id="subscription_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Family Name"><b>Subscription:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="ask_title_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Given Name"><b>Ask:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
<child>
@@ -456,268 +457,128 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="BDAY_label">
+ <widget class="GtkExpander" id="expander1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="TEL_HOME_NUMBER_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="EMAIL_HOME_USERID_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="FN_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="NICKNAME_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label57">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><b>E-Mail:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox" id="eventbox1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkTable" id="table3">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Birthday:</b></property>
- <property name="use_markup">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</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>
- </child>
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Phone No.:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <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>
- </child>
- <child>
- <widget class="GtkLabel" id="label20">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Nickname:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Name:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Homepage:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkExpander" id="expander2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <widget class="GtkTable" id="table_ADR_STREET">
- <property name="visible">True</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
<property name="n_columns">4</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">5</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label25">
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="N_FAMILY_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Country:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkLabel" id="N_GIVEN_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Postal Code:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="N_MIDDLE_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkLabel" id="N_PREFIX_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Extra Address:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
+ <widget class="GtkLabel" id="N_SUFFIX_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label18">
+ <property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>State:</b></property>
+ <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label28">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>City:</b></property>
+ <property name="label" translatable="yes" comments="Middle Name"><b>Middle:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -728,38 +589,88 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label31">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Street:</b></property>
+ <property name="label" translatable="yes" comments="Prefix in Name"><b>Prefix:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_CTRY_label">
+ <widget class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes" comments="Given Name"><b>Given:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Suffix in Name"><b>Suffix:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Full Name</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkExpander" id="expander2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <widget class="GtkTable" id="table_ADR_STREET">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">4</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="ADR_HOME_REGION_label">
+ <widget class="GtkLabel" id="ADR_HOME_STREET_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -771,13 +682,11 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_PCODE_label">
+ <widget class="GtkLabel" id="ADR_HOME_EXTADR_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -789,8 +698,6 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -813,7 +720,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_EXTADR_label">
+ <widget class="GtkLabel" id="ADR_HOME_PCODE_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -825,11 +732,13 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_STREET_label">
+ <widget class="GtkLabel" id="ADR_HOME_REGION_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -841,102 +750,48 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label30">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Address</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkExpander" id="expander1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <widget class="GtkTable" id="table3">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="n_rows">3</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkLabel" id="ADR_HOME_CTRY_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Suffix in Name"><b>Suffix:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkLabel" id="label31">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Given Name"><b>Given:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label15">
- <property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Prefix in Name"><b>Prefix:</b></property>
+ <property name="label" translatable="yes"><b>Street:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Middle Name"><b>Middle:</b></property>
+ <property name="label" translatable="yes"><b>City:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -947,112 +802,77 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label18">
+ <widget class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property>
+ <property name="label" translatable="yes"><b>State:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="N_SUFFIX_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_PREFIX_label">
+ <widget class="GtkLabel" id="label29">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Extra Address:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_MIDDLE_label">
+ <widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Postal Code:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_GIVEN_label">
+ <widget class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Country:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="N_FAMILY_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label19">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Full Name</b></property>
+ <property name="label" translatable="yes"><b>Address</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -1062,11 +882,192 @@
</widget>
<packing>
<property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Homepage:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Name:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Nickname:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Phone No.:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <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>
+ </child>
+ <child>
+ <widget class="GtkEventBox" id="eventbox1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property>
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Birthday:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</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>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label57">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><b>E-Mail:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="NICKNAME_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="FN_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="EMAIL_HOME_USERID_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="TEL_HOME_NUMBER_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="BDAY_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">1</property>
@@ -1100,98 +1101,80 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label33">
+ <widget class="GtkLabel" id="ORG_ORGNAME_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Phone No.:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label32">
+ <widget class="GtkLabel" id="ORG_ORGUNIT_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>E-Mail:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label41">
+ <widget class="GtkLabel" id="TITLE_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Role:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label43">
+ <widget class="GtkLabel" id="ROLE_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Department:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label42">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Position:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label44">
+ <widget class="GtkLabel" id="EMAIL_WORK_USERID_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Company:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="TEL_WORK_NUMBER_label">
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1201,9 +1184,9 @@
</widget>
<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="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1220,95 +1203,88 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkLabel" id="ADR_WORK_STREET_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Country:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label35">
+ <widget class="GtkLabel" id="ADR_WORK_EXTADR_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Postal Code:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label38">
+ <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Extra Address:</b></property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label36">
+ <widget class="GtkLabel" id="ADR_WORK_PCODE_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>State:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>City:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label39">
+ <widget class="GtkLabel" id="ADR_WORK_REGION_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Street:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1331,88 +1307,95 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_REGION_label">
+ <widget class="GtkLabel" id="label39">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Street:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_PCODE_label">
+ <widget class="GtkLabel" id="label37">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>City:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label">
+ <widget class="GtkLabel" id="label36">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>State:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label38">
+ <property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Extra Address:</b></property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_EXTADR_label">
+ <widget class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Postal Code:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_STREET_label">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Country:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1439,7 +1422,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="EMAIL_WORK_USERID_label">
+ <widget class="GtkLabel" id="TEL_WORK_NUMBER_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -1450,81 +1433,99 @@
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ROLE_label">
+ <widget class="GtkLabel" id="label44">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Company:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label42">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Position:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="TITLE_label">
+ <widget class="GtkLabel" id="label43">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Department:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Role:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ORG_ORGUNIT_label">
+ <widget class="GtkLabel" id="label32">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>E-Mail:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ORG_ORGNAME_label">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Phone No.:</b></property>
+ <property name="use_markup">True</property>
</widget>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
Modified: branches/osx_newbuildsys/src/common/connection_handlers.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection_handlers.py 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/src/common/connection_handlers.py 2009-02-14 11:58:51 UTC (rev 11092)
@@ -1640,7 +1640,7 @@
qp = iq_obj.setTag('time',
namespace=common.xmpp.NS_TIME_REVISED)
qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime()))
- isdst = time.localtime().tm_isdst
+ isdst = localtime().tm_isdst
zone = -(timezone, altzone)[isdst] / 60
tzo = (zone / 60, abs(zone % 60))
qp.setTagData('tzo', '%+03d:%02d' % (tzo))
Modified: branches/osx_newbuildsys/src/common/contacts.py
===================================================================
--- branches/osx_newbuildsys/src/common/contacts.py 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/src/common/contacts.py 2009-02-14 11:58:51 UTC (rev 11092)
@@ -389,7 +389,7 @@
return tag
return None
- def add_metacontact(self, brother_account, brother_jid, account, jid):
+ def add_metacontact(self, brother_account, brother_jid, account, jid, order=None):
tag = self.get_metacontacts_tag(brother_account, brother_jid)
if not tag:
tag = self.get_new_metacontacts_tag(brother_jid)
@@ -406,8 +406,12 @@
if tag not in self._metacontacts_tags[account]:
self._metacontacts_tags[account][tag] = [{'jid': jid, 'tag': tag}]
else:
- self._metacontacts_tags[account][tag].append({'jid': jid,
- 'tag': tag})
+ if order:
+ self._metacontacts_tags[account][tag].append({'jid': jid,
+ 'tag': tag, 'order': order})
+ else:
+ self._metacontacts_tags[account][tag].append({'jid': jid,
+ 'tag': tag})
common.gajim.connections[account].store_metacontacts(
self._metacontacts_tags[account])
@@ -510,6 +514,10 @@
return 1
if data1['order'] < data2['order']:
return -1
+ if 'order' in data1:
+ return 1
+ if 'order' in data2:
+ return -1
transport1 = common.gajim.get_transport_name_from_jid(jid1)
transport2 = common.gajim.get_transport_name_from_jid(jid2)
if transport2 and not transport1:
Modified: branches/osx_newbuildsys/src/common/defs.py
===================================================================
--- branches/osx_newbuildsys/src/common/defs.py 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/src/common/defs.py 2009-02-14 11:58:51 UTC (rev 11092)
@@ -25,6 +25,7 @@
docdir = '../'
datadir = '../'
+localedir = '../po'
version = '0.12.1.2-svn'
Modified: branches/osx_newbuildsys/src/common/i18n.py
===================================================================
--- branches/osx_newbuildsys/src/common/i18n.py 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/src/common/i18n.py 2009-02-14 11:58:51 UTC (rev 11092)
@@ -24,12 +24,10 @@
import locale
import gettext
import os
+import defs
APP = 'gajim'
-if os.path.isdir('../po'):
- DIR = '../po'
-else:
- DIR = '../../locale'
+DIR = defs.localedir
# set '' so each part of the locale that should be modified is set
# according to the environment variables
Modified: branches/osx_newbuildsys/src/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/gajim.py 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/src/gajim.py 2009-02-14 11:58:51 UTC (rev 11092)
@@ -781,6 +781,14 @@
self.roster.draw_contact(contact1.jid, account)
gobject.timeout_add_seconds(5, self.roster.remove_to_be_removed,
contact1.jid, account)
+
+ # unset custom status
+ if (old_show == 0 and new_show > 1) or (old_show > 1 and new_show == 0\
+ and conn.connected > 1):
+ if account in self.status_sent_to_users and \
+ jid in self.status_sent_to_users[account]:
+ del self.status_sent_to_users[account][jid]
+
contact1.show = array[1]
contact1.status = status_message
contact1.priority = priority
Modified: branches/osx_newbuildsys/src/roster_window.py
===================================================================
--- branches/osx_newbuildsys/src/roster_window.py 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/src/roster_window.py 2009-02-14 11:58:51 UTC (rev 11092)
@@ -2047,11 +2047,6 @@
if ctrl:
ctrl.update_status_display(name, uf_show, status)
- # unset custom status
- if account in gajim.interface.status_sent_to_users and \
- contact.jid in gajim.interface.status_sent_to_users[account]:
- del gajim.interface.status_sent_to_users[account][contact.jid]
-
# Delete pep if needed
keep_pep = any(c.show not in ('error', 'offline') for c in
contact_instances)
@@ -3765,6 +3760,7 @@
'So those information will not be saved on next reconnection.'))
def merge_contacts(is_checked=None):
+ contacts = 0
if is_checked is not None: # dialog has been shown
if is_checked: # user does not want to be asked again
gajim.config.set('confirm_metacontacts', 'no')
@@ -3777,6 +3773,16 @@
c_dest.jid)
if dest_family:
self._remove_metacontact_family(dest_family, account_dest)
+ source_family = gajim.contacts.get_metacontacts_family(account_source, c_source.jid)
+ if dest_family == source_family:
+ n = contacts = len(dest_family)
+ for tag in source_family:
+ if tag['jid'] == c_source.jid:
+ tag['order'] = contacts
+ continue
+ if 'order' in tag:
+ n -= 1
+ tag['order'] = n
else:
self._remove_entity(c_dest, account_dest)
@@ -3812,7 +3818,7 @@
_contact.groups = c_dest.groups[:]
gajim.contacts.add_metacontact(account_dest, c_dest.jid,
- _account, _contact.jid)
+ _account, _contact.jid, contacts)
gajim.connections[account_source].update_contact(_contact.jid,
_contact.name, _contact.groups)
Modified: branches/osx_newbuildsys/src/systray.py
===================================================================
--- branches/osx_newbuildsys/src/systray.py 2009-02-14 11:53:32 UTC (rev 11091)
+++ branches/osx_newbuildsys/src/systray.py 2009-02-14 11:58:51 UTC (rev 11092)
@@ -64,10 +64,6 @@
self.added_hide_menuitem = False
self.img_tray = gtk.Image()
self.status = 'offline'
- self.double_click = False
- self.double_click_id = None
- self.double_click_time = gtk.settings_get_default().get_property(
- 'gtk-double-click-time')
self.xml = gtkgui_helpers.get_glade('systray_context_menu.glade')
self.systray_context_menu = self.xml.get_widget('systray_context_menu')
self.xml.signal_autoconnect(self)
@@ -327,26 +323,25 @@
gajim.interface.roster.on_quit_request()
def on_left_click(self):
- self.double_click_id = None
- if self.double_click:
- self.double_click = False
- return
win = gajim.interface.roster.window
- # toggle visible/hidden for roster window
- if win.get_property('visible') and (win.get_property('has-toplevel-focus') or \
- os.name == 'nt'):
- # visible in ANY virtual desktop?
+ if len(gajim.events.get_systray_events()) == 0:
+ # No pending events, so toggle visible/hidden for roster window
+ if win.get_property('visible') and (win.get_property(
+ 'has-toplevel-focus')):
+ # visible in ANY virtual desktop?
- # we could be in another VD right now. eg vd2
- # and we want to show it in vd2
- if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
- win.hide() # else we hide it from VD that was visible in
+ # we could be in another VD right now. eg vd2
+ # and we want to show it in vd2
+ if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
+ win.hide() # else we hide it from VD that was visible in
+ else:
+ # in Windows (perhaps other Window Managers too) minimize state
+ # is remembered, so make sure it's not minimized (iconified)
+ # because user wants to see roster
+ win.deiconify()
+ win.present()
else:
- # in Windows (perhaps other Window Managers too) minimize state
- # is remembered, so make sure it's not minimized (iconified)
- # because user wants to see roster
- win.deiconify()
- win.present()
+ self.handle_first_event()
def handle_first_event(self):
account, jid, event = gajim.events.get_first_systray_event()
@@ -355,27 +350,18 @@
def on_middle_click(self):
'''middle click raises window to have complete focus (fe. get kbd events)
but if already raised, it hides it'''
- if gajim.events.get_nb_systray_events() == 0:
- return
- self.handle_first_event()
+ win = gajim.interface.roster.window
+ if win.is_active(): # is it fully raised? (eg does it receive kbd events?)
+ win.hide()
+ else:
+ win.present()
def on_clicked(self, widget, event):
self.on_tray_leave_notify_event(widget, None)
- if event.type == gtk.gdk._2BUTTON_PRESS:
- if len(gajim.events.get_systray_events()) == 0:
- return
- self.double_click = True
- self.on_middle_click()
if event.type != gtk.gdk.BUTTON_PRESS:
return
if event.button == 1: # Left click
- if len(gajim.events.get_systray_events()) == 0:
- self.on_left_click()
- else:
- if self.double_click_id:
- gobject.source_remove(self.double_click_id)
- self.double_click_id = gobject.timeout_add(
- self.double_click_time, self.on_left_click)
+ self.on_left_click()
elif event.button == 2: # middle click
self.on_middle_click()
elif event.button == 3: # right click
1
0
[commit-gajim] r11091 - in branches/osx_newbuildsys: . data/glade m4 po src src/common src/common/xmpp src/common/zeroconf
by js＠gajim.org 14 Feb '09
by js＠gajim.org 14 Feb '09
14 Feb '09
Author: js
Date: 2009-02-14 12:53:32 +0100 (Sat, 14 Feb 2009)
New Revision: 11091
Modified:
branches/osx_newbuildsys/configure.ac
branches/osx_newbuildsys/data/glade/data_form_window.glade
branches/osx_newbuildsys/data/glade/roster_window.glade
branches/osx_newbuildsys/data/glade/vcard_information_window.glade
branches/osx_newbuildsys/m4/acinclude.m4
branches/osx_newbuildsys/po/ru.po
branches/osx_newbuildsys/src/chat_control.py
branches/osx_newbuildsys/src/common/GnuPG.py
branches/osx_newbuildsys/src/common/atom.py
branches/osx_newbuildsys/src/common/config.py
branches/osx_newbuildsys/src/common/connection.py
branches/osx_newbuildsys/src/common/connection_handlers.py
branches/osx_newbuildsys/src/common/dataforms.py
branches/osx_newbuildsys/src/common/dbus_support.py
branches/osx_newbuildsys/src/common/defs.py
branches/osx_newbuildsys/src/common/gajim.py
branches/osx_newbuildsys/src/common/helpers.py
branches/osx_newbuildsys/src/common/latex.py
branches/osx_newbuildsys/src/common/optparser.py
branches/osx_newbuildsys/src/common/stanza_session.py
branches/osx_newbuildsys/src/common/xmpp/auth_nb.py
branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py
branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py
branches/osx_newbuildsys/src/common/zeroconf/connection_zeroconf.py
branches/osx_newbuildsys/src/config.py
branches/osx_newbuildsys/src/conversation_textview.py
branches/osx_newbuildsys/src/dialogs.py
branches/osx_newbuildsys/src/disco.py
branches/osx_newbuildsys/src/gajim.py
branches/osx_newbuildsys/src/groupchat_control.py
branches/osx_newbuildsys/src/message_control.py
branches/osx_newbuildsys/src/message_textview.py
branches/osx_newbuildsys/src/message_window.py
branches/osx_newbuildsys/src/notify.py
branches/osx_newbuildsys/src/remote_control.py
branches/osx_newbuildsys/src/roster_window.py
branches/osx_newbuildsys/src/session.py
branches/osx_newbuildsys/src/vcard.py
Log:
Merge trunk r11072.
Modified: branches/osx_newbuildsys/configure.ac
===================================================================
--- branches/osx_newbuildsys/configure.ac 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/configure.ac 2009-02-14 11:53:32 UTC (rev 11091)
@@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager],
- [0.12.1.1-svn],[http://trac.gajim.org/],[gajim])
+ [0.12.1.2-svn],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59])
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_SRCDIR(src)
@@ -161,18 +161,11 @@
AC_SUBST([PYTHON_INCLUDES])
AS_AC_EXPAND(DATADIR, "${datadir}")
-
-AS_AC_EXPAND(LIBDIR, ${libdir})
-
+AS_AC_EXPAND(LIBDIR, "${libdir}")
AS_AC_EXPAND(DOCDIR, "${docdir}")
AC_SUBST(VERSION)
AC_SUBST(PACKAGE, gajim)
-AC_SUBST(DATADIR)
-AC_SUBST(LIBDIR)
-AS_AC_EXPAND(DATADIR, "${DATADIR}")
-AC_SUBST(DOCDIR)
-AS_AC_EXPAND(DOCDIR, "${DOCDIR}")
AC_CONFIG_FILES([
buildsys.mk
Modified: branches/osx_newbuildsys/data/glade/data_form_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/data_form_window.glade 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/data/glade/data_form_window.glade 2009-02-14 11:53:32 UTC (rev 11091)
@@ -1,800 +1,551 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
<glade-interface>
-
-<widget class="GtkWindow" id="data_form_window">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Room Configuration</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">650</property>
- <property name="default_height">450</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <signal name="destroy" handler="on_data_form_window_destroy" last_modification_time="Thu, 19 Jan 2006 12:55:13 GMT"/>
-
- <child>
- <widget class="GtkVBox" id="vbox68">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow35">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox110">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="config_vbox">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkLabel" id="instructions_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHSeparator" id="hseparator15">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHSeparator" id="hseparator14">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="add_on_vbox">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox32">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkButton" id="cancel_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Thu, 19 Jan 2006 12:47:07 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="ok_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Thu, 19 Jan 2006 20:57:04 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="data_form_old_fake_window">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox111">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">10</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="data_form_scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport2">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkVBox" id="container_vbox">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkLabel" id="form_instructions_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHSeparator" id="form_instructions_hseparator">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkTable" id="item_list_table">
- <property name="visible">True</property>
- <property name="n_rows">1</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow36">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="item_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox112">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkButton" id="clear_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="remove_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="add_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="edit_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-edit</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="data_form_fake_window">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="data_form_vbox">
- <property name="border_width">3</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">3</property>
-
- <child>
- <widget class="GtkLabel" id="instructions_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Fill in the form.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkNotebook" id="data_form_types_notebook">
- <property name="visible">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="single_form_scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="single_form_viewport">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">True</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="multiple_form_hbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow38">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="records_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="buttons_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkButton" id="add_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_add_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:45 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="remove_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:50 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHSeparator" id="hseparator17">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">3</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="edit_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-edit</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_edit_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:54 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHSeparator" id="hseparator18">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">3</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="up_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_up_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:32:59 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="down_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_down_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:33:03 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHSeparator" id="hseparator19">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">3</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="clear_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_clear_button_clicked" last_modification_time="Mon, 21 Aug 2006 22:33:07 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
+ <widget class="GtkWindow" id="data_form_window">
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Room Configuration</property>
+ <property name="default_width">650</property>
+ <property name="default_height">450</property>
+ <signal name="destroy" handler="on_data_form_window_destroy"/>
+ <child>
+ <widget class="GtkVBox" id="vbox68">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow35">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <child>
+ <widget class="GtkViewport" id="viewport1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkVBox" id="vbox110">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkVBox" id="config_vbox">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkLabel" id="instructions_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="wrap">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator15">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator14">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="add_on_vbox">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox32">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="cancel_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_cancel_button_clicked"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="ok_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_ok_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <widget class="GtkWindow" id="data_form_old_fake_window">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <child>
+ <widget class="GtkVBox" id="vbox111">
+ <property name="visible">True</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="data_form_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkViewport" id="viewport2">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkVBox" id="container_vbox">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkLabel" id="form_instructions_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="wrap">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="form_instructions_hseparator">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkTable" id="item_list_table">
+ <property name="visible">True</property>
+ <property name="n_rows">1</property>
+ <property name="n_columns">2</property>
+ <child>
+ <widget class="GtkVBox" id="vbox112">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkButton" id="add_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="edit_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-edit</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkButton" id="remove_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="clear_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow36">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="item_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <widget class="GtkWindow" id="data_form_fake_window">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <child>
+ <widget class="GtkVBox" id="data_form_vbox">
+ <property name="visible">True</property>
+ <property name="border_width">3</property>
+ <property name="spacing">3</property>
+ <child>
+ <widget class="GtkEventBox" id="eventbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="instructions_label1">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Fill in the form.</property>
+ <property name="wrap">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkNotebook" id="data_form_types_notebook">
+ <property name="visible">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="single_form_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkViewport" id="single_form_viewport">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="tab_expand">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="multiple_form_hbox">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow38">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="records_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="buttons_vbox">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkButton" id="add_button1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_add_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="remove_button1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_remove_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator17">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="edit_button1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-edit</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_edit_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator18">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">3</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="up_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-up</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_up_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="down_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-down</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_down_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator19">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">3</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="clear_button1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_clear_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+ <child>
+ <widget class="GtkTextView" id="instructions_label2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="cursor_visible">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
</glade-interface>
Modified: branches/osx_newbuildsys/data/glade/roster_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/roster_window.glade 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/data/glade/roster_window.glade 2009-02-14 11:53:32 UTC (rev 11091)
@@ -215,6 +215,15 @@
</widget>
</child>
<child>
+ <widget class="GtkCheckMenuItem" id="show_only_active_contacts_menuitem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show Only _Active Contacts</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_show_only_active_contacts_menuitem_activate"/>
+ <accelerator key="Y" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ </widget>
+ </child>
+ <child>
<widget class="GtkCheckMenuItem" id="show_transports_menuitem">
<property name="visible">True</property>
<property name="label" translatable="yes">Show Trans_ports</property>
Modified: branches/osx_newbuildsys/data/glade/vcard_information_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/vcard_information_window.glade 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/data/glade/vcard_information_window.glade 2009-02-14 11:53:32 UTC (rev 11091)
@@ -38,85 +38,90 @@
<child>
<widget class="GtkTable" id="table7">
<property name="visible">True</property>
- <property name="n_rows">5</property>
+ <property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label51">
+ <widget class="GtkLabel" id="time_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Jabber ID:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label53">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Resource:</b></property>
+ <property name="label" translatable="yes"><b>Contact time:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</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>
</child>
<child>
- <widget class="GtkLabel" id="label54">
+ <widget class="GtkEventBox" id="status_label_eventbox">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Status:</b></property>
- <property name="use_markup">True</property>
+ <child>
+ <widget class="GtkLabel" id="status_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ </widget>
+ </child>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label55">
+ <widget class="GtkLabel" id="os_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Client:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label56">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>System:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="jid_label">
+ <widget class="GtkLabel" id="client_name_version_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -124,10 +129,13 @@
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
@@ -156,7 +164,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="client_name_version_label">
+ <widget class="GtkLabel" id="jid_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -164,61 +172,86 @@
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="os_label">
+ <widget class="GtkLabel" id="label56">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>System:</b></property>
+ <property name="use_markup">True</property>
</widget>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="status_label_eventbox">
+ <widget class="GtkLabel" id="label55">
<property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="status_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
- </widget>
- </child>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Client:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label54">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Status:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label53">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Resource:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Jabber ID:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
<child>
@@ -304,26 +337,34 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEventBox" id="subscription_label_eventbox">
+ <widget class="GtkLabel" id="ask_title_label">
<property name="visible">True</property>
- <property name="visible_window">False</property>
- <child>
- <widget class="GtkLabel" id="subscription_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Given Name"><b>Ask:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
+ <widget class="GtkLabel" id="subscription_title_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Family Name"><b>Subscription:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkEventBox" id="ask_label_eventbox">
<property name="visible">True</property>
<property name="visible_window">False</property>
@@ -344,33 +385,25 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="subscription_title_label">
+ <widget class="GtkEventBox" id="subscription_label_eventbox">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Family Name"><b>Subscription:</b></property>
- <property name="use_markup">True</property>
+ <property name="visible_window">False</property>
+ <child>
+ <widget class="GtkLabel" id="subscription_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="ask_title_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Given Name"><b>Ask:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
</child>
<child>
@@ -423,128 +456,268 @@
<placeholder/>
</child>
<child>
- <widget class="GtkExpander" id="expander1">
+ <widget class="GtkLabel" id="BDAY_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="TEL_HOME_NUMBER_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="EMAIL_HOME_USERID_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="FN_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="NICKNAME_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label57">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><b>E-Mail:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEventBox" id="eventbox1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property>
<child>
- <widget class="GtkTable" id="table3">
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Birthday:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</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>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Phone No.:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <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>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Nickname:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Name:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Homepage:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkExpander" id="expander2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <widget class="GtkTable" id="table_ADR_STREET">
+ <property name="visible">True</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
<property name="n_columns">4</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="N_FAMILY_label">
+ <widget class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Country:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_GIVEN_label">
+ <widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Postal Code:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="N_MIDDLE_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_PREFIX_label">
+ <widget class="GtkLabel" id="label29">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Extra Address:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="N_SUFFIX_label">
+ <widget class="GtkLabel" id="label27">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>State:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Middle Name"><b>Middle:</b></property>
+ <property name="label" translatable="yes"><b>City:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -555,88 +728,38 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Prefix in Name"><b>Prefix:</b></property>
+ <property name="label" translatable="yes"><b>Street:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkLabel" id="ADR_HOME_CTRY_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Given Name"><b>Given:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="Suffix in Name"><b>Suffix:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Full Name</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkExpander" id="expander2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <widget class="GtkTable" id="table_ADR_STREET">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="n_rows">3</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="ADR_HOME_STREET_label">
+ <widget class="GtkLabel" id="ADR_HOME_REGION_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -648,11 +771,13 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_EXTADR_label">
+ <widget class="GtkLabel" id="ADR_HOME_PCODE_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -664,6 +789,8 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -686,7 +813,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_PCODE_label">
+ <widget class="GtkLabel" id="ADR_HOME_EXTADR_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -698,13 +825,11 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_HOME_REGION_label">
+ <widget class="GtkLabel" id="ADR_HOME_STREET_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -716,48 +841,102 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label30">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Address</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkExpander" id="expander1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <widget class="GtkTable" id="table3">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">4</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="ADR_HOME_CTRY_label">
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes" comments="Suffix in Name"><b>Suffix:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label31">
+ <widget class="GtkLabel" id="label17">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes" comments="Given Name"><b>Given:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label15">
+ <property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Street:</b></property>
+ <property name="label" translatable="yes" comments="Prefix in Name"><b>Prefix:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label28">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>City:</b></property>
+ <property name="label" translatable="yes" comments="Middle Name"><b>Middle:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -768,77 +947,112 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
+ <widget class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>State:</b></property>
+ <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="N_SUFFIX_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkLabel" id="N_PREFIX_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Extra Address:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkLabel" id="N_MIDDLE_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Postal Code:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label25">
+ <widget class="GtkLabel" id="N_GIVEN_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Country:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="N_FAMILY_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label30">
+ <widget class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Address</b></property>
+ <property name="label" translatable="yes"><b>Full Name</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -848,192 +1062,11 @@
</widget>
<packing>
<property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Homepage:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Name:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label20">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Nickname:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Phone No.:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <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>
- </child>
- <child>
- <widget class="GtkEventBox" id="eventbox1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property>
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Birthday:</b></property>
- <property name="use_markup">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</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>
- </child>
- <child>
- <widget class="GtkLabel" id="label57">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><b>E-Mail:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="NICKNAME_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="FN_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="EMAIL_HOME_USERID_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="TEL_HOME_NUMBER_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="BDAY_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
<packing>
<property name="position">1</property>
@@ -1067,80 +1100,98 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="ORG_ORGNAME_label">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Phone No.:</b></property>
+ <property name="use_markup">True</property>
</widget>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ORG_ORGUNIT_label">
+ <widget class="GtkLabel" id="label32">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>E-Mail:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="TITLE_label">
+ <widget class="GtkLabel" id="label41">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Role:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ROLE_label">
+ <widget class="GtkLabel" id="label43">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="label" translatable="yes"><b>Department:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label42">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Position:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="EMAIL_WORK_USERID_label">
+ <widget class="GtkLabel" id="label44">
<property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>Company:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="TEL_WORK_NUMBER_label">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1150,9 +1201,9 @@
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1169,88 +1220,95 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="ADR_WORK_STREET_label">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Country:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_EXTADR_label">
+ <widget class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Postal Code:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label">
+ <widget class="GtkLabel" id="label38">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Extra Address:</b></property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_PCODE_label">
+ <widget class="GtkLabel" id="label36">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>State:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><b>City:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ADR_WORK_REGION_label">
+ <widget class="GtkLabel" id="label39">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes"><b>Street:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1273,95 +1331,88 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label39">
+ <widget class="GtkLabel" id="ADR_WORK_REGION_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Street:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label37">
+ <widget class="GtkLabel" id="ADR_WORK_PCODE_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>City:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label36">
+ <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>State:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label38">
- <property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Extra Address:</b></property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label35">
+ <widget class="GtkLabel" id="ADR_WORK_EXTADR_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Postal Code:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkLabel" id="ADR_WORK_STREET_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Country:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1388,7 +1439,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="TEL_WORK_NUMBER_label">
+ <widget class="GtkLabel" id="EMAIL_WORK_USERID_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -1399,99 +1450,81 @@
</widget>
<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="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label44">
+ <widget class="GtkLabel" id="ROLE_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Company:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label42">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Position:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label43">
+ <widget class="GtkLabel" id="TITLE_label">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Department:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label41">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Role:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label32">
+ <widget class="GtkLabel" id="ORG_ORGUNIT_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>E-Mail:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label33">
+ <widget class="GtkLabel" id="ORG_ORGNAME_label">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Phone No.:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
Modified: branches/osx_newbuildsys/m4/acinclude.m4
===================================================================
--- branches/osx_newbuildsys/m4/acinclude.m4 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/m4/acinclude.m4 2009-02-14 11:53:32 UTC (rev 11091)
@@ -1,6 +1,15 @@
+dnl as-ac-expand.m4 0.2.0 -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
+
+dnl example:
dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
@@ -15,7 +24,7 @@
dnl if no prefix given, then use /usr/local, the default prefix
if test "x$prefix" = "xNONE"; then
- prefix=$ac_default_prefix
+ prefix="$ac_default_prefix"
fi
dnl if no exec_prefix given, then use prefix
if test "x$exec_prefix" = "xNONE"; then
@@ -26,7 +35,7 @@
dnl loop until it doesn't change anymore
while true; do
new_full_var="`eval echo $full_var`"
- if test "x$new_full_var"="x$full_var"; then break; fi
+ if test "x$new_full_var" = "x$full_var"; then break; fi
full_var=$new_full_var
done
Modified: branches/osx_newbuildsys/po/ru.po
===================================================================
--- branches/osx_newbuildsys/po/ru.po 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/po/ru.po 2009-02-14 11:53:32 UTC (rev 11091)
@@ -13,14 +13,15 @@
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-17 23:01+0100\n"
-"PO-Revision-Date: 2008-12-02 18:30+0300\n"
+"POT-Creation-Date: 2009-02-01 10:18+0100\n"
+"PO-Revision-Date: 2009-01-30 18:42+0300\n"
"Last-Translator: Fomin Denis <fominde(a)mail.ru>\n"
"Language-Team: Русский <ru(a)li.org>\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
"X-Poedit-Basepath: /home/test/gajim\n"
@@ -46,7 +47,7 @@
msgstr "_Добавить контакт..."
#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
msgid "_Discover Services"
msgstr "_Просмотреть сервисы"
@@ -67,7 +68,7 @@
msgstr "_Расширенный статус"
#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
msgid "_Start Chat..."
msgstr "_Начать беседу"
@@ -107,62 +108,52 @@
"Отпечаток SHA1 сертификата:\n"
#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Щелкните, чтобы просмотреть сервисы предоставляемые jabber сервером (например, MSN, ICQ транспорты)"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:11
msgid "Connect when I press Finish"
msgstr "Подключиться, когда я нажму «Закончить»"
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:11
msgid "Gajim: Account Creation Wizard"
msgstr "Gajim: мастер создания учетной записи"
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:12
msgid "I already have an account I want to _use"
msgstr "У меня уже есть учетная запись, которую я хочу _использовать"
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:13
msgid "I want to _register for a new account"
msgstr "Я хочу _зарегистрировать новую учетную запись"
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:14
#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:24
msgid "If checked, Gajim will remember the password for this account"
msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:15
#: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
msgid "Manage..."
msgstr "Управление..."
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:16
msgid "Prox_y:"
msgstr "Про_кси:"
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:17
#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:45
msgid "Save pass_word"
msgstr "Сохранить _пароль"
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Параметры сервера"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:18
msgid "Set my profile when I connect"
msgstr "Настроить мой профиль после соединения"
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_creation_wizard_window.glade.h:19
#: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
msgid "Use custom hostname/port"
msgstr "Использовать пользовательские хост/порт"
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/account_creation_wizard_window.glade.h:20
msgid ""
"You need to have an account in order to connect\n"
"to the Jabber network."
@@ -170,40 +161,39 @@
"Необходимо создать учетную запись для присоединения \n"
"к сети Jabber."
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:22
msgid "Your JID:"
msgstr "Ваш JID:"
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:15
msgid "_Advanced"
msgstr "_Дополнительно"
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:24
msgid "_Finish"
msgstr "_Закончить"
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:25
msgid "_Hostname:"
msgstr "_Хост: "
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:26
#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
msgid "_Password:"
msgstr "_Пароль:"
-#: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:27
msgid "_Port:"
msgstr "_Порт:"
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/glade/account_creation_wizard_window.glade.h:28
msgid "_Server:"
msgstr "_Сервер:"
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:16
msgid "_Username:"
msgstr "_Имя пользователя:"
@@ -215,18 +205,16 @@
#: ../data/glade/account_modification_window.glade.h:2
#: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
msgid "<b>OpenPGP</b>"
msgstr "<b>OpenPGP</b>"
#: ../data/glade/account_modification_window.glade.h:3
#: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
msgid "<b>Personal Information</b>"
msgstr "<b>Личная информация</b>"
#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
msgid "Account"
msgstr "Учетные записи"
@@ -235,65 +223,68 @@
msgstr "Изменение учетной записи"
#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
msgid "Administration operations"
msgstr "Административные операции"
#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
msgid "Auto-reconnect when connection is lost"
msgstr "Автоподключение при разрыве связи"
#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:10
msgid "C_onnect on Gajim startup"
msgstr "_Соединяться при запуске Gajim"
#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:11
msgid "Chan_ge Password"
msgstr "И_зменить пароль"
#: ../data/glade/account_modification_window.glade.h:10
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "Если отмечено, то Gajim будет соединяться с портом 5223, на котором старые сервера обычно ожидают подключения по SSL. Заметьте, что Gajim использует TLS шифрование по умолчанию, если сервер предоставляет такую возможность, с этой же опцией TLS отключается"
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Если отмечено, то Gajim будет соединяться с портом 5223, на котором старые "
+"сервера обычно ожидают подключения по SSL. Заметьте, что Gajim использует "
+"TLS шифрование по умолчанию, если сервер предоставляет такую возможность, с "
+"этой же опцией TLS отключается"
#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:13
msgid "Choose _Key..."
msgstr "Выбрать _ключ..."
#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
msgid "Click to change account's password"
msgstr "Щелкните для изменения пароля"
#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
msgid "Click to request authorization to all contacts of another account"
-msgstr "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи"
+msgstr ""
+"Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи"
#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
msgid "Connection"
msgstr "Соединение"
#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
msgid "Edit Personal Information..."
msgstr "Редактировать личную информацию..."
#. No configured account
#: ../data/glade/account_modification_window.glade.h:16
#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/common/helpers.py:1043
-#: ../src/common/helpers.py:1055
-#: ../src/notify.py:501
-#: ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1035
+#: ../src/common/helpers.py:1047 ../src/notify.py:515 ../src/notify.py:551
+#: ../src/notify.py:563
msgid "Gajim"
msgstr "Gajim"
@@ -302,108 +293,118 @@
#. General group cannot be changed
#: ../data/glade/account_modification_window.glade.h:17
#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98
-#: ../src/dialogs.py:103
-#: ../src/dialogs.py:111
-#: ../src/dialogs.py:166
-#: ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../data/glade/preferences_window.glade.h:49 ../src/common/contacts.py:98
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2659
+#: ../src/roster_window.py:5186
msgid "General"
msgstr "Общие"
#: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
msgid "Hostname: "
msgstr "Хост: "
#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
-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/glade/accounts_window.glade.h:22
+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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва соединения по таймауту"
+#: ../data/glade/accounts_window.glade.h:25
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва "
+"соединения по таймауту"
#: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на чтение только для вас"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
+"чтение только для вас"
#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Если отмечено, Gajim после запуска будет автоматически подсоединяться к jabber серверу с использованием этой учетной записи"
+#: ../data/glade/accounts_window.glade.h:26
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Если отмечено, Gajim после запуска будет автоматически подсоединяться к "
+"jabber серверу с использованием этой учетной записи"
#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
-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/glade/accounts_window.glade.h:27
+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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:30
msgid "Information about you, as stored in the server"
msgstr "Информация о вас, сохраненная на сервере"
#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1557
+#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1556
#: ../src/config.py:2057
msgid "No key selected"
msgstr "Не выбран ключ"
#. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. useauth_checkbutton.set_active(False)
+#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/change_mood_dialog.glade.h:3
-#: ../src/config.py:1147
-#: ../src/config.py:1218
-#: ../src/config.py:1465
-#: ../src/config.py:1470
-#: ../src/config.py:1965
-#: ../src/config.py:2043
-#: ../src/config.py:2056
-#: ../src/config.py:3151
-#: ../src/config.py:3219
-#: ../src/dialogs.py:294
-#: ../src/dialogs.py:296
-#: ../src/dialogs.py:523
-#: ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748
-#: ../src/roster_window.py:2753
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1107
+#: ../src/config.py:1196 ../src/config.py:1464 ../src/config.py:1469
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3155 ../src/config.py:3223 ../src/dialogs.py:291
+#: ../src/dialogs.py:293 ../src/dialogs.py:519 ../src/roster_window.py:2728
+#: ../src/roster_window.py:2734 ../src/roster_window.py:2739
msgid "None"
msgstr "Нет"
#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:37
#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
msgid "Personal Information"
msgstr "Личная информация"
#: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
msgid "Port: "
msgstr "Порт: "
#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:38
msgid "Priori_ty:"
msgstr "Приори_тет:"
#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.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/glade/accounts_window.glade.h:39
+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/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:40
msgid "Priority will change automatically according to your status."
msgstr "Изменять приоритет автоматически в соответствии со статусом."
@@ -412,39 +413,46 @@
msgstr "Прокси:"
#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:42
msgid "Resour_ce:"
msgstr "Ресу_рс: "
#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.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/glade/accounts_window.glade.h:43
+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/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
msgid "Save _passphrase (insecure)"
msgstr "Сохранить _парольную фразу (небезопасно)"
#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:44
msgid "Save conversation _logs for all contacts"
msgstr "_Сохранять историю для всех контактов"
#: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
msgid "Send keep-alive packets"
msgstr "Отправить пинг"
#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:47
msgid "Synch_ronize account status with global status"
msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:49
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
#: ../data/glade/synchronise_select_account_dialog.glade.h:2
msgid "Synchronise contacts"
msgstr "Объединить контакты"
@@ -454,12 +462,11 @@
msgstr "Использовать _SSL (устарело)"
#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:53
msgid "Use file transfer proxies"
msgstr "Использовать прокси для передачи файла"
#: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
msgid "_Adjust to status"
msgstr "В _зависимости от статуса"
@@ -469,6 +476,7 @@
msgstr "_Jabber ID:"
#: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:14
msgid "_Name:"
msgstr "_Имя: "
@@ -476,99 +484,131 @@
msgid "<b>Proxy</b>"
msgstr "<b>Прокси</b>"
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+msgid "A_djust to status"
+msgstr "В _зависимости от статуса"
+
+#: ../data/glade/accounts_window.glade.h:7
msgid "Accounts"
msgstr "Учётные записи"
-#: ../data/glade/accounts_window.glade.h:11
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение."
+#: ../data/glade/accounts_window.glade.h:12
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
+"через незащищенное соединение."
#: ../data/glade/accounts_window.glade.h:16
+msgid "Co_nnect on Gajim startup"
+msgstr "_Соединяться при запуске Gajim"
+
+#: ../data/glade/accounts_window.glade.h:18
#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
msgid "E-Mail:"
msgstr "Почта:"
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Включить"
-
#: ../data/glade/accounts_window.glade.h:19
#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
msgid "First Name:"
msgstr "Имя:"
-#: ../data/glade/accounts_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:23
msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
-#: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:28
msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
+"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."
msgstr ""
-"Если порт по умолчанию, который используется для входящих сообщения вас не устраивает, вы можете выбрать другой.\n"
+"Если порт по умолчанию, который используется для входящих сообщения вас не "
+"устраивает, вы можете выбрать другой.\n"
"Также, возможно, придется изменить некоторые настройки брандмауэра."
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13
-#: ../src/dialogs.py:679
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:675
msgid "Jabber ID:"
msgstr "Jabber ID:"
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:32
#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
msgid "Last Name:"
msgstr "Фамилия:"
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:33
msgid "Mer_ge accounts"
msgstr "_Объединить учетные записи"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44
-#: ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5137
msgid "Re_name"
msgstr "П_ереименовать"
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:46
+msgid "Send _keep-alive packets"
+msgstr "Отправлять _пинг"
+
+#: ../data/glade/accounts_window.glade.h:48
+msgid "Synchroni_ze account status with global status"
+msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
+
+#: ../data/glade/accounts_window.glade.h:50
+msgid "Use G_PG Agent"
msgstr "Использовать GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use cust_om hostname/port"
+msgstr "Использовать польз_овательские хост/порт"
+
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use cust_om port:"
+msgstr "_Другой порт:"
+
#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Другой порт"
+msgid "_Edit Personal Information..."
+msgstr "Редактировать личную информацию..."
+#: ../data/glade/accounts_window.glade.h:55
+msgid "_Enable"
+msgstr "_Включить"
+
+#: ../data/glade/accounts_window.glade.h:56
+msgid "_Hostname: "
+msgstr "_Хост: "
+
+#: ../data/glade/accounts_window.glade.h:58
+msgid "_Manage..."
+msgstr "_Управление..."
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "_Port: "
+msgstr "_Порт:"
+
# insecure - небезопастный или незащищенный?
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/glade/accounts_window.glade.h:61
msgid "_Warn before using an insecure connection"
msgstr "_Предупреждать перед использованием незащищенного соединения"
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:62
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_использовать переменную HTTP_PROXY"
+
+#: ../data/glade/accounts_window.glade.h:63
msgid "gtk-add"
msgstr "gtk-add"
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:64
#: ../data/glade/features_window.glade.h:4
msgid "gtk-close"
msgstr "gtk-close"
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:65
msgid "gtk-remove"
msgstr "gtk-remove"
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "использовать переменную HTTP_PROXY"
-
#: ../data/glade/add_new_contact_window.glade.h:1
msgid "A_ccount:"
msgstr "Учётная запи_сь:"
@@ -668,7 +708,9 @@
#: ../data/glade/advanced_configuration_window.glade.h:2
msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>ПРИМЕЧАНИЕ:</b> Необходимо перезапустить Gajim, чтобы некоторые настройки вступили в силу"
+msgstr ""
+"<b>ПРИМЕЧАНИЕ:</b> Необходимо перезапустить Gajim, чтобы некоторые настройки "
+"вступили в силу"
#: ../data/glade/advanced_configuration_window.glade.h:3
msgid "Advanced Configuration Editor"
@@ -692,7 +734,8 @@
#: ../data/glade/advanced_menuitem_menu.glade.h:4
msgid "Sends a message to users currently connected to this server"
-msgstr "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
+msgstr ""
+"Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
#: ../data/glade/advanced_menuitem_menu.glade.h:5
msgid "Set MOTD..."
@@ -752,8 +795,7 @@
msgstr "Все статусы"
#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102
-#: ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:280
msgid "Away"
msgstr "Ушел"
@@ -770,7 +812,7 @@
msgstr "Есть "
#: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:290
msgid "Invisible"
msgstr "Невидимка"
@@ -779,7 +821,7 @@
msgstr "Выполнить команду"
#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:263
msgid "Not Available"
msgstr "Недоступен"
@@ -820,8 +862,11 @@
msgstr "Когда "
#: ../data/glade/advanced_notifications_window.glade.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата мигало на панели"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата "
+"мигало на панели"
#: ../data/glade/advanced_notifications_window.glade.h:28
msgid "_Disable auto opening chat window"
@@ -1007,9 +1052,9 @@
#: ../data/glade/gc_control_popup_menu.glade.h:6
#: ../data/glade/gc_occupants_menu.glade.h:7
#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:21
#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5833
msgid "_History"
msgstr "_История"
@@ -1023,7 +1068,7 @@
#: ../data/glade/chat_to_muc_window.glade.h:3
msgid "MUC server"
-msgstr "MUC-сервер"
+msgstr "сервер MUC"
#: ../data/glade/chat_to_muc_window.glade.h:4
msgid "Please select a MUC server."
@@ -1106,15 +1151,18 @@
msgstr "Показывает список передач между вами и остальными"
#: ../data/glade/filetransfers.glade.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Это действие удаляет единичную передачу из списка. Если передача еще активна, она сначала останавливается, а затем удаляется"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Это действие удаляет единичную передачу из списка. Если передача еще "
+"активна, она сначала останавливается, а затем удаляется"
#: ../data/glade/filetransfers.glade.h:12
msgid "When a file transfer is complete show a popup notification"
msgstr "Показать уведомление по окончании загрузки"
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
msgid "_Continue"
msgstr "_Продолжить"
@@ -1122,8 +1170,7 @@
msgid "_Notify me when a file transfer is complete"
msgstr "_Уведомить меня, когда передача файлов закончится"
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
msgid "_Open Containing Folder"
msgstr "_Открыть папку с принятым файлом"
@@ -1151,7 +1198,7 @@
"Контакт\n"
"Баннер в окне чата"
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:744
msgid "Bold"
msgstr "Полужирный"
@@ -1171,12 +1218,11 @@
msgid "Gone"
msgstr "Ушел"
-#: ../data/glade/gajim_themes_window.glade.h:11
-#: ../src/common/pep.py:152
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
msgid "Inactive"
msgstr "Неактивен"
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:745
msgid "Italic"
msgstr "Курсив"
@@ -1278,25 +1324,26 @@
msgid "Create new post"
msgstr "Создать новое сообщение"
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:305
msgid "From"
msgstr "От"
#. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:170
+#: ../src/history_manager.py:201
msgid "Subject"
msgstr "Тема"
#: ../data/glade/history_manager.glade.h:1
msgid ""
"<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
msgstr ""
"<b>ВНИМАНИЕ:</b>\n"
-"Если вы собираетесь устроить массовую чистку, удостоверьтесь, что Gajim не запущен. Избегайте удалений из логов контактов, с которыми вы разговариваете в этот момент."
+"Если вы собираетесь устроить массовую чистку, удостоверьтесь, что Gajim не "
+"запущен. Избегайте удалений из логов контактов, с которыми вы разговариваете "
+"в этот момент."
#: ../data/glade/history_manager.glade.h:3
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
@@ -1316,20 +1363,24 @@
#: ../data/glade/history_manager.glade.h:7
msgid ""
-"This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead.\n"
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
"\n"
-"Use this program to delete or export logs. You can select logs from the left and/or search database from below."
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
msgstr ""
-"Этот менеджер истории не предназначен для просмотра. Если вы хотите просматривать историю с большим количеством функций, используйте окно истории.\n"
+"Этот менеджер истории не предназначен для просмотра. Если вы хотите "
+"просматривать историю с большим количеством функций, используйте окно "
+"истории.\n"
"\n"
-"Используйте эту программу для удаления или экспорта истории. Вы можете выбрать лог слева или воспользоваться поиском в базе."
+"Используйте эту программу для удаления или экспорта истории. Вы можете "
+"выбрать лог слева или воспользоваться поиском в базе."
#: ../data/glade/history_manager.glade.h:10
msgid "_Search Database"
msgstr "_Поиск в базе данных"
-#: ../data/glade/history_window.glade.h:1
-#: ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
msgid "Conversation History"
msgstr "История"
@@ -1352,8 +1403,7 @@
msgid "_Log conversation history"
msgstr "_История сообщения"
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1698
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1694
msgid "Join Group Chat"
msgstr "Войти в комнату"
@@ -1380,8 +1430,7 @@
msgid "Room:"
msgstr "Комната:"
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1197
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1198
#: ../src/disco.py:1618
msgid "_Join"
msgstr "_Присоединиться"
@@ -1439,37 +1488,51 @@
msgstr "<b>Настройки</b>"
#: ../data/glade/manage_proxies_window.glade.h:3
+msgid "B_OSH Port:"
+msgstr "Порт B_OSH:"
+
+#: ../data/glade/manage_proxies_window.glade.h:4
msgid ""
"HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
msgstr ""
-"HTTP Соединение\n"
-"SOCKS5"
+"Соединение HTTP\n"
+"SOCKS5\n"
+"BOSH"
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:7
msgid "Manage Proxy Profiles"
msgstr "Управление профилями прокси"
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Имя:"
-
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:8
msgid "Pass_word:"
msgstr "П_ароль"
-#: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Тип:"
-
#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Использовать аутентификацию"
+msgid "Proxy _Host:"
+msgstr "Хост прокси:"
#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Хост:"
+msgid "Proxy _Port:"
+msgstr "_Порт прокси:"
+#: ../data/glade/manage_proxies_window.glade.h:11
+msgid "Use HTTP prox_y"
+msgstr "Использовать про_кси HTTP"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "Use proxy auth_entication"
+msgstr "Использовать прокси аут_ентификацию"
+
+#: ../data/glade/manage_proxies_window.glade.h:13
+msgid "_BOSH URL:"
+msgstr "URL _BOSH:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Type:"
+msgstr "_Тип:"
+
#: ../data/glade/message_window.glade.h:1
msgid "Add this contact to roster (Ctrl+D)"
msgstr "Добавить контакт в ростер (Ctrl+D)"
@@ -1503,15 +1566,19 @@
msgstr "Показать набор смайлов (Alt+M)"
#: ../data/glade/message_window.glade.h:9
+msgid "Show a list of formattings"
+msgstr "Показать список форматирования"
+
+#: ../data/glade/message_window.glade.h:10
msgid "Show a menu of advanced functions (Alt+A)"
msgstr "Показать меню дополнительных функций (Alt+A)"
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
msgid "Show the contact's profile (Ctrl+I)"
msgstr "Показать информацию о контакте (Ctrl+I)"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/message_window.glade.h:12
+#: ../data/glade/message_window.glade.h:13
#: ../data/glade/xml_console_window.glade.h:11
#: ../src/filetransfers_window.py:261
msgid "_Send"
@@ -1632,7 +1699,8 @@
#: ../data/glade/preferences_window.glade.h:33
msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "_Всегда проверять при запуске, является ли Gajim jabber-клиентом по умолчанию"
+msgstr ""
+"_Всегда проверять при запуске, является ли Gajim jabber-клиентом по умолчанию"
#: ../data/glade/preferences_window.glade.h:34
msgid "Configure color and font of the interface"
@@ -1677,84 +1745,163 @@
msgstr "Показывать _сообщения о статусе контакта в ростере"
#: ../data/glade/preferences_window.glade.h:46
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows."
-msgstr "Gajim может отсылать и получать метаданные относящиеся к беседе с контактом. Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне чата."
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim может отсылать и получать метаданные относящиеся к беседе с контактом. "
+"Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне "
+"чата."
#: ../data/glade/preferences_window.glade.h:47
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-msgstr "Gajim может отсылать и получать метаданные, относящиеся к беседе с контактом. Здесь вы можете указать, какие состояния чата Gajim будет отсылать вашему респонденту."
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim может отсылать и получать метаданные, относящиеся к беседе с "
+"контактом. Здесь вы можете указать, какие состояния чата Gajim будет "
+"отсылать вашему респонденту."
#: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в правом нижнем углу экрана"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в "
+"правом нижнем углу экрана"
#: ../data/glade/preferences_window.glade.h:50
msgid "Hide all buttons in chat windows"
msgstr "Не показывать кнопки в окнах чата"
#: ../data/glade/preferences_window.glade.h:51
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
-msgstr "Если отмечено, то Gajim будет разрешать определять операционную систему которую вы используете"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Если отмечено, то Gajim будет разрешать определять операционную систему "
+"которую вы используете"
#: ../data/glade/preferences_window.glade.h:52
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
#: ../data/glade/preferences_window.glade.h:53
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Если отмечено, то Gajim изменит статус на Away, если компьютер не используется."
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Если отмечено, то Gajim изменит статус на Away, если компьютер не "
+"используется."
#: ../data/glade/preferences_window.glade.h:54
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго не используется"
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго "
+"не используется"
#: ../data/glade/preferences_window.glade.h:55
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и в окнах комнат"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
+"в окнах комнат"
#: ../data/glade/preferences_window.glade.h:56
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под его именем в окне ростера и в окнах комнат"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
+"его именем в окне ростера и в окнах комнат"
#: ../data/glade/preferences_window.glade.h:57
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Если отмечено, то Gajim будет показывать занятия контактов в окне ростера"
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Если отмечено, то Gajim будет показывать занятия контактов в окне ростера"
#: ../data/glade/preferences_window.glade.h:58
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
#: ../data/glade/preferences_window.glade.h:59
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Если отмечено, то Gajim будет показывать tunes контактов в окне ростера"
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Если отмечено, то Gajim будет показывать tunes контактов в окне ростера"
#: ../data/glade/preferences_window.glade.h:60
-msgid "If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat."
-msgstr "Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода окон чата. Если язык проверки явно не задан, будет использован язык по умолчанию для данного контакта или комнаты."
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+"Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода "
+"окон чата. Если язык проверки явно не задан, будет использован язык по "
+"умолчанию для данного контакта или комнаты."
#: ../data/glade/preferences_window.glade.h:61
-msgid "If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Отметьте эту опцию, только если кто-то не из вашего ростера спамит/достает вас. Используйте с осторожностью, потому что это заблокирует все сообщения от контактов не из вашего роcтера."
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Отметьте эту опцию, только если кто-то не из вашего ростера спамит/достает "
+"вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
+"от контактов не из вашего ростера."
#: ../data/glade/preferences_window.glade.h:62
-msgid "If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged."
-msgstr "Если отмечено, Gajim будет сохранять историю зашифрованных сообщений. Помните, что при использовании E2E шифрования удаленная сторона должна дать согласие на ведение истории, иначе сообщения не будут сохраняться."
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"Если отмечено, Gajim будет сохранять историю зашифрованных сообщений. "
+"Помните, что при использовании E2E шифрования удаленная сторона должна дать "
+"согласие на ведение истории, иначе сообщения не будут сохраняться."
#: ../data/glade/preferences_window.glade.h:63
-msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
-msgstr "Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail"
#: ../data/glade/preferences_window.glade.h:64
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Если отмечено, то Gajim будет использовать для каждого протокола свои иконки (например, контакты из MSN будут иметь соответствующие иконки msn для статусов «в сети», «ушёл», «занят» и т.д.)"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Если отмечено, то Gajim будет использовать для каждого протокола свои иконки "
+"(например, контакты из MSN будут иметь соответствующие иконки msn для "
+"статусов «в сети», «ушёл», «занят» и т.д.)"
#: ../data/glade/preferences_window.glade.h:65
-msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
-msgstr "Если включено, Gajim не будет запрашивать статус-сообщение. Вместо него будет использовано соответствующее сообщение по умолчанию."
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
+"будет использовано соответствующее сообщение по умолчанию."
#: ../data/glade/preferences_window.glade.h:66
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Gajim заменяет текстовые смайлики, например ':)', их графическим или анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило."
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Gajim заменяет текстовые смайлики, например ':)', их графическим или "
+"анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило."
#: ../data/glade/preferences_window.glade.h:67
msgid "Log _encrypted chat session"
@@ -1769,30 +1916,40 @@
msgstr "_Управление..."
#: ../data/glade/preferences_window.glade.h:70
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+"Никогда\n"
+"Только при пропущенных событиях\n"
+"Всегда"
+
+#: ../data/glade/preferences_window.glade.h:73
msgid "Notifications"
msgstr "Уведомления"
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:74
msgid "Notify me about contacts that sign _in"
msgstr "Уведомлять о контактах, которые _вошли: "
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:75
msgid "Notify me about contacts that sign _out"
msgstr "Уведомлять о контактах, которые _вышли: "
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:76
msgid "Notify on new _GMail email"
msgstr "Сообщать о новых письмах в _Gmail"
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:77
msgid "Personal Events"
msgstr "Расширенные статусы"
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:78
msgid "Play _sounds"
msgstr "Проигрывать _звук"
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:79
msgid ""
"Pop it up\n"
"Notify me about it\n"
@@ -1802,148 +1959,172 @@
"Сообщить мне об этом\n"
"Показать в ростере"
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:82
msgid "Preferences"
msgstr "Настройки"
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:83
+msgid "Show systray:"
+msgstr "Показывать иконку в системном лотке:"
+
+#: ../data/glade/preferences_window.glade.h:84
msgid "Sign _in"
msgstr "В_ошел"
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:85
msgid "Sign _out"
msgstr "В_ышел"
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). Если отмечено, Gajim будет отображать только их текст, без форматирования."
+#: ../data/glade/preferences_window.glade.h:86
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). "
+"Если отмечено, Gajim будет отображать только их текст, без форматирования."
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:87
msgid "Sort contacts by status"
msgstr "Сортировать контакты по статусу"
-#: ../data/glade/preferences_window.glade.h:84
-#: ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:88 ../src/config.py:382
msgid "Status"
msgstr "Статус"
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:89
msgid "Status _iconset:"
msgstr "Тема статусных _иконок:"
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:90
msgid "Style"
msgstr "Стиль"
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:91
msgid "T_heme:"
msgstr "_Тема:"
-#: ../data/glade/preferences_window.glade.h:88
-msgid "The auto away status message. If empty, Gajim will not change the current status message"
-msgstr "Автоматическое статусное сообщение (Ушел). Если не указано, Gajim не будет изменять статусное сообщение"
+#: ../data/glade/preferences_window.glade.h:92
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
+msgstr ""
+"Автоматическое сообщение о статусе «Ушел». Если не указано, Gajim не будет "
+"изменять сообщение о статусе\n"
+"$S заменяется на предыдущее сообщение о статусе\n"
+"$T заменяется на время срабатывания автоматического сообщения о статусе «Ушел»"
-#: ../data/glade/preferences_window.glade.h:89
-msgid "The auto not available status message. If empty, Gajim will not change the current status message"
-msgstr "Автоматическое статусное сообщение (Недоступен). Если не указано, Gajim не будет изменять статусное сообщение"
+#: ../data/glade/preferences_window.glade.h:95
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
+msgstr ""
+"Автоматическое сообщение о статусе «Недоступен». Если не указано, Gajim не "
+"будет изменять сообщение о статусе\n"
+"$S заменяется на предыдущее сообщение о статусе\n"
+"$T заменяется на время срабатывания автоматического сообщения о статусе "
+"«Недоступен»"
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:98
msgid "Use _transports icons"
msgstr "Использовать иконки _транспортов"
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:99
msgid "Use system _default"
msgstr "Использовать _системный шрифт"
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:100
msgid "When new event is received:"
msgstr "Когда получено новое сообытие:"
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:101
msgid "_Away after:"
msgstr "Авто-_отошел после:"
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:102
msgid "_Browser:"
msgstr "_Браузер:"
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:103
msgid "_Display chat state notifications:"
msgstr "_Отображать уведомления о состоянии чата:"
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:104
msgid "_Emoticons:"
msgstr "_Смайлики:"
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:105
msgid "_File manager:"
msgstr "_Менеджер файлов:"
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:106
msgid "_Highlight misspelled words"
msgstr "Выделять _слова с опечатками"
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:107
msgid "_Ignore events from contacts not in the roster"
msgstr "_Игнорировать события от контактов не из ростера"
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:108
msgid "_Ignore rich content in incoming messages"
msgstr "_Игнорировать форматирование во входящих сообщениях"
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:109
msgid "_Incoming message:"
msgstr "_Входящее сообщение:"
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:110
msgid "_Log status changes of contacts"
msgstr "_Записывать в лог изменения статусов контактов"
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:111
msgid "_Mail client:"
msgstr "_Почтовый клиент:"
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:112
msgid "_Not available after:"
msgstr "Авто-_недоступен после:"
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:113
msgid "_Open..."
msgstr "_Открыть..."
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:114
msgid "_Outgoing message:"
msgstr "_Исходящее сообщение:"
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:115
msgid "_Reset to Default Colors"
msgstr "_Вернуться к цветам по умолчанию"
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:116
msgid "_Send chat state notifications:"
msgstr "_Отправлять уведомления о состоянии чата:"
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:117
msgid "_Status message:"
msgstr "_Сообщение о статусе:"
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:118
msgid "_URL highlight:"
msgstr "_Цвет ссылок:"
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:119
msgid "_Window behavior:"
msgstr "Поведение _окна:"
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:120
msgid "in _group chats"
msgstr "в _комнатах"
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:121
msgid "in _roster"
msgstr "в _ростере"
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:122
msgid "minutes"
msgstr "минут"
@@ -1991,8 +2172,7 @@
msgid "Order:"
msgstr "Номер:"
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2568
msgid "Privacy List"
msgstr "Список доступа"
@@ -2136,8 +2316,7 @@
msgstr "<b>Префикс:</b>"
#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29
-#: ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
msgid "<b>Role:</b>"
msgstr "<b>Обязанности:</b>"
@@ -2197,10 +2376,8 @@
#. Remove group
#. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623
-#: ../src/roster_window.py:5752
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5652 ../src/roster_window.py:5781
msgid "_Remove"
msgstr "_Удалить"
@@ -2214,7 +2391,7 @@
#: ../data/glade/roster_contact_context_menu.glade.h:3
msgid "Assign Open_PGP Key..."
-msgstr "Назначить Open_PGP ключ"
+msgstr "Назначить ключ Open_PGP"
#: ../data/glade/roster_contact_context_menu.glade.h:4
msgid "Edit _Groups..."
@@ -2222,15 +2399,14 @@
#. Execute Command
#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5724
msgid "Execute Command..."
msgstr "Выполнить команду..."
#. Invite to
#. Invite to Groupchat
#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064
-#: ../src/roster_window.py:5576
+#: ../src/roster_window.py:5092 ../src/roster_window.py:5605
msgid "In_vite to"
msgstr "_Пригласить в"
@@ -2240,8 +2416,7 @@
#. Send Custom Status
#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074
-#: ../src/roster_window.py:5661
+#: ../src/roster_window.py:5102 ../src/roster_window.py:5690
msgid "Send Cus_tom Status"
msgstr "Установи_ть статус"
@@ -2267,9 +2442,8 @@
msgstr "_Позволить ему или ей видеть мой статус"
#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137
-#: ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
+#: ../src/roster_window.py:5165 ../src/roster_window.py:5642
+#: ../src/roster_window.py:5771
msgid "_Block"
msgstr "_Блокировать"
@@ -2295,9 +2469,8 @@
msgstr "_Подписка"
#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131
-#: ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
+#: ../src/roster_window.py:5159 ../src/roster_window.py:5636
+#: ../src/roster_window.py:5768
msgid "_Unblock"
msgstr "_Разблокировать"
@@ -2330,57 +2503,60 @@
msgstr "Профиль и _аватар"
#: ../data/glade/roster_window.glade.h:9
+msgid "Show Only _Active Contacts"
+msgstr "Показать _только активных"
+
+#: ../data/glade/roster_window.glade.h:10
msgid "Show Trans_ports"
msgstr "Показать транс_порты"
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
msgid "Show _Offline Contacts"
msgstr "Показать _отключенных"
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:12
msgid "Show _roster"
msgstr "Показать _ростер"
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
msgid "_Accounts"
msgstr "Учётные _записи"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
#: ../data/glade/subscription_request_window.glade.h:6
msgid "_Actions"
msgstr "_Действия"
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
msgid "_Contents"
msgstr "_Содержание"
-#: ../data/glade/roster_window.glade.h:17
-#: ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1352
msgid "_Edit"
msgstr "_Правка"
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
msgid "_FAQ"
msgstr "_ЧаВО"
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
msgid "_Help"
msgstr "_Помощь"
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
msgid "_Preferences"
msgstr "_Настройки"
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
msgid "_Quit"
msgstr "_Выйти"
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
msgid "_Send Single Message..."
msgstr "Отправить одиночное _сообщение..."
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
msgid "_View"
msgstr "_Вид"
@@ -2397,13 +2573,11 @@
msgstr "Добавить _контакт"
#. Information
-#: ../data/glade/search_window.glade.h:4
-#: ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5793
msgid "_Information"
msgstr "_Информация о контакте"
-#: ../data/glade/search_window.glade.h:5
-#: ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1210
msgid "_Search"
msgstr "_Поиск"
@@ -2476,7 +2650,9 @@
msgstr "Авторизовать контакт (он будет видеть ваш статус)"
#: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
#: ../data/glade/subscription_request_window.glade.h:4
@@ -2487,6 +2663,10 @@
msgid "_Deny"
msgstr "_Отклонить"
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+msgid "Select the account with which to synchronise"
+msgstr "Выберите учетную запись для объединения"
+
#: ../data/glade/synchronise_select_account_dialog.glade.h:1
msgid "Select the account with which you want to synchronise"
msgstr "Выберите учетную запись для объединения"
@@ -2586,6 +2766,11 @@
msgid "<b>XML Input</b>"
msgstr "<b>XML Ввод</b>"
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Включить"
+
#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
#: ../data/glade/xml_console_window.glade.h:6
msgid "Info/Query"
@@ -2610,17 +2795,17 @@
#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
msgid "Assign Open_PGP Key"
-msgstr "Назначить Open_PGP ключ"
+msgstr "Назначить ключ Open_PGP"
#. Edit Groups
#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5625
msgid "Edit _Groups"
msgstr "Редактировать _группы"
#. Rename
#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5751
msgid "_Rename"
msgstr "П_ереименовать"
@@ -2644,17 +2829,15 @@
msgid "Status:"
msgstr "Статус:"
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Редактировать учетную запись"
-
#: ../src/adhoc_commands.py:264
msgid "Cancel confirmation"
msgstr "Отменить подтверждение"
#: ../src/adhoc_commands.py:265
-msgid "You are in process of executing command. Do you really want to cancel it?"
-msgstr "Команда находится в процессе выполнения. Вы уверены, что хотите её отменить?"
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+"Команда находится в процессе выполнения. Вы уверены, что хотите её отменить?"
#: ../src/adhoc_commands.py:304
msgid "Service changed the session identifier."
@@ -2690,7 +2873,7 @@
msgid "Text"
msgstr "Текст"
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:764
msgid "Color"
msgstr "Цвет"
@@ -2720,164 +2903,166 @@
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "English"
msgstr "Английский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Belarusian"
msgstr "Белорусский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Bulgarian"
msgstr "Болгарский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Breton"
msgstr "Бретонский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Czech"
msgstr "Чешский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "German"
msgstr "Немецкий"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Greek"
msgstr "Греческий"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "British"
msgstr "Британский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Esperanto"
msgstr "Эсперанто"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Spanish"
msgstr "Испанский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Basque"
msgstr "Баскский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "French"
msgstr "Французский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Croatian"
msgstr "Хорватский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Italian"
msgstr "Итальянский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Norwegian (b)"
msgstr "Норвежский (букмол)"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Dutch"
msgstr "Голландский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Norwegian"
msgstr "Норвежский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Polish"
msgstr "Польский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Portuguese"
msgstr "Португальский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Brazilian Portuguese"
msgstr "Португальский (Бразилия)"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Russian"
msgstr "Русский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Serbian"
msgstr "Сербский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Slovak"
msgstr "Словацкий"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Swedish"
msgstr "Шведский"
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:67
msgid "Chinese (Ch)"
msgstr "Китайский"
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:340
msgid "Spelling language"
msgstr "Язык проверки орфографии"
#. we are not connected
-#: ../src/chat_control.py:355
-#: ../src/chat_control.py:549
+#: ../src/chat_control.py:363 ../src/chat_control.py:551
msgid "A connection is not available"
msgstr "Подключение недоступно"
-#: ../src/chat_control.py:356
-#: ../src/chat_control.py:550
+#: ../src/chat_control.py:364 ../src/chat_control.py:552
msgid "Your message can not be sent until you are connected."
msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
-#: ../src/chat_control.py:1147
-#: ../src/chat_control.py:1543
+#: ../src/chat_control.py:746
+msgid "Underline"
+msgstr "Подчеркнутый"
+
+#: ../src/chat_control.py:747
+msgid "Strike"
+msgstr "Зачеркнутый"
+
+#: ../src/chat_control.py:770
+msgid "Font"
+msgstr "Шрифт"
+
+#: ../src/chat_control.py:779
+msgid "Clear formating"
+msgstr "Удалить форматирование"
+
+#: ../src/chat_control.py:1215 ../src/chat_control.py:1618
msgid "GPG encryption enabled"
msgstr "GPG шифрование включено"
#. Add to roster
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1169
-#: ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113
-#: ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303
-#: ../src/conversation_textview.py:845
-#: ../src/dialogs.py:904
-#: ../src/gajim.py:1633
-#: ../src/roster_window.py:916
-#: ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544
-#: ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111
-#: ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258
-#: ../src/roster_window.py:5442
+#: ../src/chat_control.py:1245 ../src/chat_control.py:2114
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:62
+#: ../src/common/helpers.py:292 ../src/conversation_textview.py:858
+#: ../src/dialogs.py:900 ../src/gajim.py:965 ../src/gajim.py:1629
+#: ../src/normal_control.py:483 ../src/roster_window.py:911
+#: ../src/roster_window.py:1542 ../src/roster_window.py:1544
+#: ../src/roster_window.py:1875 ../src/roster_window.py:3098
+#: ../src/roster_window.py:3121 ../src/roster_window.py:5286
+#: ../src/roster_window.py:5471
msgid "Not in Roster"
msgstr "Не в ростере"
-#: ../src/chat_control.py:1301
-#: ../src/tooltips.py:627
+#: ../src/chat_control.py:1377 ../src/tooltips.py:627
msgid "Unknown Artist"
msgstr "Неизвестный исполнитель"
-#: ../src/chat_control.py:1303
-#: ../src/tooltips.py:632
+#: ../src/chat_control.py:1379 ../src/tooltips.py:632
msgid "Unknown Title"
msgstr "Неизвестная песня"
-#: ../src/chat_control.py:1305
-#: ../src/tooltips.py:637
+#: ../src/chat_control.py:1381 ../src/tooltips.py:637
msgid "Unknown Source"
msgstr "Неизвестный альбом"
-#: ../src/chat_control.py:1309
-#: ../src/tooltips.py:639
+#: ../src/chat_control.py:1385 ../src/tooltips.py:639
#, python-format
msgid ""
"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -2886,7 +3071,7 @@
"<b>«%(title)s»</b> <i>%(artist)s</i>\n"
"из <i>%(source)s</i>"
-#: ../src/chat_control.py:1314
+#: ../src/chat_control.py:1390
#, python-format
msgid ""
"%(title)s by %(artist)s\n"
@@ -2895,65 +3080,68 @@
"%(title)s by %(artist)s\n"
"из %(source)s"
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1513
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
msgstr "%(nickname)s из комнаты %(room_name)s"
#. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523
-#: ../src/dialogs.py:3911
+#: ../src/chat_control.py:1598 ../src/dialogs.py:3909
msgid "No GPG key assigned"
msgstr "Ключ GPG не присвоен"
-#: ../src/chat_control.py:1524
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать сообщения с помощью GPG."
+#: ../src/chat_control.py:1599
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+"Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
+"сообщения с помощью GPG."
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1608
msgid "GPG encryption disabled"
msgstr "GPG шифрование выключено"
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1634
msgid "Session WILL be logged"
msgstr "Для сеанса БУДЕТ сохранена история сообщений"
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1636
msgid "Session WILL NOT be logged"
msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
#. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1650
msgid "is"
msgstr "было"
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1650
msgid "is NOT"
msgstr "НЕ"
#. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1652
msgid "will"
msgstr "будет"
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1652
msgid "will NOT"
msgstr "НЕ будет"
#. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1656
msgid "and authenticated"
msgstr "и заверено"
#. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1660
msgid "and NOT authenticated"
msgstr "и НЕ заверено"
#. status will become 'is' or 'is not', authentificaed will become
#. 'and authentificated' or 'and not authentificated', logged will become
#. 'will' or 'will not'
-#: ../src/chat_control.py:1590
+#: ../src/chat_control.py:1666
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -2962,219 +3150,220 @@
"%(type)s шифрование %(status)s включено %(authenticated)s.\n"
"Для сеанса %(logged)s сохранена история сообщений."
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1714
msgid "Command not supported for zeroconf account."
msgstr "Команда не поддерживается учетной записью zeroconf."
-#: ../src/chat_control.py:1649
-#: ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1725 ../src/groupchat_control.py:1643
#, python-format
msgid "Commands: %s"
msgstr "Команды: %s"
-#: ../src/chat_control.py:1652
-#: ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1728 ../src/groupchat_control.py:1657
#, python-format
msgid "Usage: /%s, clears the text window."
msgstr "Использование: /%s, очищает текстовое окно."
-#: ../src/chat_control.py:1655
-#: ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1731 ../src/groupchat_control.py:1662
#, python-format
msgid "Usage: /%s, hide the chat buttons."
msgstr "Использование: /%s, скрывает кнопки беседы."
-#: ../src/chat_control.py:1658
-#: ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1734 ../src/groupchat_control.py:1678
#, python-format
-msgid "Usage: /%(command)s <action>, sends action to the current group chat. Use third person. (e.g. /%(command)s explodes.)"
-msgstr "Использование: /%(command)s <действие>, совершает действие в текущей комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
+msgid ""
+"Usage: /%(command)s <action>, sends action to the current group chat. Use "
+"third person. (e.g. /%(command)s explodes.)"
+msgstr ""
+"Использование: /%(command)s <действие>, совершает действие в текущей "
+"комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1739
#, python-format
msgid "Usage: /%s, sends a ping to the contact"
msgstr "Использование: /%s, посылает пинг контакту"
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1742
#, python-format
msgid "Usage: /%s, send the message to the contact"
msgstr "Использование: /%s, посылает сообщение контакту"
-#: ../src/chat_control.py:1669
-#: ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1745 ../src/groupchat_control.py:1701
#, python-format
msgid "No help info for /%s"
msgstr "Нет подсказки для /%s"
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1878
msgid "Session negotiation cancelled"
msgstr "Установление сеанса отменено"
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1885
msgid "This session is encrypted"
msgstr "Сеанс зашифрован"
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1888
msgid " and WILL be logged"
msgstr " и БУДЕТ сохранена история сообщений"
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1890
msgid " and WILL NOT be logged"
msgstr " и НЕ БУДЕТ сохранена история сообщений"
-#: ../src/chat_control.py:1817
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для подробностей."
+#: ../src/chat_control.py:1895
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для "
+"подробностей."
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1897
msgid "E2E encryption disabled"
msgstr "E2E шифрование выключено"
-#: ../src/chat_control.py:1848
-#: ../src/chat_control.py:1861
+#: ../src/chat_control.py:1925 ../src/chat_control.py:1938
msgid "The following message was NOT encrypted"
msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1931
msgid "The following message was encrypted"
msgstr "Последнее сообщение зашифровано"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2302
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "Получено новое сообщение от «%s»"
-#: ../src/chat_control.py:2226
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Если вы закроете эту вкладку и у вас отключена функция ведения истории сообщений, то это сообщение будет утеряно."
+#: ../src/chat_control.py:2303
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
+"сообщений, то это сообщение будет утеряно."
-#: ../src/chat_control.py:2376
-#: ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2207
-#: ../src/common/connection.py:1222
-#: ../src/gajim.py:170
+#: ../src/chat_control.py:2451 ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:1949
+#: ../src/common/connection_handlers.py:2137
+#: ../src/common/connection_handlers.py:2270 ../src/common/connection.py:1315
+#: ../src/gajim.py:177
msgid "Database Error"
msgstr "Ошибка базы данных"
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2452
#, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его или удалить (вся история будет утеряна)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+"Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
+"или удалить (вся история будет утеряна)."
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2688
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s теперь %(status)s"
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
msgid "creating logs database"
msgstr "создается БД истории"
-#: ../src/common/check_paths.py:110
-#: ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:129
#, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s должен быть директорией, а не файлом"
-#: ../src/common/check_paths.py:111
-#: ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129
-#: ../src/common/check_paths.py:137
+#: ../src/common/check_paths.py:112 ../src/common/check_paths.py:123
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:138
msgid "Gajim will now exit"
msgstr "Закончить работу"
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:137
#, python-format
msgid "%s is a directory but should be a file"
msgstr "%s должен быть файлом, а не директорией"
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:153
#, python-format
msgid "creating %s directory"
msgstr "создается директория %s"
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
msgid "Change status information"
msgstr "Изменить информацию о статусе"
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
msgid "Change status"
msgstr "Контакт изменит статус"
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
msgid "Set the presence type and description"
msgstr "Установка статуса и статусного сообщения"
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
msgid "Free for chat"
msgstr "Готов поболтать"
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
msgid "Online"
msgstr "В сети"
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
msgid "Extended away"
msgstr "Недоступен (расширенный)"
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
msgid "Do not disturb"
msgstr "Не беспокоить."
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
msgid "Offline - disconnect"
msgstr "Не в сети — отключен"
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
msgid "Presence description:"
msgstr "Описание присутствия:"
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
msgid "The status has been changed."
msgstr "Статус изменён."
-#: ../src/common/commands.py:177
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
msgid "Leave Groupchats"
msgstr "Покинуть конференции"
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
#, python-format
msgid "%(nickname)s on %(room_jid)s"
msgstr "%(nickname)s из комнаты %(room_jid)s"
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
msgid "You have not joined a groupchat."
msgstr "Вы не вошли в комнату."
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
msgid "Choose the groupchats you want to leave"
msgstr "Выберите конференции, которые вы хотите покинуть"
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206
-#: ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73
-#: ../src/roster_window.py:788
-#: ../src/roster_window.py:1546
-#: ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:62 ../src/roster_window.py:785
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5062
msgid "Groupchats"
msgstr "Комнаты"
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
msgid "You left the following groupchats:"
msgstr "Вы покинули следующие комнаты:"
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
msgid "Forward unread messages"
msgstr "Переслать непрочитанные сообщения"
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
msgid "All unread messages have been forwarded."
msgstr "Все непрочитанные сообщения отправлены."
@@ -3182,6 +3371,12 @@
msgid "Use D-Bus and Notification-Daemon to show notifications"
msgstr "Использовать DBus и Notification Daemon для показа уведомлений"
+#: ../src/common/config.py:84
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+"Показывать в ростере только контакты со статусами \"Доступен\" и \"Готов "
+"поболтать\"."
+
#: ../src/common/config.py:87
msgid "Time in minutes, after which your status changes to away."
msgstr "Время в минутах, после которого ваш статус изменится на Отошел."
@@ -3192,7 +3387,7 @@
#: ../src/common/config.py:88
msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr "$S будет замещено текущим статус-сообщением, $T — временем простоя."
+msgstr "$S будет замещено текущим сообщением о статусе, $T — временем простоя."
#: ../src/common/config.py:90
msgid "Time in minutes, after which your status changes to not available."
@@ -3204,25 +3399,32 @@
#: ../src/common/config.py:91
msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr "$S будет замещён текущим статус-сообщением, $T — временем простоя."
+msgstr "$S будет замещено текущим сообщением о статусе, $T — временем простоя."
+#: ../src/common/config.py:101
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+"Когда показывать иконку в системном лотке. Возможные значения 'never', "
+"'on_event', 'always'."
+
#: ../src/common/config.py:111
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
#. sorted alphanum
-#: ../src/common/config.py:112
-#: ../src/common/config.py:448
-#: ../src/common/optparser.py:215
-#: ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467
-#: ../src/gajim.py:3114
+#: ../src/common/config.py:112 ../src/common/config.py:463
+#: ../src/common/optparser.py:221 ../src/common/optparser.py:439
+#: ../src/common/optparser.py:473 ../src/gajim.py:3143
msgid "default"
msgstr "По_умолчанию"
#: ../src/common/config.py:116
msgid "Enable link-local/zeroconf messaging"
-msgstr "Приём и отправка локальных (link-local) сообщений и сообщений в сетях zeroconf"
+msgstr ""
+"Приём и отправка локальных (link-local) сообщений и сообщений в сетях "
+"zeroconf"
#: ../src/common/config.py:119
msgid "Language used by speller"
@@ -3239,559 +3441,814 @@
"«never» — не печатать время."
#: ../src/common/config.py:121
-msgid "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is 'sometimes'."
-msgstr "Печатать время в беседе как в неточных часах. Степень неточности может быть от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. Используется только если режим печати времени установлен на «sometimes» (иногда)."
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Печатать время в беседе как в неточных часах. Степень неточности может быть "
+"от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. "
+"Используется только если режим печати времени установлен на "
+"«sometimes» (иногда)."
#: ../src/common/config.py:124
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "Обрабатывать пары * / _ как возможные форматирующие символы."
#: ../src/common/config.py:125
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Если True, то не будут удаляться */_. Так что *фыва* будет написано полужирным шрифтом, но * * удалены не будут"
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Если активно, то не будут удаляться */_. Так что *фыва* будет написано "
+"полужирным шрифтом, но * * удалены не будут"
#: ../src/common/config.py:128
-msgid "Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)"
-msgstr "Использовать разметку ReStructuredText для отправки HTML, плюс ascii форматирование, если оно выбрано. Синтаксис описан на http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.htm (Если вы хотите воспользоваться этой опцией, установите docutils)"
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Использовать разметку ReStructuredText для отправки HTML, плюс ascii "
+"форматирование, если оно выбрано. Синтаксис описан на http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.htm (Если вы хотите "
+"воспользоваться этой опцией, установите docutils)"
#: ../src/common/config.py:137
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Символ, который нужно добавлять к нику, когда используется дополнение (tab) в комнате."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Символ, который нужно добавлять к нику, когда используется дополнение (tab) "
+"в комнате."
#: ../src/common/config.py:138
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Символ, который будет добавляться после ника, когда желаемый ник уже занят кем-нибудь в комнате."
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Символ, который будет добавляться после ника, когда желаемый ник уже занят "
+"кем-нибудь в комнате."
-#: ../src/common/config.py:161
-msgid "This option let you customize timestamp that is printed in conversation. For exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr "Эта опция позволяет настроить отпечаток времени, который печатается в чатах. К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно документацию python к strftime (http://docs.python.org/lib/module-time.html)"
+#: ../src/common/config.py:166
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Эта опция позволяет настроить отпечаток времени, который печатается в чатах. "
+"К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно "
+"документацию python к strftime (http://docs.python.org/lib/module-time.html)"
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
msgid "Characters that are printed before the nickname in conversations"
msgstr "Символы, которые будут отображаться перед никами в чате."
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
msgid "Characters that are printed after the nickname in conversations"
msgstr "Символы, которые будут отображаться после ников в чате"
-#: ../src/common/config.py:168
+#: ../src/common/config.py:172
msgid "Add * and [n] in roster title?"
msgstr "Добавлять * и [n] в окно ростера?"
-#: ../src/common/config.py:169
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются вновь."
+#: ../src/common/config.py:173
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
+"вновь."
-#: ../src/common/config.py:170
+#: ../src/common/config.py:174
msgid "How many minutes should last lines from previous conversation last."
msgstr "Сколько минут должны оставаться последние строки из предыдущей беседы."
-#: ../src/common/config.py:171
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в Mirabilis ICQ)"
+#: ../src/common/config.py:175
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
+"Mirabilis ICQ)"
-#: ../src/common/config.py:173
+#: ../src/common/config.py:177
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "Сколько строк хранить для Ctrl+Стрелка вверх"
-#: ../src/common/config.py:176
+#: ../src/common/config.py:180
#, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или «WIKTIONARY», чтобы использовать Викисловарь."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или "
+"«WIKTIONARY», чтобы использовать Викисловарь."
-#: ../src/common/config.py:179
+#: ../src/common/config.py:183
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием gajim-remote."
+msgstr ""
+"Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
+"gajim-remote."
-#: ../src/common/config.py:180
-msgid "If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection."
-msgstr "Если True, тогда «слушать» сообщения от NetworkManager по D-Bus и изменять статус учетных записей в зависимости от состояния сетевого соединения (необходимо, чтобы учетные записи не имели установленной в False опции listen_to_network_manager и они должны синхронизировать свой статус с глобальным)"
+#: ../src/common/config.py:184
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Если активно, тогда «слушать» сообщения от NetworkManager по D-Bus и изменять "
+"статус учетных записей в зависимости от состояния сетевого соединения "
+"(необходимо, чтобы учетные записи не имели установленной в «Неактивно» опции "
+"listen_to_network_manager и они должны синхронизировать свой статус с "
+"глобальным)"
-#: ../src/common/config.py:181
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only (только печать), disabled (никаких уведомлений)."
+#: ../src/common/config.py:185
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
+"(только печать), disabled (никаких уведомлений)."
-#: ../src/common/config.py:182
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Отображать состояния беседы в окне беседы. Варианты: all (все), composing_only (только печать), disabled (никаких уведомлений)."
+#: ../src/common/config.py:186
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Отображать состояния беседы в окне беседы. Варианты: all (все), "
+"composing_only (только печать), disabled (никаких уведомлений)."
-#: ../src/common/config.py:184
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Если отключена печать времени для каждого сообщения, то печатать его каждые X минут."
+#: ../src/common/config.py:188
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Если отключена печать времени для каждого сообщения, то печатать его каждые "
+"X минут."
-#: ../src/common/config.py:185
+#: ../src/common/config.py:189
msgid "Ask before closing a group chat tab/window."
msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
-#: ../src/common/config.py:186
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. Комнаты в списке разделяются пробелом."
+#: ../src/common/config.py:190
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
+"Комнаты в списке разделяются пробелом."
-#: ../src/common/config.py:187
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. Комнаты в списке разделяются пробелом."
+#: ../src/common/config.py:191
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
+"Комнаты в списке разделяются пробелом."
-#: ../src/common/config.py:190
-msgid "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
-msgstr "Разделенный запятыми список хостов, который мы отсылаем в дополнение к локальным интерфейсам при передаче файлов в случае, если мы за NAT или используется перенаправление портов."
+#: ../src/common/config.py:194
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Разделенный запятыми список хостов, который мы отсылаем в дополнение к "
+"локальным интерфейсам при передаче файлов в случае, если мы за NAT или "
+"используется перенаправление портов."
-#: ../src/common/config.py:192
+#: ../src/common/config.py:196
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "IEC стандарт утверждает, что KiB = 1024 байт, KB = 1000 байт"
-#: ../src/common/config.py:194
+#: ../src/common/config.py:198
msgid "Notify of events in the system trayicon."
msgstr "Уведомлять о событиях в системном лотке."
-#: ../src/common/config.py:200
+#: ../src/common/config.py:204
msgid "Show tab when only one conversation?"
msgstr "Показывать вкладку при одном чат-окне?"
-#: ../src/common/config.py:201
+#: ../src/common/config.py:205
msgid "Show tabbed notebook border in chat windows?"
msgstr "Показывать границу вкладки в окне чата?"
-#: ../src/common/config.py:202
+#: ../src/common/config.py:206
msgid "Show close button in tab?"
msgstr "Показывать кнопку закрытия на вкладке?"
-#: ../src/common/config.py:203
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что вы хотите сохранить историю сообщений?"
+#: ../src/common/config.py:207
+msgid ""
+"A list of modp groups to use in a Diffie-Hellman, highest preference first, "
+"separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+"Список modp групп (через запятую) для использования в алгоритме Диффи-"
+"Хеллмана, начиная с наиболее предпочтительной. Допустимые группы: 1, 2, 5, "
+"14, 15, 16, 17 и 18. Более высокие числа безопаснее, но требуют более "
+"длительных вычислений при начале сеанса."
-#: ../src/common/config.py:204
-msgid "A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session."
-msgstr "Список modp групп (через запятую) для использования в алгоритме Диффи-Хеллмана, начиная с наиболее предпочтительной. Допустимые группы: 1, 2, 5, 14, 15, 16, 17 и 18. Более высокие числа безопаснее, но требуют более длительных вычислений при начале сеанса."
-
-#: ../src/common/config.py:213
+#: ../src/common/config.py:216
msgid "Preview new messages in notification popup?"
msgstr "Предпросмотр новых сообщений во всплывающем окне?"
-#: ../src/common/config.py:218
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
+#: ../src/common/config.py:221
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
-#: ../src/common/config.py:219
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
-msgstr "Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. Эта опция учитывается, только если используется иконка для трея."
+#: ../src/common/config.py:222
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"Если активно, то Gajim будет завершаться при нажатии на кнопку закрытия "
+"окна. Эта опция учитывается, только если используется иконка для трея."
-#: ../src/common/config.py:220
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Если True, то Gajim будет проверять при запуске, является ли он jabber-клиентом по умолчанию."
+#: ../src/common/config.py:223
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Если активно, то Gajim будет проверять при запуске, является ли он jabber-"
+"клиентом по умолчанию."
-#: ../src/common/config.py:221
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные сообщения. В зависимости от темы, она может быть анимированной."
+#: ../src/common/config.py:224
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Если активно, то Gajim отображает иконку на каждой вкладке, которая содержит "
+"непрочитанные сообщения. В зависимости от темы, она может быть анимированной."
-#: ../src/common/config.py:222
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Если True, то Gajim будет отображать сообщение о статусе, если оно не пустое, для каждого контакта под именем контакта в окне ростера"
+#: ../src/common/config.py:225
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Если активно то Gajim будет отображать сообщение о статусе, если оно не "
+"пустое, для каждого контакта под именем контакта в окне ростера"
-#: ../src/common/config.py:227
+#: ../src/common/config.py:230
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr "Определяет позицию аватар в ростере. Может быть left или right"
-#: ../src/common/config.py:228
-msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old."
-msgstr "Если True, то Gajim будет запрашивать аватару для каждого контакта, у которого её не было в последний раз или она уже слишком старая."
+#: ../src/common/config.py:231
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"Если активно, то Gajim будет запрашивать аватару для каждого контакта, у "
+"которого её не было в последний раз или она уже слишком старая."
-#: ../src/common/config.py:229
-msgid "If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message."
-msgstr "Если отключено, то Gajim больше не будет показывать статусную строку в окне беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
+#: ../src/common/config.py:232
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Если неактивно, то Gajim больше не будет показывать строку статуса в окне "
+"беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
-#: ../src/common/config.py:230
-msgid "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
-msgstr "может быть «none», «all» или «in_and_out». Если установлено «none», то Gajim больше не будет выводить сообщения о статусе в комнатах, когда участник меняет свой статус или сообщение о статусе. Если установлено в «all», то Gajim будет выводить все сообщения о статусе. Если установлено в «in_and_out», то Gajim будет выводить сообщение только когда кто-то входит или выходит из комнаты."
+#: ../src/common/config.py:233
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"может быть «none», «all» или «in_and_out». Если установлено «none», то Gajim "
+"больше не будет выводить сообщения о статусе в комнатах, когда участник "
+"меняет свой статус или сообщение о статусе. Если установлено в «all», то "
+"Gajim будет выводить все сообщения о статусе. Если установлено в "
+"«in_and_out», то Gajim будет выводить сообщение только когда кто-то входит "
+"или выходит из комнаты."
-#: ../src/common/config.py:232
+#: ../src/common/config.py:235
msgid "Background color of contacts when they just signed in."
msgstr "Фоновый цвет контакта, который только что вошел."
-#: ../src/common/config.py:233
+#: ../src/common/config.py:236
msgid "Background color of contacts when they just signed out."
msgstr "Фоновый цвет контакта, который только что вышел."
-#: ../src/common/config.py:235
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Если установлено, то восстановленные сообщения будут иметь меньший шрифт."
+#: ../src/common/config.py:238
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr "Если активно, то восстановленные сообщения будут иметь меньший шрифт."
-#: ../src/common/config.py:236
+#: ../src/common/config.py:239
msgid "Don't show avatar for the transport itself."
msgstr "Не показывать аватар для транспорта."
-#: ../src/common/config.py:237
+#: ../src/common/config.py:240
msgid "Don't show roster in the system taskbar."
msgstr "Не показывать ростер в панели задач."
-#: ../src/common/config.py:238
-msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events."
-msgstr "Если True и установлены GTK+ и PyGTK версий 2.8 и выше, то окно будет мигать (поведение по умолчанию для большинства менеджеров окон) когда присутствуют не просмотренные события."
+#: ../src/common/config.py:241
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Если активно и установлены GTK+ и PyGTK версий 2.8 и выше, то окно будет "
+"мигать (поведение по умолчанию для большинства менеджеров окон) когда "
+"присутствуют не просмотренные события."
-#: ../src/common/config.py:240
-msgid "Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences."
-msgstr "Jabberd1.4 не понимает sha данные при входе в комнату, защищенную паролем. Установите эту опцию в False для того, чтобы запретить отсылку sha данных в информации для комнат"
+#: ../src/common/config.py:243
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 не понимает sha данные при входе в комнату, защищенную паролем. "
+"Установите эту опцию в «Неактивно» для того, чтобы запретить отсылку sha "
+"данных в информации для комнат"
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:246
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
"'never' - All messages get their own window.\n"
"'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window."
msgstr ""
"Управляет окном, где помещаются новые сообщения.\n"
"«always» — Все сообщения отправляются в одно окно.\n"
"«always_with_roster» — Как «always» но сообщения в одном окне с ростером.\n"
"«never» — Все сообщения приходят в свои отдельные окна.\n"
"«peracct» — Сообщения для каждой учетной записи отсылаются в свои окна.\n"
-"«pertype» — Каждый тип сообщения (например, беседа или комната) отсылается в свое окно. Заметьте, что при изменении этого параметра требуется перезапуск Gajim, чтобы изменения вступили в силу."
+"«pertype» — Каждый тип сообщения (например, беседа или комната) отсылается в "
+"свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
+"Gajim, чтобы изменения вступили в силу."
-#: ../src/common/config.py:244
+#: ../src/common/config.py:247
msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Если False, вы больше не будете видеть аватары в окне беседы."
+msgstr "Если неактивно, вы больше не будете видеть аватары в окне беседы."
-#: ../src/common/config.py:245
+#: ../src/common/config.py:248
msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Если True, то нажатие клавиши Escape будет закрывать вкладку/окно."
+msgstr "Если активно, то нажатие клавиши Escape будет закрывать вкладку/окно."
-#: ../src/common/config.py:246
+#: ../src/common/config.py:249
msgid "Hides the buttons in chat windows."
msgstr "Скрывает кнопки в окнах чата."
-#: ../src/common/config.py:247
+#: ../src/common/config.py:250
msgid "Hides the banner in a group chat window"
msgstr "Скрывает баннер в окне комнаты"
-#: ../src/common/config.py:248
+#: ../src/common/config.py:251
msgid "Hides the banner in two persons chat window"
msgstr "Скрывает баннер в окне чата"
-#: ../src/common/config.py:249
+#: ../src/common/config.py:252
msgid "Hides the group chat occupants list in group chat window."
msgstr "Скрывает список посетителей в окне комнаты."
-#: ../src/common/config.py:250
-msgid "In a chat, show the nickname at the beginning of a line only when it's not the same person talking than in previous message."
-msgstr "Показывать ник в начале строки в чате только если предыдущее сообщение было написано другим участником."
+#: ../src/common/config.py:253
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"Показывать ник в начале строки в чате только если предыдущее сообщение было "
+"написано другим участником."
-#: ../src/common/config.py:251
+#: ../src/common/config.py:254
msgid "Indentation when using merge consecutive nickname."
-msgstr "Разделитель, используемый при активированной настройке chat_merge_consecutive_nickname."
+msgstr ""
+"Разделитель, используемый при активированной настройке "
+"chat_merge_consecutive_nickname."
-#: ../src/common/config.py:252
+#: ../src/common/config.py:255
msgid "Smooth scroll message in conversation window"
msgstr "Плавно прокручивать сообщения в окне чата"
-#: ../src/common/config.py:253
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "Список цветов, разделенных «:» которые будут использоваться для раскраски ников в комнатах."
-
-#: ../src/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым сообщением, когда нет непрочитанных сообщений."
-
-#: ../src/common/config.py:255
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая строка означает, что сообщение не будет показываться вообще."
-
#: ../src/common/config.py:256
-msgid "If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server."
-msgstr "Если установлено, то у вас появится возможность назначить для учетной записи приоритет меньше нуля в окне настройки учетной записи. БУДЬТЕ ОСТОРОЖНЫ, если вы подключитесь с отрицательным приоритетом, то вы НЕ получите никаких сообщений от сервера."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Список цветов, разделенных «:» которые будут использоваться для раскраски "
+"ников в комнатах."
#: ../src/common/config.py:257
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Если активно, Gajim будет использовать (если возможно) Gnome Keyring для хранения паролей учетных записей."
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+"Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым "
+"сообщением, когда нет непрочитанных сообщений."
#: ../src/common/config.py:258
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Если активно, Gajim будет показывать количество контактов онлайн/всего в строках с названием учетной записи и групп."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
+"строка означает, что сообщение не будет показываться вообще."
#: ../src/common/config.py:259
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все входящие сообщения так, как будто бы они были этого типа."
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Если активно, то у вас появится возможность назначить для учетной записи "
+"приоритет меньше нуля в окне настройки учетной записи. БУДЬТЕ ОСТОРОЖНЫ, "
+"если вы подключитесь с отрицательным приоритетом, то вы НЕ получите никаких "
+"сообщений от сервера."
#: ../src/common/config.py:260
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
-msgstr "Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам сообщение последним, если окно чата еще небыло открыто."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
+"хранения паролей учетных записей."
#: ../src/common/config.py:261
-msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
-msgstr "Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, используя dvips и конвертировать до вставки его в окно чата."
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Если активно, Gajim будет показывать количество контактов онлайн/всего в "
+"строках с названием учетной записи и групп."
#: ../src/common/config.py:262
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все "
+"входящие сообщения так, как будто бы они были этого типа."
+
+#: ../src/common/config.py:263
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам "
+"сообщение последним, если окно чата еще небыло открыто."
+
+#: ../src/common/config.py:264
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, "
+"используя dvips и конвертировать до вставки его в окно чата."
+
+#: ../src/common/config.py:265
msgid "Time of inactivity needed before the change status window closes down."
msgstr "Время не активности прежде чем окно изменения статуса закроется."
-#: ../src/common/config.py:263
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
+#: ../src/common/config.py:266
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
msgstr "Максимальное количество строк в окне. Старые строки будут удалены."
-#: ../src/common/config.py:264
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
-msgstr "Если активно, окно уведомления от notification-daemon будет прикреплено к системному трею."
+#: ../src/common/config.py:267
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+"Если активно, окно уведомления от notification-daemon будет прикреплено к "
+"системному трею."
-#: ../src/common/config.py:265
+#: ../src/common/config.py:268
msgid "Choose interval between 2 checks of idleness."
msgstr "Выберите интервал между 2 проверками на бездействие."
-#: ../src/common/config.py:266
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
+#: ../src/common/config.py:269
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
msgstr "Измените значение для изменения размера отображаемых формул LaTeX."
-#: ../src/common/config.py:267
-msgid "Valid uri schemes. Only schemes in this list will be made accepted as \"real\" uri."
-msgstr "Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» uri."
+#: ../src/common/config.py:270
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled seperately)"
+msgstr ""
+"Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» "
+"uri.(mailto и xmpp обрабатываются отдельно)"
-#: ../src/common/config.py:278
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты для статусов задаются в пункте autopriority_* ."
+#: ../src/common/config.py:281
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты "
+"для статусов задаются в пункте autopriority_* ."
-#: ../src/common/config.py:286
-msgid "Status used to autoconnect as. Can be online, chat, away, xa, dnd, invisible. NOTE: this option is used only if restore_last_status is disabled"
-msgstr "Статус, используемый при автоподключении. Варианты: отключен, в сети, готов поболтать, отошел, недоступен, не беспокоить, невидимка"
+#: ../src/common/config.py:289
+msgid ""
+"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
+"invisible. NOTE: this option is used only if restore_last_status is disabled"
+msgstr ""
+"Статус, используемый при автоподключении. Варианты: отключен, в сети, готов "
+"поболтать, отошел, недоступен, не беспокоить, невидимка"
-#: ../src/common/config.py:287
+#: ../src/common/config.py:290
msgid "If enabled, restore the last status that was used."
msgstr "Если включено, восстанавливать последний использованный статус."
-#: ../src/common/config.py:292
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr "Если отключено, не подписывать присутствие GPG ключом, даже если GPG настроен."
+#: ../src/common/config.py:295
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+"Если отключено, не подписывать присутствие GPG ключом, даже если GPG "
+"настроен."
-#: ../src/common/config.py:294
+#: ../src/common/config.py:297
msgid "Enable ESessions encryption for this account."
msgstr "Включить ESessions шифрование для данной учетной записи."
-#: ../src/common/config.py:295
+#: ../src/common/config.py:298
msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr "Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
+msgstr ""
+"Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
-#: ../src/common/config.py:296
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Упорядоченный список (разделённый пробелами) типов подключения, которые будут перепробованы. Может включать tls, ssl или plain"
+#: ../src/common/config.py:299
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Упорядоченный список (разделённый пробелами) типов подключения, которые "
+"будут перепробованы. Может включать tls, ssl или plain"
-#: ../src/common/config.py:297
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение."
+#: ../src/common/config.py:300
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
+"через незащищенное соединение."
-#: ../src/common/config.py:298
+#: ../src/common/config.py:301
msgid "Show a warning dialog before using standard SSL library."
msgstr "Предупреждать, прежде чем использовать стандартную библиотеку SSL."
-#: ../src/common/config.py:300
+#: ../src/common/config.py:303
msgid "Space separated list of ssl errors to ignore."
msgstr "Разделенный пробелами список игнорирования ошибок ssl"
-#: ../src/common/config.py:312
-msgid "How many seconds to wait for the answer of keepalive packet before we try to reconnect."
-msgstr "Время ожидания (в секундах) ответа на «keepalive packet» перед повторной попыткой соединения."
+#: ../src/common/config.py:315
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr ""
+"Время ожидания (в секундах) ответа на «keepalive packet» перед повторной "
+"попыткой соединения."
#. yes, no, ask
-#: ../src/common/config.py:316
+#: ../src/common/config.py:319
msgid "Jabberd2 workaround"
msgstr "Костыль для jabberd2"
-#: ../src/common/config.py:320
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в параметре file_transfer_proxies для передачи файлов"
+#: ../src/common/config.py:323
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
+"параметре file_transfer_proxies для передачи файлов"
-#: ../src/common/config.py:334
+#: ../src/common/config.py:337
msgid "Answer to receipt requests"
msgstr "Отвечать на запросы уведомления"
-#: ../src/common/config.py:335
+#: ../src/common/config.py:338
msgid "Sent receipt requests"
msgstr "Посылать запросы уведомления"
-#: ../src/common/config.py:389
+#: ../src/common/config.py:346
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что "
+"вы хотите сохранить историю сообщений?"
+
+#: ../src/common/config.py:404
msgid "Is OpenPGP enabled for this contact?"
-msgstr "Используется ли для этого контакта OpenPGP"
+msgstr "Используется ли для этого контакта OpenPGP?"
-#: ../src/common/config.py:390
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
-msgstr "Должен ли Gajim по возможности автоматически начинать для данного контакта зашифрованный сеанс?"
+#: ../src/common/config.py:405
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+"Должен ли Gajim по возможности автоматически начинать для данного контакта "
+"зашифрованный сеанс?"
-#: ../src/common/config.py:391
-#: ../src/common/config.py:394
+#: ../src/common/config.py:406 ../src/common/config.py:409
msgid "Language for which we want to check misspelled words"
msgstr "Язык, который используется при проверке правописания"
-#: ../src/common/config.py:400
+#: ../src/common/config.py:415
msgid "all or space separated status"
msgstr "все или статусы, разделенные пробелом"
-#: ../src/common/config.py:401
+#: ../src/common/config.py:416
msgid "'yes', 'no', or 'both'"
msgstr "«yes» (да), «no» (нет) или «both» (оба)"
-#: ../src/common/config.py:402
-#: ../src/common/config.py:404
-#: ../src/common/config.py:405
-#: ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../src/common/config.py:417 ../src/common/config.py:419
+#: ../src/common/config.py:420 ../src/common/config.py:423
+#: ../src/common/config.py:424
msgid "'yes', 'no' or ''"
msgstr "«yes» (да), «no» (нет) или «» (пусто)"
-#: ../src/common/config.py:415
-#: ../src/common/pep.py:159
+#: ../src/common/config.py:430 ../src/common/pep.py:159
msgid "Sleeping"
msgstr "Сплю"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:431
msgid "Back soon"
msgstr "Скоро буду"
-#: ../src/common/config.py:416
+#: ../src/common/config.py:431
msgid "Back in some minutes."
msgstr "Вернусь через несколько минут"
-#: ../src/common/config.py:417
-#: ../src/common/pep.py:129
+#: ../src/common/config.py:432 ../src/common/pep.py:129
msgid "Eating"
msgstr "Ем"
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
msgid "I'm eating, so leave me a message."
msgstr "Кушаю, так что оставьте сообщение секретарю."
-#: ../src/common/config.py:418
+#: ../src/common/config.py:433
msgid "Movie"
msgstr "В кино"
-#: ../src/common/config.py:418
+#: ../src/common/config.py:433
msgid "I'm watching a movie."
msgstr "Смотрю кино"
-#: ../src/common/config.py:419
-#: ../src/common/pep.py:188
+#: ../src/common/config.py:434 ../src/common/pep.py:188
msgid "Working"
msgstr "Работаю"
-#: ../src/common/config.py:419
+#: ../src/common/config.py:434
msgid "I'm working."
msgstr "Работаю"
-#: ../src/common/config.py:420
+#: ../src/common/config.py:435
msgid "Phone"
msgstr "Телефон"
-#: ../src/common/config.py:420
+#: ../src/common/config.py:435
msgid "I'm on the phone."
msgstr "Говорю по телефону"
-#: ../src/common/config.py:421
+#: ../src/common/config.py:436
msgid "Out"
msgstr "Вышел"
-#: ../src/common/config.py:421
+#: ../src/common/config.py:436
msgid "I'm out enjoying life."
msgstr "Наслаждаюсь жизнью, чего и вам желаю."
-#: ../src/common/config.py:425
+#: ../src/common/config.py:440
msgid "I'm available."
msgstr "Я здесь."
-#: ../src/common/config.py:426
+#: ../src/common/config.py:441
msgid "I'm free for chat."
msgstr "Я готов поболтать."
-#: ../src/common/config.py:427
-#: ../src/config.py:1397
+#: ../src/common/config.py:442 ../src/config.py:1396
msgid "Be right back."
msgstr "Скоро буду."
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
msgid "I'm not available."
msgstr "Меня нет."
-#: ../src/common/config.py:429
+#: ../src/common/config.py:444
msgid "Do not disturb."
msgstr "Не беспокоить."
-#: ../src/common/config.py:430
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445 ../src/common/config.py:446
msgid "Bye!"
msgstr "Пока!"
-#: ../src/common/config.py:441
-msgid "Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname."
-msgstr "Звук, который нужно воспроизвести, когда в MUC появляется сообщение, которое содержит слово из списка muc_highlight_words, или когда сообщение содержит ваш ник."
+#: ../src/common/config.py:456
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Звук, который нужно воспроизвести, когда в MUC появляется сообщение, которое "
+"содержит слово из списка muc_highlight_words, или когда сообщение содержит "
+"ваш ник."
-#: ../src/common/config.py:442
+#: ../src/common/config.py:457
msgid "Sound to play when any MUC message arrives."
msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
-#: ../src/common/config.py:451
-#: ../src/common/optparser.py:229
+#: ../src/common/config.py:466 ../src/common/optparser.py:235
msgid "green"
msgstr "зеленый"
-#: ../src/common/config.py:455
-#: ../src/common/optparser.py:215
+#: ../src/common/config.py:470 ../src/common/optparser.py:221
msgid "grocery"
msgstr "овощной"
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
msgid "human"
msgstr "телесный"
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
msgid "marine"
msgstr "морской"
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:73
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
msgid "Unable to load idle module"
msgstr "Не могу загрузить модуль «idle»"
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:235
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
msgid "Wrong host"
msgstr "Неверный хост"
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:236
msgid "Invalid local address? :-O"
msgstr "Неправильный локальный адрес? :-O"
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:669
#, python-format
msgid "Registration information for transport %s has not arrived in time"
msgstr "Данные о регистрации для транспорта %s не пришли вовремя."
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1845
-#: ../src/common/connection_handlers.py:1891
-#: ../src/common/connection_handlers.py:2079
-#: ../src/common/connection_handlers.py:2205
-#: ../src/common/connection.py:1220
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:676
+msgid "Registration succeeded"
+msgstr "Регистрация завершена"
+
+#: ../src/common/connection_handlers.py:677
+#, python-format
+msgid "Resgitration with agent %s succeeded"
+msgstr "Регистрация сервиса %s завершена успешно"
+
+#: ../src/common/connection_handlers.py:679
+msgid "Registration failed"
+msgstr "Ошибка регистрации"
+
+#: ../src/common/connection_handlers.py:679
+#, python-format
+msgid ""
+"Resgitration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"Регистрация сервиса %(agent)s завершилась ошибкой: %(error)s: %(error_msg)s"
+
+#: ../src/common/connection_handlers.py:967
+#: ../src/common/connection_handlers.py:1901
+#: ../src/common/connection_handlers.py:1947
+#: ../src/common/connection_handlers.py:2135
+#: ../src/common/connection_handlers.py:2268 ../src/common/connection.py:1313
+#: ../src/gajim.py:399
msgid "Disk Write Error"
msgstr "Ошибка записи на диск"
-#: ../src/common/connection_handlers.py:1137
-#: ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1174 ../src/common/connection.py:909
msgid "Invisibility not supported"
msgstr "Невидимость не поддерживается"
-#: ../src/common/connection_handlers.py:1138
-#: ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1175 ../src/common/connection.py:910
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Учетная запись %s не поддерживает невидимость."
-#: ../src/common/connection_handlers.py:1848
-#: ../src/common/connection_handlers.py:1894
-#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2208
-#: ../src/common/connection.py:1223
-#: ../src/gajim.py:171
+#: ../src/common/connection_handlers.py:1729 ../src/common/connection.py:1144
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3093 ../src/dataforms_widget.py:580 ../src/dialogs.py:2354
+msgid "Invalid Jabber ID"
+msgstr "Неверный Jabber ID"
+
+#: ../src/common/connection_handlers.py:1730
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Было получено сообщение от неверного JID, оно было проигнорировано."
+
+#: ../src/common/connection_handlers.py:1904
+#: ../src/common/connection_handlers.py:1950
+#: ../src/common/connection_handlers.py:2138
+#: ../src/common/connection_handlers.py:2271 ../src/common/connection.py:1316
+#: ../src/gajim.py:178
#, python-format
-msgid "The database file (%s) cannot be read. Try to repair it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
-msgstr "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история будет утеряна)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его"
+"(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история "
+"будет утеряна)."
-#: ../src/common/connection_handlers.py:1966
+#: ../src/common/connection_handlers.py:2022
#, python-format
msgid "Nickname not allowed: %s"
msgstr "Ник недопустим: %s"
@@ -3799,288 +4256,287 @@
#. we are banned
#. group chat does not exist
#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2041
-#: ../src/common/connection_handlers.py:2044
-#: ../src/common/connection_handlers.py:2047
-#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2054
-#: ../src/gajim.py:556
+#: ../src/common/connection_handlers.py:2097
+#: ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2103
+#: ../src/common/connection_handlers.py:2106
+#: ../src/common/connection_handlers.py:2110 ../src/gajim.py:538
msgid "Unable to join group chat"
msgstr "Не получается войти в комнату"
-#: ../src/common/connection_handlers.py:2042
+#: ../src/common/connection_handlers.py:2098
#, python-format
msgid "You are banned from group chat %s."
msgstr "Вам запрещено входить в комнату %s."
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2101
#, python-format
msgid "Group chat %s does not exist."
msgstr "Комнаты %s не существует."
-#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2104
msgid "Group chat creation is restricted."
msgstr "Создание комнат запрещено."
-#: ../src/common/connection_handlers.py:2051
+#: ../src/common/connection_handlers.py:2107
#, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr "Необходимо использовать ваш зарегистрированный ник в комнате %s."
-#: ../src/common/connection_handlers.py:2055
+#: ../src/common/connection_handlers.py:2111
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "Вас нет в списке членов комнаты %s."
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2097
+#: ../src/common/connection_handlers.py:2153
msgid "Room has been destroyed"
msgstr "Комната была удалена"
-#: ../src/common/connection_handlers.py:2104
+#: ../src/common/connection_handlers.py:2160
#, python-format
msgid "You can join this room instead: %s"
msgstr "Взамен, вы можете присоединиться к комнате: %s"
-#: ../src/common/connection_handlers.py:2131
+#: ../src/common/connection_handlers.py:2187
msgid "I would like to add you to my roster."
msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2152
+#: ../src/common/connection_handlers.py:2208
#, python-format
msgid "we are now subscribed to %s"
msgstr "теперь мы подписались на %s"
-#: ../src/common/connection_handlers.py:2154
+#: ../src/common/connection_handlers.py:2210
#, python-format
msgid "unsubscribe request from %s"
msgstr "%s хочет отменить подписку"
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2212
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "теперь мы отписались от %s"
-#: ../src/common/connection_handlers.py:2331
+#: ../src/common/connection_handlers.py:2394
#, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. Используйте средство управления ростера, например http://jru.jabberstudio.org/, чтобы удалить его"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. Используйте "
+"средство управления ростера, например http://jru.jabberstudio.org/, чтобы "
+"удалить его"
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2356
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2419
+#: ../src/common/zeroconf/connection_zeroconf.py:173
msgid "OpenPGP passphrase was not given"
msgstr "Не задана парольная фраза OpenPGP"
#. %s is the account name here
-#: ../src/common/connection_handlers.py:2358
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931
-#: ../src/roster_window.py:1951
+#: ../src/common/connection_handlers.py:2421
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1925 ../src/roster_window.py:1945
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Вы будете подключены к %s без использования OpenPGP."
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
msgid "Unable to get issuer certificate"
msgstr "Не удалось получить сертификат издателя"
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
msgid "Unable to get certificate CRL"
msgstr "Не удалось получить сертификат CRL"
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
msgid "Unable to decrypt certificate's signature"
msgstr "Не удалось расшифровать подпись сертификата"
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
msgid "Unable to decrypt CRL's signature"
msgstr "Не удалось расшифровать подпись CRL"
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
msgid "Unable to decode issuer public key"
msgstr "Не удалось расшифровать открытый ключ издателя"
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
msgid "Certificate signature failure"
msgstr "Ошибка подписи сертификата"
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
msgid "CRL signature failure"
msgstr "Ошибка подписи CRL"
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
msgid "Certificate is not yet valid"
msgstr "Сертификат ещё не действителен"
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
msgid "Certificate has expired"
msgstr "Сертификат просрочен"
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
msgid "CRL is not yet valid"
msgstr "CRL ещё не действителен"
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
msgid "CRL has expired"
msgstr "CRL просрочен"
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
msgid "Format error in certificate's notBefore field"
msgstr "Ошибка в поле notBefore сертификата"
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
msgid "Format error in certificate's notAfter field"
msgstr "Ошибка в поле notAfter сертификата"
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
msgid "Format error in CRL's lastUpdate field"
-msgstr "Ошибка в CRL в поле lastUpdate"
+msgstr "Ошибка в поле «lastUpdate» CRL"
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
msgid "Format error in CRL's nextUpdate field"
-msgstr "Ошибка в CRL в поле nextUpdate"
+msgstr "Ошибка в поле «nextUpdate» CRL"
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
msgid "Out of memory"
msgstr "Недостаточно памяти"
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
msgid "Self signed certificate"
msgstr "Сертификат подписан самим владельцем."
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
msgid "Self signed certificate in certificate chain"
msgstr "Самостоятельно подписанный сертификат в цепочке сертификатов"
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
msgid "Unable to get local issuer certificate"
msgstr "Не удалось получить сертификат локального издателя"
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
msgid "Unable to verify the first certificate"
msgstr "Не удалось подтвердить первый сертификат"
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
msgid "Certificate chain too long"
msgstr "Цепочка сертификатов слишком длинная"
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
msgid "Certificate revoked"
msgstr "Сертификат аннулирован"
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
msgid "Invalid CA certificate"
msgstr "Недопустимый сертификат CA"
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
msgid "Path length constraint exceeded"
msgstr "Превышено ограничение по длине пути"
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
msgid "Unsupported certificate purpose"
msgstr "Неподдерживаемое назначение сертификата"
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
msgid "Certificate not trusted"
msgstr "Сертификат не является доверенным"
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
msgid "Certificate rejected"
msgstr "Сертификат отклонен"
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
msgid "Subject issuer mismatch"
msgstr "Несоответствие поставщика сертификата"
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
msgid "Authority and subject key identifier mismatch"
msgstr "Идентификаторы ключа центра сертификации и владельца не совпадают"
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
msgid "Authority and issuer serial number mismatch"
msgstr "Идентификаторы ключа центра сертификации и издателя не совпадают"
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
msgid "Key usage does not include certificate signing"
msgstr "Назначение ключа не включает подписывание сертификата"
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
msgid "Application verification failure"
msgstr "Ошибка при проверке приложения"
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:268
+#: ../src/common/zeroconf/connection_zeroconf.py:215
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "Связь с учетной записью «%s» была потеряна"
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:269
msgid "Reconnect manually."
msgstr "Переподключаться вручную."
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:280
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr "Сервер %(name)s неверно ответил на запрос о регистрации: %(error)s"
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:314
#, python-format
msgid "Server %s provided a different registration form"
msgstr "Сервер %s предоставил другую регистрационную форму"
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:327
#, python-format
msgid "Unknown SSL error: %d"
msgstr "Неизвестная ошибка SSL: %d"
#. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:342
msgid "Invalid answer"
msgstr "Неверный ответ"
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:343
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr "Транспорт %(name)s неверно ответил на запрос о регистрации: %(error)s"
-#: ../src/common/connection.py:522
-msgid "Connection to proxy failed"
-msgstr "Соединение с прокси разорвалось"
-
-#: ../src/common/connection.py:610
-#: ../src/common/connection.py:711
-#: ../src/common/connection.py:1355
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../src/common/connection.py:630 ../src/common/connection.py:747
+#: ../src/common/connection.py:1449
+#: ../src/common/zeroconf/connection_zeroconf.py:249
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Не могу соединиться с «%s»"
-#: ../src/common/connection.py:611
-#: ../src/gajim.py:1052
+#: ../src/common/connection.py:631 ../src/gajim.py:1042
msgid "Check your connection or try again later."
msgstr "Проверьте настройки сети или попробуйте еще раз позже."
-#: ../src/common/connection.py:643
-#: ../src/common/connection.py:691
+#: ../src/common/connection.py:640
+msgid "Connection to proxy failed"
+msgstr "Соединение с прокси разорвалось"
+
+#: ../src/common/connection.py:671 ../src/common/connection.py:727
#, python-format
msgid "Could not connect to account %s"
msgstr "Не могу соединиться с %s"
-#: ../src/common/connection.py:644
-#: ../src/common/connection.py:692
+#: ../src/common/connection.py:672 ../src/common/connection.py:728
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr "Связь с учетной записью %s была потеряна.Попытка подключения."
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:694
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "Достоверность сертификата %s может быть недействительной."
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:697
#, python-format
msgid ""
"\n"
@@ -4089,7 +4545,7 @@
"\n"
"Ошибка SSL: <b>%s</b>"
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:699
#, python-format
msgid ""
"\n"
@@ -4098,47 +4554,56 @@
"\n"
"Неизвестная ошибка SSL: %d"
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:748
msgid "Check your connection or try again later"
msgstr "Проверьте настройки сети или попробуйте еще раз позже"
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:773
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Ошибка аутентификации с «%s»"
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:775
msgid "Please check your login and password for correctness."
msgstr "Проверьте правильность логина и пароля."
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:836
msgid "Error while removing privacy list"
msgstr "Ошибка при удалении списка доступа"
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:837
#, python-format
-msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Deactivate it and try again."
-msgstr "Список доступа %s не может быть удален. Возможно, он используется одним из ваших активных ресурсов. Отключите ресурс и попробуйте снова."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Список доступа %s не может быть удален. Возможно, он используется одним из "
+"ваших активных ресурсов. Отключите ресурс и попробуйте снова."
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/connection.py:1145 ../src/dialogs.py:2355
+#, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "Не удалось передать сообщение %s — этот JID неверен."
+
+#: ../src/common/connection.py:1167
+#: ../src/common/zeroconf/connection_zeroconf.py:389
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "Ни удаленное присутствие не подписано, ни ключ не присвоен."
-#: ../src/common/connection.py:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/connection.py:1169
+#: ../src/common/zeroconf/connection_zeroconf.py:391
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
msgstr "Ключ (%s) контакта не соответствует ключу, присвоенному в Gajim."
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1105
+#: ../src/common/connection.py:1201
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[Это сообщение *зашифровано* (см. :XEP:`27`]"
-#: ../src/common/connection.py:1210
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1303
+#: ../src/common/zeroconf/connection_zeroconf.py:468
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -4147,27 +4612,20 @@
"Тема: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:1388
+#: ../src/common/connection.py:1482
msgid "Not fetched because of invisible status"
msgstr "Нельзя получить из-за невидимости"
-#: ../src/common/contacts.py:92
-#: ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:62
+#: ../src/gajim.py:965
msgid "Observers"
msgstr "Наблюдатели"
-#: ../src/common/contacts.py:96
-#: ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73
-#: ../src/disco.py:117
-#: ../src/disco.py:118
-#: ../src/disco.py:1348
-#: ../src/gajim.py:802
-#: ../src/roster_window.py:818
-#: ../src/roster_window.py:1471
-#: ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540
-#: ../src/roster_window.py:1677
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:62 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1349 ../src/gajim.py:794 ../src/roster_window.py:815
+#: ../src/roster_window.py:1469 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
msgid "Transports"
msgstr "Транспорты"
@@ -4176,11 +4634,11 @@
msgstr "Не в ростере"
#. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:49
msgid "D-Bus python bindings are missing in this computer"
msgstr "На компьютере не установлена библиотека D-Bus для Python"
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:50
msgid "D-Bus capabilities of Gajim cannot be used"
msgstr "Возможности работы Gajim с D-Bus не могут быть использованы"
@@ -4194,7 +4652,9 @@
#: ../src/common/exceptions.py:55
msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Сервис недоступен: Gajim не запущен или отключена функция удаленного управления"
+msgstr ""
+"Сервис недоступен: Gajim не запущен или отключена функция удаленного "
+"управления (настройка remote_control)"
#: ../src/common/exceptions.py:63
msgid "D-Bus is not present on this machine or python module is missing"
@@ -4258,68 +4718,55 @@
#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
msgid "$0 o'clock"
msgstr "%0"
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
msgid "five past $0"
msgstr "пять минут %1"
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
msgid "ten past $0"
msgstr "десять минут %1"
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
msgid "quarter past $0"
msgstr "четверть %1"
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
msgid "twenty past $0"
msgstr "двадцать минут %1"
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
msgid "twenty five past $0"
msgstr "двадцать пять минут %1"
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
msgid "half past $0"
msgstr "половина %1"
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
msgid "twenty five to $1"
msgstr "без двадцати пяти %1"
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
msgid "twenty to $1"
msgstr "без двадцати %1"
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
msgid "quarter to $1"
msgstr "без четверти %1"
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
msgid "ten to $1"
msgstr "без десяти %1"
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
msgid "five to $1"
msgstr "без пяти %1"
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
msgid "$1 o'clock"
msgstr "%1"
@@ -4371,208 +4818,206 @@
msgid "Weekend!"
msgstr "Выходные!"
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:147
msgid "Invalid character in username."
msgstr "Неверный символ в имени пользователя."
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:152
msgid "Server address required."
msgstr "Требуется адрес сервера."
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:158
msgid "Invalid character in hostname."
msgstr "Неверный символ в имени сервера"
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:165
msgid "Invalid character in resource."
msgstr "Неверный символ в ресурсе"
#. GiB means gibibyte
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:205
#, python-format
msgid "%s GiB"
msgstr "%s GiB"
#. GB means gigabyte
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:208
#, python-format
msgid "%s GB"
msgstr "%s GB"
#. MiB means mibibyte
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:212
#, python-format
msgid "%s MiB"
msgstr "%s MiB"
#. MB means megabyte
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:215
#, python-format
msgid "%s MB"
msgstr "%s MB"
#. KiB means kibibyte
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:219
#, python-format
msgid "%s KiB"
msgstr "%s KiB"
#. KB means kilo bytes
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:222
#, python-format
msgid "%s KB"
msgstr "%s KB"
#. B means bytes
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:225
#, python-format
msgid "%s B"
msgstr "%s B"
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:256
msgid "_Busy"
msgstr "_Занят"
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:258
msgid "Busy"
msgstr "Занят"
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:261
msgid "_Not Available"
msgstr "_Недоступен"
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:266
msgid "_Free for Chat"
msgstr "_Готов поболтать"
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:268
msgid "Free for Chat"
msgstr "Готов поболтать"
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:271
msgid "_Available"
msgstr "_Доступен"
-#: ../src/common/helpers.py:284
-#: ../src/features_window.py:121
+#: ../src/common/helpers.py:273 ../src/features_window.py:115
msgid "Available"
msgstr "Доступен"
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:275
msgid "Connecting"
msgstr "Соединяюсь"
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:278
msgid "A_way"
msgstr "_Ушел"
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:283
msgid "_Offline"
msgstr "_Отключен"
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:285
msgid "Offline"
msgstr "Отключен"
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:288
msgid "_Invisible"
msgstr "_Невидимка"
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:294
msgid "?contact has status:Unknown"
msgstr "Неизвестен"
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:296
msgid "?contact has status:Has errors"
msgstr "Ошибка"
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:301
msgid "?Subscription we already have:None"
msgstr "Нет"
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:303
msgid "To"
msgstr "К"
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:307
msgid "Both"
msgstr "Оба"
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:315
msgid "?Ask (for Subscription):None"
msgstr "Нет"
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:317
msgid "Subscribe"
msgstr "Подписаться"
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:326
msgid "?Group Chat Contact Role:None"
msgstr "Отсутствует"
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:329
msgid "Moderators"
msgstr "Модераторы"
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:331
msgid "Moderator"
msgstr "Модератор"
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:334
msgid "Participants"
msgstr "Участники"
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:336
msgid "Participant"
msgstr "Участник"
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:339
msgid "Visitors"
msgstr "Посетители"
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:341
msgid "Visitor"
msgstr "Посетитель"
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:347
msgid "?Group Chat Contact Affiliation:None"
msgstr "?Group Chat Contact Affiliation:Отсутствует"
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:349
msgid "Owner"
msgstr "Владелец"
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:351
msgid "Administrator"
msgstr "Администратор"
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:353
msgid "Member"
msgstr "Участник"
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:390
msgid "is paying attention to the conversation"
msgstr "читает сообщение"
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:392
msgid "is doing something else"
msgstr "занят чем-то еще"
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:394
msgid "is composing a message..."
msgstr "печатает сообщение..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:397
msgid "paused composing a message"
msgstr "перестал печатать сообщение"
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:399
msgid "has closed the chat window or tab"
msgstr "закрыл окно чата или вкладку"
-#: ../src/common/helpers.py:992
-#: ../src/common/helpers.py:999
+#: ../src/common/helpers.py:984 ../src/common/helpers.py:991
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
@@ -4580,24 +5025,22 @@
msgstr[1] "%d пропущенных сообщения"
msgstr[2] "%d пропущенных сообщений"
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:997
#, python-format
msgid " from room %s"
msgstr " в комнате %s"
-#: ../src/common/helpers.py:1008
-#: ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1000 ../src/common/helpers.py:1019
#, python-format
msgid " from user %s"
msgstr " от пользователя %s"
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1002
#, python-format
msgid " from %s"
msgstr " от %s"
-#: ../src/common/helpers.py:1017
-#: ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1009 ../src/common/helpers.py:1016
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
@@ -4605,30 +5048,34 @@
msgstr[1] "%d события пропущено"
msgstr[2] "%d событий пропущено"
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1049
#, python-format
msgid "Gajim - %s"
msgstr "Gajim — %s"
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Ошибка выполнения «%(command)s»: %(error)s"
+
#. we talk about a file
#: ../src/common/optparser.py:56
#, python-format
msgid "error: cannot open %s for reading"
msgstr "ошибка: не могу открыть %s для чтения"
-#: ../src/common/optparser.py:224
-#: ../src/common/optparser.py:225
+#: ../src/common/optparser.py:230 ../src/common/optparser.py:231
msgid "cyan"
msgstr "синий"
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:347
msgid "migrating logs database to indices"
msgstr "переносим журнал на индексы"
-#: ../src/common/passwords.py:92
+#: ../src/common/passwords.py:117
#, python-format
-msgid "Gajim account %s"
-msgstr "Учётная запись Gajim %s"
+msgid "XMPP account %s@%s"
+msgstr "XMPP учетная запись %s@%s"
#: ../src/common/pep.py:29
msgid "Afraid"
@@ -5042,8 +5489,7 @@
msgid "Exercising"
msgstr "Занимаюсь спортом"
-#: ../src/common/pep.py:135
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
msgid "Cycling"
msgstr "На велосипеде"
@@ -5260,39 +5706,46 @@
msgstr "Пишу"
#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
#, python-format
msgid "Unable to bind to port %s."
msgstr "Не могу привязаться к порту %s."
-#: ../src/common/socks5.py:85
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
+#: ../src/common/socks5.py:87
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
#. we're not english
-#: ../src/common/stanza_session.py:278
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[Это часть зашифрованного сообщения. Если вы видите это сообщение, возможно, произошла ошибка.]"
+#: ../src/common/stanza_session.py:281
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[Это часть зашифрованного сообщения. Если вы видите это сообщение, возможно, "
+"произошла ошибка.]"
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Не удалось соединиться с хостом: истекло время ожидания."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
#, python-format
-msgid "The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored."
-msgstr "Хост %s, который настроен как ft_add_hosts_to_send, не действителен, поэтому игнорируется."
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Хост %s, который настроен как ft_add_hosts_to_send, не действителен, поэтому "
+"игнорируется."
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:216
msgid "To continue sending and receiving messages, you will need to reconnect."
msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:239
msgid "Avahi error"
msgstr "Ошибка Avahi"
# link-local это вроде не просто локальный. http://en.wikipedia.org/wiki/Link-local_address
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:239
#, python-format
msgid ""
"%s\n"
@@ -5301,210 +5754,175 @@
"%s\n"
"Возможно, обмен локальными сообщениями работает не верно."
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:250
msgid "Please check if Avahi or Bonjour is installed."
msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
msgid "Could not start local service"
msgstr "Не могу запустить локальный сервис"
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:260
#, python-format
msgid "Unable to bind to port %d."
msgstr "Не могу использовать порт %d."
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
msgid "Please check if avahi-daemon is running."
msgstr "Удостоверьтесь, что демон avahi запущен."
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:358
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "Не могу изменить статус учётной записи «%s»"
-#: ../src/common/zeroconf/connection_zeroconf.py:374
-msgid "You are not connected or not visible to others. Your message could not be sent."
-msgstr "Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
+#: ../src/common/zeroconf/connection_zeroconf.py:381
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:399
msgid "[This message is encrypted]"
msgstr "[Это сообщение зашифровано]"
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:483
msgid "Your message could not be sent."
msgstr "Ваше сообщение не может быть отправлено."
#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:489
msgid "Contact is offline. Your message could not be sent."
msgstr "Контакт не в сети. Отправить сообщение не удалось."
+#: ../src/common/zeroconf/connection_zeroconf.py:586
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "Не удалось соединиться с хостом: истекло время ожидания."
+
#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
#, python-format
msgid "Error while adding service. %s"
msgstr "Ошибка при добавлении службы. %s"
-#: ../src/config.py:150
-#: ../src/config.py:582
+#: ../src/config.py:150 ../src/config.py:597
msgid "Disabled"
msgstr "Отключены"
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Активен"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Событие"
-
-#: ../src/config.py:405
+#: ../src/config.py:387
msgid "Default Message"
msgstr "Сообщение по умолчанию"
-#: ../src/config.py:412
+#: ../src/config.py:394
msgid "Enabled"
msgstr "Включено"
-#: ../src/config.py:454
+#: ../src/config.py:436
msgid "Always use OS/X default applications"
msgstr "Всегда использовать приложения OS/X по умолчанию"
-#: ../src/config.py:455
+#: ../src/config.py:437
msgid "Custom"
msgstr "Другое"
-#: ../src/config.py:650
-#: ../src/dialogs.py:1200
+#: ../src/config.py:663 ../src/dialogs.py:1196
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Нет словаря для языка %s"
-#: ../src/config.py:651
+#: ../src/config.py:664
#, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Чтобы воспользоваться проверкой правописания, установите словарь для языка %s или выберите другой язык, исправив настройку speller_language."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
+"s или выберите другой язык, исправив настройку speller_language."
-#: ../src/config.py:1016
+#: ../src/config.py:1038
msgid "status message title"
-msgstr "заголовок сообщения сервера"
+msgstr "заголовок сообщения о статусе"
-#: ../src/config.py:1016
+#: ../src/config.py:1038
msgid "status message text"
-msgstr "текст сообщения сервера"
+msgstr "текст сообщения о статусе"
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Получено первое сообщение"
-
-#: ../src/config.py:1054
-msgid "Next Message Received Focused"
-msgstr "Следующее сообщение получено в окне с фокусом"
-
-#: ../src/config.py:1056
-msgid "Next Message Received Unfocused"
-msgstr "Следующее сообщение получено в окне без фокуса"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Контакт подключился"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Контакт отключился"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Сообщение отправлено"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Вас упомянули в комнате"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Получено сообщение в комнате"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "Получено письмо на Gmail"
-
#. Name column
-#: ../src/config.py:1319
-#: ../src/dialogs.py:1824
-#: ../src/dialogs.py:1888
-#: ../src/disco.py:768
-#: ../src/disco.py:1562
-#: ../src/disco.py:1809
+#: ../src/config.py:1318 ../src/dialogs.py:1820 ../src/dialogs.py:1884
+#: ../src/disco.py:770 ../src/disco.py:1562 ../src/disco.py:1808
#: ../src/history_window.py:87
msgid "Name"
msgstr "Имя"
-#: ../src/config.py:1405
+#: ../src/config.py:1404
msgid "Relogin now?"
msgstr "Переподключиться сейчас?"
-#: ../src/config.py:1406
+#: ../src/config.py:1405
msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Если вы хотите, чтобы изменения были применены немедленно, вы должны переподключиться."
+msgstr ""
+"Если вы хотите, чтобы изменения были применены немедленно, вы должны "
+"переподключиться."
-#: ../src/config.py:1531
-#: ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1530 ../src/config.py:1629
+msgid "OpenPGP is not usable on this computer"
msgstr "Невозможно использовать OpenPGP на этом компьютере"
-#: ../src/config.py:1666
-#: ../src/config.py:1709
+#: ../src/config.py:1665 ../src/config.py:1708
msgid "Unread events"
msgstr "Непросмотренные события"
-#: ../src/config.py:1667
+#: ../src/config.py:1666
msgid "Read all pending events before removing this account."
msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
-#: ../src/config.py:1693
+#: ../src/config.py:1692
#, python-format
msgid "You have opened chat in account %s"
msgstr "У вас есть окна чата под учётной записью %s"
-#: ../src/config.py:1694
+#: ../src/config.py:1693
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
-#: ../src/config.py:1705
+#: ../src/config.py:1704
msgid "You are currently connected to the server"
msgstr "Вы сейчас подсоединены к серверу"
-#: ../src/config.py:1706
+#: ../src/config.py:1705
msgid "To change the account name, you must be disconnected."
msgstr "Для смены имени учетной записи необходимо отключиться."
-#: ../src/config.py:1710
+#: ../src/config.py:1709
msgid "To change the account name, you must read all pending events."
-msgstr "Для смены имени учетной записи необходимо просмотреть ожидающие события."
+msgstr ""
+"Для смены имени учетной записи необходимо просмотреть ожидающие события."
-#: ../src/config.py:1716
+#: ../src/config.py:1715
msgid "Account Name Already Used"
msgstr "Такое имя учетной записи уже используется"
-#: ../src/config.py:1717
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Это имя уже используется в другой вашей учетной записи. Выберите другое."
+#: ../src/config.py:1716
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Это имя уже используется в другой вашей учетной записи. Выберите другое."
-#: ../src/config.py:1721
-#: ../src/config.py:1725
+#: ../src/config.py:1720 ../src/config.py:1724
msgid "Invalid account name"
msgstr "Неверное имя учетной записи"
-#: ../src/config.py:1722
+#: ../src/config.py:1721
msgid "Account name cannot be empty."
msgstr "Имя учетной записи не может быть пустым."
-#: ../src/config.py:1726
+#: ../src/config.py:1725
msgid "Account name cannot contain spaces."
msgstr "Имя учетной записи не может содержать пробелы."
@@ -5517,25 +5935,15 @@
msgid "Enter a new name for account %s"
msgstr "Введите новое название для учетной записи %s"
-#: ../src/config.py:1819
-#: ../src/config.py:1827
-#: ../src/config.py:1870
-#: ../src/config.py:3089
-#: ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Неверный Jabber ID"
-
#: ../src/config.py:1828
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Jabber ID должен иметь формат «имя_пользователя@сервер»."
-#: ../src/config.py:2018
-#: ../src/config.py:3161
+#: ../src/config.py:2018 ../src/config.py:3165
msgid "Invalid entry"
msgstr "Неверная запись"
-#: ../src/config.py:2019
-#: ../src/config.py:3162
+#: ../src/config.py:2019 ../src/config.py:3166
msgid "Custom port must be a port number."
msgstr "В качестве номера порта должно выступать число"
@@ -5555,79 +5963,75 @@
msgid "Choose your OpenPGP key"
msgstr "Выберите свой ключ OpenPGP"
-#: ../src/config.py:2088
+#: ../src/config.py:2084
msgid "No such account available"
msgstr "Такая учетная запись недоступна"
-#: ../src/config.py:2089
+#: ../src/config.py:2085
msgid "You must create your account before editing your personal information."
-msgstr "Перед редактированием личных данных необходимо сначала создать учетную запись."
+msgstr ""
+"Перед редактированием личных данных необходимо сначала создать учетную "
+"запись."
-#: ../src/config.py:2096
-#: ../src/dialogs.py:1676
-#: ../src/dialogs.py:1812
-#: ../src/dialogs.py:1991
-#: ../src/disco.py:439
-#: ../src/profile_window.py:320
+#: ../src/config.py:2092 ../src/dialogs.py:1672 ../src/dialogs.py:1808
+#: ../src/dialogs.py:1987 ../src/disco.py:439 ../src/profile_window.py:317
msgid "You are not connected to the server"
msgstr "Вы не подключены к серверу"
-#: ../src/config.py:2097
+#: ../src/config.py:2093
msgid "Without a connection, you can not edit your personal information."
msgstr "Чтобы отредактировать личную информацию, нужно подключиться к серверу."
-#: ../src/config.py:2101
+#: ../src/config.py:2097
msgid "Your server doesn't support Vcard"
msgstr "Сервер не поддерживает Vcard"
-#: ../src/config.py:2102
+#: ../src/config.py:2098
msgid "Your server can't save your personal information."
msgstr "Ваш сервер не может хранить личную информацию."
-#: ../src/config.py:2133
+#: ../src/config.py:2129
msgid "Account Local already exists."
msgstr "Учётная запись Local уже существует."
-#: ../src/config.py:2134
+#: ../src/config.py:2130
msgid "Please rename or remove it before enabling link-local messaging."
msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
-#: ../src/config.py:2317
+#: ../src/config.py:2313
#, python-format
msgid "Edit %s"
msgstr "Править %s"
-#: ../src/config.py:2319
+#: ../src/config.py:2315
#, python-format
msgid "Register to %s"
msgstr "Зарегистрировать %s"
#. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2351
msgid "Ban List"
msgstr "Черный список"
-#: ../src/config.py:2356
+#: ../src/config.py:2352
msgid "Member List"
msgstr "Список участников"
-#: ../src/config.py:2357
+#: ../src/config.py:2353
msgid "Owner List"
msgstr "Список владельцев"
-#: ../src/config.py:2358
+#: ../src/config.py:2354
msgid "Administrator List"
msgstr "Список администраторов"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2407
-#: ../src/disco.py:775
-#: ../src/history_manager.py:184
+#: ../src/config.py:2403 ../src/disco.py:777 ../src/history_manager.py:183
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2415
+#: ../src/config.py:2413
msgid "Reason"
msgstr "Причина"
@@ -5635,16 +6039,16 @@
msgid "Nick"
msgstr "Ник"
-#: ../src/config.py:2424
+#: ../src/config.py:2426
msgid "Role"
msgstr "Обязанность"
-#: ../src/config.py:2449
+#: ../src/config.py:2453
msgid "Banning..."
msgstr "Баню..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2455
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -5652,11 +6056,11 @@
"<b>Кого вы хотите забанить?</b>\n"
"\n"
-#: ../src/config.py:2453
+#: ../src/config.py:2457
msgid "Adding Member..."
msgstr "Добавляю участника..."
-#: ../src/config.py:2454
+#: ../src/config.py:2458
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -5664,11 +6068,11 @@
"<b>Кого вы хотите сделать участником?</b>\n"
"\n"
-#: ../src/config.py:2456
+#: ../src/config.py:2460
msgid "Adding Owner..."
msgstr "Добавляю владельца..."
-#: ../src/config.py:2457
+#: ../src/config.py:2461
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -5676,11 +6080,11 @@
"<b>Кого вы хотите сделать владельцем?</b>\n"
"\n"
-#: ../src/config.py:2459
+#: ../src/config.py:2463
msgid "Adding Administrator..."
msgstr "Добавляю администратора..."
-#: ../src/config.py:2460
+#: ../src/config.py:2464
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -5688,7 +6092,7 @@
"<b>Кого вы хотите сделать администратором?</b>\n"
"\n"
-#: ../src/config.py:2461
+#: ../src/config.py:2465
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -5704,110 +6108,112 @@
"4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
"domain/resource, так и адрес, содержащий этот поддомен)"
-#: ../src/config.py:2558
+#: ../src/config.py:2562
#, python-format
msgid "Removing %s account"
msgstr "Удаление учетной записи %s"
-#: ../src/config.py:2580
-#: ../src/gajim.py:1424
-#: ../src/roster_window.py:1943
+#: ../src/config.py:2584 ../src/gajim.py:1418 ../src/roster_window.py:1937
msgid "Password Required"
msgstr "Требуется пароль"
-#: ../src/config.py:2581
-#: ../src/roster_window.py:1917
+#: ../src/config.py:2585 ../src/roster_window.py:1911
#, python-format
msgid "Enter your password for account %s"
msgstr "Введите пароль для учетной записи %s"
-#: ../src/config.py:2582
-#: ../src/roster_window.py:1944
+#: ../src/config.py:2586 ../src/roster_window.py:1938
msgid "Save password"
msgstr "Сохранить пароль"
-#: ../src/config.py:2591
+#: ../src/config.py:2595
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Учетная запись «%s» подключена к серверу"
-#: ../src/config.py:2592
+#: ../src/config.py:2596
msgid "If you remove it, the connection will be lost."
msgstr "Если вы удалите его, произойдет отключение."
-#: ../src/config.py:2688
+#: ../src/config.py:2692
msgid "Default"
msgstr "По умолчанию"
-#: ../src/config.py:2688
+#: ../src/config.py:2692
msgid "?print_status:All"
msgstr "?print_status:Все"
-#: ../src/config.py:2689
+#: ../src/config.py:2693
msgid "Enter and leave only"
msgstr "Только приход и уход"
-#: ../src/config.py:2690
+#: ../src/config.py:2694
msgid "?print_status:None"
msgstr "?print_status:Нет"
-#: ../src/config.py:2758
+#: ../src/config.py:2762
msgid "New Group Chat"
msgstr "Новая комната"
-#: ../src/config.py:2791
+#: ../src/config.py:2795
msgid "This bookmark has invalid data"
msgstr "Эта закладка содержит неверные данные"
-#: ../src/config.py:2792
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите эту закладку."
+#: ../src/config.py:2796
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите "
+"эту закладку."
-#: ../src/config.py:3072
+#: ../src/config.py:3076
msgid "Invalid username"
msgstr "Неверное имя пользователя"
-#: ../src/config.py:3074
+#: ../src/config.py:3078
msgid "You must provide a username to configure this account."
msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
-#: ../src/config.py:3100
+#: ../src/config.py:3104
msgid "Duplicate Jabber ID"
msgstr "Дублирующийся Jabber ID"
-#: ../src/config.py:3101
+#: ../src/config.py:3105
msgid "This account is already configured in Gajim."
msgstr "Этот контакт уже настроен в Gajim."
-#: ../src/config.py:3118
+#: ../src/config.py:3122
msgid "Account has been added successfully"
msgstr "Учетная запись успешно добавлена"
-#: ../src/config.py:3119
-#: ../src/config.py:3308
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menuitem under the Edit menu from the main window."
-msgstr "Вы можете установить расширенные настройки учетной записи нажатием кнопки «Дополнительно», или сделать это позже посредством пункта «Учетные записи» меню «Правка» в главном окне программы."
+#: ../src/config.py:3123 ../src/config.py:3312
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"Вы можете установить расширенные настройки учетной записи нажатием кнопки "
+"«Дополнительно», или сделать это позже посредством пункта «Учетные записи» "
+"меню «Правка» в главном окне программы."
-#: ../src/config.py:3137
+#: ../src/config.py:3141
msgid "Invalid server"
msgstr "Неверный сервер"
-#: ../src/config.py:3138
+#: ../src/config.py:3142
msgid "Please provide a server on which you want to register."
msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
-#: ../src/config.py:3189
-#: ../src/gajim.py:1996
+#: ../src/config.py:3193 ../src/gajim.py:1997
msgid "Certificate Already in File"
msgstr "Сертификат уже находится в файле"
-#: ../src/config.py:3190
-#: ../src/gajim.py:1997
+#: ../src/config.py:3194 ../src/gajim.py:1998
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
-#: ../src/config.py:3258
+#: ../src/config.py:3262
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -5822,8 +6228,7 @@
"Ошибка SSL: %(error)s\n"
"Соединиться с этим сервером?"
-#: ../src/config.py:3264
-#: ../src/gajim.py:2020
+#: ../src/config.py:3268 ../src/gajim.py:2022
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -5834,24 +6239,67 @@
"Отпечаток SHA1 сертификата:\n"
"%s"
-#: ../src/config.py:3287
-#: ../src/config.py:3326
+#: ../src/config.py:3291 ../src/config.py:3330
msgid "An error occurred during account creation"
msgstr "Произошла ошибка при создании учетной записи"
-#: ../src/config.py:3307
+#: ../src/config.py:3311
msgid "Your new account has been created successfully"
msgstr "Ваша новая учетная запись успешно создана"
-#: ../src/config.py:3410
+#: ../src/config.py:3414
msgid "Account name is in use"
msgstr "Такое имя учетной записи уже используется"
-#: ../src/config.py:3411
+#: ../src/config.py:3415
msgid "You already have an account using this name."
msgstr "У вас уже есть учетная запись с таким именем."
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3568
+msgid "Active"
+msgstr "Активен"
+
+#: ../src/config.py:3576
+msgid "Event"
+msgstr "Событие"
+
+#: ../src/config.py:3611
+msgid "First Message Received"
+msgstr "Получено первое сообщение"
+
+#: ../src/config.py:3612
+msgid "Next Message Received Focused"
+msgstr "Следующее сообщение получено в окне с фокусом"
+
+#: ../src/config.py:3614
+msgid "Next Message Received Unfocused"
+msgstr "Следующее сообщение получено в окне без фокуса"
+
+#: ../src/config.py:3615
+msgid "Contact Connected"
+msgstr "Контакт подключился"
+
+#: ../src/config.py:3616
+msgid "Contact Disconnected"
+msgstr "Контакт отключился"
+
+#: ../src/config.py:3617
+msgid "Message Sent"
+msgstr "Сообщение отправлено"
+
+#: ../src/config.py:3618
+msgid "Group Chat Message Highlight"
+msgstr "Вас упомянули в комнате"
+
+#: ../src/config.py:3619
+msgid "Group Chat Message Received"
+msgstr "Получено сообщение в комнате"
+
+#: ../src/config.py:3620
+msgid "GMail Email Received"
+msgstr "Получено письмо на Gmail"
+
+#: ../src/conversation_textview.py:560
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
@@ -5861,7 +6309,7 @@
"Если иконка не пропадает долгое время,\n"
"это означает, что сообщение потеряно."
-#: ../src/conversation_textview.py:568
+#: ../src/conversation_textview.py:579
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
@@ -5869,76 +6317,69 @@
"Текст под этой линией был сказан после того,\n"
"как вы последний раз заглядывали в эту комнату"
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:689
#, python-format
msgid "_Actions for \"%s\""
msgstr "_Действия для «%s»"
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:701
msgid "Read _Wikipedia Article"
msgstr "Смотреть статью в _Wikipedia"
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:706
msgid "Look it up in _Dictionary"
msgstr "Искать в _словаре"
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:723
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "В URL словаря отсутствует «%s» и это не WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:736
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "В URL Web-поиска отсутствует «%s»"
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:739
msgid "Web _Search for it"
msgstr "_Поиск по Web"
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:745
msgid "Open as _Link"
msgstr "Открыть как _ссылку"
-#: ../src/conversation_textview.py:973
-#: ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Ошибка выполнения «%(command)s»: %(error)s"
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1199
msgid "Yesterday"
msgstr "Вчера"
#. the number is >= 2
#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1203
#, python-format
msgid "%i days ago"
msgstr "%i дней назад"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1237
#, python-format
msgid "Subject: %s\n"
msgstr "Тема: %s\n"
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:584
msgid "Jabber ID already in list"
msgstr "Jabber ID уже в списке"
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:585
msgid "The Jabber ID you entered is already in the list. Choose another one."
msgstr "Jabber ID, который вы ввели, уже существует. Выберите другой."
#. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:596
msgid "new(a)jabber.id"
msgstr "new(a)jabber.id"
-#: ../src/dataforms_widget.py:555
-#: ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:599 ../src/dataforms_widget.py:601
#, python-format
msgid "new%d(a)jabber.id"
msgstr "new%d(a)jabber.id"
@@ -5953,140 +6394,139 @@
msgid "Jabber ID: <i>%s</i>"
msgstr "Jabber ID: <i>%s</i>"
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
msgid "Group"
msgstr "Группа"
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
msgid "In the group"
msgstr "В группе"
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:276
msgid "KeyID"
msgstr "KeyID"
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:281
msgid "Contact name"
msgstr "Имя контакта"
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:457
msgid "Set Mood"
msgstr "Установить настроение"
-#: ../src/dialogs.py:549
+#: ../src/dialogs.py:545
#, python-format
msgid "%s Status Message"
msgstr "Сообщение о статусе %s"
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:547
msgid "Status Message"
msgstr "Сообщение о статусе"
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:659
msgid "Overwrite Status Message?"
msgstr "Изменить сообщение о статусе?"
-#: ../src/dialogs.py:664
-msgid "This name is already used. Do you want to overwrite this status message?"
-msgstr "Это имя уже используется. Перезаписать это статусное сообщение?"
+#: ../src/dialogs.py:660
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Это имя уже используется. Перезаписать это сообщение о статусе?"
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:669
msgid "Save as Preset Status Message"
msgstr "Сохранить установленное сообщение о статусе"
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:670
msgid "Please type a name for this status message"
msgstr "Введите имя для этого сообщения о статусе"
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:676
msgid "AIM Address:"
msgstr "Адрес AIM:"
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:677
msgid "GG Number:"
msgstr "Номер GaduGadu"
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:678
msgid "ICQ Number:"
msgstr "Номер ICQ:"
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:679
msgid "MSN Address:"
msgstr "Адрес в MSN:"
-#: ../src/dialogs.py:684
+#: ../src/dialogs.py:680
msgid "Yahoo! Address:"
msgstr "Адрес Yahoo:"
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:716
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr ""
"Заполните данные о контакте,\n"
"который хотите добавить в ростер учетной записи %s"
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:718
msgid "Please fill in the data of the contact you want to add"
msgstr "Заполните данные о контакте, который вы хотите добавить"
-#: ../src/dialogs.py:879
-#: ../src/dialogs.py:885
-#: ../src/dialogs.py:890
+#: ../src/dialogs.py:875 ../src/dialogs.py:881 ../src/dialogs.py:886
msgid "Invalid User ID"
msgstr "Неверный ID пользователя"
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:882
msgid "The user ID must not contain a resource."
msgstr "ID пользователя не должен содержать ресурс."
-#: ../src/dialogs.py:891
+#: ../src/dialogs.py:887
msgid "You cannot add yourself to your roster."
msgstr "Вы не можете добавлять себя в свой ростер."
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:901
msgid "Contact already in roster"
msgstr "Контакт уже в ростере"
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:902
msgid "This contact is already listed in your roster."
msgstr "Этот контакт уже содержится в вашем ростере."
-#: ../src/dialogs.py:942
+#: ../src/dialogs.py:938
msgid "User ID:"
msgstr "ID пользователя:"
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:996
msgid "A GTK+ jabber client"
msgstr "Jabber-клиент на GTK+"
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:997
msgid "GTK+ Version:"
msgstr "Версия GTK+:"
-#: ../src/dialogs.py:1002
+#: ../src/dialogs.py:998
msgid "PyGTK Version:"
msgstr "Версия PyGTK:"
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1008
msgid "Current Developers:"
msgstr "Разработчики:"
-#: ../src/dialogs.py:1014
+#: ../src/dialogs.py:1010
msgid "Past Developers:"
msgstr "Разработчики прошлых версий:"
-#: ../src/dialogs.py:1020
+#: ../src/dialogs.py:1016
msgid "THANKS:"
msgstr "БЛАГОДАРНОСТИ:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1026
+#: ../src/dialogs.py:1022
msgid "Last but not least, we would like to thank all the package maintainers."
msgstr "И наконец, мы хотели бы поблагодарить всех мейнтейнеров пакетов."
#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1039
+#: ../src/dialogs.py:1035
msgid "translator-credits"
msgstr ""
"Яков Безруков <nebulam51(a)gmail.com>\n"
@@ -6095,405 +6535,375 @@
"Денис Фомин <fominde(a)mail.ru>\n"
"Григорий Сарницкий <sargrigory(a)ya.ru>"
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1197
#, python-format
msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n"
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
"\n"
"Highlighting misspelled words feature will not be used"
-msgstr "Чтобы воспользоваться проверкой правописания, установите словарь для языка %s или выберите другой язык, исправив настройку speller_language."
+msgstr ""
+"Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
+"s или выберите другой язык, исправив настройку speller_language."
-#: ../src/dialogs.py:1605
+#: ../src/dialogs.py:1601
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "Запрос на подписку для учетной записи %(account)s от %(jid)s"
-#: ../src/dialogs.py:1608
+#: ../src/dialogs.py:1604
#, python-format
msgid "Subscription request from %s"
msgstr "Запрос на подписку от %s"
-#: ../src/dialogs.py:1669
-#: ../src/gajim.py:2617
+#: ../src/dialogs.py:1665 ../src/gajim.py:2647
#, python-format
msgid "You are already in group chat %s"
msgstr "Вы уже в комнате %s"
-#: ../src/dialogs.py:1677
+#: ../src/dialogs.py:1673
msgid "You can not join a group chat unless you are connected."
msgstr "Вы не можете зайти в комнату без подключения."
-#: ../src/dialogs.py:1696
+#: ../src/dialogs.py:1692
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Войти в комнату с учетной записи %s"
-#: ../src/dialogs.py:1767
+#: ../src/dialogs.py:1763
msgid "Invalid Nickname"
msgstr "Неверное имя пользователя"
-#: ../src/dialogs.py:1768
-#: ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
+#: ../src/dialogs.py:1764 ../src/groupchat_control.py:1441
+#: ../src/groupchat_control.py:1724
msgid "The nickname has not allowed characters."
msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
-#: ../src/dialogs.py:1772
-#: ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:1768 ../src/dialogs.py:1774
+#: ../src/groupchat_control.py:1894
msgid "Invalid group chat Jabber ID"
msgstr "Неверное имя комнаты"
-#: ../src/dialogs.py:1773
-#: ../src/dialogs.py:1779
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:1769 ../src/dialogs.py:1775
+#: ../src/groupchat_control.py:1895
msgid "The group chat Jabber ID has not allowed characters."
msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:1781
msgid "This is not a group chat"
msgstr "Это не комната"
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1782
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s не является именем комнаты."
-#: ../src/dialogs.py:1813
+#: ../src/dialogs.py:1809
msgid "Without a connection, you can not synchronise your contacts."
msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
-#: ../src/dialogs.py:1827
+#: ../src/dialogs.py:1823
msgid "Server"
msgstr "Сервер"
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:1856
msgid "This account is not connected to the server"
msgstr "Учётная запись не подключена к серверу"
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:1857
msgid "You cannot synchronize with an account unless it is connected."
msgstr "Вы не можете синхронизировать учетную запись если она не подключена."
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:1881
msgid "Synchronise"
msgstr "Синхронизировать"
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:1939
#, python-format
msgid "Start Chat with account %s"
msgstr "Начать чат с учетной записью %s"
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:1941
msgid "Start Chat"
msgstr "Начать чат"
-#: ../src/dialogs.py:1946
+#: ../src/dialogs.py:1942
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
-msgstr "Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
+msgstr ""
+"Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
#. if offline or connecting
-#: ../src/dialogs.py:1970
-#: ../src/dialogs.py:2344
-#: ../src/dialogs.py:2487
+#: ../src/dialogs.py:1966 ../src/dialogs.py:2340 ../src/dialogs.py:2490
+#: ../src/normal_control.py:640
msgid "Connection not available"
msgstr "Соединение недоступно"
-#: ../src/dialogs.py:1971
-#: ../src/dialogs.py:2345
-#: ../src/dialogs.py:2488
+#: ../src/dialogs.py:1967 ../src/dialogs.py:2341 ../src/dialogs.py:2491
+#: ../src/normal_control.py:641
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Удостоверьтесь, что вы подключены к «%s»."
-#: ../src/dialogs.py:1980
-#: ../src/dialogs.py:1983
+#: ../src/dialogs.py:1976 ../src/dialogs.py:1979
msgid "Invalid JID"
msgstr "Неверный JID"
-#: ../src/dialogs.py:1983
+#: ../src/dialogs.py:1979
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Не понимаю адреса «%s»."
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:1988
msgid "Without a connection, you can not change your password."
msgstr "Чтобы изменить пароль, необходимо подключиться к серверу."
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2007
msgid "Invalid password"
msgstr "Неверный пароль"
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2007
msgid "You must enter a password."
msgstr "Необходимо ввести пароль."
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2011
msgid "Passwords do not match"
msgstr "Пароли не совпадают"
-#: ../src/dialogs.py:2016
+#: ../src/dialogs.py:2012
msgid "The passwords typed in both fields must be identical."
msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
#. img to display
#. default value
-#: ../src/dialogs.py:2055
-#: ../src/notify.py:245
-#: ../src/notify.py:459
+#: ../src/dialogs.py:2052 ../src/notify.py:245 ../src/notify.py:473
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
msgstr "Контакт подключился"
-#: ../src/dialogs.py:2057
-#: ../src/notify.py:253
-#: ../src/notify.py:461
+#: ../src/dialogs.py:2054 ../src/notify.py:253 ../src/notify.py:475
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "Контакт отключился"
#. chat message
-#: ../src/dialogs.py:2059
-#: ../src/notify.py:276
-#: ../src/notify.py:463
+#: ../src/dialogs.py:2056 ../src/notify.py:276 ../src/notify.py:477
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "Новое сообщение"
#. single message
-#: ../src/dialogs.py:2059
-#: ../src/notify.py:257
-#: ../src/notify.py:463
+#: ../src/dialogs.py:2056 ../src/notify.py:257 ../src/notify.py:477
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "Новое одиночное сообщение"
#. private message
-#: ../src/dialogs.py:2060
-#: ../src/notify.py:264
-#: ../src/notify.py:464
+#: ../src/dialogs.py:2057 ../src/notify.py:264 ../src/notify.py:478
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "Новое личное сообщение"
-#: ../src/dialogs.py:2060
-#: ../src/gajim.py:1587
-#: ../src/notify.py:472
+#: ../src/dialogs.py:2057 ../src/gajim.py:1583 ../src/notify.py:486
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "Новое письмо"
-#: ../src/dialogs.py:2062
-#: ../src/gajim.py:1653
-#: ../src/notify.py:466
+#: ../src/dialogs.py:2059 ../src/gajim.py:1649 ../src/notify.py:480
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "Запрос передачи"
-#: ../src/dialogs.py:2064
-#: ../src/gajim.py:1553
-#: ../src/gajim.py:1620
-#: ../src/notify.py:468
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2061 ../src/gajim.py:1549 ../src/gajim.py:1616
+#: ../src/notify.py:482 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "Ошибка передачи"
-#: ../src/dialogs.py:2066
-#: ../src/gajim.py:1695
-#: ../src/gajim.py:1717
-#: ../src/gajim.py:1734
-#: ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2063 ../src/gajim.py:1691 ../src/gajim.py:1713
+#: ../src/gajim.py:1730 ../src/notify.py:484 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "Передача файла завершена"
-#: ../src/dialogs.py:2067
-#: ../src/gajim.py:1698
-#: ../src/notify.py:470
+#: ../src/dialogs.py:2064 ../src/gajim.py:1694 ../src/notify.py:484
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "Передача остановлена"
-#: ../src/dialogs.py:2069
-#: ../src/gajim.py:1445
-#: ../src/notify.py:474
+#: ../src/dialogs.py:2066 ../src/gajim.py:1439 ../src/notify.py:488
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Приглашение в комнату"
-#: ../src/dialogs.py:2071
-#: ../src/notify.py:237
-#: ../src/notify.py:476
+#: ../src/dialogs.py:2068 ../src/notify.py:237 ../src/notify.py:490
#: ../src/osx/growler.py:16
msgid "Contact Changed Status"
msgstr "Контакт изменит статус"
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2259 ../src/normal_control.py:241
#, python-format
msgid "Single Message using account %s"
msgstr "Новое сообщение с учетной записи %s"
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2261 ../src/normal_control.py:243
#, python-format
msgid "Single Message in account %s"
msgstr "Новое сообщение для учетной записи %s"
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2263 ../src/normal_control.py:245
msgid "Single Message"
msgstr "Сообщение"
#. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2266 ../src/normal_control.py:248
#, python-format
msgid "Send %s"
msgstr "Отправить %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2289 ../src/normal_control.py:290
#, python-format
msgid "Received %s"
msgstr "Получено %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2312 ../src/normal_control.py:324
#, python-format
msgid "Form %s"
msgstr "От %s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2391 ../src/normal_control.py:692
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2389
+#: ../src/dialogs.py:2392 ../src/normal_control.py:696
#, python-format
msgid "%s wrote:\n"
msgstr "%s написал:\n"
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2436
#, python-format
msgid "XML Console for %s"
msgstr "Консоль XML для %s"
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2438
msgid "XML Console"
msgstr "Консоль XML"
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2562
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Список доступа <b><i>%s</i></b>"
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2566
#, python-format
msgid "Privacy List for %s"
msgstr "Список доступа для %s"
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2622
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr "Номер: %(order)s,действие: %(action)s, тип: %(type)s, значение: %(value)s"
+msgstr ""
+"Номер: %(order)s,действие: %(action)s, тип: %(type)s, значение: %(value)s"
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2627
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "Номер: %(order)s, действие: %(action)s"
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2669
msgid "<b>Edit a rule</b>"
msgstr "<b>Изменить правило</b>"
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2756
msgid "<b>Add a rule</b>"
msgstr "<b>Добавить правило</b>"
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2852
#, python-format
msgid "Privacy Lists for %s"
msgstr "Списки доступа для %s"
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2854
msgid "Privacy Lists"
msgstr "Списки доступа"
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2924
msgid "Invalid List Name"
msgstr "Недопустимое имя списка"
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2925
msgid "You must enter a name to create a privacy list."
msgstr "Необходимо ввести имя для нового списка доступа."
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:2957
msgid "You are invited to a groupchat"
msgstr "Вы приглашены в конференцию"
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:2960
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact приглашает вас присоединиться к обсуждению."
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:2962
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact приглашает вас в комнату %(room_jid)s."
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:2970
#, python-format
msgid "Comment: %s"
msgstr "Комментарий: %s"
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2972
msgid "Do you want to accept the invitation?"
msgstr "Вы принимаете приглашение?"
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3027
msgid "Choose Sound"
msgstr "Выберите звуковой файл"
-#: ../src/dialogs.py:3034
-#: ../src/dialogs.py:3085
+#: ../src/dialogs.py:3037 ../src/dialogs.py:3088
msgid "All files"
msgstr "Все файлы"
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3042
msgid "Wav Sounds"
msgstr "В формате Wav"
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3075
msgid "Choose Image"
msgstr "Выбрать картинку"
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3093
msgid "Images"
msgstr "Картинки"
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3158
#, python-format
msgid "When %s becomes:"
msgstr "Когда %s происходит:"
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3160
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Добавление специального уведомления для %s"
#. # means number
-#: ../src/dialogs.py:3228
+#: ../src/dialogs.py:3229
msgid "#"
msgstr "№"
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3235
msgid "Condition"
msgstr "Условие"
-#: ../src/dialogs.py:3352
+#: ../src/dialogs.py:3353
msgid "when I am "
msgstr "когда я "
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:3825
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6504,68 +6914,87 @@
"\n"
"Short Authentication String данного сеанса <b>%(sas)s</b>."
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3829
msgid "You have already verified this contact's identity."
msgstr "Вы уже удостоверили личность этого контакта."
-#: ../src/dialogs.py:3837
-#: ../src/dialogs.py:3924
+#: ../src/dialogs.py:3835 ../src/dialogs.py:3922
msgid "Contact's identity verified"
msgstr "Личность контакта удостоверена"
-#: ../src/dialogs.py:3845
+#: ../src/dialogs.py:3843
msgid "Verify again..."
msgstr "Удостоверить снова..."
-#: ../src/dialogs.py:3850
-msgid "To be certain that <b>only</b> the expected person can read your messages or send you messages, you need to verify their identity by clicking the button below."
-msgstr "Чтобы быть уверенным, что <b>только</b> нужный человек может прочитать ваши сообщения или послать сообщения вам, вы должны удостоверить личность собеседника, нажав кнопку, расположенную ниже."
+#: ../src/dialogs.py:3848
+msgid ""
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
+msgstr ""
+"Чтобы быть уверенным, что <b>только</b> нужный человек может прочитать ваши "
+"сообщения или послать сообщения вам, вы должны удостоверить личность "
+"собеседника, нажав кнопку, расположенную ниже."
-#: ../src/dialogs.py:3853
-#: ../src/dialogs.py:3905
-#: ../src/dialogs.py:3918
+#: ../src/dialogs.py:3851 ../src/dialogs.py:3903 ../src/dialogs.py:3916
msgid "Contact's identity NOT verified"
msgstr "Личность контакта НЕ удостоверена"
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:3858
msgid "Verify..."
msgstr "Удостоверить..."
-#: ../src/dialogs.py:3872
+#: ../src/dialogs.py:3870
msgid "Have you verified the contact's identity?"
msgstr "Вы удостоверили личность удаленного контакта?"
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:3871
#, python-format
msgid ""
-"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> directly (in person or on the phone) and verify that they see the same Short Authentication String (SAS) as you.\n"
+"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
+"directly (in person or on the phone) and verify that they see the same Short "
+"Authentication String (SAS) as you.\n"
"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
-"Для предотвращения атаки типа «человек посередине» вы должны переговорить с <b>%(jid)s</b> напрямую (лично или по телефону) и убедиться, что он видит ту же Short Authentication String (SAS), что и вы.\n"
+"Для предотвращения атаки типа «человек посередине» вы должны переговорить с "
+"<b>%(jid)s</b> напрямую (лично или по телефону) и убедиться, что он видит ту "
+"же Short Authentication String (SAS), что и вы.\n"
"\n"
"Short Authentication String этого сеанса <b>%(sas)s</b>"
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:3872
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "Вы переговорили с удаленным контактом и удостоверили SAS?"
-#: ../src/dialogs.py:3906
+#: ../src/dialogs.py:3904
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr "Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
+msgstr ""
+"Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
-#: ../src/dialogs.py:3912
+#: ../src/dialogs.py:3910
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать сообщения."
+msgstr ""
+"Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
+"сообщения."
-#: ../src/dialogs.py:3919
-msgid "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
-msgstr "Этому контакту присвоен ключ GPG, но <b>вы не доверяете этому ключу</b>. Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
+#: ../src/dialogs.py:3917
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+"Этому контакту присвоен ключ GPG, но <b>вы не доверяете этому ключу</b>. "
+"Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь "
+"вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
-#: ../src/dialogs.py:3925
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "Этому контакту присвоен ключ GPG, и вы доверяете этому ключу. Таким образом, сообщения будут зашифрованы."
+#: ../src/dialogs.py:3923
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+"Этому контакту присвоен ключ GPG, и вы доверяете этому ключу. Таким образом, "
+"сообщения будут зашифрованы."
#: ../src/disco.py:116
msgid "Others"
@@ -6594,11 +7023,14 @@
msgstr "Сервис не обнаружен"
#: ../src/disco.py:657
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и попробуйте еще раз."
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
+"попробуйте еще раз."
-#: ../src/disco.py:661
-#: ../src/disco.py:955
+#: ../src/disco.py:661 ../src/disco.py:957
msgid "The service is not browsable"
msgstr "Сервис недоступен для просмотра"
@@ -6606,34 +7038,32 @@
msgid "This type of service does not contain any items to browse."
msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
-#: ../src/disco.py:699
-#: ../src/disco.py:709
+#: ../src/disco.py:699 ../src/disco.py:709
msgid "Invalid Server Name"
msgstr "Неверное имя сервера"
-#: ../src/disco.py:754
+#: ../src/disco.py:756
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "Просмотр %(address)s с учетной записью %(account)s"
-#: ../src/disco.py:794
+#: ../src/disco.py:796
msgid "_Browse"
msgstr "_Браузер"
-#: ../src/disco.py:956
+#: ../src/disco.py:958
msgid "This service does not contain any items to browse."
msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
-#: ../src/disco.py:1179
+#: ../src/disco.py:1180
msgid "_Execute Command"
msgstr "В_ыполнить команду..."
-#: ../src/disco.py:1189
-#: ../src/disco.py:1353
+#: ../src/disco.py:1190 ../src/disco.py:1354
msgid "Re_gister"
msgstr "За_регистрироваться"
-#: ../src/disco.py:1390
+#: ../src/disco.py:1391
#, python-format
msgid "Scanning %(current)d / %(total)d.."
msgstr "Сканирую %(current)d / %(total)d.."
@@ -6653,250 +7083,277 @@
msgid "Id"
msgstr "ID"
-#: ../src/disco.py:1818
+#: ../src/disco.py:1817
msgid "Subscribed"
msgstr "Подписка"
-#: ../src/disco.py:1826
+#: ../src/disco.py:1825
msgid "Node"
msgstr "Узел"
-#: ../src/disco.py:1883
+#: ../src/disco.py:1882
msgid "New post"
msgstr "Новое сообщение"
-#: ../src/disco.py:1889
+#: ../src/disco.py:1888
msgid "_Subscribe"
msgstr "_Подписаться"
-#: ../src/disco.py:1895
+#: ../src/disco.py:1894
msgid "_Unsubscribe"
msgstr "_Отписаться"
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:45
+msgid "SSL certificat validation"
+msgstr "Подтверждение SSL сертификата"
-#: ../src/features_window.py:52
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "Библиотека используется для подтверждения действительности сертификатов сервера для того, чтобы удостовериться в защищенности соединения."
+#: ../src/features_window.py:46
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Библиотека используется для подтверждения действительности сертификатов "
+"сервера для того, чтобы удостовериться в защищенности соединения."
-#: ../src/features_window.py:53
-#: ../src/features_window.py:54
+#: ../src/features_window.py:47 ../src/features_window.py:48
msgid "Requires python-pyopenssl."
msgstr "Требует python-pyopenssl."
-#: ../src/features_window.py:55
+#: ../src/features_window.py:49
msgid "Bonjour / Zeroconf"
msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:56
+#: ../src/features_window.py:50
msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Не требующее сервера общение между автоматически обнаруживаемыми клиентами в локальной сети."
+msgstr ""
+"Не требующее сервера общение между автоматически обнаруживаемыми клиентами в "
+"локальной сети."
-#: ../src/features_window.py:57
+#: ../src/features_window.py:51
msgid "Requires python-avahi."
msgstr "Требует python-avahi."
-#: ../src/features_window.py:58
+#: ../src/features_window.py:52
msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
msgstr "Требует pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:53
+msgid "Command line"
+msgstr "Командная строка"
-#: ../src/features_window.py:60
+#: ../src/features_window.py:54
msgid "A script to control Gajim via commandline."
-msgstr "Скрипт для управления Gajim'ом через коммандную строку."
+msgstr "Скрипт для управления Gajim'ом через командную строку."
-#: ../src/features_window.py:61
+#: ../src/features_window.py:55
msgid "Requires python-dbus."
msgstr "Требует python-dbus."
-#: ../src/features_window.py:62
-#: ../src/features_window.py:66
-#: ../src/features_window.py:70
-#: ../src/features_window.py:74
-#: ../src/features_window.py:78
-#: ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../src/features_window.py:56 ../src/features_window.py:60
+#: ../src/features_window.py:64 ../src/features_window.py:68
+#: ../src/features_window.py:72 ../src/features_window.py:80
+#: ../src/features_window.py:84
msgid "Feature not available under Windows."
msgstr "Эта возможность отсутствует в Windows."
-#: ../src/features_window.py:63
-msgid "OpenGPG"
-msgstr "OpenGPG"
+#: ../src/features_window.py:57
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP шифрование"
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:58
+msgid "Encrypting chat messages with gpg keys."
msgstr "Шифрование сообщений при помощи gpg ключей."
-#: ../src/features_window.py:65
+#: ../src/features_window.py:59
msgid "Requires gpg and python-GnuPGInterface."
msgstr "Требует gpg и python-GnuPGInterface."
-#: ../src/features_window.py:67
-msgid "network-manager"
-msgstr "network-manager"
+#: ../src/features_window.py:61
+msgid "Network-manager"
+msgstr "Network-manager"
-#: ../src/features_window.py:68
+#: ../src/features_window.py:62
msgid "Autodetection of network status."
msgstr "Автоопределение состояния соединения с сетью."
-#: ../src/features_window.py:69
+#: ../src/features_window.py:63
msgid "Requires gnome-network-manager and python-dbus."
msgstr "Требует gnome-network-manager и python-dbus."
-#: ../src/features_window.py:71
+#: ../src/features_window.py:65
msgid "Session Management"
msgstr "Управление сеансами"
-#: ../src/features_window.py:72
+#: ../src/features_window.py:66
msgid "Gajim session is stored on logout and restored on login."
-msgstr "Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе (login)."
+msgstr ""
+"Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе "
+"(login)."
-#: ../src/features_window.py:73
+#: ../src/features_window.py:67
msgid "Requires python-gnome2."
msgstr "Требует python-gnome2."
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:69
+msgid "Password encryption"
+msgstr "Шифрование паролей"
-#: ../src/features_window.py:76
+#: ../src/features_window.py:70
msgid "Passwords can be stored securely and not just in plaintext."
msgstr "Пароли могут храниться безопасно, а не просто открытым текстом."
-#: ../src/features_window.py:77
+#: ../src/features_window.py:71
msgid "Requires gnome-keyring and python-gnome2-desktop."
msgstr "Требует gnome-keyring и python-gnome2-desktop."
-#: ../src/features_window.py:79
+#: ../src/features_window.py:73
msgid "SRV"
msgstr "SRV"
-#: ../src/features_window.py:80
+#: ../src/features_window.py:74
msgid "Ability to connect to servers which are using SRV records."
msgstr "Возможность соединяться с серверами, использующими SRV записи."
-#: ../src/features_window.py:81
+#: ../src/features_window.py:75
msgid "Requires dnsutils."
msgstr "Требует dnsutils."
-#: ../src/features_window.py:82
+#: ../src/features_window.py:76
msgid "Requires nslookup to use SRV records."
msgstr "Требует nslookup для использования SRV записей."
-#: ../src/features_window.py:83
+#: ../src/features_window.py:77
msgid "Spell Checker"
msgstr "Проверка орфографии"
-#: ../src/features_window.py:84
+#: ../src/features_window.py:78
msgid "Spellchecking of composed messages."
msgstr "Проверка орфографии набираемых сообщений"
-#: ../src/features_window.py:85
-msgid "Requires python-gnome2-extras or compilation of gtkspell module from Gajim sources."
-msgstr "Требует python-gnome2-extras или скомпилированного модуля gtkspell из исходных кодов Gajim."
+#: ../src/features_window.py:79
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+"Требует python-gnome2-extras или скомпилированного модуля gtkspell из "
+"исходных кодов Gajim."
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:81
+msgid "Notification"
+msgstr "Уведомления"
-#: ../src/features_window.py:88
+#: ../src/features_window.py:82
msgid "Passive popups notifying for new events."
msgstr "Пассивные всплывающие окна для уведомления о новых событиях."
-#: ../src/features_window.py:89
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
+#: ../src/features_window.py:83
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
msgstr "Требует python-notify или python-dbus совместно с notification-daemon."
-#: ../src/features_window.py:91
+#: ../src/features_window.py:85
msgid "Trayicon"
msgstr "Иконка в системном трее"
-#: ../src/features_window.py:92
+#: ../src/features_window.py:86
msgid "A icon in systemtray reflecting the current presence."
msgstr "Иконка в системном лотке отображающая текущий статус."
-#: ../src/features_window.py:93
-msgid "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr "Требует python-gnome2-extras или скомпилированного модуля trayicon из исходных кодов Gajim."
+#: ../src/features_window.py:87
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+"Требует python-gnome2-extras или скомпилированного модуля trayicon из "
+"исходных кодов Gajim."
-#: ../src/features_window.py:94
+#: ../src/features_window.py:88
msgid "Requires PyGTK >= 2.10."
msgstr "Требует PyGTK >= 2.10."
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr "Время бездействия"
+#: ../src/features_window.py:89
+msgid "Automatic status"
+msgstr "Авто статус"
-#: ../src/features_window.py:96
+#: ../src/features_window.py:90
msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Возможность определения времени бездействия для того, чтобы установить автостатус."
+msgstr ""
+"Возможность определения времени бездействия для того, чтобы установить "
+"автостатус."
-#: ../src/features_window.py:97
-#: ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
-msgstr "Требует скомпилированного модуля idle из исходных кодов Gajim."
+#: ../src/features_window.py:91
+msgid "Requires libxss library."
+msgstr "Требует библиотеку libxss."
-#: ../src/features_window.py:99
+#: ../src/features_window.py:92
+msgid "Requires python2.5."
+msgstr "Требует python2.5."
+
+#: ../src/features_window.py:93
msgid "LaTeX"
msgstr "LaTeX"
-#: ../src/features_window.py:100
+#: ../src/features_window.py:94
msgid "Transform LaTeX expressions between $$ $$."
msgstr "Преобразовывать LaTeX выражения, заключенные в $$ $$"
-#: ../src/features_window.py:101
-msgid "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Требует texlive-latex-base и dvipng. Необходимо присвоить пункту 'use_latex' значение True в Расширенном редакторе настроек."
+#: ../src/features_window.py:95
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Требует texlive-latex-base и dvipng. Необходимо присвоить пункту 'use_latex' "
+"значение «Активно» в Расширенном редакторе настроек."
-#: ../src/features_window.py:102
-msgid "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Требует texlive-latex-base и dvipng (оба есть в MikTeX). Необходимо присвоить пункту 'use_latex' значение True в Расширенном редакторе настроек."
+#: ../src/features_window.py:96
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Требует texlive-latex-base и dvipng (оба есть в MikTeX). Необходимо "
+"присвоить пункту 'use_latex' значение «Активно» в Расширенном редакторе "
+"настроек."
-#: ../src/features_window.py:103
-msgid "End to End Encryption"
+#: ../src/features_window.py:97
+msgid "End to End message encryption"
msgstr "End to end шифрование"
-#: ../src/features_window.py:104
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:98
+msgid "Encrypting chat messages."
msgstr "Шифрование сообщений чата."
-#: ../src/features_window.py:105
-#: ../src/features_window.py:106
+#: ../src/features_window.py:99 ../src/features_window.py:100
msgid "Requires python-crypto."
msgstr "Требует python-crypto."
-#: ../src/features_window.py:107
+#: ../src/features_window.py:101
msgid "RST Generator"
msgstr "Генератор RST"
-#: ../src/features_window.py:108
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Генерировать XHTML вывод из кода RST (см. http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+#: ../src/features_window.py:102
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Генерировать XHTML вывод из кода RST (см. http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
-#: ../src/features_window.py:109
-#: ../src/features_window.py:110
+#: ../src/features_window.py:103 ../src/features_window.py:104
msgid "Requires python-docutils."
msgstr "Требует python-docutils."
-#: ../src/features_window.py:111
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:105
+msgid "Banners and clickable links"
+msgstr "Кликабельные ссылки"
-#: ../src/features_window.py:112
+#: ../src/features_window.py:106
msgid "Ability to have clickable URLs in chat and groupchat window banners."
msgstr "Кликабельные ссылки в баннере."
-#: ../src/features_window.py:113
-#: ../src/features_window.py:114
+#: ../src/features_window.py:107 ../src/features_window.py:108
msgid "Requires python-sexy."
msgstr "Требует python-sexy."
-#: ../src/features_window.py:128
+#: ../src/features_window.py:122
msgid "Feature"
msgstr "Функции"
@@ -6912,23 +7369,20 @@
msgid "Progress"
msgstr "Прогресс"
-#: ../src/filetransfers_window.py:173
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
#, python-format
msgid "Filename: %s"
msgstr "Имя файла: %s"
-#: ../src/filetransfers_window.py:174
-#: ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
#, python-format
msgid "Size: %s"
msgstr "Размер: %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
-#: ../src/filetransfers_window.py:183
-#: ../src/filetransfers_window.py:193
-#: ../src/history_manager.py:499
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:495
msgid "You"
msgstr "Вы"
@@ -6937,8 +7391,7 @@
msgid "Sender: %s"
msgstr "Отправитель: %s"
-#: ../src/filetransfers_window.py:185
-#: ../src/filetransfers_window.py:596
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
#: ../src/tooltips.py:671
msgid "Recipient: "
msgstr "Получатель:"
@@ -6952,13 +7405,11 @@
msgid "File transfer completed"
msgstr "Передача завершена"
-#: ../src/filetransfers_window.py:212
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
msgid "File transfer cancelled"
msgstr "Передача отменена"
-#: ../src/filetransfers_window.py:212
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
msgid "Connection with peer cannot be established."
msgstr "Соединение не может быть установлено."
@@ -6980,8 +7431,7 @@
msgid "Choose File to Send..."
msgstr "Выбрать файл для отправки..."
-#: ../src/filetransfers_window.py:268
-#: ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
msgid "Description: "
msgstr "Описание: "
@@ -7013,37 +7463,33 @@
msgid "%s wants to send you a file:"
msgstr "%s хочет отправить вам файл:"
-#: ../src/filetransfers_window.py:332
-#: ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:817
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "Не могу заместить существующий файл «%s»"
-#: ../src/filetransfers_window.py:333
-#: ../src/gtkgui_helpers.py:823
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:819
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
-#: ../src/filetransfers_window.py:349
-#: ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:823
msgid "This file already exists"
msgstr "Файл уже существует"
-#: ../src/filetransfers_window.py:349
-#: ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:823
msgid "What do you want to do?"
msgstr "Что вы хотите сделать?"
#. read-only bit is used to mark special folder under windows,
#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:830
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "Папка «%s» не доступна для записи"
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:831
msgid "You do not have permission to create files in this directory."
msgstr "У вас нет права создавать файлы в этой директории."
@@ -7067,8 +7513,7 @@
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/s)"
-#: ../src/filetransfers_window.py:566
-#: ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
msgid "Invalid File"
msgstr "Неверный файл"
@@ -7080,77 +7525,83 @@
msgid "It is not possible to send empty files"
msgstr "Нельзя отсылать пустые файлы"
-#: ../src/filetransfers_window.py:592
-#: ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
msgid "Name: "
msgstr "Имя: "
-#: ../src/filetransfers_window.py:594
-#: ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
msgid "Sender: "
msgstr "Отправитель:"
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
msgid "Pause"
msgstr "Пауза"
-#: ../src/gajim.py:83
+#: ../src/gajim.py:92
#, python-format
msgid "%s is not a valid loglevel"
msgstr "%s не является допустимым loglevel"
-#: ../src/gajim.py:156
+#: ../src/gajim.py:164
msgid "Gajim needs X server to run. Quiting..."
msgstr "Gajim для запуска требуется X-сервер. Выход..."
-#: ../src/gajim.py:186
+#: ../src/gajim.py:193
msgid "Gajim needs PyGTK 2.8 or above"
msgstr "Gajim требуется PyGTK 2.8 или выше"
-#: ../src/gajim.py:187
+#: ../src/gajim.py:194
msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
msgstr "Gajim для запуска требуется PyGTK 2.8 или выше. Выход..."
-#: ../src/gajim.py:189
+#: ../src/gajim.py:196
msgid "Gajim needs GTK 2.8 or above"
msgstr "Gajim требуется GTK 2.8 или выше"
-#: ../src/gajim.py:190
+#: ../src/gajim.py:197
msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
msgstr "Gajim для запуска требуется GTK 2.8 или выше. Выход..."
-#: ../src/gajim.py:195
+#: ../src/gajim.py:202
msgid "GTK+ runtime is missing libglade support"
msgstr "У GTK отсутствует поддержка libglade."
-#: ../src/gajim.py:197
+#: ../src/gajim.py:204
#, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Удалите вашу текущую версию GTK и установите последнюю стабильную версию с %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Удалите вашу текущую версию GTK и установите последнюю стабильную версию с %s"
-#: ../src/gajim.py:199
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#: ../src/gajim.py:206
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."
-#: ../src/gajim.py:204
+#: ../src/gajim.py:211
msgid "Gajim needs PySQLite2 to run"
msgstr "Gajim для запуска требуется PySQLite2"
-#: ../src/gajim.py:212
+#: ../src/gajim.py:219
msgid "Gajim needs pywin32 to run"
msgstr "Gajim для запуска требуется pywin32"
-#: ../src/gajim.py:213
+#: ../src/gajim.py:220
#, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Удостоверьтесь, что в вашей системе установлен Pywin32. Вы можете получить его на сайте: %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Удостоверьтесь, что в вашей системе установлен Pywin32. Вы можете получить "
+"его на сайте: %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:373
msgid "Gajim is already running"
msgstr "Gajim уже запущен"
-#: ../src/gajim.py:367
+#: ../src/gajim.py:374
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7158,81 +7609,79 @@
"По-видимому, уже запущен другой экземпляр Gajim\n"
"Запустить ещё один?"
-#: ../src/gajim.py:493
+#: ../src/gajim.py:459
msgid "Passphrase Required"
msgstr "Требуется парольная фраза"
-#: ../src/gajim.py:494
+#: ../src/gajim.py:460
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
#. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:475
msgid "Wrong Passphrase"
msgstr "Неверная парольная фраза"
-#: ../src/gajim.py:510
+#: ../src/gajim.py:476
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
-#: ../src/gajim.py:557
+#: ../src/gajim.py:539
#, python-format
msgid ""
-"Your desired nickname in group chat %s is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
"Please specify another nickname below:"
msgstr ""
-"Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован другим пользователем.\n"
+"Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован "
+"другим пользователем.\n"
"Укажите другой ник:"
-#: ../src/gajim.py:571
+#: ../src/gajim.py:553
msgid "Do you accept this request?"
msgstr "Вы принимаете этот запрос?"
-#: ../src/gajim.py:573
+#: ../src/gajim.py:555
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "Вы принимаете запрос %s?"
-#: ../src/gajim.py:576
+#: ../src/gajim.py:558
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
-#: ../src/gajim.py:624
-#: ../src/notify.py:478
-#: ../src/osx/growler.py:17
+#: ../src/gajim.py:609 ../src/notify.py:492 ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "Соединение разорвалось"
-#: ../src/gajim.py:930
-#: ../src/gajim.py:934
+#: ../src/gajim.py:919 ../src/gajim.py:923
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Ошибка %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944
-#: ../src/gajim.py:957
+#: ../src/gajim.py:933 ../src/gajim.py:947
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "ошибка при отправке %(message)s ( %(error)s )"
-#: ../src/gajim.py:989
+#: ../src/gajim.py:979
msgid "Authorization accepted"
msgstr "Авторизация принята"
-#: ../src/gajim.py:990
+#: ../src/gajim.py:980
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:999
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Контакт «%s» отозвал подписку с вами"
-#: ../src/gajim.py:1010
+#: ../src/gajim.py:1000
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -7240,93 +7689,94 @@
"Вы всегда будете видеть его или её как отключенными.\n"
"Удалить его или её из контакт-листа?"
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1041
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Связь с «%s» не может быть установлена"
-#: ../src/gajim.py:1227
-#: ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1217 ../src/groupchat_control.py:1152
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s теперь известен как %(new_nick)s"
-#: ../src/gajim.py:1245
-#: ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417
-#: ../src/notify.py:232
+#: ../src/gajim.py:1235 ../src/groupchat_control.py:1327
+#: ../src/history_window.py:428 ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s теперь %(status)s"
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1302
#, python-format
msgid "%(jid)s has set the subject to %(subject)s"
msgstr "%(jid)s установил(а) тему: %(subject)s"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1372
-#: ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1366 ../src/groupchat_control.py:1112
msgid "Any occupant is allowed to see your full JID"
msgstr "Любой участник может увидеть ваш настоящий JID"
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1369
msgid "Room now shows unavailable member"
msgstr "Теперь в комнате отображается недоступный участник"
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1371
msgid "room now does not show unavailable members"
msgstr "теперь в комнате не отображаются недоступные участники"
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1374
msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
+msgstr ""
+"Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1377
msgid "Room logging is now enabled"
msgstr "Запись логов конференции включена"
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1379
msgid "Room logging is now disabled"
msgstr "Запись логов конференции выключена"
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1381
msgid "Room is now non-anonymous"
msgstr "Конференция не анонимна"
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1384
msgid "Room is now semi-anonymous"
msgstr "Конференция частично анонимна"
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1387
msgid "Room is now fully-anonymous"
msgstr "Конференция полностью анонимна"
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1419
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "Чтобы войти в комнату %s, нужен пароль."
-#: ../src/gajim.py:1459
-msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
-msgstr "Gajim настроен на использование GPG агента, но GPG агент не запущен или он возвратил неверный пароль.\n"
+#: ../src/gajim.py:1453
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
+"возвратил неверный пароль.\n"
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1455
msgid "You are currently connected without your OpenPGP key."
-msgstr "Вы сейчас соединены без OpenPGP ключа."
+msgstr "Вы сейчас соединены без ключа OpenPGP."
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1458
msgid "Your passphrase is incorrect"
msgstr "Ваша парольная фраза неверна"
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1560
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Новое письмо на %(gmail_mail_address)s"
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1562
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
@@ -7334,7 +7784,7 @@
msgstr[1] "У вас есть %d непрочитанных письма"
msgstr[2] "У вас есть %d непрочитанных писем"
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1575
#, python-format
msgid ""
"\n"
@@ -7349,29 +7799,29 @@
"Тема: %(subject)s\n"
"%(snippet)s"
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1646
#, python-format
msgid "%s wants to send you a file."
msgstr "%s хочет отправить вам файл."
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1714
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Успешно получен файл %(filename)s от %(name)s."
#. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1718
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Передача файла %(filename)s от %(name)s приостановлена."
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1731
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
#. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1735
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Передача файла %(filename)s к %(name)s приостановлена."
@@ -7415,438 +7865,469 @@
msgstr "Такое имя уже есть"
#: ../src/gajim.py:1964
-msgid "You are already connected to this account with the same resource. Please type a new one"
-msgstr "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите другой ресурс"
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
+"другой ресурс"
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2019
msgid "Error verifying SSL certificate"
msgstr "Ошибка при проверке SSL сертификата"
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2020
#, python-format
msgid ""
-"There was an error verifying the SSL certificate of your jabber server: %(error)s\n"
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
"Do you still want to connect to this server?"
msgstr ""
-"Произошла ошибка при проверке сертификата SSL вашего jabber сервера: %(error)s\n"
+"Произошла ошибка при проверке сертификата SSL вашего jabber сервера: %(error)"
+"s\n"
"Вы всё ещё хотите подключиться к этому серверу?"
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2025
msgid "Ignore this error for this certificate."
msgstr "Игнорировать эту ошибку для данного сертификата."
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2045
msgid "SSL certificate error"
msgstr "Ошибка SSL сертификата"
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2046
#, python-format
msgid ""
-"It seems the SSL certificate has changed or your connection is being hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
"Old fingerprint: %(old)s\n"
"New fingerprint: %(new)s\n"
"\n"
"Do you still want to connect and update the fingerprint of the certificate?"
msgstr ""
-"По видимому, сертификат SSL изменился или ваше соединение было взломано.\n"
+"По видимому, сертификат SSL учетной записи %(account)s изменился или ваше "
+"соединение было взломано.\n"
"Старый отпечаток: %(old)s\n"
"Новый отпечаток: %(new)s\n"
"Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
-#: ../src/gajim.py:2061
-#: ../src/gajim.py:2091
+#: ../src/gajim.py:2076 ../src/gajim.py:2111
msgid "Insecure connection"
msgstr "Небезопасное соединение"
-#: ../src/gajim.py:2062
-msgid "You are about to send your password on an unencrypted connection. Are you sure you want to do that?"
+#: ../src/gajim.py:2077
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
-#: ../src/gajim.py:2064
-#: ../src/gajim.py:2094
+#: ../src/gajim.py:2079 ../src/gajim.py:2114
msgid "Yes, I really want to connect insecurely"
msgstr "Да, я действительно хочу соединиться небезопасно"
-#: ../src/gajim.py:2065
-#: ../src/gajim.py:2095
-#: ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
+#: ../src/gajim.py:2080 ../src/gajim.py:2115 ../src/groupchat_control.py:1835
+#: ../src/roster_window.py:3818
msgid "Do _not ask me again"
msgstr "Не _переспрашивать"
-#: ../src/gajim.py:2092
-msgid "You are about to send your password on an insecure connection. You should install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? (Установите PyOpenSSL, чтобы этого не происходило.)"
+#: ../src/gajim.py:2112
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+"Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
+"(Установите PyOpenSSL, чтобы этого не происходило.)"
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2132
msgid "PEP node was not removed"
msgstr "PEP узел не был удален"
-#: ../src/gajim.py:2110
+#: ../src/gajim.py:2133
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "PEP узел %(node)s не был удален: %(message)s"
#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2575
-#: ../src/gajim.py:2596
+#: ../src/gajim.py:2604 ../src/gajim.py:2626
msgid "Emoticons disabled"
msgstr "Смайлики выключены"
-#: ../src/gajim.py:2576
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
+#: ../src/gajim.py:2605
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
msgstr "Тема смайликов не найдена, они будут отключены."
-#: ../src/gajim.py:2597
-msgid "Your configured emoticons theme cannot been loaded. You maybe need to update the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons for more details."
-msgstr "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
+#: ../src/gajim.py:2627
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+"Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
+"emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
-#: ../src/gajim.py:2623
-#: ../src/roster_window.py:3324
+#: ../src/gajim.py:2653 ../src/roster_window.py:3325
msgid "You cannot join a group chat while you are invisible"
msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
#. it is good to notify the user
#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:2931
msgid "Could not save your settings and preferences"
msgstr "Не могу сохранить ваши установки и настройки"
-#: ../src/gajim.py:3000
+#: ../src/gajim.py:3028
msgid "Bookmark already set"
msgstr "Закладка уже установлена"
-#: ../src/gajim.py:3001
+#: ../src/gajim.py:3029
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Комната «%s» уже есть в ваших закладках."
-#: ../src/gajim.py:3014
+#: ../src/gajim.py:3042
msgid "Bookmark has been added successfully"
msgstr "Закладка успешно добавлена"
-#: ../src/gajim.py:3015
+#: ../src/gajim.py:3043
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:81
msgid "Shows a help on specific command"
msgstr "Показывает помощь для конкретной команды"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:84
msgid "command"
msgstr "команда"
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:85
msgid "show help on command"
msgstr "показать помощь по команде"
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:89
msgid "Shows or hides the roster window"
msgstr "Скрывает или показывает окно ростера"
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:93
msgid "Pops up a window with the next pending event"
msgstr "Показывать окно со следующим непрочитанным сообщением"
-#: ../src/gajim-remote.py:95
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной строке"
+#: ../src/gajim-remote.py:97
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
+"строке"
-#: ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219
-#: ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233
-#: ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:272
msgid "account"
msgstr "Учетные записи"
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:100
msgid "show only contacts of the given account"
msgstr "показывать контакты только для данной учетной записи"
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:106
msgid "Prints a list of registered accounts"
msgstr "Показывает список зарегистрированных учетных записей"
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:110
msgid "Changes the status of account or accounts"
msgstr "Изменяет статус учетной записи или записей"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
msgid "status"
msgstr "статус"
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
+msgstr ""
+"один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
-#: ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:160
msgid "message"
msgstr "сообщение"
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:114
msgid "status message"
-msgstr "сообщение сервера"
+msgstr "сообщение о статусе"
-#: ../src/gajim-remote.py:113
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
-msgstr "изменяет статус учетной записи «учетная запись». Если не указано, пытается изменить статус всех учетных записей, у которых установлена опция «синхронизировать с глобальным статусом»"
+#: ../src/gajim-remote.py:115
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"изменяет статус учетной записи «учетная запись». Если не указано, пытается "
+"изменить статус всех учетных записей, у которых установлена опция "
+"«синхронизировать с глобальным статусом»"
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:121
msgid "Shows the chat dialog so that you can send messages to a contact"
msgstr "Показывает окно беседы, чтобы вы могли отправлять сообщения контакту"
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:123
msgid "JID of the contact that you want to chat with"
msgstr "JID контакта, с которым вы хотели бы побеседовать"
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:212
msgid "if specified, contact is taken from the contact list of this account"
msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
-#: ../src/gajim-remote.py:128
-msgid "Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Отправить новое сообщение контакту в ростере. Как OpenPGP ключ, так и учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
+#: ../src/gajim-remote.py:130
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Отправить новое сообщение контакту в ростере. Как ключ OpenPGP, так и "
+"учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
+"без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
-#: ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
msgid "JID of the contact that will receive the message"
msgstr "JID контакта, который получит сообщение"
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
msgid "message contents"
msgstr "содержимое сообщения"
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
msgid "pgp key"
msgstr "PGP ключ"
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
msgid "if specified, the message will be encrypted using this public key"
-msgstr "если указано, сообщение будет зашифровано с использованием открытого ключа"
+msgstr ""
+"если указано, сообщение будет зашифровано с использованием открытого ключа"
-#: ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
msgid "if specified, the message will be sent using this account"
-msgstr "если указано, сообщение будет отправлено с использованием этой учетной записи"
+msgstr ""
+"если указано, сообщение будет отправлено с использованием этой учетной записи"
-#: ../src/gajim-remote.py:141
-msgid "Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Отправить новое сообщение контакту в ростере. Как OpenPGP ключ, так и учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
+#: ../src/gajim-remote.py:143
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Отправить новое сообщение контакту в ростере. Как ключ OpenPGP, так и "
+"учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
+"без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
msgid "subject"
msgstr "тема"
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
msgid "message subject"
msgstr "тема сообщения"
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
msgid "Sends new message to a groupchat you've joined."
msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
msgid "JID of the room that will receive the message"
msgstr "JID контакта, который получит сообщение"
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
msgid "Gets detailed info on a contact"
msgstr "Получает детальную информацию о контакте"
-#: ../src/gajim-remote.py:166
-#: ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
msgid "JID of the contact"
msgstr "JID контакта"
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
msgid "Gets detailed info on a account"
msgstr "Получает детальную информацию о учетной записи"
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
msgid "Name of the account"
msgstr "Имя учетной записи"
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
msgid "Sends file to a contact"
msgstr "Отправляет контакту файл"
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
msgid "file"
msgstr "файл"
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
msgid "File path"
msgstr "Путь до файла"
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
msgid "if specified, file will be sent using this account"
-msgstr "если указано, файл будет отправлен с использованием этой учетной записи"
+msgstr ""
+"если указано, файл будет отправлен с использованием этой учетной записи"
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
msgid "Lists all preferences and their values"
msgstr "Показывает все параметры с их значениями"
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
msgid "Sets value of 'key' to 'value'."
msgstr "Присваивает 'ключу' в 'значение'"
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
msgid "key=value"
msgstr "ключ=значение"
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
+msgstr ""
+"'ключ' это название параметра, а 'значение' это то, что ему присваивают"
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
msgid "Deletes a preference item"
msgstr "Удаляет параметр"
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
msgid "key"
msgstr "ключ"
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
msgid "name of the preference to be deleted"
msgstr "имя параметра, который нужно удалить"
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
msgid "Removes contact from roster"
msgstr "Удаляет контакт из ростера"
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
msgid "Adds contact to roster"
msgstr "Добавляет контакт в ростер"
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
msgid "jid"
msgstr "JID"
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
msgid "Adds new contact to this account"
msgstr "Добавляет новый контакт для данной учетной записи"
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
msgid "Returns current status (the global one unless account is specified)"
-msgstr "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная запись)"
+msgstr ""
+"Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
+"запись)"
-#: ../src/gajim-remote.py:231
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная запись)"
+#: ../src/gajim-remote.py:233
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не "
+"указана учетная запись)"
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
msgid "Returns number of unread messages"
msgstr "Возвращает количество непрочитанных сообщений"
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
msgid "Opens 'Start Chat' dialog"
msgstr "Открыть диалог «Начать беседу»"
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
msgid "Starts chat, using this account"
msgstr "Начать беседу с этой учетной записи"
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
msgid "Sends custom XML"
msgstr "Отправляет произвольный XML"
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
msgid "XML to send"
msgstr "Отправляемый XML"
-#: ../src/gajim-remote.py:251
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
+#: ../src/gajim-remote.py:253
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
msgstr "Учётная запись, из которой будет отправлен XML."
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
msgid "Handle a xmpp:/ uri"
msgstr "Обработать ссылку формата «xmpp:/»"
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
msgid "uri"
msgstr "uri"
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
msgid "URI to handle"
msgstr "URI для обработки"
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
msgid "Account in which you want to handle it"
msgstr "Учетная запись, в которой вы хотите его использовать"
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:267
msgid "Join a MUC room"
-msgstr "Присоединиться к MUC комнате"
+msgstr "Присоединиться к комнате MUC"
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:269
msgid "room"
msgstr "комната"
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:269
msgid "Room JID"
msgstr "JID комнаты"
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:270
msgid "nick"
msgstr "Ник"
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:270
msgid "Nickname to use"
msgstr "Используемый ник"
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:271
msgid "password"
msgstr "Пароль:"
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:271
msgid "Password to enter the room"
msgstr "Пароль для входа в комнату"
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:272
msgid "Account from which you want to enter the room"
msgstr "Выберите учетную запись, с которой вы хотите войти в комнату"
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:277
msgid "Check if Gajim is running"
msgstr "Проверить, запущен ли Gajim"
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:281
msgid "Shows or hides the ipython window"
msgstr "Скрывает или показывает окно ipython"
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:308
msgid "Missing argument \"contact_jid\""
msgstr "Пропущен аргумент «JID контакта»"
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:327
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -7855,15 +8336,15 @@
"'%s' не в вашем ростере.\n"
"Укажите учетную запись для отправки сообщения."
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:330
msgid "You have no active account"
msgstr "У вас нет ни одной активной учетной записи"
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:382
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:405
#, python-format
msgid ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7872,16 +8353,16 @@
"Использование: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:409
msgid "Arguments:"
msgstr "Аргументы:"
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:413
#, python-format
msgid "%s not found"
msgstr "%s не найден"
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:417
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -7890,7 +8371,7 @@
"Использование: %s команда [аргумента]\n"
"Команда одна из:\n"
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:482
#, python-format
msgid ""
"Too many arguments. \n"
@@ -7899,7 +8380,7 @@
"Много аргументов. \n"
"Наберите «%(basename)s help %(command)s» для справки"
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:487
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -7908,7 +8389,7 @@
"Аргумент «%(arg)s» не задан. \n"
"Наберите «%(basename)s help %(command)s» для справки"
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:506
msgid "Wrong uri"
msgstr "Неверный хост"
@@ -7937,238 +8418,271 @@
msgid "Please first choose another for your current theme."
msgstr "Выберите сначала другую тему."
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
msgid "Sending private message failed"
msgstr "Не удалось отправить личное сообщение"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
msgstr "Вы больше не находитесь в комнате «%(room)s» или «%(nick)s» вышел."
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:453
msgid "Insert Nickname"
msgstr "Вставить ник"
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:605
msgid "Conversation with "
msgstr "Беседа с "
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:607
msgid "Continued conversation"
msgstr "Возобновлённая беседа"
-#: ../src/groupchat_control.py:1027
+#: ../src/groupchat_control.py:1014
msgid "Really send file?"
msgstr "Отправить файл?"
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1015
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID."
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1115
msgid "Room logging is enabled"
msgstr "Запись логов конференции включена"
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1117
msgid "A new room has been created"
msgstr "Новая комната была создана"
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1120
msgid "The server has assigned or modified your roomnick"
msgstr "Сервер присвоил или изменил ваш ник в комнате"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1126
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s выгнали из комнаты: %(reason)s"
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1130
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1137
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1141
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1150
#, python-format
msgid "You are now known as %s"
msgstr "Вы теперь известны как %s"
-#: ../src/groupchat_control.py:1200
-#: ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1188 ../src/groupchat_control.py:1192
+#: ../src/groupchat_control.py:1197
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1189
msgid "affiliation changed"
msgstr "ранг изменен"
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1194
msgid "room configuration changed to members-only"
msgstr "настройки комнаты были изменены на 'только для участников'"
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1199
msgid "system shutdown"
msgstr "выключение системы"
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1268
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
msgstr "** %(actor)s присвоил %(nick)s ранг %(affiliation)s"
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1272
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1287
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
msgstr "** %(actor)s присвоил %(nick)s обязанности %(role)s"
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1291
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
msgstr "** Обязанности %(nick)s были изменены на %(role)s"
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1320
#, python-format
msgid "%s has left"
msgstr "%s ушел"
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1325
#, python-format
msgid "%s has joined the group chat"
msgstr "%s зашёл в комнату"
#. Invalid Nickname
#. invalid char
-#: ../src/groupchat_control.py:1452
-#: ../src/groupchat_control.py:1733
+#: ../src/groupchat_control.py:1440 ../src/groupchat_control.py:1723
msgid "Invalid nickname"
msgstr "Неверное имя пользователя"
-#: ../src/groupchat_control.py:1476
-#: ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578
-#: ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1464 ../src/groupchat_control.py:1482
+#: ../src/groupchat_control.py:1568 ../src/groupchat_control.py:1585
#, python-format
msgid "Nickname not found: %s"
msgstr "Ник не обнаружен: %s"
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1498
msgid "This group chat has no subject"
msgstr "У этой комнаты нет темы"
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1510
#, python-format
msgid "Invited %(contact_jid)s to %(room_jid)s."
msgstr "Пригласил(а) %(contact_jid)s в %(room_jid)s."
-#: ../src/groupchat_control.py:1656
+#: ../src/groupchat_control.py:1646
#, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the group chat, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Использование: /%s <ник|JID> [причина], запрещает JID заходить в комнату. Ник посетителя можно подставить, если он не содержит «@». Если JID в данный момент находится в комнате, то он/она/оно также будет выгнан. НЕ поддерживает пробелы в никах."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Использование: /%s <ник|JID> [причина], запрещает JID заходить в комнату. "
+"Ник посетителя можно подставить, если он не содержит «@». Если JID в данный "
+"момент находится в комнате, то он/она/оно также будет выгнан. НЕ "
+"поддерживает пробелы в никах."
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1653
#, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-msgstr "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Использование: /%s <ник>, открывает окно привата с указанным посетителем."
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1659
#, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Использование: /%s [причина], закрывает текущее окно или вкладку, приводя причину, если она указана."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Использование: /%s [причина], закрывает текущее окно или вкладку, приводя "
+"причину, если она указана."
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1665
#, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с возможным указанием причины."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
+"возможным указанием причины."
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1669
#, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к комната@сервер, с возможным указанием ника."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к "
+"комната@сервер, с возможным указанием ника."
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1673
#, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
+"комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1682
#, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Использование: /%s <ник> [сообщение], открывает окно личной беседы и отсылает сообщение посетителю с указанным ником."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
+"отсылает сообщение посетителю с указанным ником."
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1687
#, python-format
msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1691
#, python-format
msgid "Usage: /%s , display the names of group chat occupants."
msgstr "Использование: /%s, показывает список присутствующих в комнате."
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1695
#, python-format
msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
+msgstr ""
+"Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1698
#, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд в нем."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
+"в нем."
-#: ../src/groupchat_control.py:1837
+#: ../src/groupchat_control.py:1829
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "Вы точно хотите выйти из комнаты «%s»?"
-#: ../src/groupchat_control.py:1839
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1831
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1868
msgid "Changing Subject"
msgstr "Смена темы"
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1869
msgid "Please specify the new subject:"
msgstr "Введите новую тему:"
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1873
msgid "Changing Nickname"
msgstr "Смена ника"
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1874
msgid "Please specify the new nickname you want to use:"
msgstr "Введите новый ник, который вы хотите использовать:"
# смотря где вылазит меседж - нужно присмотреться
#. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1901
#, python-format
msgid "Destroying %s"
msgstr "Удаление %s"
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1902
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
@@ -8176,23 +8690,22 @@
"Вы собираетесь полностью уничтожить эту комнату.\n"
"Можете указать причину:"
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1904
msgid "You may also enter an alternate venue:"
msgstr "Можете указать альтернативную комнату:"
#. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2075
#, python-format
msgid "Kicking %s"
msgstr "Выгоняем %s"
-#: ../src/groupchat_control.py:2084
-#: ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2076 ../src/groupchat_control.py:2367
msgid "You may specify a reason below:"
msgstr "Вы можете указать причину ниже:"
#. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2366
#, python-format
msgid "Banning %s"
msgstr "Забанить %s"
@@ -8202,8 +8715,12 @@
msgstr "Обнаружена ошибка в программе"
#: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Возможно это не так страшно, но все равно стоит сообщить об этом разработчикам."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Возможно это не так страшно, но все равно стоит сообщить об этом "
+"разработчикам."
#: ../src/gtkexcepthook.py:54
msgid "_Report Bug"
@@ -8214,8 +8731,7 @@
msgstr "Детали"
#. we talk about file
-#: ../src/gtkgui_helpers.py:166
-#: ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
#, python-format
msgid "Error: cannot open %s for reading"
msgstr "Ошибка: не могу открыть %s для чтения"
@@ -8246,7 +8762,8 @@
#: ../src/gtkgui_helpers.py:735
msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
+msgstr ""
+"Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
#: ../src/gtkgui_helpers.py:804
msgid "Extension not supported"
@@ -8255,137 +8772,141 @@
#: ../src/gtkgui_helpers.py:805
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Изображение нельзя сохранить в формате %(type)s. Сохранить как %(new_filename)s?"
+msgstr ""
+"Изображение нельзя сохранить в формате %(type)s. Сохранить как %"
+"(new_filename)s?"
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:840
msgid "Save Image as..."
msgstr "Сохранить изображение как..."
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:96
msgid "Cannot find history logs database"
msgstr "Не могу найти базу данных истории"
#. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:136
msgid "Contacts"
msgstr "Контакты"
#. holds time
-#: ../src/history_manager.py:150
-#: ../src/history_manager.py:190
+#: ../src/history_manager.py:149 ../src/history_manager.py:189
#: ../src/history_window.py:95
msgid "Date"
msgstr "Дата"
#. holds nickname
-#: ../src/history_manager.py:156
-#: ../src/history_manager.py:208
+#: ../src/history_manager.py:155 ../src/history_manager.py:207
msgid "Nickname"
msgstr "Ник"
#. holds message
-#: ../src/history_manager.py:164
-#: ../src/history_manager.py:196
+#: ../src/history_manager.py:163 ../src/history_manager.py:195
#: ../src/history_window.py:103
msgid "Message"
msgstr "Сообщение"
-#: ../src/history_manager.py:224
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ, ЕСЛИ GAJIM ЗАПУЩЕН)"
+#: ../src/history_manager.py:223
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ, ЕСЛИ GAJIM ЗАПУЩЕН)"
-#: ../src/history_manager.py:226
+#: ../src/history_manager.py:225
msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
"\n"
"In case you click YES, please wait..."
msgstr ""
-"Обычно размер файла базы данных не уменьшается при очистке, а используется заново. Если вы хотите действительно уменьшить размер файла, нажмите ДА, в противном случае нажмите НЕТ.\n"
+"Обычно размер файла базы данных не уменьшается при очистке, а используется "
+"заново. Если вы хотите действительно уменьшить размер файла, нажмите ДА, в "
+"противном случае нажмите НЕТ.\n"
"\n"
"Если вы нажали ДА, пожалуйста подождите..."
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:433
msgid "Exporting History Logs..."
msgstr "Экспортирую историю..."
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:508
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s в %(time)s сказал: %(message)s\n"
-#: ../src/history_manager.py:549
+#: ../src/history_manager.py:545
msgid "Do you really want to delete logs of the selected contact?"
msgid_plural "Do you really want to delete logs of the selected contacts?"
msgstr[0] "Вы точно хотите удалить логи выделенного контакта?"
msgstr[1] "Вы точно хотите удалить логи выделенных контактов?"
msgstr[2] "Вы точно хотите удалить логи выделенных контактов?"
-#: ../src/history_manager.py:553
-#: ../src/history_manager.py:588
+#: ../src/history_manager.py:549 ../src/history_manager.py:584
msgid "This is an irreversible operation."
msgstr "Это необратимая операция"
-#: ../src/history_manager.py:585
+#: ../src/history_manager.py:581
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Вы точно хотите удалить выделенное сообщение?"
msgstr[1] "Вы точно хотите удалить выделенные сообщения?"
msgstr[2] "Вы точно хотите удалить выделенные сообщения?"
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
#, python-format
msgid "Conversation History with %s"
msgstr "История %s"
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
msgid "Disk Error"
msgstr "Ошибка записи на диск"
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
#, python-format
msgid "%(nick)s is now %(status)s: %(status_msg)s"
msgstr "%(nick)s теперь %(status)s: %(status_msg)s"
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
#, python-format
msgid "Status is now: %(status)s: %(status_msg)s"
msgstr "Статус установлен в: %(status)s: %(status_msg)s"
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
#, python-format
msgid "Status is now: %(status)s"
msgstr "Статус установлен в: %(status)s"
-#: ../src/htmltextview.py:591
-#: ../src/htmltextview.py:602
+#: ../src/htmltextview.py:563 ../src/htmltextview.py:574
msgid "Timeout loading image"
msgstr "Не могу загрузить изображение"
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:584
msgid "Image is too big"
msgstr "Изображение слишком большое"
-#: ../src/message_window.py:446
+#: ../src/message_window.py:433
msgid "Chats"
msgstr "Чаты"
-#: ../src/message_window.py:448
+#: ../src/message_window.py:435
msgid "Group Chats"
msgstr "Комнаты"
-#: ../src/message_window.py:450
+#: ../src/message_window.py:437
msgid "Private Chats"
msgstr "Личные беседы"
-#: ../src/message_window.py:456
+#: ../src/message_window.py:443
msgid "Messages"
msgstr "Сообщения"
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
msgid "- messages will be logged"
msgstr "— сообщения будут записаны в лог"
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
msgid "- messages will not be logged"
msgstr "— сообщения не будут записаны в лог"
@@ -8433,244 +8954,279 @@
msgid "Generic"
msgstr "Общие"
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
msgid "Retrieving profile..."
msgstr "Получаю данные..."
-#: ../src/profile_window.py:109
-#: ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2773
msgid "File is empty"
msgstr "Пустой файл"
-#: ../src/profile_window.py:112
-#: ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2776
msgid "File does not exist"
msgstr "Файл не существует"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:126
-#: ../src/profile_window.py:142
-#: ../src/roster_window.py:2792
-#: ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2778 ../src/roster_window.py:2789
msgid "Could not load image"
msgstr "Не могу загрузить изображение"
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
msgid "Information received"
msgstr "Информация получена"
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
msgid "Without a connection you can not publish your contact information."
msgstr "Необходимо присоединиться к серверу для обновления личной информации"
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
msgid "Sending profile..."
msgstr "Отправляю данные..."
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
msgid "Information NOT published"
msgstr "Информация НЕ опубликована"
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
msgid "vCard publication failed"
msgstr "Публикация vCard не удалась"
-#: ../src/profile_window.py:358
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "При публикации вашей личной информации произошла ошибка, попробуйте позже."
+#: ../src/profile_window.py:355
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"При публикации вашей личной информации произошла ошибка, попробуйте позже."
-#: ../src/roster_window.py:288
-#: ../src/roster_window.py:945
+#: ../src/roster_window.py:286 ../src/roster_window.py:940
msgid "Merged accounts"
msgstr "Объединенные учетные записи"
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1855
msgid "Authorization has been sent"
msgstr "Была отправлена авторизация"
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1856
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Теперь «%s» будет знать о вашем статусе."
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1876
msgid "Subscription request has been sent"
msgstr "Был отправлен запрос на подписку "
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1877
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1889
msgid "Authorization has been removed"
msgstr "Авторизация была удалена"
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1890
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
-#: ../src/roster_window.py:1920
-msgid "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started (environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr "Gnome Keyring установлен, но некорректно запущен\t\t\t\t\t\t\t\t(возможно неверно установлена переменная среды)"
+#: ../src/roster_window.py:1914
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring установлен, но некорректно запущен\t\t\t\t\t\t\t\t(возможно "
+"неверно установлена переменная среды)"
-#: ../src/roster_window.py:1930
-#: ../src/roster_window.py:1950
+#: ../src/roster_window.py:1924 ../src/roster_window.py:1944
msgid "GPG is not usable"
msgstr "GPG использовать невозможно"
-#: ../src/roster_window.py:2119
-#: ../src/roster_window.py:3267
+#: ../src/roster_window.py:2108 ../src/roster_window.py:3269
msgid "You are participating in one or more group chats"
msgstr "Вы находитесь в одной или более комнатах"
-#: ../src/roster_window.py:2120
-#: ../src/roster_window.py:3268
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно хотите стать невидимым?"
+#: ../src/roster_window.py:2109 ../src/roster_window.py:3270
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
+"хотите стать невидимым?"
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2135
msgid "desync'ed"
msgstr "не синхронизировано"
-#: ../src/roster_window.py:2284
-#: ../src/roster_window.py:2521
+#: ../src/roster_window.py:2273 ../src/roster_window.py:2510
msgid "You have unread messages"
msgstr "У вас есть непрочитанные сообщения"
-#: ../src/roster_window.py:2285
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
-msgstr "Сообщения будут доступны для чтения позже, если у вас активирована опция истории."
+#: ../src/roster_window.py:2274
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Сообщения будут доступны для чтения позже, если у вас активирована опция "
+"истории."
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2511
msgid "You must read them before removing this transport."
msgstr "Просмотрите все ожидающие события перед удалением транспорта."
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2514
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Транспорт «%s» будет удален"
-#: ../src/roster_window.py:2526
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "У вас теперь не будет возможности приема и отправки сообщения контактам через этот транспорт."
+#: ../src/roster_window.py:2515
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"У вас теперь не будет возможности приема и отправки сообщения контактам "
+"через этот транспорт."
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2518
msgid "Transports will be removed"
msgstr "Транспорты будут удалены"
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2523
#, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "У вас больше не будет возможности приема и отправки сообщений через эти транспорты:%s."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"У вас больше не будет возможности приема и отправки сообщений через эти "
+"транспорты:%s."
#. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2654
msgid "Rename Contact"
msgstr "Переименовать контакт"
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2655
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Введите новый ник для контакта %s"
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2662
msgid "Rename Group"
msgstr "Переименовать группу"
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2663
#, python-format
msgid "Enter a new name for group %s"
msgstr "Введите новое название для группы %s"
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2719
msgid "Remove Group"
msgstr "Удалить группу"
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2720
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Вы точно хотите удалить группу %s из ростера?"
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2721
msgid "Also remove all contacts in this group from your roster"
msgstr "Удалить из ростера все контакты в этой группе"
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2760
msgid "Assign OpenPGP Key"
-msgstr "Назначить OpenPGP ключ"
+msgstr "Назначить ключ OpenPGP"
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2761
msgid "Select a key to apply to the contact"
msgstr "Выберите ключ, который будет применен к контакту"
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3114
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Контакт «%s» будет удален из вашего ростера"
-#: ../src/roster_window.py:3132
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Удаляя контакт, вы одновременно удалите авторизацию, и этот человек больше не сможет видеть ваш статус."
+#: ../src/roster_window.py:3118
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Удаляя контакт, вы одновременно удалите авторизацию, и этот человек больше "
+"не сможет видеть ваш статус."
#. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3123
msgid "Do you want to continue?"
msgstr "Продолжить?"
-#: ../src/roster_window.py:3141
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть его или её всегда в оффлайне."
+#: ../src/roster_window.py:3127
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
+"его или её всегда в оффлайне."
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3130
msgid "I want this contact to know my status after removal"
msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3134
msgid "Contacts will be removed from your roster"
msgstr "Контакты будут удалены из вашего ростера"
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3138
#, python-format
msgid ""
"By removing these contacts:%s\n"
"you also remove authorization resulting in them always seeing you as offline."
msgstr ""
"Вы удаляете эти контакты:%s.\n"
-"Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в оффлайне."
+"Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
+"оффлайне."
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3193
msgid "No account available"
msgstr "Нет доступной учетной записи"
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3194
msgid "You must create an account before you can chat with other contacts."
-msgstr "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
+msgstr ""
+"Для начала беседы с другими людьми прежде необходимо создать учетную запись."
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3736
msgid "Metacontacts storage not supported by your server"
msgstr "Сервер не умеет хранить метаконтакты"
-#: ../src/roster_window.py:3710
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при следующем подключении."
+#: ../src/roster_window.py:3738
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
+"следующем подключении."
-#: ../src/roster_window.py:3784
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:3812
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
msgstr "Вы точно хотите создать метаконтакт?"
-#: ../src/roster_window.py:3786
-msgid "Metacontacts are a way to regroup several contacts in one line. Generally it is used when the same person has several Jabber accounts or transport accounts."
-msgstr "Метаконтакты — это метод группировки нескольких контактов в одну запись. Обычно используется, когда один и тот же человек имеет несколько учетных записей в Jabber или на транспортах."
+#: ../src/roster_window.py:3814
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+"Метаконтакты — это метод группировки нескольких контактов в одну запись. "
+"Обычно используется, когда один и тот же человек имеет несколько учетных "
+"записей в Jabber или на транспортах."
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:3927
msgid "Invalid file URI:"
msgstr "Неверный файл:"
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:3938
#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
@@ -8683,130 +9239,123 @@
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4587
-#: ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667
-#: ../src/systray.py:243
-#: ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../src/roster_window.py:4615 ../src/roster_window.py:4686
+#: ../src/roster_window.py:4695 ../src/systray.py:219 ../src/systray.py:266
+#: ../src/systray.py:272
#, python-format
msgid "using account %s"
msgstr "используя учетную запись %s"
#. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4702
#, python-format
msgid "to %s account"
msgstr "для учетной записи %s"
#. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4707
#, python-format
msgid "using %s account"
msgstr "учетной записи %s"
-#: ../src/roster_window.py:4716
-#: ../src/systray.py:303
+#: ../src/roster_window.py:4744 ../src/systray.py:282
msgid "_Manage Bookmarks..."
msgstr "Управление _закладками..."
#. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4764
#, python-format
msgid "of account %s"
msgstr "для учетной записи %s"
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4804
#, python-format
msgid "for account %s"
msgstr "для учетной записи %s"
-#: ../src/roster_window.py:4838
-#: ../src/roster_window.py:4947
+#: ../src/roster_window.py:4866 ../src/roster_window.py:4975
msgid "_Change Status Message"
msgstr "_Изменить сообщение о статусе"
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4893
msgid "Publish Tune"
msgstr "Музыка"
-#: ../src/roster_window.py:4872
+#: ../src/roster_window.py:4900
msgid "Mood"
msgstr "Настроение"
-#: ../src/roster_window.py:4876
+#: ../src/roster_window.py:4904
msgid "Activity"
msgstr "Занятие"
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4909
msgid "Configure Services..."
msgstr "Настроить Сервисы..."
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5063
msgid "_Maximize All"
msgstr "_Развернуть все"
#. Send Group Message
-#: ../src/roster_window.py:5043
-#: ../src/roster_window.py:5568
+#: ../src/roster_window.py:5071 ../src/roster_window.py:5597
msgid "Send Group M_essage"
msgstr "_Отправить сообщение группе"
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5079
msgid "To all users"
msgstr "Всем пользователям"
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5083
msgid "To all online users"
msgstr "Всем, кто подключён"
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5494
msgid "I would like to add you to my roster"
msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
#. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5617
msgid "_Manage Contacts"
msgstr "_Управление контактами"
#. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5678
msgid "Send Single Message"
msgstr "Отправить одиночное сообщение"
#. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5734
msgid "_Manage Transport"
msgstr "_Управление транспортом"
#. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5742
msgid "_Modify Transport"
msgstr "_Изменить транспорт"
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5816
msgid "_Maximize"
msgstr "Развернут_ь"
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5823
msgid "_Disconnect"
msgstr "_Выйти"
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5903
msgid "_New Group Chat"
msgstr "В _новую комнату"
#. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6016
msgid "History Manager"
msgstr "Менеджер истории"
-#: ../src/roster_window.py:5997
-#: ../src/systray.py:341
+#: ../src/roster_window.py:6025
msgid "_Join New Group Chat"
msgstr "_Войти в новую комнату"
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6235
msgid "Change Status Message..."
msgstr "Изменить сообщение о статусе..."
@@ -8814,18 +9363,16 @@
msgid "Waiting for results"
msgstr "Ожидание результатов"
-#: ../src/search_window.py:133
-#: ../src/search_window.py:211
+#: ../src/search_window.py:133 ../src/search_window.py:211
msgid "Error in received dataform"
msgstr "Ошибка в принятой форме данных"
#. No result
-#: ../src/search_window.py:167
-#: ../src/search_window.py:203
+#: ../src/search_window.py:167 ../src/search_window.py:203
msgid "No result"
msgstr "Нет результата"
-#: ../src/session.py:124
+#: ../src/session.py:123
msgid "Disk WriteError"
msgstr "Ошибка записи на диск"
@@ -8834,8 +9381,7 @@
msgid "Subject: %s"
msgstr "Тема: %s"
-#: ../src/session.py:398
-#: ../src/session.py:433
+#: ../src/session.py:398 ../src/session.py:433
msgid "Confirm these session options"
msgstr "Подтвердить данные настройки сеанса"
@@ -8869,21 +9415,19 @@
"\n"
"Продолжить этот сеанс?"
-#: ../src/systray.py:188
+#: ../src/systray.py:180
msgid "_Change Status Message..."
msgstr "_Изменить сообщение о статусе..."
-#: ../src/systray.py:322
+#: ../src/systray.py:297
msgid "Hide this menu"
msgstr "Скрыть это меню"
-#: ../src/tooltips.py:327
-#: ../src/tooltips.py:521
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
msgid "Jabber ID: "
msgstr "Jabber ID: "
-#: ../src/tooltips.py:330
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
msgid "Resource: "
msgstr "Ресурс: "
@@ -8900,8 +9444,7 @@
msgid " [minimized]"
msgstr "[свернуто]"
-#: ../src/tooltips.py:451
-#: ../src/tooltips.py:706
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
msgid "Status: "
msgstr "Статус: "
@@ -8946,11 +9489,11 @@
#: ../src/tooltips.py:664
msgid "Download"
-msgstr "Загрузить"
+msgstr "Скачать"
#: ../src/tooltips.py:670
msgid "Upload"
-msgstr "Upload"
+msgstr "Загрузить"
#: ../src/tooltips.py:677
msgid "Type: "
@@ -8960,8 +9503,7 @@
msgid "Transferred: "
msgstr "Передано: "
-#: ../src/tooltips.py:684
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
msgid "Not started"
msgstr "Не начато"
@@ -8969,8 +9511,7 @@
msgid "Stopped"
msgstr "Остановлено"
-#: ../src/tooltips.py:690
-#: ../src/tooltips.py:693
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
msgid "Completed"
msgstr "Завершено"
@@ -9007,9 +9548,7 @@
msgid "?OS:Unknown"
msgstr "Неизвестна"
-#: ../src/vcard.py:272
-#: ../src/vcard.py:282
-#: ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
#, python-format
msgid "since %s"
msgstr "с %s"
@@ -9019,12 +9558,20 @@
msgstr "<b>Ранг:</b>"
#: ../src/vcard.py:319
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её присутствии не интересна"
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
+"присутствии не интересна"
#: ../src/vcard.py:321
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Вам хочется получать информацию о присутствии контакта, но он или она не заинтересована в вашей."
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Вам хочется получать информацию о присутствии контакта, но он или она не "
+"заинтересована в вашей."
#: ../src/vcard.py:323
msgid "You and the contact are interested in each other's presence information"
@@ -9032,7 +9579,9 @@
#. None
#: ../src/vcard.py:325
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга"
#: ../src/vcard.py:332
@@ -9043,49 +9592,101 @@
msgid "There is no pending subscription request."
msgstr "Нет ожидающего запроса на подписку."
-#: ../src/vcard.py:339
-#: ../src/vcard.py:377
-#: ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
msgid " resource with priority "
msgstr " ресурс с приоритетом "
-#~ msgid "Show a list of formattings"
-#~ msgstr "Показать список форматирования"
-#~ msgid "Select the account with which to synchronise"
-#~ msgstr "Выберите учетную запись для объединения"
-#~ msgid "Underline"
-#~ msgstr "Подчеркнутый"
-#~ msgid "Strike"
-#~ msgstr "Зачеркнутый"
-#~ msgid "Font"
-#~ msgstr "Шрифт"
-#~ msgid "Clear formating"
-#~ msgstr "Удалить форматирование"
+#, fuzzy
+#~ msgid "OS version"
+#~ msgstr "Версия GTK+:"
+
+#, fuzzy
+#~ msgid "Client name"
+#~ msgstr "Имя контакта"
+
+#, fuzzy
+#~ msgid "Client version"
+#~ msgstr "Возобновлённая беседа"
+
+#~ msgid "Name:"
+#~ msgstr "Имя:"
+
+#~ msgid "Modify Account"
+#~ msgstr "Редактировать учетную запись"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Учётная запись Gajim %s"
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "Время бездействия"
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "_Host:"
+#~ msgstr "_Хост:"
+
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Щелкните, чтобы просмотреть сервисы предоставляемые jabber сервером "
+#~ "(например, MSN, ICQ транспорты)"
+
+#~ msgid "Servers Features"
+#~ msgstr "Параметры сервера"
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Требует скомпилированного модуля idle из исходных кодов Gajim."
+
#~ msgid "The username used to identify the Last.fm account."
#~ msgstr "Имя пользователя на Last.fm."
+
#~ msgid "Network Manager support not available"
#~ msgstr "Network Manager не используется"
+
#~ msgid "Session Management support not available (missing gnome.ui module)"
#~ msgstr ""
#~ "Отсутствует поддержка управления сеансами (отсутствует модуль gnome.ui)"
+
#~ msgid "Thoughtful"
#~ msgstr "В раздумье"
+
#~ msgid ""
#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
#~ "their status and not by the shown name"
#~ msgstr ""
#~ "Если отмечено, то Gajim будет сортировать контакты в окне ростера и в "
#~ "окнах комнат по статусу, а не по имени"
+
#~ msgid "E2E encryption enabled"
#~ msgstr "E2E шифрование включено"
+
#~ msgid "A_ccounts"
#~ msgstr "_Учётные записи"
+
#~ msgid "<b>\"%(title)s\"</b> by "
#~ msgstr "<b>\"%(title)s\"</b> "
+
#~ msgid "%(title)s by %(artist)s\n"
#~ msgstr "%(title)s %(artist)s\n"
+
#~ msgid "The following message was "
#~ msgstr "Следующее сообщение было "
+
#~ msgid "Close"
#~ msgstr "Закрыть"
@@ -9096,12 +9697,16 @@
#, fuzzy
#~ msgid "This message was not delivered"
#~ msgstr "[Это сообщение зашифровано]"
+
#~ msgid "Other"
#~ msgstr "Другое"
+
#~ msgid "<b>Doing Chores</b>"
#~ msgstr "<b>Работа по хозяйству</b>"
+
#~ msgid "<b>Drinking</b>"
#~ msgstr "<b>Пью</b>"
+
#~ msgid "<b>Eating</b>"
#~ msgstr "<b>Ем</b>"
@@ -9109,20 +9714,28 @@
#, fuzzy
#~ msgid "<b>Exercising</b>"
#~ msgstr "<b>Упражняюсь</b>"
+
#~ msgid "<b>Grooming</b>"
#~ msgstr "<b>Уход за собой</b>"
+
#~ msgid "<b>Having an Appointment</b>"
#~ msgstr "<b>Встреча</b>"
+
#~ msgid "<b>Inactive</b>"
#~ msgstr "<b>Неактивен</b>"
+
#~ msgid "<b>Relaxing</b>"
#~ msgstr "<b>Отдыхаю</b>"
+
#~ msgid "<b>Talking</b>"
#~ msgstr "<b>Разговариваю</b>"
+
#~ msgid "<b>Traveling</b>"
#~ msgstr "<b>Путешествую</b>"
+
#~ msgid "<b>Working</b>"
#~ msgstr "<b>Работаю</b>"
+
#~ msgid ""
#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
#~ "third person. (e.g. /%s explodes.)"
@@ -9133,86 +9746,118 @@
#, fuzzy
#~ msgid "%s is now %s"
#~ msgstr "%s %s"
+
#~ msgid ""
#~ "Usage: %s %s %s \n"
#~ "\t %s"
#~ msgstr ""
#~ "Использование: %s %s %s \n"
#~ "\t %s"
+
#~ msgid "%s - %s"
#~ msgstr "%s - %s"
+
#~ msgid "mood"
#~ msgstr "настроение"
+
#~ msgid "cold"
#~ msgstr "неприветливый"
+
#~ msgid "hot"
#~ msgstr "страстный"
+
#~ msgid "moody"
#~ msgstr "капризный"
+
#~ msgid "sick"
#~ msgstr "больной"
+
#~ msgid "working"
#~ msgstr "работаю"
+
#~ msgid "eating"
#~ msgstr "кушаю"
+
#~ msgid "inactive"
#~ msgstr "неактивен"
+
#~ msgid "walking"
#~ msgstr "гуляю"
+
#~ msgid "sleeping"
#~ msgstr "Сплю"
+
#~ msgid "other"
#~ msgstr "другое"
+
#~ msgid "Accept"
#~ msgstr "Принять"
+
#~ msgid "Invitation Received"
#~ msgstr "Получено приглашение"
+
#~ msgid "Confirm Passphrase"
#~ msgstr "Подтверждение парольной фразы"
+
#~ msgid "Enter your new passphrase again for confirmation"
#~ msgstr "Введите снова для подтверждения"
+
#~ msgid "Create Passphrase"
#~ msgstr "Создать парольную фразу"
+
#~ msgid "Passphrases did not match.\n"
#~ msgstr "Пароли не совпадают.\n"
+
#~ msgid ""
#~ "When negotiating an encrypted session, should Gajim prefer to use public "
#~ "keys for identification?"
#~ msgstr ""
#~ "Когда устанавливается зашифрованная сессия, дожен ли Gajim предпочитать "
#~ "использовать открытый ключ для идентификации?"
+
#~ msgid "Click to see past conversations with this contact"
#~ msgstr "Щелкните для просмотра последних бесед с этим человеком"
+
#~ msgid "Click to see past conversation in this room"
#~ msgstr "Щелкните для просмотра бесед в этой комнате"
+
#~ msgid "<b>Publish and Subscribe</b>"
#~ msgstr "<b>Отправка и получение</b>"
+
#~ msgid "Allow others to see your:"
#~ msgstr "_Позволить ему или ей видеть мой статус"
+
#~ msgid "Receive your contact's:"
#~ msgstr "Получать от ваших контактов:"
+
#~ msgid "Tune"
#~ msgstr "Слушаю"
+
#~ msgid ""
#~ "\n"
#~ "From: %(from_address)s"
#~ msgstr ""
#~ "\n"
#~ "От: %(from_address)s"
+
#~ msgid ""
#~ "If checked, Gajim can regularly poll a Last.fm account and sends recently "
#~ "played songs through PEP."
#~ msgstr ""
#~ "Если включено, Gajim будет проверять аккаунт на Last.fm и менять ваш PEP "
#~ "статус на имя проигрываемого трека. "
+
#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
#~ msgstr ""
#~ "Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к "
#~ "ней префикс /say)"
+
#~ msgid "<b>History Viewer</b>"
#~ msgstr "<b>Менеджер истории</b>"
+
#~ msgid "<b>JID Selection</b>"
#~ msgstr "<b>Выбор JID</b>"
+
#~ msgid ""
#~ "Choose the chatlog you want to view. \n"
#~ "Enter the jid of a groupchat or a contact here. For online accounts you "
@@ -9220,49 +9865,68 @@
#~ msgstr ""
#~ "Выберите лог чата, который хотите посмотреть. \n"
#~ "Введите jid чата или контакта. Для онлайн контактов можете ввести ники."
+
#~ msgid "in"
#~ msgstr "в"
+
#~ msgid "Role:"
#~ msgstr "Обязанности:"
+
#~ msgid "Affiliation:"
#~ msgstr "Ранг:"
+
#~ msgid "Connection to host could not be established"
#~ msgstr "Не удалось соединиться с хостом"
+
#~ msgid ""
#~ "Connection to host could not be established: Incorrect answer from server."
#~ msgstr "Нельзя подключиться к хосту: Неверный ответ от сервера."
+
#~ msgid "_Services"
#~ msgstr "_Сервисы"
+
#~ msgid "Address"
#~ msgstr "Адрес"
+
#~ msgid "City:"
#~ msgstr "Город:"
+
#~ msgid "Company:"
#~ msgstr "Компания:"
+
#~ msgid "Country:"
#~ msgstr "Страна:"
+
#~ msgid "Given:"
#~ msgstr "Имя:"
+
#~ msgid "Middle:"
#~ msgstr "Отчество:"
+
#~ msgid "Position:"
#~ msgstr "Должность:"
+
#~ msgid "Prefix:"
#~ msgstr "Префикс:"
+
#~ msgid "State:"
#~ msgstr "Штат:"
+
#~ msgid "Suffix:"
#~ msgstr "Суффикс:"
+
#~ msgid "Ask:"
#~ msgstr "Спрашивать:"
+
#~ msgid "Client:"
#~ msgstr "Клиент:"
+
#~ msgid "OS:"
#~ msgstr "ОС:"
+
#~ msgid "Subscription:"
#~ msgstr "Подписка:"
#, fuzzy
#~ msgid "%s is now %s (%s)"
#~ msgstr "%s %s (%s)"
-
Modified: branches/osx_newbuildsys/src/chat_control.py
===================================================================
--- branches/osx_newbuildsys/src/chat_control.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/chat_control.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -134,7 +134,9 @@
def handle_message_textview_mykey_press(self, widget, event_keyval,
event_keymod):
- pass # Derived should implement this rather than connecting to the event itself.
+ # Derived should implement this rather than connecting to the event
+ # itself.
+ pass
def status_url_clicked(self, widget, url):
helpers.launch_browser_mailer('url', url)
@@ -167,12 +169,14 @@
self._on_banner_eventbox_button_press_event)
self.handlers[id_] = widget
- self.urlfinder = re.compile(r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]")
+ self.urlfinder = re.compile(
+ r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]")
if gajim.HAVE_PYSEXY:
import sexy
self.banner_status_label = sexy.UrlLabel()
- self.banner_status_label.connect('url_activated', self.status_url_clicked)
+ self.banner_status_label.connect('url_activated',
+ self.status_url_clicked)
else:
self.banner_status_label = gtk.Label()
self.banner_status_label.set_selectable(True)
@@ -275,29 +279,7 @@
# Attach speller
if gajim.config.get('use_speller') and HAS_GTK_SPELL:
- try:
- spell = gtkspell.Spell(self.msg_textview)
- # loop removing non-existant dictionaries
- # iterating on a copy
- for lang in dict(langs):
- try:
- spell.set_language(langs[lang])
- except Exception:
- del langs[lang]
- # now set the one the user selected
- per_type = 'contacts'
- if self.type_id == message_control.TYPE_GC:
- per_type = 'rooms'
- lang = gajim.config.get_per(per_type, self.contact.jid,
- 'speller_language')
- if not lang:
- # use the default one
- lang = gajim.config.get('speller_language')
- if lang:
- self.msg_textview.lang = lang
- spell.set_language(lang)
- except (gobject.GError, RuntimeError):
- dialogs.AspellDictError(lang)
+ self.set_speller()
self.conv_textview.tv.show()
self._paint_banner()
@@ -307,8 +289,37 @@
self.smooth = True
self.msg_textview.grab_focus()
+ def set_speller(self):
+ try:
+ lang = gajim.config.get('speller_language')
+ if not lang:
+ lang = gajim.LANG
+ spell = gtkspell.Spell(self.msg_textview, lang)
+ # loop removing non-existant dictionaries
+ # iterating on a copy
+ for lang in dict(langs):
+ try:
+ spell.set_language(langs[lang])
+ except Exception:
+ del langs[lang]
+ # now set the one the user selected
+ per_type = 'contacts'
+ if self.type_id == message_control.TYPE_GC:
+ per_type = 'rooms'
+ lang = gajim.config.get_per(per_type, self.contact.jid,
+ 'speller_language')
+ if not lang:
+ # use the default one
+ lang = gajim.config.get('speller_language')
+ if lang:
+ self.msg_textview.lang = lang
+ spell.set_language(lang)
+ except (gobject.GError, RuntimeError):
+ dialogs.AspellDictError(lang)
+
def on_msg_textview_populate_popup(self, textview, menu):
- '''we override the default context menu and we prepend an option to switch languages'''
+ '''we override the default context menu and we prepend an option to switch
+ languages'''
def _on_select_dictionary(widget, lang):
per_type = 'contacts'
if self.type_id == message_control.TYPE_GC:
@@ -589,21 +600,19 @@
return True
return False
- def send_message(self, message, keyID = '', type_ = 'chat', chatstate = None,
- msg_id = None, composing_xep = None, resource = None,
- process_command = True, xhtml = None):
+ def send_message(self, message, keyID='', type_='chat', chatstate=None,
+ msg_id=None, composing_xep=None, resource=None, process_command=True,
+ xhtml=None, callback=None, callback_args=[]):
'''Send the given message to the active tab. Doesn't return None if error
'''
if not message or message == '\n':
return None
- ret = None
-
if not process_command or not self._process_command(message):
- ret = MessageControl.send_message(self, message, keyID, type_ = type_,
- chatstate = chatstate, msg_id = msg_id,
- composing_xep = composing_xep, resource = resource,
- user_nick = self.user_nick, xhtml = xhtml)
+ MessageControl.send_message(self, message, keyID, type_=type_,
+ chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep,
+ resource=resource, user_nick=self.user_nick, xhtml=xhtml,
+ callback=callback, callback_args=callback_args)
# Record message history
self.save_sent_message(message)
@@ -615,8 +624,6 @@
message_buffer = self.msg_textview.get_buffer()
message_buffer.set_text('') # clear message buffer (and tv of course)
- return ret
-
def save_sent_message(self, message):
# save the message, so user can scroll though the list with key up/down
size = len(self.sent_history)
@@ -662,7 +669,7 @@
# other_tags_for_text == ['marked'] --> highlighted gc message
gajim.last_message_time[self.account][full_jid] = time.time()
- if kind in ('incoming', 'incoming_queue'):
+ if kind in ('incoming', 'incoming_queue', 'error'):
gc_message = False
if self.type_id == message_control.TYPE_GC:
gc_message = True
@@ -672,7 +679,7 @@
not self.parent_win.is_active() or not end)) or \
(gc_message and \
jid in gajim.interface.minimized_controls[self.account])) and \
- kind in ('incoming', 'incoming_queue'):
+ kind in ('incoming', 'incoming_queue', 'error'):
# we want to have save this message in events list
# other_tags_for_text == ['marked'] --> highlighted gc message
if gc_message:
@@ -704,7 +711,7 @@
if (not self.parent_win.get_active_control() or \
self != self.parent_win.get_active_control() or \
not self.parent_win.is_active() or not end) and \
- kind in ('incoming', 'incoming_queue'):
+ kind in ('incoming', 'incoming_queue', 'error'):
self.parent_win.redraw_tab(self)
if not self.parent_win.is_active():
self.parent_win.show_title(True, self) # Enabled Urgent hint
@@ -1617,7 +1624,8 @@
ChatControlBase.print_conversation_line(self, msg,
'status', '', None)
- loggable = gajim.config.get('log_encrypted_sessions')
+ loggable = gajim.config.get_per('accounts', self.account,
+ 'log_encrypted_sessions')
if self.session:
self.session.loggable = loggable
@@ -1796,11 +1804,7 @@
gobject.source_remove(self.possible_inactive_timeout_id)
self._schedule_activity_timers()
- id_ = ChatControlBase.send_message(self, message, keyID,
- type_ = 'chat', chatstate = chatstate_to_send,
- composing_xep = composing_xep,
- process_command = process_command, xhtml = xhtml)
- if id_:
+ def _on_sent(id_, contact, message, encrypted, xhtml):
# XXX: Once we have fallback to disco, remove notexistant check
if gajim.capscache.is_supported(contact, NS_RECEIPTS) \
and not gajim.capscache.is_supported(contact,
@@ -1814,6 +1818,11 @@
encrypted = encrypted, xep0184_id = xep0184_id,
xhtml = xhtml)
+ ChatControlBase.send_message(self, message, keyID, type_='chat',
+ chatstate=chatstate_to_send, composing_xep=composing_xep,
+ process_command=process_command, xhtml=xhtml, callback=_on_sent,
+ callback_args=[contact, message, encrypted, xhtml])
+
def check_for_possible_paused_chatstate(self, arg):
''' did we move mouse of that window or write something in message
textview in the last 5 seconds?
@@ -1898,12 +1907,15 @@
def print_conversation(self, text, frm='', tim=None, encrypted=False,
subject=None, xhtml=None, simple=False, xep0184_id=None):
- # TODO: contact? ITYM frm.
'''Print a line in the conversation:
- if contact is set to status: it's a status message
- if contact is set to another value: it's an outgoing message
- if contact is set to print_queue: it is incomming from queue
- if contact is not set: it's an incomming message'''
+ if frm is set to status: it's a status message
+ if frm is set to error: it's an error message
+ The difference between status and error is mainly that with error, msg
+ count as a new message (in systray and in control).
+ if frm is set to info: it's a information message
+ if frm is set to print_queue: it is incomming from queue
+ if frm is set to another value: it's an outgoing message
+ if frm is not set: it's an incomming message'''
contact = self.contact
if frm == 'status':
@@ -1911,6 +1923,9 @@
return
kind = 'status'
name = ''
+ elif frm == 'error':
+ kind = 'error'
+ name = ''
elif frm == 'info':
kind = 'info'
name = ''
@@ -2403,10 +2418,10 @@
e2e_is_active = self.session and \
self.session.enable_encryption
- e2e_pref = gajim.config.get_per('accounts',
- self.account, 'autonegotiate_esessions') and \
- gajim.config.get_per('contacts',
- self.contact.jid, 'autonegotiate_esessions')
+ e2e_pref = gajim.config.get_per('accounts', self.account,
+ 'enable_esessions') and gajim.config.get_per('accounts',
+ self.account, 'autonegotiate_esessions') and gajim.config.get_per(
+ 'contacts', self.contact.jid, 'autonegotiate_esessions')
want_e2e = not e2e_is_active and not self.gpg_is_active \
and e2e_pref
Modified: branches/osx_newbuildsys/src/common/GnuPG.py
===================================================================
--- branches/osx_newbuildsys/src/common/GnuPG.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/GnuPG.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -40,6 +40,9 @@
self.options.armor = 1
self.options.meta_interactive = 0
self.options.extra_args.append('--no-secmem-warning')
+ # disable photo viewer when verifying keys
+ self.options.extra_args.append('--verify-options')
+ self.options.extra_args.append('no-show-photo')
if self.use_agent:
self.options.extra_args.append('--use-agent')
Modified: branches/osx_newbuildsys/src/common/atom.py
===================================================================
--- branches/osx_newbuildsys/src/common/atom.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/atom.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -64,7 +64,7 @@
xmpp.Node.__init__(self, 'entry', node=node)
def __repr__(self):
- return '<Atom:Entry object of id="%r">' % self.id
+ return '<Atom:Entry object of id="%r">' % self.getAttr('id')
class OldEntry(xmpp.Node, object):
''' Parser for feeds from pubsub.com. They use old Atom 0.3 format with
@@ -74,7 +74,7 @@
xmpp.Node.__init__(self, 'entry', node=node)
def __repr__(self):
- return '<Atom0.3:Entry object of id="%r">' % self.id
+ return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id')
def get_feed_title(self):
''' Returns title of feed, where the entry was created. The result is the feed name
Modified: branches/osx_newbuildsys/src/common/config.py
===================================================================
--- branches/osx_newbuildsys/src/common/config.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/config.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -80,8 +80,8 @@
'notify_on_new_message': [ opt_bool, True ],
'autopopupaway': [ opt_bool, False ],
'use_notif_daemon': [ opt_bool, True , _('Use D-Bus and Notification-Daemon to show notifications') ],
- 'ignore_unknown_contacts': [ opt_bool, False ],
'showoffline': [ opt_bool, False ],
+ 'show_only_chat_and_online': [ opt_bool, False, _('Show only online and free for chat contacts in roster.')],
'show_transports_group': [ opt_bool, True ],
'autoaway': [ opt_bool, True ],
'autoawaytime': [ opt_int, 5, _('Time in minutes, after which your status changes to away.') ],
@@ -166,7 +166,6 @@
'time_stamp': [ opt_str, '[%X] ', _('This option let you customize timestamp that is printed in conversation. For exemple "[%H:%M] " will show "[hour:minute] ". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html') ],
'before_nickname': [ opt_str, '', _('Characters that are printed before the nickname in conversations') ],
'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ],
- 'send_os_info': [ opt_bool, True ],
'notify_on_new_gmail_email': [ opt_bool, True ],
'notify_on_new_gmail_email_extra': [ opt_bool, False ],
'use_gpg_agent': [ opt_bool, False ],
@@ -205,7 +204,6 @@
'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')],
'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')],
'tabs_close_button': [opt_bool, True, _('Show close button in tab?')],
- 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')],
'esession_modp': [opt_str, '5,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')],
'chat_avatar_width': [opt_int, 52],
'chat_avatar_height': [opt_int, 52],
@@ -343,6 +341,9 @@
'subscribe_activity': [opt_bool, True],
'subscribe_tune': [opt_bool, True],
'subscribe_nick': [opt_bool, True],
+ 'ignore_unknown_contacts': [ opt_bool, False ],
+ 'send_os_info': [ opt_bool, True ],
+ 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')],
}, {}),
'statusmsg': ({
'message': [ opt_str, '' ],
Modified: branches/osx_newbuildsys/src/common/connection.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/connection.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -519,10 +519,7 @@
if len(self._hosts):
# No config option exist when creating a new account
if self.last_connection_type:
- if self.last_connection_type == 'plain':
- self._connection_types = ['plain']
- else:
- self._connection_types = [self.last_connection_type]
+ self._connection_types = [self.last_connection_type]
elif self.name in gajim.config.get_per('accounts'):
self._connection_types = gajim.config.get_per('accounts', self.name,
'connection_types').split()
@@ -1135,7 +1132,7 @@
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):
+ original_message=None, delayed=None, callback=None, callback_args=[]):
if not self.connection or self.connected < 2:
return 1
try:
@@ -1151,7 +1148,7 @@
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(msg)
if not msg and chatstate is None and form_node is None:
- return 2
+ return
fjid = jid
if resource:
fjid += '/' + resource
@@ -1168,30 +1165,61 @@
elif keyID.endswith('MISMATCH'):
error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8])
else:
- #encrypt
- msgenc, error = self.gpg.encrypt(msg, [keyID])
- if msgenc and not error:
- msgtxt = '[This message is *encrypted* (See :XEP:`27`]'
- lang = os.getenv('LANG')
- if lang is not None and lang != 'en': # we're not english
- # one in locale and one en
- msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \
- ' (' + msgtxt + ')'
- else:
- # Encryption failed, do not send message
- tim = localtime()
- self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
- return 3
+ def encrypt_thread(msg, keyID):
+ # encrypt message. This function returns (msgenc, error)
+ return self.gpg.encrypt(msg, [keyID])
+ gajim.thread_interface(encrypt_thread, [msg, keyID],
+ self._on_message_encrypted, [type_, msg, msgtxt,
+ original_message, fjid, resource, jid, xhtml, subject,
+ chatstate, composing_xep, forward_from, delayed, session,
+ form_node, user_nick, keyID, callback, callback_args])
+ return
+
+ self._on_message_encrypted(self, ('', error), type_, msg, msgtxt,
+ original_message, fjid, resource, jid, xhtml, subject, chatstate,
+ composing_xep, forward_from, delayed, session, form_node, user_nick,
+ keyID, callback, callback_args)
+
+ self._on_continue_message(type_, msg, msgtxt, original_message, fjid,
+ resource, jid, xhtml, subject, msgenc, keyID, chatstate, composing_xep,
+ forward_from, delayed, session, form_node, user_nick, callback,
+ callback_args)
+
+ def _on_message_encrypted(self, output, type_, msg, msgtxt, original_message,
+ fjid, resource, jid, xhtml, subject, chatstate, composing_xep, forward_from,
+ delayed, session, form_node, user_nick, keyID, callback, callback_args):
+ msgenc, error = output
+
+ if msgenc and not error:
+ msgtxt = '[This message is *encrypted* (See :XEP:`27`]'
+ lang = os.getenv('LANG')
+ if lang is not None and lang != 'en': # we're not english
+ # one in locale and one en
+ msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \
+ ' (' + msgtxt + ')'
+ self._on_continue_message(type_, msg, msgtxt, original_message, fjid,
+ resource, jid, xhtml, subject, msgenc, keyID, chatstate,
+ composing_xep, forward_from, delayed, session, form_node, user_nick,
+ callback, callback_args)
+ return
+ # Encryption failed, do not send message
+ tim = localtime()
+ self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
+
+ def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid,
+ resource, jid, xhtml, subject, msgenc, keyID, chatstate, composing_xep,
+ forward_from, delayed, session, form_node, user_nick, callback,
+ callback_args):
if type_ == 'chat':
- msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_,
- xhtml = xhtml)
+ msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_,
+ xhtml=xhtml)
else:
if subject:
- msg_iq = common.xmpp.Message(to = fjid, body = msgtxt,
- typ = 'normal', subject = subject, xhtml = xhtml)
+ msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
+ subject=subject, xhtml=xhtml)
else:
- msg_iq = common.xmpp.Message(to = fjid, body = msgtxt,
- typ = 'normal', xhtml = xhtml)
+ msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
+ xhtml=xhtml)
if msgenc:
msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc)
@@ -1206,11 +1234,9 @@
# TODO: We might want to write a function so we don't need to
# reproduce that ugly if somewhere else.
if resource:
- contact = gajim.contacts.get_contact(self.name, jid,
- resource)
+ contact = gajim.contacts.get_contact(self.name, jid, resource)
else:
- contact = gajim.contacts. \
- get_contact_with_highest_priority(self.name,
+ contact = gajim.contacts.get_contact_with_highest_priority(self.name,
jid)
# chatstates - if peer supports xep85 or xep22, send chatstates
@@ -1226,16 +1252,13 @@
not gajim.capscache.is_supported(contact,
'notexistant')):
# XEP-0085
- msg_iq.setTag(chatstate,
- namespace = common.xmpp.NS_CHATSTATES)
+ msg_iq.setTag(chatstate, namespace=common.xmpp.NS_CHATSTATES)
if composing_xep in ('XEP-0022', 'asked_once') or \
not composing_xep:
# XEP-0022
- chatstate_node = msg_iq.setTag('x',
- namespace = common.xmpp.NS_EVENT)
+ chatstate_node = msg_iq.setTag('x', namespace=common.xmpp.NS_EVENT)
if chatstate is 'composing' or msgtxt:
- chatstate_node.addChild(
- name = 'composing')
+ chatstate_node.addChild(name='composing')
if forward_from:
addresses = msg_iq.addChild('addresses',
@@ -1255,8 +1278,7 @@
if msgtxt and gajim.config.get_per('accounts', self.name,
'request_receipt') and gajim.capscache.is_supported(contact,
common.xmpp.NS_RECEIPTS):
- msg_iq.setTag('request',
- namespace=common.xmpp.NS_RECEIPTS)
+ msg_iq.setTag('request', namespace=common.xmpp.NS_RECEIPTS)
if session:
# XEP-0201
@@ -1294,7 +1316,8 @@
common.logger.LOG_DB_PATH
self.dispatch('MSGSENT', (jid, msg, keyID))
- return msg_id
+ if callback:
+ callback(msg_id, *callback_args)
def send_stanza(self, stanza):
''' send a stanza untouched '''
@@ -1458,7 +1481,7 @@
to_whom_jid = jid
if resource:
to_whom_jid += '/' + resource
- iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\
+ iq = common.xmpp.Iq(to=to_whom_jid, typ='get', queryNS=\
common.xmpp.NS_VERSION)
id_ = self.connection.getAnID()
iq.setID(id_)
@@ -1467,6 +1490,27 @@
self.version_ids.append(id_)
self.connection.send(iq)
+ def request_entity_time(self, jid, resource, groupchat_jid=None):
+ '''groupchat_jid is used when we want to send a request to a real jid
+ and act as if the answer comes from the groupchat_jid'''
+ if not self.connection:
+ return
+ # If we are invisible, do not request
+ if self.connected == gajim.SHOW_LIST.index('invisible'):
+ self.dispatch('ENTITY_TIME', (jid, resource, _('Not fetched because of invisible status')))
+ return
+ to_whom_jid = jid
+ if resource:
+ to_whom_jid += '/' + resource
+ iq = common.xmpp.Iq(to=to_whom_jid, typ='get', queryNS=\
+ common.xmpp.NS_TIME_REVISED)
+ id_ = self.connection.getAnID()
+ iq.setID(id_)
+ if groupchat_jid:
+ self.groupchat_jids[id_] = groupchat_jid
+ self.entity_time_ids.append(id_)
+ self.connection.send(iq)
+
def get_settings(self):
''' Get Gajim settings as described in XEP 0049 '''
if not self.connection:
Modified: branches/osx_newbuildsys/src/common/connection_handlers.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection_handlers.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/connection_handlers.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -38,6 +38,7 @@
from time import (altzone, daylight, gmtime, localtime, mktime, strftime,
time as time_time, timezone, tzname)
from calendar import timegm
+import datetime
import socks5
import common.xmpp
@@ -766,9 +767,9 @@
hostname = gajim.config.get_per('accounts', self.name,
'hostname')
id_ = iq_obj.getID()
- if jid == hostname and id_[0] == 'p':
+ if jid == hostname and id_[:6] == 'Gajim_':
for item in items:
- self.discoverInfo(item['jid'], id_prefix='p')
+ self.discoverInfo(item['jid'], id_prefix='Gajim_')
else:
self.dispatch('AGENT_INFO_ITEMS', (jid, node, items))
@@ -800,7 +801,7 @@
raise common.xmpp.NodeProcessed
id_ = unicode(iq_obj.getAttr('id'))
- if id_[0] == 'p':
+ if id_[:6] == 'Gajim_':
# We get this request from echo.server
raise common.xmpp.NodeProcessed
@@ -867,7 +868,7 @@
if not identities: # ejabberd doesn't send identities when we browse online users
#FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225
identities = [{'category': 'server', 'type': 'im', 'name': node}]
- if id_[0] == 'p':
+ if id_[:6] == 'Gajim_':
if jid == gajim.config.get_per('accounts', self.name, 'hostname'):
if features.__contains__(common.xmpp.NS_GMAILNOTIFY):
gajim.gmail_domains.append(jid)
@@ -1426,6 +1427,8 @@
self.last_ids = []
# IDs of jabber:iq:version requests
self.version_ids = []
+ # IDs of urn:xmpp:time requests
+ self.entity_time_ids = []
# ID of urn:xmpp:ping requests
self.awaiting_xmpp_ping_id = None
self.continue_connect_info = None
@@ -1475,6 +1478,10 @@
self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, -1, ''))
self.last_ids.remove(id_)
return
+ if id_ in self.entity_time_ids:
+ self.dispatch('ENTITY_TIME', (jid_stripped, resource, ''))
+ self.entity_time_ids.remove(id_)
+ return
if id_ == self.awaiting_xmpp_ping_id:
self.awaiting_xmpp_ping_id = None
errmsg = iq_obj.getErrorMsg()
@@ -1550,7 +1557,7 @@
qp = iq_obj.getTag('query')
qp.setTagData('name', 'Gajim')
qp.setTagData('version', gajim.version)
- send_os = gajim.config.get('send_os_info')
+ send_os = gajim.config.get_per('accounts', self.name, 'send_os_info')
if send_os:
qp.setTagData('os', helpers.get_os_info())
self.connection.send(iq_obj)
@@ -1633,12 +1640,54 @@
qp = iq_obj.setTag('time',
namespace=common.xmpp.NS_TIME_REVISED)
qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime()))
- zone = -(timezone, altzone)[daylight] / 60
+ isdst = time.localtime().tm_isdst
+ zone = -(timezone, altzone)[isdst] / 60
tzo = (zone / 60, abs(zone % 60))
qp.setTagData('tzo', '%+03d:%02d' % (tzo))
self.connection.send(iq_obj)
raise common.xmpp.NodeProcessed
+ def _TimeRevisedResultCB(self, con, iq_obj):
+ log.debug('TimeRevisedResultCB')
+ time_info = ''
+ qp = iq_obj.getTag('time')
+ tzo = qp.getTag('tzo').getData()
+ if tzo == 'Z':
+ tzo = '0:0'
+ tzoh, tzom = tzo.split(':')
+ utc_time = qp.getTag('utc').getData()
+ ZERO = datetime.timedelta(0)
+ class UTC(datetime.tzinfo):
+ def utcoffset(self, dt):
+ return ZERO
+ def tzname(self, dt):
+ return "UTC"
+ def dst(self, dt):
+ return ZERO
+
+ class contact_tz(datetime.tzinfo):
+ def utcoffset(self, dt):
+ return datetime.timedelta(hours=int(tzoh), minutes=int(tzom))
+ def tzname(self, dt):
+ return "remote timezone"
+ def dst(self, dt):
+ return ZERO
+
+ t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ')
+ t = t.replace(tzinfo=UTC())
+
+ time_info = t.astimezone(contact_tz()).strftime('%c')
+ id_ = iq_obj.getID()
+ if id_ in self.groupchat_jids:
+ who = self.groupchat_jids[id_]
+ del self.groupchat_jids[id_]
+ else:
+ who = helpers.get_full_jid_from_iq(iq_obj)
+ jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who)
+ if id_ in self.entity_time_ids:
+ self.entity_time_ids.remove(id_)
+ self.dispatch('ENTITY_TIME', (jid_stripped, resource, time_info))
+
def _gMailNewMailCB(self, con, gm):
'''Called when we get notified of new mail messages in gmail account'''
if not self.connection or self.connected < 2:
@@ -1772,6 +1821,7 @@
encrypted = False
xep_200_encrypted = msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO)
+ session = None
if mtype != 'groupchat':
session = self.get_or_create_session(frm, thread_id)
@@ -1853,10 +1903,22 @@
keyID = gajim.config.get_per('accounts', self.name, 'keyid')
if keyID:
- decmsg = self.gpg.decrypt(encmsg, keyID)
- # \x00 chars are not allowed in C (so in GTK)
- msgtxt = decmsg.replace('\x00', '')
- encrypted = 'xep27'
+ def decrypt_thread(encmsg, keyID):
+ decmsg = self.gpg.decrypt(encmsg, keyID)
+ # \x00 chars are not allowed in C (so in GTK)
+ msgtxt = helpers.decode_string(decmsg.replace('\x00', ''))
+ encrypted = 'xep27'
+ return (msgtxt, encrypted)
+ gajim.thread_interface(decrypt_thread, [encmsg, keyID],
+ self._on_message_decrypted, [mtype, msg, session, frm, jid,
+ invite, tim])
+ return
+ self._on_message_decrypted((msgtxt, encrypted), mtype, msg, session, frm,
+ jid, invite, tim)
+
+ def _on_message_decrypted(self, output, mtype, msg, session, frm, jid,
+ invite, tim):
+ msgtxt, encrypted = output
if mtype == 'error':
self.dispatch_error_message(msg, msgtxt, session, frm, tim)
elif mtype == 'groupchat':
@@ -2339,9 +2401,9 @@
return
self.connection.getRoster(self._on_roster_set)
self.discoverItems(gajim.config.get_per('accounts', self.name,
- 'hostname'), id_prefix='p')
+ 'hostname'), id_prefix='Gajim_')
self.discoverInfo(gajim.config.get_per('accounts', self.name,
- 'hostname'), id_prefix='p')
+ 'hostname'), id_prefix='Gajim_')
if gajim.config.get_per('accounts', self.name, 'use_ft_proxies'):
self.discover_ft_proxies()
@@ -2530,6 +2592,8 @@
common.xmpp.NS_LAST)
con.RegisterHandler('iq', self._VersionResultCB, 'result',
common.xmpp.NS_VERSION)
+ con.RegisterHandler('iq', self._TimeRevisedResultCB, 'result',
+ common.xmpp.NS_TIME_REVISED)
con.RegisterHandler('iq', self._MucOwnerCB, 'result',
common.xmpp.NS_MUC_OWNER)
con.RegisterHandler('iq', self._MucAdminCB, 'result',
Modified: branches/osx_newbuildsys/src/common/dataforms.py
===================================================================
--- branches/osx_newbuildsys/src/common/dataforms.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/dataforms.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -21,15 +21,18 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
##
-""" This module contains wrappers for different parts of data forms (JEP 0004). For information
-how to use them, read documentation. """
+""" This module contains wrappers for different parts of data forms (JEP 0004).
+For information how to use them, read documentation. """
import xmpp
# exceptions used in this module
-class Error(Exception): pass # base class
-class UnknownDataForm(Error): pass # when we get xmpp.Node which we do not understand
-class WrongFieldValue(Error): pass # when we get xmpp.Node which contains bad fields
+# base class
+class Error(Exception): pass
+# when we get xmpp.Node which we do not understand
+class UnknownDataForm(Error): pass
+# when we get xmpp.Node which contains bad fields
+class WrongFieldValue(Error): pass
# helper class to change class of already existing object
class ExtendedNode(xmpp.Node, object):
@@ -56,7 +59,7 @@
''' Helper function to create a field of given type. '''
f = {
'boolean': BooleanField,
- 'fixed': TextMultiField, # not editable, still can have multiple lines of text
+ 'fixed': StringField,
'hidden': StringField,
'text-private': StringField,
'text-single': StringField,
@@ -76,7 +79,7 @@
typ=node.getAttr('type')
f = {
'boolean': BooleanField,
- 'fixed': TextMultiField,
+ 'fixed': StringField,
'hidden': StringField,
'text-private': StringField,
'text-single': StringField,
@@ -101,33 +104,40 @@
""" Keeps data about one field - var, field type, labels, instructions...
Base class for different kinds of fields. Use Field() function to
construct one of these. """
- def __init__(self, typ=None, var=None, value=None, label=None, desc=None, required=False,
- options=None, extend=None):
+
+ def __init__(self, typ=None, var=None, value=None, label=None, desc=None,
+ required=False, options=None, extend=None):
if extend is None:
ExtendedNode.__init__(self, 'field')
self.type = typ
self.var = var
- if value is not None: self.value = value
- if label is not None: self.label = label
- if desc is not None: self.desc = desc
+ if value is not None:
+ self.value = value
+ if label is not None:
+ self.label = label
+ if desc is not None:
+ self.desc = desc
self.required = required
self.options = options
@nested_property
def type():
- '''Type of field. Recognized values are: 'boolean', 'fixed', 'hidden', 'jid-multi',
- 'jid-single', 'list-multi', 'list-single', 'text-multi', 'text-private',
- 'text-single'. If you set this to something different, DataField will store
- given name, but treat all data as text-single.'''
+ '''Type of field. Recognized values are: 'boolean', 'fixed', 'hidden',
+ 'jid-multi', 'jid-single', 'list-multi', 'list-single', 'text-multi',
+ 'text-private', 'text-single'. If you set this to something different,
+ DataField will store given name, but treat all data as text-single.'''
def fget(self):
t = self.getAttr('type')
- if t is None: return 'text-single'
+ if t is None:
+ return 'text-single'
return t
+
def fset(self, value):
assert isinstance(value, basestring)
self.setAttr('type', value)
+
return locals()
@nested_property
@@ -135,11 +145,14 @@
'''Field identifier.'''
def fget(self):
return self.getAttr('var')
+
def fset(self, value):
assert isinstance(value, basestring)
self.setAttr('var', value)
+
def fdel(self):
self.delAttr('var')
+
return locals()
@nested_property
@@ -147,12 +160,15 @@
'''Human-readable field name.'''
def fget(self):
return self.getAttr('label')
+
def fset(self, value):
assert isinstance(value, basestring)
self.setAttr('label', value)
+
def fdel(self):
if self.getAttr('label'):
self.delAttr('label')
+
return locals()
@nested_property
@@ -160,16 +176,19 @@
'''Human-readable description of field meaning.'''
def fget(self):
return self.getTagData('desc') or u''
+
def fset(self, value):
assert isinstance(value, basestring)
if value == '':
fdel(self)
else:
self.setTagData('desc', value)
+
def fdel(self):
t = self.getTag('desc')
if t is not None:
self.delChild(t)
+
return locals()
@nested_property
@@ -177,12 +196,14 @@
'''Controls whether this field required to fill. Boolean.'''
def fget(self):
return bool(self.getTag('required'))
+
def fset(self, value):
t = self.getTag('required')
if t and not value:
self.delChild(t)
elif not t and value:
self.addChild('required')
+
return locals()
class BooleanField(DataField):
@@ -191,16 +212,22 @@
'''Value of field. May contain True, False or None.'''
def fget(self):
v = self.getTagData('value')
- if v in ('0', 'false'): return False
- if v in ('1', 'true'): return True
- if v is None: return False # default value is False
+ if v in ('0', 'false'):
+ return False
+ if v in ('1', 'true'):
+ return True
+ if v is None:
+ return False # default value is False
raise WrongFieldValue
+
def fset(self, value):
self.setTagData('value', value and '1' or '0')
+
def fdel(self, value):
t = self.getTag('value')
if t is not None:
self.delChild(t)
+
return locals()
class StringField(DataField):
@@ -210,20 +237,23 @@
'''Value of field. May be any unicode string.'''
def fget(self):
return self.getTagData('value') or u''
+
def fset(self, value):
assert isinstance(value, basestring)
if value == '':
return fdel(self)
self.setTagData('value', value)
+
def fdel(self):
try:
self.delChild(self.getTag('value'))
except ValueError: # if there already were no value tag
pass
+
return locals()
class ListField(DataField):
- ''' Covers fields of types: jid-multi, jid-single, list-multi, list-single. '''
+ '''Covers fields of types: jid-multi, jid-single, list-multi, list-single.'''
@nested_property
def options():
'''Options.'''
@@ -231,22 +261,27 @@
options = []
for element in self.getTags('option'):
v = element.getTagData('value')
- if v is None: raise WrongFieldValue
+ if v is None:
+ raise WrongFieldValue
options.append((element.getAttr('label'), v))
return options
+
def fset(self, values):
fdel(self)
for value, label in values:
self.addChild('option', {'label': label}).setTagData('value', value)
+
def fdel(self):
for element in self.getTags('option'):
self.delChild(element)
+
return locals()
def iter_options(self):
for element in self.iterTags('option'):
v = element.getTagData('value')
- if v is None: raise WrongFieldValue
+ if v is None:
+ raise WrongFieldValue
l = element.getAttr('label')
if not l:
l = v
@@ -266,13 +301,16 @@
for element in self.getTags('value'):
values.append(element.getData())
return values
+
def fset(self, values):
fdel(self)
for value in values:
self.addChild('value').setData(value)
+
def fdel(self):
for element in self.getTags('value'):
self.delChild(element)
+
return locals()
def iter_values(self):
@@ -288,14 +326,18 @@
for element in self.iterTags('value'):
value += '\n' + element.getData()
return value[1:]
+
def fset(self, value):
fdel(self)
- if value == '': return
+ if value == '':
+ return
for line in value.split('\n'):
self.addChild('value').setData(line)
+
def fdel(self):
for element in self.getTags('value'):
self.delChild(element)
+
return locals()
class DataRecord(ExtendedNode):
@@ -308,7 +350,8 @@
# we have to build this object from scratch
xmpp.Node.__init__(self)
- if fields is not None: self.fields = fields
+ if fields is not None:
+ self.fields = fields
else:
# we already have xmpp.Node inside - try to convert all
# fields into DataField objects
@@ -327,15 +370,18 @@
'''List of fields in this record.'''
def fget(self):
return self.getTags('field')
+
def fset(self, fields):
fdel(self)
for field in fields:
if not isinstance(field, DataField):
ExtendField(extend=field)
self.addChild(node=field)
+
def fdel(self):
for element in self.getTags('field'):
self.delChild(element)
+
return locals()
def iter_fields(self):
@@ -359,9 +405,12 @@
# we have to build form from scratch
xmpp.Node.__init__(self, 'x', attrs={'xmlns': xmpp.NS_DATA})
- if type_ is not None: self.type_=type_
- if title is not None: self.title=title
- if instructions is not None: self.instructions=instructions
+ if type_ is not None:
+ self.type_=type_
+ if title is not None:
+ self.title=title
+ if instructions is not None:
+ self.instructions=instructions
@nested_property
def type():
@@ -370,9 +419,11 @@
filledform = DataForm(replyto=thisform)...'''
def fget(self):
return self.getAttr('type')
+
def fset(self, type_):
assert type_ in ('form', 'submit', 'cancel', 'result')
self.setAttr('type', type_)
+
return locals()
@nested_property
@@ -380,13 +431,16 @@
''' Title of the form. Human-readable, should not contain any \\r\\n.'''
def fget(self):
return self.getTagData('title')
+
def fset(self, title):
self.setTagData('title', title)
+
def fdel(self):
try:
self.delChild('title')
except ValueError:
pass
+
return locals()
@nested_property
@@ -398,19 +452,24 @@
for valuenode in self.getTags('instructions'):
value += '\n' + valuenode.getData()
return value[1:]
+
def fset(self, value):
fdel(self)
if value == '': return
for line in value.split('\n'):
self.addChild('instructions').setData(line)
+
def fdel(self):
for value in self.getTags('instructions'):
self.delChild(value)
+
return locals()
class SimpleDataForm(DataForm, DataRecord):
- def __init__(self, type_=None, title=None, instructions=None, fields=None, extend=None):
- DataForm.__init__(self, type_=type_, title=title, instructions=instructions, extend=extend)
+ def __init__(self, type_=None, title=None, instructions=None, fields=None, \
+ extend=None):
+ DataForm.__init__(self, type_=type_, title=title,
+ instructions=instructions, extend=extend)
DataRecord.__init__(self, fields=fields, extend=self, associated=self)
def get_purged(self):
@@ -433,12 +492,14 @@
return c
class MultipleDataForm(DataForm):
- def __init__(self, type_=None, title=None, instructions=None, items=None, extend=None):
- DataForm.__init__(self, type_=type_, title=title, instructions=instructions, extend=extend)
+ def __init__(self, type_=None, title=None, instructions=None, items=None,
+ extend=None):
+ DataForm.__init__(self, type_=type_, title=title,
+ instructions=instructions, extend=extend)
# all records, recorded into DataRecords
if extend is None:
-
- if items is not None: self.items = items
+ if items is not None:
+ self.items = items
else:
# we already have xmpp.Node inside - try to convert all
# fields into DataField objects
@@ -449,22 +510,25 @@
self.delChild(item)
self.items = items
reported_tag = self.getTag('reported')
- self.reported = DataRecord(extend = reported_tag)
+ self.reported = DataRecord(extend=reported_tag)
@nested_property
def items():
''' A list of all records. '''
def fget(self):
return list(self.iter_records())
+
def fset(self, records):
fdel(self)
for record in records:
if not isinstance(record, DataRecord):
DataRecord(extend=record)
self.addChild(node=record)
+
def fdel(self):
for record in self.getTags('item'):
self.delChild(record)
+
return locals()
def iter_records(self):
Modified: branches/osx_newbuildsys/src/common/dbus_support.py
===================================================================
--- branches/osx_newbuildsys/src/common/dbus_support.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/dbus_support.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -110,7 +110,7 @@
session_bus = SessionBus()
-def get_interface(interface, path):
+def get_interface(interface, path, start_service=True):
'''Returns an interface on the current SessionBus. If the interface isn\'t
running, it tries to start it first.'''
if not supported:
@@ -126,7 +126,7 @@
started = True
if interface not in running_services:
# try to start the service
- if dbus_iface.StartServiceByName(interface, dbus.UInt32(0)) == 1:
+ if start_service and dbus_iface.StartServiceByName(interface, dbus.UInt32(0)) == 1:
started = True
else:
started = False
@@ -139,11 +139,25 @@
return None
-def get_notifications_interface():
- '''Returns the notifications interface.'''
- return get_interface('org.freedesktop.Notifications',
- '/org/freedesktop/Notifications')
+def get_notifications_interface(notif=None):
+ '''Returns the notifications interface.
+ :param notif: DesktopNotification instance'''
+ # try to see if KDE notifications are available
+ iface = get_interface('org.kde.VisualNotifications', '/VisualNotifications',
+ start_service=False)
+ if iface != None:
+ if notif != None:
+ notif.kde_notifications = True
+ return iface
+ # KDE notifications don't seem to be available, falling back to
+ # notification-daemon
+ else:
+ if notif != None:
+ notif.kde_notifications = False
+ return get_interface('org.freedesktop.Notifications',
+ '/org/freedesktop/Notifications')
+
if supported:
class MissingArgument(dbus.DBusException):
_dbus_error_name = _GAJIM_ERROR_IFACE + '.MissingArgument'
Modified: branches/osx_newbuildsys/src/common/defs.py
===================================================================
--- branches/osx_newbuildsys/src/common/defs.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/defs.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -26,7 +26,7 @@
docdir = '../'
datadir = '../'
-version = '0.12.1.1-svn'
+version = '0.12.1.2-svn'
import sys, os.path
for base in ('.', 'common'):
Modified: branches/osx_newbuildsys/src/common/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/common/gajim.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/gajim.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -63,6 +63,7 @@
sys.exit(1)
interface = None # The actual interface (the gtk one for the moment)
+thread_interface = None # Interface to run a thread and then a callback
config = config.Config()
version = config.get('version')
connections = {} # 'account name': 'account (connection.Connection) instance'
Modified: branches/osx_newbuildsys/src/common/helpers.py
===================================================================
--- branches/osx_newbuildsys/src/common/helpers.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/helpers.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -42,17 +42,11 @@
from encodings.punycode import punycode_encode
-import gajim
from i18n import Q_
from i18n import ngettext
import xmpp
try:
- from osx import nsapp
-except ImportError:
- pass
-
-try:
import winsound # windows-only built-in module for playing wav
import win32api
import win32con
@@ -187,65 +181,6 @@
else:
raise
-def convert_bytes(string):
- suffix = ''
- # IEC standard says KiB = 1024 bytes KB = 1000 bytes
- # but do we use the standard?
- use_kib_mib = gajim.config.get('use_kib_mib')
- align = 1024.
- bytes = float(string)
- if bytes >= align:
- bytes = round(bytes/align, 1)
- if bytes >= align:
- bytes = round(bytes/align, 1)
- if bytes >= align:
- bytes = round(bytes/align, 1)
- if use_kib_mib:
- #GiB means gibibyte
- suffix = _('%s GiB')
- else:
- #GB means gigabyte
- suffix = _('%s GB')
- else:
- if use_kib_mib:
- #MiB means mibibyte
- suffix = _('%s MiB')
- else:
- #MB means megabyte
- suffix = _('%s MB')
- else:
- if use_kib_mib:
- #KiB means kibibyte
- suffix = _('%s KiB')
- else:
- #KB means kilo bytes
- suffix = _('%s KB')
- else:
- #B means bytes
- suffix = _('%s B')
- return suffix % unicode(bytes)
-
-
-def get_contact_dict_for_account(account):
- ''' create a dict of jid, nick -> contact with all contacts of account.
- Can be used for completion lists'''
- contacts_dict = {}
- for jid in gajim.contacts.get_jid_list(account):
- contact = gajim.contacts.get_contact_with_highest_priority(account,
- jid)
- contacts_dict[jid] = contact
- name = contact.name
- if name in contacts_dict:
- contact1 = contacts_dict[name]
- del contacts_dict[name]
- contacts_dict['%s (%s)' % (name, contact1.jid)] = contact1
- contacts_dict['%s (%s)' % (name, jid)] = contact
- else:
- if contact.name == gajim.get_nick_from_jid(jid):
- del contacts_dict[jid]
- contacts_dict[name] = contact
- return contacts_dict
-
def get_uf_show(show, use_mnemonic = False):
'''returns a userfriendly string for dnd/xa/chat
and makes all strings translatable
@@ -426,6 +361,347 @@
command = '%s "%s"' % (executable, parameter)
return command
+def get_file_path_from_dnd_dropped_uri(uri):
+ path = urllib.unquote(uri) # escape special chars
+ path = path.strip('\r\n\x00') # remove \r\n and NULL
+ # get the path to file
+ if re.match('^file:///[a-zA-Z]:/', path): # windows
+ path = path[8:] # 8 is len('file:///')
+ elif path.startswith('file://'): # nautilus, rox
+ if sys.platform == 'darwin':
+ # OS/X includes hostname in file:// URI
+ path = re.sub('file://[^/]*', '', path)
+ else:
+ path = path[7:] # 7 is len('file://')
+ elif path.startswith('file:'): # xffm
+ path = path[5:] # 5 is len('file:')
+ return path
+
+def from_xs_boolean_to_python_boolean(value):
+ # this is xs:boolean so 'true', 'false', '1', '0'
+ # convert those to True/False (python booleans)
+ if value in ('1', 'true'):
+ val = True
+ else: # '0', 'false' or anything else
+ val = False
+
+ return val
+
+def get_xmpp_show(show):
+ if show in ('online', 'offline'):
+ return None
+ return show
+
+def get_output_of_command(command):
+ try:
+ child_stdin, child_stdout = os.popen2(command)
+ except ValueError:
+ return None
+
+ output = child_stdout.readlines()
+ child_stdout.close()
+ child_stdin.close()
+
+ return output
+
+def decode_string(string):
+ '''try to decode (to make it Unicode instance) given string'''
+ if isinstance(string, unicode):
+ return string
+ # by the time we go to iso15 it better be the one else we show bad characters
+ encodings = (locale.getpreferredencoding(), 'utf-8', 'iso-8859-15')
+ for encoding in encodings:
+ try:
+ string = string.decode(encoding)
+ except UnicodeError:
+ continue
+ break
+
+ return string
+
+def ensure_utf8_string(string):
+ '''make sure string is in UTF-8'''
+ try:
+ string = decode_string(string).encode('utf-8')
+ except Exception:
+ pass
+ return string
+
+def get_windows_reg_env(varname, default=''):
+ '''asks for paths commonly used but not exposed as ENVs
+ in english Windows 2003 those are:
+ 'AppData' = %USERPROFILE%\Application Data (also an ENV)
+ 'Desktop' = %USERPROFILE%\Desktop
+ 'Favorites' = %USERPROFILE%\Favorites
+ 'NetHood' = %USERPROFILE%\NetHood
+ 'Personal' = D:\My Documents (PATH TO MY DOCUMENTS)
+ 'PrintHood' = %USERPROFILE%\PrintHood
+ 'Programs' = %USERPROFILE%\Start Menu\Programs
+ 'Recent' = %USERPROFILE%\Recent
+ 'SendTo' = %USERPROFILE%\SendTo
+ 'Start Menu' = %USERPROFILE%\Start Menu
+ 'Startup' = %USERPROFILE%\Start Menu\Programs\Startup
+ 'Templates' = %USERPROFILE%\Templates
+ 'My Pictures' = D:\My Documents\My Pictures
+ 'Local Settings' = %USERPROFILE%\Local Settings
+ 'Local AppData' = %USERPROFILE%\Local Settings\Application Data
+ 'Cache' = %USERPROFILE%\Local Settings\Temporary Internet Files
+ 'Cookies' = %USERPROFILE%\Cookies
+ 'History' = %USERPROFILE%\Local Settings\History
+ '''
+
+ if os.name != 'nt':
+ return ''
+
+ val = default
+ try:
+ rkey = win32api.RegOpenKey(win32con.HKEY_CURRENT_USER,
+r'Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders')
+ try:
+ val = str(win32api.RegQueryValueEx(rkey, varname)[0])
+ val = win32api.ExpandEnvironmentStrings(val) # expand using environ
+ except Exception:
+ pass
+ finally:
+ win32api.RegCloseKey(rkey)
+ return val
+
+def get_my_pictures_path():
+ '''windows-only atm. [Unix lives in the past]'''
+ return get_windows_reg_env('My Pictures')
+
+def get_desktop_path():
+ if os.name == 'nt':
+ path = get_windows_reg_env('Desktop')
+ else:
+ path = os.path.join(os.path.expanduser('~'), 'Desktop')
+ return path
+
+def get_documents_path():
+ if os.name == 'nt':
+ path = get_windows_reg_env('Personal')
+ else:
+ path = os.path.expanduser('~')
+ return path
+
+def sanitize_filename(filename):
+ '''makes sure the filename we will write does contain only acceptable and
+ latin characters, and is not too long (in that case hash it)'''
+ # 48 is the limit
+ if len(filename) > 48:
+ hash = hashlib.md5(filename)
+ filename = base64.b64encode(hash.digest())
+
+ filename = punycode_encode(filename) # make it latin chars only
+ filename = filename.replace('/', '_')
+ if os.name == 'nt':
+ filename = filename.replace('?', '_').replace(':', '_')\
+ .replace('\\', '_').replace('"', "'").replace('|', '_')\
+ .replace('*', '_').replace('<', '_').replace('>', '_')
+
+ return filename
+
+def reduce_chars_newlines(text, max_chars = 0, max_lines = 0):
+ '''Cut the chars after 'max_chars' on each line
+ and show only the first 'max_lines'.
+ If any of the params is not present (None or 0) the action
+ on it is not performed'''
+
+ def _cut_if_long(string):
+ if len(string) > max_chars:
+ string = string[:max_chars - 3] + '...'
+ return string
+
+ if isinstance(text, str):
+ text = text.decode('utf-8')
+
+ if max_lines == 0:
+ lines = text.split('\n')
+ else:
+ lines = text.split('\n', max_lines)[:max_lines]
+ if max_chars > 0:
+ if lines:
+ lines = [_cut_if_long(e) for e in lines]
+ if lines:
+ reduced_text = '\n'.join(lines)
+ if reduced_text != text:
+ reduced_text += '...'
+ else:
+ reduced_text = ''
+ return reduced_text
+
+def get_account_status(account):
+ status = reduce_chars_newlines(account['status_line'], 100, 1)
+ return status
+
+def get_avatar_path(prefix):
+ '''Returns the filename of the avatar, distinguishes between user- and
+ contact-provided one. Returns None if no avatar was found at all.
+ prefix is the path to the requested avatar just before the ".png" or
+ ".jpeg".'''
+ # First, scan for a local, user-set avatar
+ for type_ in ('jpeg', 'png'):
+ file_ = prefix + '_local.' + type_
+ if os.path.exists(file_):
+ return file_
+ # If none available, scan for a contact-provided avatar
+ for type_ in ('jpeg', 'png'):
+ file_ = prefix + '.' + type_
+ if os.path.exists(file_):
+ return file_
+ return None
+
+def datetime_tuple(timestamp):
+ '''Converts timestamp using strptime and the format: %Y%m%dT%H:%M:%S
+ Because of various datetime formats are used the following exceptions
+ are handled:
+ - Optional milliseconds appened to the string are removed
+ - Optional Z (that means UTC) appened to the string are removed
+ - XEP-082 datetime strings have all '-' cahrs removed to meet
+ the above format.'''
+ timestamp = timestamp.split('.')[0]
+ timestamp = timestamp.replace('-', '')
+ timestamp = timestamp.replace('z', '')
+ timestamp = timestamp.replace('Z', '')
+ from time import strptime
+ return strptime(timestamp, '%Y%m%dT%H:%M:%S')
+
+def sort_identities_func(i1, i2):
+ cat1 = i1['category']
+ cat2 = i2['category']
+ if cat1 < cat2:
+ return -1
+ if cat1 > cat2:
+ return 1
+ type1 = i1.get('type', '')
+ type2 = i2.get('type', '')
+ if type1 < type2:
+ return -1
+ if type1 > type2:
+ return 1
+ lang1 = i1.get('xml:lang', '')
+ lang2 = i2.get('xml:lang', '')
+ if lang1 < lang2:
+ return -1
+ if lang1 > lang2:
+ return 1
+ return 0
+
+def sort_dataforms_func(d1, d2):
+ f1 = d1.getField('FORM_TYPE')
+ f2 = d2.getField('FORM_TYPE')
+ if f1 and f2 and (f1.getValue() < f2.getValue()):
+ return -1
+ return 1
+
+def compute_caps_hash(identities, features, dataforms=[], hash_method='sha-1'):
+ '''Compute caps hash according to XEP-0115, V1.5
+
+ dataforms are xmpp.DataForms objects as common.dataforms don't allow several
+ values without a field type list-multi'''
+ S = ''
+ identities.sort(cmp=sort_identities_func)
+ for i in identities:
+ c = i['category']
+ type_ = i.get('type', '')
+ lang = i.get('xml:lang', '')
+ name = i.get('name', '')
+ S += '%s/%s/%s/%s<' % (c, type_, lang, name)
+ features.sort()
+ for f in features:
+ S += '%s<' % f
+ dataforms.sort(cmp=sort_dataforms_func)
+ for dataform in dataforms:
+ # fields indexed by var
+ fields = {}
+ for f in dataform.getChildren():
+ fields[f.getVar()] = f
+ form_type = fields.get('FORM_TYPE')
+ if form_type:
+ S += form_type.getValue() + '<'
+ del fields['FORM_TYPE']
+ for var in sorted(fields.keys()):
+ S += '%s<' % var
+ values = sorted(fields[var].getValues())
+ for value in values:
+ S += '%s<' % value
+
+ if hash_method == 'sha-1':
+ hash_ = hashlib.sha1(S)
+ elif hash_method == 'md5':
+ hash_ = hashlib.md5(S)
+ else:
+ return ''
+ return base64.b64encode(hash_.digest())
+
+# import gajim only when needed (after decode_string is defined) see #4764
+
+import gajim
+
+try:
+ from osx import nsapp
+except ImportError:
+ pass
+
+
+def convert_bytes(string):
+ suffix = ''
+ # IEC standard says KiB = 1024 bytes KB = 1000 bytes
+ # but do we use the standard?
+ use_kib_mib = gajim.config.get('use_kib_mib')
+ align = 1024.
+ bytes = float(string)
+ if bytes >= align:
+ bytes = round(bytes/align, 1)
+ if bytes >= align:
+ bytes = round(bytes/align, 1)
+ if bytes >= align:
+ bytes = round(bytes/align, 1)
+ if use_kib_mib:
+ #GiB means gibibyte
+ suffix = _('%s GiB')
+ else:
+ #GB means gigabyte
+ suffix = _('%s GB')
+ else:
+ if use_kib_mib:
+ #MiB means mibibyte
+ suffix = _('%s MiB')
+ else:
+ #MB means megabyte
+ suffix = _('%s MB')
+ else:
+ if use_kib_mib:
+ #KiB means kibibyte
+ suffix = _('%s KiB')
+ else:
+ #KB means kilo bytes
+ suffix = _('%s KB')
+ else:
+ #B means bytes
+ suffix = _('%s B')
+ return suffix % unicode(bytes)
+
+def get_contact_dict_for_account(account):
+ ''' create a dict of jid, nick -> contact with all contacts of account.
+ Can be used for completion lists'''
+ contacts_dict = {}
+ for jid in gajim.contacts.get_jid_list(account):
+ contact = gajim.contacts.get_contact_with_highest_priority(account,
+ jid)
+ contacts_dict[jid] = contact
+ name = contact.name
+ if name in contacts_dict:
+ contact1 = contacts_dict[name]
+ del contacts_dict[name]
+ contacts_dict['%s (%s)' % (name, contact1.jid)] = contact1
+ contacts_dict['%s (%s)' % (name, jid)] = contact
+ else:
+ if contact.name == gajim.get_nick_from_jid(jid):
+ del contacts_dict[jid]
+ contacts_dict[name] = contact
+ return contacts_dict
+
def launch_browser_mailer(kind, uri):
#kind = 'url' or 'mail'
if os.name == 'nt':
@@ -517,49 +793,6 @@
command = build_command(player, path_to_soundfile)
exec_command(command)
-def get_file_path_from_dnd_dropped_uri(uri):
- path = urllib.unquote(uri) # escape special chars
- path = path.strip('\r\n\x00') # remove \r\n and NULL
- # get the path to file
- if re.match('^file:///[a-zA-Z]:/', path): # windows
- path = path[8:] # 8 is len('file:///')
- elif path.startswith('file://'): # nautilus, rox
- if sys.platform == 'darwin':
- # OS/X includes hostname in file:// URI
- path = re.sub('file://[^/]*', '', path)
- else:
- path = path[7:] # 7 is len('file://')
- elif path.startswith('file:'): # xffm
- path = path[5:] # 5 is len('file:')
- return path
-
-def from_xs_boolean_to_python_boolean(value):
- # this is xs:boolean so 'true', 'false', '1', '0'
- # convert those to True/False (python booleans)
- if value in ('1', 'true'):
- val = True
- else: # '0', 'false' or anything else
- val = False
-
- return val
-
-def get_xmpp_show(show):
- if show in ('online', 'offline'):
- return None
- return show
-
-def get_output_of_command(command):
- try:
- child_stdin, child_stdout = os.popen2(command)
- except ValueError:
- return None
-
- output = child_stdout.readlines()
- child_stdout.close()
- child_stdin.close()
-
- return output
-
def get_global_show():
maxi = 0
for account in gajim.connections:
@@ -625,91 +858,6 @@
return contact.show
return 'not in roster'
-def decode_string(string):
- '''try to decode (to make it Unicode instance) given string'''
- if isinstance(string, unicode):
- return string
- # by the time we go to iso15 it better be the one else we show bad characters
- encodings = (locale.getpreferredencoding(), 'utf-8', 'iso-8859-15')
- for encoding in encodings:
- try:
- string = string.decode(encoding)
- except UnicodeError:
- continue
- break
-
- return string
-
-def ensure_utf8_string(string):
- '''make sure string is in UTF-8'''
- try:
- string = decode_string(string).encode('utf-8')
- except Exception:
- pass
- return string
-
-def remove_invalid_xml_chars(string):
- if string:
- string = re.sub(gajim.interface.invalid_XML_chars_re, '', string)
- return string
-
-def get_windows_reg_env(varname, default=''):
- '''asks for paths commonly used but not exposed as ENVs
- in english Windows 2003 those are:
- 'AppData' = %USERPROFILE%\Application Data (also an ENV)
- 'Desktop' = %USERPROFILE%\Desktop
- 'Favorites' = %USERPROFILE%\Favorites
- 'NetHood' = %USERPROFILE%\NetHood
- 'Personal' = D:\My Documents (PATH TO MY DOCUMENTS)
- 'PrintHood' = %USERPROFILE%\PrintHood
- 'Programs' = %USERPROFILE%\Start Menu\Programs
- 'Recent' = %USERPROFILE%\Recent
- 'SendTo' = %USERPROFILE%\SendTo
- 'Start Menu' = %USERPROFILE%\Start Menu
- 'Startup' = %USERPROFILE%\Start Menu\Programs\Startup
- 'Templates' = %USERPROFILE%\Templates
- 'My Pictures' = D:\My Documents\My Pictures
- 'Local Settings' = %USERPROFILE%\Local Settings
- 'Local AppData' = %USERPROFILE%\Local Settings\Application Data
- 'Cache' = %USERPROFILE%\Local Settings\Temporary Internet Files
- 'Cookies' = %USERPROFILE%\Cookies
- 'History' = %USERPROFILE%\Local Settings\History
- '''
-
- if os.name != 'nt':
- return ''
-
- val = default
- try:
- rkey = win32api.RegOpenKey(win32con.HKEY_CURRENT_USER,
-r'Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders')
- try:
- val = str(win32api.RegQueryValueEx(rkey, varname)[0])
- val = win32api.ExpandEnvironmentStrings(val) # expand using environ
- except Exception:
- pass
- finally:
- win32api.RegCloseKey(rkey)
- return val
-
-def get_my_pictures_path():
- '''windows-only atm. [Unix lives in the past]'''
- return get_windows_reg_env('My Pictures')
-
-def get_desktop_path():
- if os.name == 'nt':
- path = get_windows_reg_env('Desktop')
- else:
- path = os.path.join(os.path.expanduser('~'), 'Desktop')
- return path
-
-def get_documents_path():
- if os.name == 'nt':
- path = get_windows_reg_env('Personal')
- else:
- path = os.path.expanduser('~')
- return path
-
def get_full_jid_from_iq(iq_obj):
'''return the full jid (with resource) from an iq as unicode'''
return parse_jid(str(iq_obj.getFrom()))
@@ -723,6 +871,10 @@
''' return sha of sid + initiator + target used for proxy auth'''
return hashlib.sha1("%s%s%s" % (sid, initiator, target)).hexdigest()
+def remove_invalid_xml_chars(string):
+ if string:
+ string = re.sub(gajim.interface.invalid_XML_chars_re, '', string)
+ return string
distro_info = {
'Arch Linux': '/etc/arch-release',
@@ -832,23 +984,7 @@
gajim.os_info = os_info
return os_info
-def sanitize_filename(filename):
- '''makes sure the filename we will write does contain only acceptable and
- latin characters, and is not too long (in that case hash it)'''
- # 48 is the limit
- if len(filename) > 48:
- hash = hashlib.md5(filename)
- filename = base64.b64encode(hash.digest())
- filename = punycode_encode(filename) # make it latin chars only
- filename = filename.replace('/', '_')
- if os.name == 'nt':
- filename = filename.replace('?', '_').replace(':', '_')\
- .replace('\\', '_').replace('"', "'").replace('|', '_')\
- .replace('*', '_').replace('<', '_').replace('>', '_')
-
- return filename
-
def allow_showing_notification(account, type_ = 'notify_on_new_message',
advanced_notif_num = None, is_first_message = True):
'''is it allowed to show nofication?
@@ -919,39 +1055,6 @@
# unknown contact or offline message
return gajim.interface.msg_win_mgr.get_control(contact.jid, account)
-def reduce_chars_newlines(text, max_chars = 0, max_lines = 0):
- '''Cut the chars after 'max_chars' on each line
- and show only the first 'max_lines'.
- If any of the params is not present (None or 0) the action
- on it is not performed'''
-
- def _cut_if_long(string):
- if len(string) > max_chars:
- string = string[:max_chars - 3] + '...'
- return string
-
- if isinstance(text, str):
- text = text.decode('utf-8')
-
- if max_lines == 0:
- lines = text.split('\n')
- else:
- lines = text.split('\n', max_lines)[:max_lines]
- if max_chars > 0:
- if lines:
- lines = [_cut_if_long(e) for e in lines]
- if lines:
- reduced_text = '\n'.join(lines)
- if reduced_text != text:
- reduced_text += '...'
- else:
- reduced_text = ''
- return reduced_text
-
-def get_account_status(account):
- status = reduce_chars_newlines(account['status_line'], 100, 1)
- return status
-
def get_notification_icon_tooltip_dict():
'''returns a dict of the form {acct: {'show': show, 'message': message,
'event_lines': [list of text lines to show in tooltip]}'''
@@ -1086,38 +1189,7 @@
'show': status, 'message': message})
return accounts
-def get_avatar_path(prefix):
- '''Returns the filename of the avatar, distinguishes between user- and
- contact-provided one. Returns None if no avatar was found at all.
- prefix is the path to the requested avatar just before the ".png" or
- ".jpeg".'''
- # First, scan for a local, user-set avatar
- for type_ in ('jpeg', 'png'):
- file_ = prefix + '_local.' + type_
- if os.path.exists(file_):
- return file_
- # If none available, scan for a contact-provided avatar
- for type_ in ('jpeg', 'png'):
- file_ = prefix + '.' + type_
- if os.path.exists(file_):
- return file_
- return None
-def datetime_tuple(timestamp):
- '''Converts timestamp using strptime and the format: %Y%m%dT%H:%M:%S
- Because of various datetime formats are used the following exceptions
- are handled:
- - Optional milliseconds appened to the string are removed
- - Optional Z (that means UTC) appened to the string are removed
- - XEP-082 datetime strings have all '-' cahrs removed to meet
- the above format.'''
- timestamp = timestamp.split('.')[0]
- timestamp = timestamp.replace('-', '')
- timestamp = timestamp.replace('z', '')
- timestamp = timestamp.replace('Z', '')
- from time import strptime
- return strptime(timestamp, '%Y%m%dT%H:%M:%S')
-
def get_iconset_path(iconset):
if os.path.isdir(os.path.join(gajim.DATA_DIR, 'iconsets', iconset)):
return os.path.join(gajim.DATA_DIR, 'iconsets', iconset)
@@ -1179,74 +1251,6 @@
keyID = 'UNKNOWN'
return keyID
-def sort_identities_func(i1, i2):
- cat1 = i1['category']
- cat2 = i2['category']
- if cat1 < cat2:
- return -1
- if cat1 > cat2:
- return 1
- type1 = i1.get('type', '')
- type2 = i2.get('type', '')
- if type1 < type2:
- return -1
- if type1 > type2:
- return 1
- lang1 = i1.get('xml:lang', '')
- lang2 = i2.get('xml:lang', '')
- if lang1 < lang2:
- return -1
- if lang1 > lang2:
- return 1
- return 0
-
-def sort_dataforms_func(d1, d2):
- f1 = d1.getField('FORM_TYPE')
- f2 = d2.getField('FORM_TYPE')
- if f1 and f2 and (f1.getValue() < f2.getValue()):
- return -1
- return 1
-
-def compute_caps_hash(identities, features, dataforms=[], hash_method='sha-1'):
- '''Compute caps hash according to XEP-0115, V1.5
-
- dataforms are xmpp.DataForms objects as common.dataforms don't allow several
- values without a field type list-multi'''
- S = ''
- identities.sort(cmp=sort_identities_func)
- for i in identities:
- c = i['category']
- type_ = i.get('type', '')
- lang = i.get('xml:lang', '')
- name = i.get('name', '')
- S += '%s/%s/%s/%s<' % (c, type_, lang, name)
- features.sort()
- for f in features:
- S += '%s<' % f
- dataforms.sort(cmp=sort_dataforms_func)
- for dataform in dataforms:
- # fields indexed by var
- fields = {}
- for f in dataform.getChildren():
- fields[f.getVar()] = f
- form_type = fields.get('FORM_TYPE')
- if form_type:
- S += form_type.getValue() + '<'
- del fields['FORM_TYPE']
- for var in sorted(fields.keys()):
- S += '%s<' % var
- values = sorted(fields[var].getValues())
- for value in values:
- S += '%s<' % value
-
- if hash_method == 'sha-1':
- hash_ = hashlib.sha1(S)
- elif hash_method == 'md5':
- hash_ = hashlib.md5(S)
- else:
- return ''
- return base64.b64encode(hash_.digest())
-
def update_optional_features(account = None):
if account:
accounts = [account]
Modified: branches/osx_newbuildsys/src/common/latex.py
===================================================================
--- branches/osx_newbuildsys/src/common/latex.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/latex.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -37,6 +37,7 @@
import gajim
from exceptions import LatexError
+import helpers
# some latex commands are really bad
blacklist = ['\\def', '\\let', '\\futurelet',
@@ -121,7 +122,7 @@
except Exception, e:
exitcode = _('Error executing "%(command)s": %(error)s') % {
'command': 'latex --interaction=nonstopmode %s.tex' % tmpfile,
- 'error': str(e)}
+ 'error': helpers.decode_string(e.message)}
if exitcode == 0:
# convert dvi to png
Modified: branches/osx_newbuildsys/src/common/optparser.py
===================================================================
--- branches/osx_newbuildsys/src/common/optparser.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/optparser.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -189,6 +189,8 @@
self.update_config_to_01201()
if old < [0, 12, 1, 1] and new >= [0, 12, 1, 1]:
self.update_config_to_01211()
+ if old < [0, 12, 1, 2] and new >= [0, 12, 1, 2]:
+ self.update_config_to_01212()
gajim.logger.init_vars()
gajim.config.set('version', new_version)
@@ -618,4 +620,13 @@
gajim.config.set('trayicon', 'always')
gajim.config.set('version', '0.12.1.1')
+ def update_config_to_01212(self):
+ for opt in ('ignore_unknown_contacts', 'send_os_info',
+ 'log_encrypted_sessions'):
+ if opt in self.old_values:
+ val = self.old_values[opt]
+ for account in gajim.config.get_per('accounts'):
+ gajim.config.set_per('accounts', account, opt, val)
+ gajim.config.set('version', '0.12.1.2')
+
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/stanza_session.py
===================================================================
--- branches/osx_newbuildsys/src/common/stanza_session.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/stanza_session.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -246,7 +246,7 @@
return crypto.encode_mpi(gajim.pubkey.sign(hash_, '')[0])
def encrypt_stanza(self, stanza):
- encryptable = [x for x in stanza.getChildren() if x.getName() not in
+ encryptable = [x for x in stanza.getChildren() if x.getName() not in
('error', 'amp', 'thread')]
# FIXME can also encrypt contents of <error/> elements in stanzas @type =
@@ -353,7 +353,8 @@
return self.decrypter.decrypt(ciphertext)
def logging_preference(self):
- if gajim.config.get('log_encrypted_sessions'):
+ if gajim.config.get_per('accounts', self.conn.name,
+ 'log_encrypted_sessions'):
return ['may', 'mustnot']
else:
return ['mustnot', 'may']
@@ -989,7 +990,7 @@
def fail_bad_negotiation(self, reason, fields=None):
'''
Sends an error and cancels everything.
-
+
If fields is None, the remote party has given us a bad cryptographic
value of some kind. Otherwise, list the fields we haven't implemented
'''
Modified: branches/osx_newbuildsys/src/common/xmpp/auth_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/auth_nb.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/xmpp/auth_nb.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -499,14 +499,5 @@
log.error('Session open failed.')
self.session = 0
self.on_bound(None)
- self._owner.onreceive(None)
- if isResultNode(resp):
- log.info('Successfully opened session.')
- self.session = 1
- self.on_bound('ok')
- else:
- log.error('Session open failed.')
- self.session = 0
- self.on_bound(None)
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -134,7 +134,10 @@
self._owner.lastErrNode = None
self._owner.lastErr = None
self._owner.lastErrCode = None
- self.StreamInit()
+ if hasattr(self._owner, 'StreamInit'):
+ self._owner.StreamInit()
+ else:
+ self.StreamInit()
def plugout(self):
''' Prepares instance to be destructed. '''
Modified: branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py
===================================================================
--- branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -155,11 +155,16 @@
if on_not_ok:
on_not_ok('Connection to host could not be established.')
return
- id = stanza.getThread()
+ thread_id = stanza.getThread()
+ id_ = stanza.getID()
+ if not id_:
+ id_ = self.Dispatcher.getAnID()
if self.conn_holder.ids_of_awaiting_messages.has_key(self.fd):
- self.conn_holder.ids_of_awaiting_messages[self.fd].append(id)
+ self.conn_holder.ids_of_awaiting_messages[self.fd].append((id_,
+ thread_id))
else:
- self.conn_holder.ids_of_awaiting_messages[self.fd] = [id]
+ self.conn_holder.ids_of_awaiting_messages[self.fd] = [(id_,
+ thread_id)]
def add_stanza(self, stanza, is_message=False):
if self.Connection:
@@ -170,24 +175,32 @@
self.stanzaqueue.append((stanza, is_message))
if is_message:
- id = stanza.getThread()
+ id_ = stanza.getID()
+ if not id_:
+ id_ = self.Dispatcher.getAnID()
if self.conn_holder.ids_of_awaiting_messages.has_key(self.fd):
- self.conn_holder.ids_of_awaiting_messages[self.fd].append(id)
+ self.conn_holder.ids_of_awaiting_messages[self.fd].append((id_,
+ thread_id))
else:
- self.conn_holder.ids_of_awaiting_messages[self.fd] = [id]
+ self.conn_holder.ids_of_awaiting_messages[self.fd] = [(id_,
+ thread_id)]
return True
def on_message_sent(self, connection_id):
- self.conn_holder.ids_of_awaiting_messages[connection_id].pop(0)
+ id_, thread_id = \
+ self.conn_holder.ids_of_awaiting_messages[connection_id].pop(0)
+ if self.on_ok:
+ self.on_ok(id_)
+ # use on_ok only on first message. For others it's called in
+ # ClientZeroconf
+ self.on_ok = None
def on_connect(self, conn):
self.Connection = conn
self.Connection.PlugIn(self)
dispatcher_nb.Dispatcher().PlugIn(self)
self._register_handlers()
- if self.on_ok:
- self.on_ok()
def StreamInit(self):
''' Send an initial stream header. '''
@@ -393,8 +406,9 @@
def read_timeout(self):
ids = self.client.conn_holder.ids_of_awaiting_messages
if self.fd in ids and len(ids[self.fd]) > 0:
- for id in ids[self.fd]:
- self._owner.Dispatcher.Event('', DATA_ERROR, (self.client.to, id))
+ for (id_, thread_id) in ids[self.fd]:
+ self._owner.Dispatcher.Event('', DATA_ERROR, (self.client.to,
+ thread_id))
ids[self.fd] = []
self.pollend()
@@ -679,8 +693,7 @@
stanza.setID(id_)
if conn.add_stanza(stanza, is_message):
if on_ok:
- on_ok()
- return id_
+ on_ok(id_)
if item['address'] in self.ip_to_hash:
hash_ = self.ip_to_hash[item['address']]
@@ -690,14 +703,11 @@
stanza.setID(id_)
if conn.add_stanza(stanza, is_message):
if on_ok:
- on_ok()
- return id_
+ on_ok(id_)
# otherwise open new connection
stanza.setID('zero')
P2PClient(None, item['address'], item['port'], self,
[(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)
- return 'zero'
-
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/common/zeroconf/connection_zeroconf.py
===================================================================
--- branches/osx_newbuildsys/src/common/zeroconf/connection_zeroconf.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/common/zeroconf/connection_zeroconf.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -364,7 +364,7 @@
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):
+ original_message=None, delayed=None, callback=None, callback_args=[]):
fjid = jid
if msg and not xhtml and gajim.config.get(
@@ -402,7 +402,7 @@
# Encryption failed, do not send message
tim = time.localtime()
self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
- return 3
+ return
if type_ == 'chat':
msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_,
@@ -458,7 +458,7 @@
if session.enable_encryption:
msg_iq = session.encrypt_stanza(msg_iq)
- def on_send_ok():
+ def on_send_ok(id):
no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for')
ji = gajim.get_jid_without_resource(jid)
if session.is_loggable() and self.name not in no_log_for and\
@@ -473,9 +473,12 @@
else:
kind = 'single_msg_sent'
gajim.logger.write(kind, jid, log_msg)
-
+
self.dispatch('MSGSENT', (jid, msg, keyID))
+ if callback:
+ callback(id, *callback_args)
+
def on_send_not_ok(reason):
reason += ' ' + _('Your message could not be sent.')
self.dispatch('MSGERROR', [jid, -1, reason, None, None, session])
@@ -484,8 +487,6 @@
if ret == -1:
# Contact Offline
self.dispatch('MSGERROR', [jid, -1, _('Contact is offline. Your message could not be sent.'), None, None, session])
- return ret
- return ret
def send_stanza(self, stanza):
Modified: branches/osx_newbuildsys/src/config.py
===================================================================
--- branches/osx_newbuildsys/src/config.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/config.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -468,20 +468,32 @@
self.xml.get_widget('log_show_changes_checkbutton').set_active(st)
# log encrypted chat sessions
- st = gajim.config.get('log_encrypted_sessions')
- self.xml.get_widget('log_encrypted_chats_checkbutton').set_active(st)
+ w = self.xml.get_widget('log_encrypted_chats_checkbutton')
+ st = self.get_per_account_option('log_encrypted_sessions')
+ if st == 'mixed':
+ w.set_inconsistent(True)
+ else:
+ w.set_active(st)
# send os info
- st = gajim.config.get('send_os_info')
- self.xml.get_widget('send_os_info_checkbutton').set_active(st)
+ w = self.xml.get_widget('send_os_info_checkbutton')
+ st = self.get_per_account_option('send_os_info')
+ if st == 'mixed':
+ w.set_inconsistent(True)
+ else:
+ w.set_active(st)
# check if gajm is default
st = gajim.config.get('check_if_gajim_is_default')
self.xml.get_widget('check_default_client_checkbutton').set_active(st)
# Ignore messages from unknown contacts
- self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton').\
- set_active(gajim.config.get('ignore_unknown_contacts'))
+ w = self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton')
+ st = self.get_per_account_option('ignore_unknown_contacts')
+ if st == 'mixed':
+ w.set_inconsistent(True)
+ else:
+ w.set_active(st)
self.xml.signal_autoconnect(self)
@@ -504,14 +516,36 @@
if event.keyval == gtk.keysyms.Escape:
self.window.hide()
+ def get_per_account_option(self, opt):
+ '''Return the value of the option opt if it's the same in all accoutns
+ else returns "mixed"'''
+ val = None
+ for account in gajim.connections:
+ v = gajim.config.get_per('accounts', account, opt)
+ if val is None:
+ val = v
+ elif val != v:
+ return 'mixed'
+ return val
+
def on_checkbutton_toggled(self, widget, config_name,
- change_sensitivity_widgets = None):
+ change_sensitivity_widgets=None):
gajim.config.set(config_name, widget.get_active())
if change_sensitivity_widgets:
for w in change_sensitivity_widgets:
w.set_sensitive(widget.get_active())
gajim.interface.save_config()
+ def on_per_account_checkbutton_toggled(self, widget, config_name,
+ change_sensitivity_widgets=None):
+ for account in gajim.connections:
+ gajim.config.set_per('accounts', account, config_name,
+ widget.get_active())
+ if change_sensitivity_widgets:
+ for w in change_sensitivity_widgets:
+ w.set_sensitive(widget.get_active())
+ gajim.interface.save_config()
+
def on_sort_by_show_in_roster_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster')
gajim.interface.roster.setup_and_draw_roster()
@@ -601,7 +635,7 @@
spell_obj = None
if not spell_obj:
- gtkspell.Spell(ctrl.msg_textview)
+ ctrl.set_speller()
def remove_speller(self):
for ctrl in gajim.interface.msg_win_mgr.controls():
@@ -706,7 +740,8 @@
gajim.config.set('displayed_chat_state_notifications', 'disabled')
def on_ignore_events_from_unknown_contacts_checkbutton_toggled(self, widget):
- self.on_checkbutton_toggled(widget, 'ignore_unknown_contacts')
+ widget.set_inconsistent(False)
+ self.on_per_account_checkbutton_toggled(widget, 'ignore_unknown_contacts')
def on_on_event_combobox_changed(self, widget):
active = widget.get_active()
@@ -953,10 +988,12 @@
self.on_checkbutton_toggled(widget, 'log_contact_status_changes')
def on_log_encrypted_chats_checkbutton_toggled(self, widget):
- self.on_checkbutton_toggled(widget, 'log_encrypted_sessions')
+ widget.set_inconsistent(False)
+ self.on_per_account_checkbutton_toggled(widget, 'log_encrypted_sessions')
def on_send_os_info_checkbutton_toggled(self, widget):
- self.on_checkbutton_toggled(widget, 'send_os_info')
+ widget.set_inconsistent(False)
+ self.on_per_account_checkbutton_toggled(widget, 'send_os_info')
def on_check_default_client_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'check_if_gajim_is_default')
@@ -2985,6 +3022,8 @@
# 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.del_per('accounts'):
+ gajim.config.del_per('accounts', self.account)
del gajim.interface.instances['account_creation_wizard']
def on_register_server_features_button_clicked(self, widget):
@@ -3244,6 +3283,8 @@
if self.update_progressbar_timeout_id is not None:
gobject.source_remove(self.update_progressbar_timeout_id)
del gajim.connections[self.account]
+ if self.account in gajim.config.get_per('accounts'):
+ gajim.config.del_per('accounts', self.account)
self.back_button.show()
self.cancel_button.show()
self.go_online_checkbutton.hide()
@@ -3288,6 +3329,8 @@
self.go_online_checkbutton.hide()
self.show_vcard_checkbutton.hide()
del gajim.connections[self.account]
+ if self.account in gajim.config.del_per('accounts'):
+ gajim.config.del_per('accounts', self.account)
img = self.xml.get_widget('finish_image')
img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occurred during '
Modified: branches/osx_newbuildsys/src/conversation_textview.py
===================================================================
--- branches/osx_newbuildsys/src/conversation_textview.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/conversation_textview.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -1154,7 +1154,7 @@
buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n',
'time_sometimes')
# kind = info, we print things as if it was a status: same color, ...
- if kind == 'info':
+ if kind in ('error', 'info'):
kind = 'status'
other_text_tag = self.detect_other_text_tag(text, kind)
text_tags = other_tags_for_text[:] # create a new list
Modified: branches/osx_newbuildsys/src/dialogs.py
===================================================================
--- branches/osx_newbuildsys/src/dialogs.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/dialogs.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -2195,12 +2195,11 @@
if gajim.config.get('use_speller') and HAS_GTK_SPELL and action == 'send':
try:
- spell1 = gtkspell.Spell(self.conversation_textview.tv)
- spell2 = gtkspell.Spell(self.message_textview)
lang = gajim.config.get('speller_language')
- if lang:
- spell1.set_language(lang)
- spell2.set_language(lang)
+ if not lang:
+ lang = gajim.LANG
+ gtkspell.Spell(self.conversation_textview.tv, lang)
+ gtkspell.Spell(self.message_textview, lang)
except gobject.GError:
AspellDictError(lang)
Modified: branches/osx_newbuildsys/src/disco.py
===================================================================
--- branches/osx_newbuildsys/src/disco.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/disco.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -606,7 +606,8 @@
# self.browser._get_agent_address() would break when no browser.
addr = get_agent_address(self.jid, self.node)
- del gajim.interface.instances[self.account]['disco'][addr]
+ if addr in gajim.interface.instances[self.account]['disco']:
+ del gajim.interface.instances[self.account]['disco'][addr]
if self.browser:
self.window.hide()
Modified: branches/osx_newbuildsys/src/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/gajim.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/gajim.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -430,6 +430,7 @@
import roster_window
import profile_window
import config
+from threading import Thread
class PassphraseRequest:
@@ -489,6 +490,22 @@
cancel_handler=_cancel)
self.dialog_created = True
+
+class ThreadInterface:
+ def __init__(self, func, func_args, callback, callback_args):
+ '''Call a function in a thread
+
+ :param func: the function to call in the thread
+ :param func_args: list or arguments for this function
+ :param callback: callback to call once function is finished
+ :param callback_args: list of arguments for this callback
+ '''
+ def thread_function(func, func_args, callback, callback_args):
+ output = func(*func_args)
+ gobject.idle_add(callback, output, *callback_args)
+ Thread(target=thread_function, args=(func, func_args, callback,
+ callback_args)).start()
+
class Interface:
################################################################################
@@ -1168,6 +1185,18 @@
if self.remote_ctrl:
self.remote_ctrl.raise_signal('OsInfo', (account, array))
+ def handle_event_entity_time(self, account, array):
+ #'ENTITY_TIME' (account, (jid, resource, time_info))
+ win = None
+ if array[0] in self.instances[account]['infos']:
+ win = self.instances[account]['infos'][array[0]]
+ elif array[0] + '/' + array[1] in self.instances[account]['infos']:
+ win = self.instances[account]['infos'][array[0] + '/' + array[1]]
+ if win:
+ win.set_entity_time(array[1], array[2])
+ if self.remote_ctrl:
+ self.remote_ctrl.raise_signal('EntityTime', (account, array))
+
def handle_event_gc_notify(self, account, array):
#'GC_NOTIFY' (account, (room_jid, show, status, nick,
# role, affiliation, jid, reason, actor, statusCode, newNick, avatar_sha))
@@ -1239,6 +1268,8 @@
jids = array[0].split('/', 1)
room_jid = jids[0]
+ msg = array[1]
+
gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
if not gc_control and \
room_jid in self.minimized_controls[account]:
@@ -1257,9 +1288,11 @@
# message from someone
nick = jids[1]
- gc_control.on_message(nick, array[1], array[2], array[3], xhtml, array[5])
+ gc_control.on_message(nick, msg, array[2], array[3], xhtml, array[5])
if self.remote_ctrl:
+ highlight = gc_control.needs_visual_notification(msg)
+ array += (highlight,)
self.remote_ctrl.raise_signal('GCMessage', (account, array))
def handle_event_gc_subject(self, account, array):
@@ -2029,10 +2062,11 @@
gajim.connections[account].disconnect(on_purpose=True)
self.handle_event_status(account, 'offline')
pritext = _('SSL certificate error')
- sectext = _('It seems the SSL certificate has changed or your connection '
- 'is being hacked.\nOld fingerprint: %(old)s\nNew fingerprint: %(new)s'
- '\n\nDo you still want to connect and update the fingerprint of the '
- 'certificate?') % {'old': gajim.config.get_per('accounts', account,
+ sectext = _('It seems the SSL certificate of account %(account)s has '
+ 'changed or your connection is being hacked.\nOld fingerprint: %(old)s'
+ '\nNew fingerprint: %(new)s\n\nDo you still want to connect and update'
+ ' the fingerprint of the certificate?') % {'account': account,
+ 'old': gajim.config.get_per('accounts', account,
'ssl_fingerprint_sha1'), 'new': data[0]}
if 'fingerprint_error' in self.instances[account]['online_dialog']:
self.instances[account]['online_dialog']['fingerprint_error'].destroy()
@@ -2148,6 +2182,7 @@
'VCARD': self.handle_event_vcard,
'LAST_STATUS_TIME': self.handle_event_last_status_time,
'OS_INFO': self.handle_event_os_info,
+ 'ENTITY_TIME': self.handle_event_entity_time,
'GC_NOTIFY': self.handle_event_gc_notify,
'GC_MSG': self.handle_event_gc_msg,
'GC_SUBJECT': self.handle_event_gc_subject,
@@ -3073,6 +3108,7 @@
def __init__(self):
gajim.interface = self
+ gajim.thread_interface = ThreadInterface
# This is the manager and factory of message windows set by the module
self.msg_win_mgr = None
self.jabber_state_images = {'16': {}, '32': {}, 'opened': {},
Modified: branches/osx_newbuildsys/src/groupchat_control.py
===================================================================
--- branches/osx_newbuildsys/src/groupchat_control.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/groupchat_control.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -56,7 +56,7 @@
C_AVATAR, # avatar of the contact
) = range(5)
-def set_renderer_color(treeview, renderer, set_background = True):
+def set_renderer_color(treeview, renderer, set_background=True):
'''set style for group row, using PRELIGHT system color'''
if set_background:
bgcolor = treeview.style.bg[gtk.STATE_PRELIGHT]
@@ -355,7 +355,7 @@
def add_avatar_renderer():
renderer_pixbuf = gtk.CellRendererPixbuf() # avatar image
- column.pack_start(renderer_pixbuf, expand = False)
+ column.pack_start(renderer_pixbuf, expand=False)
column.add_attribute(renderer_pixbuf, 'pixbuf', C_AVATAR)
column.set_cell_data_func(renderer_pixbuf, tree_cell_data_func,
self.list_treeview)
@@ -365,13 +365,13 @@
renderer_image = cell_renderer_image.CellRendererImage(0, 0) # status img
renderer_image.set_property('width', 26)
- column.pack_start(renderer_image, expand = False)
+ column.pack_start(renderer_image, expand=False)
column.add_attribute(renderer_image, 'image', C_IMG)
column.set_cell_data_func(renderer_image, tree_cell_data_func,
self.list_treeview)
renderer_text = gtk.CellRendererText() # nickname
- column.pack_start(renderer_text, expand = True)
+ column.pack_start(renderer_text, expand=True)
column.add_attribute(renderer_text, 'markup', C_TEXT)
renderer_text.set_property("ellipsize", pango.ELLIPSIZE_END)
column.set_cell_data_func(renderer_text, tree_cell_data_func,
@@ -385,7 +385,7 @@
# workaround to avoid gtk arrows to be shown
column = gtk.TreeViewColumn() # 2nd COLUMN
renderer = gtk.CellRendererPixbuf()
- column.pack_start(renderer, expand = False)
+ column.pack_start(renderer, expand=False)
self.list_treeview.append_column(column)
column.set_visible(False)
self.list_treeview.set_expander_column(column)
@@ -457,7 +457,7 @@
for nick in sorted(gajim.contacts.get_nick_list(self.account,
self.room_jid)):
- item = gtk.MenuItem(nick, use_underline = False)
+ item = gtk.MenuItem(nick, use_underline=False)
submenu.append(item)
id_ = item.connect('activate', self.append_nick_in_msg_textview, nick)
self.handlers[id_] = item
@@ -622,7 +622,7 @@
self.name_label.set_markup(text)
if self.subject:
- subject = helpers.reduce_chars_newlines(self.subject, max_lines = 2)
+ subject = helpers.reduce_chars_newlines(self.subject, max_lines=2)
subject = gobject.markup_escape_text(subject)
if gajim.HAVE_PYSEXY:
subject_text = self.urlfinder.sub(self.make_href, subject)
@@ -643,7 +643,7 @@
self.banner_status_label.set_markup(subject_text)
- def prepare_context_menu(self, hide_buttonbar_entries = False):
+ def prepare_context_menu(self, hide_buttonbar_entries=False):
'''sets sensitivity state for configure_room'''
ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
self.change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n,
@@ -720,7 +720,7 @@
self.print_conversation(msg, nick, tim, xhtml)
def on_private_message(self, nick, msg, tim, xhtml, session,
- msg_id = None, encrypted = False):
+ msg_id=None, encrypted=False):
# Do we have a queue?
fjid = self.room_jid + '/' + nick
no_queue = len(gajim.events.get_events(self.account, fjid)) == 0
@@ -739,7 +739,7 @@
model = self.list_treeview.get_model()
state_images =\
gajim.interface.roster.get_appropriate_state_images(
- self.room_jid, icon_name = 'event')
+ self.room_jid, icon_name='event')
image = state_images['event']
model[iter_][C_IMG] = image
if self.parent_win:
@@ -778,7 +778,7 @@
fin = True
return None
- def print_old_conversation(self, text, contact = '', tim = None,
+ def print_old_conversation(self, text, contact='', tim=None,
xhtml = None):
if isinstance(text, str):
text = unicode(text, 'utf-8')
@@ -795,9 +795,9 @@
small_attr = []
ChatControlBase.print_conversation_line(self, text, kind, contact, tim,
small_attr, small_attr + ['restored_message'],
- small_attr + ['restored_message'], count_as_new = False, xhtml = xhtml)
+ small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml)
- def print_conversation(self, text, contact = '', tim = None, xhtml = None):
+ def print_conversation(self, text, contact='', tim=None, xhtml=None):
'''Print a line in the conversation:
if contact is set: it's a message from someone or an info message (contact
= 'info' in such a case)
@@ -860,7 +860,7 @@
self.check_and_possibly_add_focus_out_line()
ChatControlBase.print_conversation_line(self, text, kind, contact, tim,
- other_tags_for_name, [], other_tags_for_text, xhtml = xhtml)
+ other_tags_for_name, [], other_tags_for_text, xhtml=xhtml)
def get_nb_unread(self):
type_events = ['printed_marked_gc_msg']
@@ -883,7 +883,6 @@
text, the second, what sound to play.'''
highlight, sound = (None, None)
-
# Are any of the defined highlighting words in the text?
if self.needs_visual_notification(text):
highlight = True
@@ -1013,7 +1012,8 @@
if self.is_anonymous and gc_contact.affiliation not in ['admin', 'owner']\
and self_contact.affiliation in ['admin', 'owner']:
prim_text = _('Really send file?')
- sec_text = _('If you send a file to %s, he/she will know your real Jabber ID.') % gc_contact.name
+ sec_text = _('If you send a file to %s, he/she will know your real '
+ 'Jabber ID.') % gc_contact.name
dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text,
on_response_ok = (_on_send_files, gc_contact))
dialog.popup()
@@ -1039,13 +1039,13 @@
if status and gajim.config.get('show_status_msgs_in_roster'):
status = status.strip()
if status != '':
- status = helpers.reduce_chars_newlines(status, max_lines = 1)
+ status = helpers.reduce_chars_newlines(status, max_lines=1)
# escape markup entities and make them small italic and fg color
color = gtkgui_helpers._get_fade_color(self.list_treeview,
selected, focus)
colorstring = "#%04x%04x%04x" % (color.red, color.green, color.blue)
- name += '\n' '<span size="small" style="italic" foreground="%s">%s</span>'\
- % (colorstring, gobject.markup_escape_text(status))
+ name += ('\n<span size="small" style="italic" foreground="%s">'
+ '%s</span>') % (colorstring, gobject.markup_escape_text(status))
model[iter_][C_IMG] = image
model[iter_][C_TEXT] = name
@@ -1082,7 +1082,7 @@
self.draw_role(role)
def chg_contact_status(self, nick, show, status, role, affiliation, jid,
- reason, actor, statusCode, new_nick, avatar_sha, tim = None):
+ reason, actor, statusCode, new_nick, avatar_sha, tim=None):
'''When an occupant changes his or her status'''
if show == 'invisible':
return
@@ -1131,7 +1131,7 @@
'nick': nick,
'who': actor,
'reason': reason }
- self.print_conversation(s, 'info', tim = tim)
+ self.print_conversation(s, 'info', tim=tim)
elif '301' in statusCode:
if actor is None: # do not print 'banned by None'
s = _('%(nick)s has been banned: %(reason)s') % {
@@ -1142,7 +1142,7 @@
'nick': nick,
'who': actor,
'reason': reason }
- self.print_conversation(s, 'info', tim = tim)
+ self.print_conversation(s, 'info', tim=tim)
elif '303' in statusCode: # Someone changed his or her nick
if new_nick == self.new_nick: # We changed our nick
self.nick = self.new_nick
@@ -1187,17 +1187,17 @@
elif '321' in statusCode:
s = _('%(nick)s has been removed from the room (%(reason)s)') % {
'nick': nick, 'reason': _('affiliation changed') }
- self.print_conversation(s, 'info', tim = tim)
+ self.print_conversation(s, 'info', tim=tim)
elif '322' in statusCode:
s = _('%(nick)s has been removed from the room (%(reason)s)') % {
'nick': nick,
'reason': _('room configuration changed to members-only') }
- self.print_conversation(s, 'info', tim = tim)
+ self.print_conversation(s, 'info', tim=tim)
elif '332' in statusCode:
s = _('%(nick)s has been removed from the room (%(reason)s)') % {
'nick': nick,
'reason': _('system shutdown') }
- self.print_conversation(s, 'info', tim = tim)
+ self.print_conversation(s, 'info', tim=tim)
elif 'destroyed' in statusCode: # Room has been destroyed
self.print_conversation(reason, 'info', tim)
@@ -1355,9 +1355,9 @@
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,
- name = nick, show = show, status = status, role = role,
- affiliation = affiliation, jid = j, resource = resource)
+ gc_contact = gajim.contacts.create_gc_contact(room_jid=self.room_jid,
+ 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)
@@ -1458,7 +1458,7 @@
nicks = gajim.contacts.get_nick_list(self.account, self.room_jid)
for nick in (nick0, nick1):
if nick in nicks:
- self.on_send_pm(nick = nick)
+ self.on_send_pm(nick=nick)
self.clear(self.msg_textview)
return True
self.print_conversation(_('Nickname not found: %s') % \
@@ -1505,7 +1505,8 @@
message_array = message_array[0].split()
invitee = message_array.pop(0)
reason = ' '.join(message_array)
- gajim.connections[self.account].send_invite(self.room_jid, invitee, reason)
+ gajim.connections[self.account].send_invite(self.room_jid, invitee,
+ reason)
s = _('Invited %(contact_jid)s to %(room_jid)s.') % {
'contact_jid': invitee,
'room_jid': self.room_jid}
@@ -1519,7 +1520,8 @@
if len(message_array):
room_jid = message_array[0]
if room_jid.find('@') < 0:
- room_jid = room_jid + '@' + gajim.get_server_from_jid(self.room_jid)
+ room_jid = room_jid + '@' + gajim.get_server_from_jid(
+ self.room_jid)
else:
room_jid = '@' + gajim.get_server_from_jid(self.room_jid)
if room_jid.find('/') >= 0:
@@ -1534,7 +1536,7 @@
try:
gajim.interface.instances[self.account]['join_gc'] =\
dialogs.JoinGroupchatWindow(self.account,
- room_jid = room_jid, nick = nick)
+ room_jid = room_jid, nick=nick)
except GajimGeneralException:
pass
self.clear(self.msg_textview)
@@ -1641,9 +1643,9 @@
self.print_conversation(_('Commands: %s') % GroupchatControl.MUC_CMDS,
'info')
elif command == 'ban':
- s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the group chat.'
- ' The nickname of an occupant may be substituted, but not if it '
- 'contains "@". If the JID is currently in the group chat, '
+ s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the group'
+ ' chat. The nickname of an occupant may be substituted, but not if '
+ 'it contains "@". If the JID is currently in the group chat, '
'he/she/it will also be kicked. Does NOT support spaces in '
'nickname.') % command
self.print_conversation(s, 'info')
@@ -1773,7 +1775,8 @@
fjid = self.room_jid + '/' + nick
ctrl = gajim.interface.msg_win_mgr.get_gc_control(fjid, self.account)
if ctrl:
- contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
+ contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
+ nick)
contact.show = 'offline'
contact.status = ''
ctrl.update_ui()
@@ -1876,7 +1879,8 @@
if c.affiliation == 'owner':
gajim.connections[self.account].request_gc_config(self.room_jid)
elif c.affiliation == 'admin':
- if self.room_jid not in gajim.interface.instances[self.account]['gc_config']:
+ if self.room_jid not in gajim.interface.instances[self.account][
+ 'gc_config']:
gajim.interface.instances[self.account]['gc_config'][self.room_jid]\
= config.GroupchatConfigWindow(self.account, self.room_jid)
@@ -2214,7 +2218,7 @@
nick = model[path][C_NICK].decode('utf-8')
self._start_private_message(nick)
- def on_list_treeview_row_activated(self, widget, path, col = 0):
+ def on_list_treeview_row_activated(self, widget, path, col=0):
'''When an iter is double clicked: open the chat window'''
if not gajim.single_click:
self.on_row_activated(widget, path)
@@ -2330,7 +2334,6 @@
else:
self.tooltip.hide_tooltip()
-
def grant_voice(self, widget, nick):
'''grant voice privilege to a user'''
gajim.connections[self.account].gc_set_role(self.room_jid, nick,
@@ -2375,7 +2378,8 @@
def grant_admin(self, widget, jid):
'''grant administrative privilege to a user'''
- gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, 'admin')
+ gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
+ 'admin')
def revoke_admin(self, widget, jid):
'''revoke administrative privilege to a user'''
@@ -2384,11 +2388,13 @@
def grant_owner(self, widget, jid):
'''grant owner privilege to a user'''
- gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, 'owner')
+ gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
+ 'owner')
def revoke_owner(self, widget, jid):
'''revoke owner privilege to a user'''
- gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid, 'admin')
+ gajim.connections[self.account].gc_set_affiliation(self.room_jid, jid,
+ 'admin')
def on_info(self, widget, nick):
'''Call vcard_information_window class to display user's information'''
@@ -2403,7 +2409,7 @@
def on_history(self, widget, nick):
jid = gajim.construct_fjid(self.room_jid, nick)
- self._on_history_menuitem_activate(widget = widget, jid = jid)
+ self._on_history_menuitem_activate(widget=widget, jid=jid)
def on_add_to_roster(self, widget, jid):
dialogs.AddNewContactWindow(self.account, jid)
Modified: branches/osx_newbuildsys/src/message_control.py
===================================================================
--- branches/osx_newbuildsys/src/message_control.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/message_control.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -158,9 +158,9 @@
if crypto_changed:
self.print_esession_details()
- def send_message(self, message, keyID = '', type_ = 'chat',
- chatstate = None, msg_id = None, composing_xep = None, resource = None,
- user_nick = None, xhtml = None):
+ def send_message(self, message, keyID='', type_='chat', chatstate=None,
+ msg_id=None, composing_xep=None, resource=None, user_nick=None, xhtml=None,
+ callback=None, callback_args=[]):
# Send the given message to the active tab.
# Doesn't return None if error
jid = self.contact.jid
@@ -182,11 +182,10 @@
self.set_session(sess)
# Send and update history
- return conn.send_message(jid, message, keyID, type_ = type_,
- chatstate = chatstate, msg_id = msg_id,
- composing_xep = composing_xep,
- resource = self.resource, user_nick = user_nick,
- session = self.session,
- original_message = original_message, xhtml = xhtml)
+ conn.send_message(jid, message, keyID, type_=type_, chatstate=chatstate,
+ msg_id=msg_id, composing_xep=composing_xep, resource=self.resource,
+ user_nick=user_nick, session=self.session,
+ original_message=original_message, xhtml=xhtml, callback=callback,
+ callback_args=callback_args)
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/message_textview.py
===================================================================
--- branches/osx_newbuildsys/src/message_textview.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/message_textview.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -217,6 +217,7 @@
def xhtml_special(text):
text = text.replace('<', '<')
text = text.replace('>', '>')
+ text = text.replace('&', '&')
text = text.replace('\n', '<br />')
return text
Modified: branches/osx_newbuildsys/src/message_window.py
===================================================================
--- branches/osx_newbuildsys/src/message_window.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/message_window.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -480,7 +480,8 @@
bctrl = self.get_control(jid, ctrl.account)
# keep last_message_time around unless this was our last control with
# that jid
- if not fctrl and not bctrl:
+ if not fctrl and not bctrl and \
+ fjid in gajim.last_message_time[ctrl.account]:
del gajim.last_message_time[ctrl.account][fjid]
# Disconnect tab DnD only if GTK version < 2.10
Modified: branches/osx_newbuildsys/src/notify.py
===================================================================
--- branches/osx_newbuildsys/src/notify.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/notify.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -489,7 +489,8 @@
ntype = 'transfer'
elif event_type == _('File Transfer Error'):
ntype = 'transfer.error'
- elif event_type in (_('File Transfer Completed'), _('File Transfer Stopped')):
+ elif event_type in (_('File Transfer Completed'),
+ _('File Transfer Stopped')):
ntype = 'transfer.complete'
elif event_type == _('New E-mail'):
ntype = 'email.arrived'
@@ -506,17 +507,41 @@
'chat_msg_recv.png')) # img to display
ntype = 'im' # Notification Type
- self.notif = dbus_support.get_notifications_interface()
+ self.notif = dbus_support.get_notifications_interface(self)
if self.notif is None:
raise dbus.DBusException('unable to get notifications interface')
self.ntype = ntype
- self.get_version()
+ if self.kde_notifications:
+ self.attempt_notify()
+ else:
+ self.get_version()
def attempt_notify(self):
- version = self.version
timeout = gajim.config.get('notification_timeout') # in seconds
ntype = self.ntype
+ if self.kde_notifications:
+ notification_text = ('<html><img src="%(image)s" align=left />' \
+ '%(title)s<br/>%(text)s</html>') % {'title': self.title,
+ 'text': self.text, 'image': self.path_to_image}
+ gajim_icon = os.path.abspath(os.path.join(gajim.DATA_DIR, 'pixmaps',
+ 'gajim.png'))
+ self.notif.Notify(
+ dbus.String(_('Gajim')), # app_name (string)
+ dbus.UInt32(0), # replaces_id (uint)
+ ntype, # event_id (string)
+ dbus.String(gajim_icon), # app_icon (string)
+ dbus.String(_('')), # summary (string)
+ dbus.String(notification_text), # body (string)
+ # actions (stringlist)
+ (dbus.String('default'), dbus.String(self.event_type),
+ dbus.String('ignore'), dbus.String(_('Ignore'))),
+ [], # hints (not used in KDE yet)
+ dbus.UInt32(timeout*1000), # timeout (int), in ms
+ reply_handler=self.attach_by_id,
+ error_handler=self.notify_another_way)
+ return
+ version = self.version
if version[:2] == [0, 2]:
try:
self.notif.Notify(
@@ -594,11 +619,16 @@
self.notif.CloseNotification(dbus.UInt32(id_))
self.notif = None
+ if reason == 'ignore':
+ return
+
gajim.interface.handle_event(self.account, self.jid, self.msg_type)
def version_reply_handler(self, name, vendor, version, spec_version=None):
if spec_version:
version = spec_version
+ elif vendor == 'Xfce' and version == '0.1.0':
+ version = '0.9'
version_list = version.split('.')
self.version = []
while len(version_list):
Modified: branches/osx_newbuildsys/src/remote_control.py
===================================================================
--- branches/osx_newbuildsys/src/remote_control.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/remote_control.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -172,6 +172,10 @@
pass
@dbus.service.signal(INTERFACE, signature='av')
+ def EntityTime(self, account_and_array):
+ pass
+
+ @dbus.service.signal(INTERFACE, signature='av')
def GCPresence(self, account_and_array):
pass
Modified: branches/osx_newbuildsys/src/roster_window.py
===================================================================
--- branches/osx_newbuildsys/src/roster_window.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/roster_window.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -1441,6 +1441,9 @@
if contact.jid in gajim.to_be_removed[account]:
return True
return False
+ if gajim.config.get('show_only_chat_and_online') and contact.show in (
+ 'away', 'xa', 'busy'):
+ return False
return True
def _visible_func(self, model, titer):
@@ -1500,12 +1503,14 @@
for data in nearby_family:
jid = data['jid']
account = data['account']
- contact = gajim.contacts.get_first_contact_from_jid(account, jid)
+ contact = gajim.contacts.get_contact_with_highest_priority(
+ account, jid)
if contact and self.contact_is_visible(contact, account):
return True
return False
else:
- contact = gajim.contacts.get_first_contact_from_jid(account, jid)
+ contact = gajim.contacts.get_contact_with_highest_priority(account,
+ jid)
return self.contact_is_visible(contact, account)
if type_ == 'agent':
return gajim.config.get('show_transports_group') and \
@@ -1586,6 +1591,18 @@
return 1
if removing2 and not removing1:
return -1
+ sub1 = contact1.sub
+ sub2 = contact2.sub
+ # both goes before
+ if sub1 == 'both' and sub2 != 'both':
+ return -1
+ if sub1 != 'both' and sub2 == 'both':
+ return 1
+ # none goes after
+ if sub1 != 'none' and sub2 == 'none':
+ return -1
+ if sub1 == 'none' and sub2 != 'none':
+ return 1
if show1 < show2:
return -1
elif show1 > show2:
@@ -3178,7 +3195,7 @@
jid += '/' + contact.resource
self.send_status(account, show, message, to=jid)
- dialogs.ChangeStatusMessageDialog(on_response, show)
+ self.get_status_message(show, on_response)
def on_status_combobox_changed(self, widget):
'''When we change our status via the combobox'''
@@ -3680,11 +3697,29 @@
redraw the treeview'''
gajim.config.set('showoffline', not gajim.config.get('showoffline'))
self.refilter_shown_roster_items()
+ w = self.xml.get_widget('show_only_active_contacts_menuitem')
if gajim.config.get('showoffline'):
# We need to filter twice to show groups with no contacts inside
# in the correct expand state
self.refilter_shown_roster_items()
+ w.set_sensitive(False)
+ else:
+ w.set_sensitive(True)
+ def on_show_only_active_contacts_menuitem_activate(self, widget):
+ '''when show only active contact option is changed:
+ redraw the treeview'''
+ gajim.config.set('show_only_chat_and_online', not gajim.config.get(
+ 'show_only_chat_and_online'))
+ self.refilter_shown_roster_items()
+ w = self.xml.get_widget('show_offline_contacts_menuitem')
+ if gajim.config.get('show_only_chat_and_online'):
+ # We need to filter twice to show groups with no contacts inside
+ # in the correct expand state
+ self.refilter_shown_roster_items()
+ w.set_sensitive(False)
+ else:
+ w.set_sensitive(True)
def on_view_menu_activate(self, widget):
# Hide the show roster menu if we are not in the right windowing mode.
@@ -6251,9 +6286,18 @@
self.previous_status_combobox_active = number_of_menuitem
showOffline = gajim.config.get('showoffline')
- self.xml.get_widget('show_offline_contacts_menuitem').set_active(
- showOffline)
+ showOnlyChatAndOnline = gajim.config.get('show_only_chat_and_online')
+ w = self.xml.get_widget('show_offline_contacts_menuitem')
+ w.set_active(showOffline)
+ if showOnlyChatAndOnline:
+ w.set_sensitive(False)
+
+ w = self.xml.get_widget('show_only_active_contacts_menuitem')
+ w.set_active(showOnlyChatAndOnline)
+ if showOffline:
+ w.set_sensitive(False)
+
show_transports_group = gajim.config.get('show_transports_group')
self.xml.get_widget('show_transports_menuitem').set_active(
show_transports_group)
Modified: branches/osx_newbuildsys/src/session.py
===================================================================
--- branches/osx_newbuildsys/src/session.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/session.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -184,8 +184,9 @@
if not msgtxt: # empty message text
return
- if gajim.config.get('ignore_unknown_contacts') and \
- not gajim.contacts.get_contacts(self.conn.name, jid) and not pm:
+ if gajim.config.get_per('accounts', self.conn.name,
+ 'ignore_unknown_contacts') and not gajim.contacts.get_contacts(
+ self.conn.name, jid) and not pm:
return
if not contact:
@@ -295,12 +296,17 @@
self.conn.name, jid, user_nick)
if not self.control:
- # if no control exists and message comes from highest prio, the new
- # control shouldn't have a resource
- if highest_contact and contact.resource == highest_contact.resource \
- and not jid == gajim.get_jid_from_account(self.conn.name):
- fjid = jid
- resource_for_chat = None
+ ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.conn.name)
+ if ctrl:
+ self.control = ctrl
+ self.control.set_session(self)
+ else:
+ # if no control exists and message comes from highest prio, the new
+ # control shouldn't have a resource
+ if highest_contact and contact.resource == highest_contact.resource\
+ and not jid == gajim.get_jid_from_account(self.conn.name):
+ fjid = jid
+ resource_for_chat = None
# Do we have a queue?
no_queue = len(gajim.events.get_events(self.conn.name, fjid)) == 0
@@ -318,7 +324,7 @@
typ = ''
if msg_type == 'error':
- typ = 'status'
+ typ = 'error'
self.control.print_conversation(msg, typ, tim=tim, encrypted=encrypted,
subject=subject, xhtml=xhtml)
Modified: branches/osx_newbuildsys/src/vcard.py
===================================================================
--- branches/osx_newbuildsys/src/vcard.py 2009-02-14 11:37:46 UTC (rev 11090)
+++ branches/osx_newbuildsys/src/vcard.py 2009-02-14 11:53:32 UTC (rev 11091)
@@ -112,6 +112,7 @@
self.avatar_encoded = None
self.vcard_arrived = False
self.os_info_arrived = False
+ self.entity_time_arrived = False
self.update_progressbar_timeout_id = gobject.timeout_add(100,
self.update_progressbar)
@@ -215,7 +216,7 @@
def test_remove_progressbar(self):
if self.update_progressbar_timeout_id is not None and \
- self.vcard_arrived and self.os_info_arrived:
+ self.vcard_arrived and self.os_info_arrived and self.entity_time_arrived:
gobject.source_remove(self.update_progressbar_timeout_id)
self.progressbar.hide()
self.update_progressbar_timeout_id = None
@@ -250,6 +251,26 @@
self.os_info_arrived = True
self.test_remove_progressbar()
+ def set_entity_time(self, resource, time_info):
+ if self.xml.get_widget('information_notebook').get_n_pages() < 5:
+ return
+ i = 0
+ time_s = ''
+ while i in self.time_info:
+ if not self.time_info[i]['resource'] or \
+ self.time_info[i]['resource'] == resource:
+ self.time_info[i]['time'] = time_info
+ if i > 0:
+ time_s += '\n'
+ time_s += self.time_info[i]['time']
+ i += 1
+
+ if time_s == '':
+ time_s = Q_('?Time:Unknown')
+ self.xml.get_widget('time_label').set_text(time_s)
+ self.entity_time_arrived = True
+ self.test_remove_progressbar()
+
def fill_status_label(self):
if self.xml.get_widget('information_notebook').get_n_pages() < 5:
return
@@ -364,8 +385,25 @@
else:
gobject.idle_add(gajim.connections[self.account].request_os_info,
self.contact.jid, self.contact.resource)
+
+ # do not wait for entity_time if contact is not connected or has error
+ # additional check for observer is needed, as show is offline for him
+ if self.contact.show in ('offline', 'error')\
+ and not self.contact.is_observer():
+ self.entity_time_arrived = True
+ else: # Request entity time if contact is connected
+ if self.gc_contact:
+ j, r = gajim.get_room_and_nick_from_fjid(self.real_jid)
+ gobject.idle_add(gajim.connections[self.account].\
+ request_entity_time, j, r, self.contact.jid)
+ else:
+ gobject.idle_add(gajim.connections[self.account].\
+ request_entity_time, self.contact.jid, self.contact.resource)
+
+
self.os_info = {0: {'resource': self.contact.resource, 'client': '',
'os': ''}}
+ self.time_info = {0: {'resource': self.contact.resource, 'time': ''}}
i = 1
contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid)
if contact_list:
@@ -379,11 +417,15 @@
gobject.idle_add(
gajim.connections[self.account].request_os_info, c.jid,
c.resource)
+ gobject.idle_add(gajim.connections[self.account].\
+ request_entity_time, c.jid, c.resource)
gajim.connections[self.account].request_last_status_time(c.jid,
c.resource)
self.os_info[i] = {'resource': c.resource, 'client': '',
'os': ''}
+ self.time_info[i] = {'resource': c.resource, 'time': ''}
i += 1
+
self.xml.get_widget('resource_prio_label').set_text(resources)
resource_prio_label_eventbox = self.xml.get_widget(
'resource_prio_label_eventbox')
1
0
[commit-gajim] r11090 - in branches/osx_newbuildsys: . data/glade po src src/common
by js＠gajim.org 14 Feb '09
by js＠gajim.org 14 Feb '09
14 Feb '09
Author: js
Date: 2009-02-14 12:37:46 +0100 (Sat, 14 Feb 2009)
New Revision: 11090
Added:
branches/osx_newbuildsys/data/glade/manage_sounds_window.glade
Modified:
branches/osx_newbuildsys/README.html
branches/osx_newbuildsys/configure.ac
branches/osx_newbuildsys/data/glade/preferences_window.glade
branches/osx_newbuildsys/po/cs.po
branches/osx_newbuildsys/src/common/config.py
branches/osx_newbuildsys/src/common/connection_handlers.py
branches/osx_newbuildsys/src/common/defs.py
branches/osx_newbuildsys/src/common/optparser.py
branches/osx_newbuildsys/src/config.py
branches/osx_newbuildsys/src/gajim-remote.py
branches/osx_newbuildsys/src/gajim.py
branches/osx_newbuildsys/src/message_window.py
branches/osx_newbuildsys/src/systray.py
Log:
Merge trunk r11031.
Modified: branches/osx_newbuildsys/README.html
===================================================================
--- branches/osx_newbuildsys/README.html 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/README.html 2009-02-14 11:37:46 UTC (rev 11090)
@@ -32,12 +32,12 @@
<li>python-crypto to enable End to end encryption</li>
<li>For idle module, libxss library</li>
<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
-<li>dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it</li>
+<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
<li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
<li>gnome-python-desktop (for GnomeKeyring support)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li>
<li>python-dbus bindings</li>
<li>python-sexy to have clickable URLs in chat windows</li>
<li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
Modified: branches/osx_newbuildsys/configure.ac
===================================================================
--- branches/osx_newbuildsys/configure.ac 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/configure.ac 2009-02-14 11:37:46 UTC (rev 11090)
@@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager],
- [0.12.0.1-svn],[http://trac.gajim.org/],[gajim])
+ [0.12.1.1-svn],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59])
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_SRCDIR(src)
Copied: branches/osx_newbuildsys/data/glade/manage_sounds_window.glade (from rev 11031, trunk/data/glade/manage_sounds_window.glade)
===================================================================
--- branches/osx_newbuildsys/data/glade/manage_sounds_window.glade (rev 0)
+++ branches/osx_newbuildsys/data/glade/manage_sounds_window.glade 2009-02-14 11:37:46 UTC (rev 11090)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Sat Jan 24 14:54:22 2009 -->
+<glade-interface>
+ <widget class="GtkWindow" id="manage_sounds_window">
+ <property name="width_request">400</property>
+ <property name="height_request">350</property>
+ <property name="border_width">6</property>
+ <signal name="delete_event" handler="on_manage_sounds_window_delete_event"/>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="sounds_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="sounds_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="cursor_changed" handler="on_treeview_sounds_cursor_changed"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="browse_sounds_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkEntry" id="sounds_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="changed" handler="on_sounds_entry_changed"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="browse_for_sounds_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">...</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_browse_for_sounds_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="play_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_play_button_clicked"/>
+ <child>
+ <widget class="GtkImage" id="image1370">
+ <property name="visible">True</property>
+ <property name="stock">gtk-media-play</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="close_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">gtk-close</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_close_button_clicked"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
Modified: branches/osx_newbuildsys/data/glade/preferences_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/preferences_window.glade 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/data/glade/preferences_window.glade 2009-02-14 11:37:46 UTC (rev 11090)
@@ -524,6 +524,38 @@
</packing>
</child>
<child>
+ <widget class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show systray:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="systray_combobox">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">Never
+Only when pending events
+Always</property>
+ <signal name="changed" handler="on_systray_combobox_changed"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox" id="hbox2">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="no_show_all">True</property>
@@ -547,7 +579,7 @@
</child>
</widget>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
</widget>
@@ -582,7 +614,7 @@
<property name="border_width">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox65">
+ <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
@@ -600,75 +632,20 @@
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="sounds_scrolledwindow">
+ <widget class="GtkButton" id="manage_sounds_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTreeView" id="sounds_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="cursor_changed" handler="on_treeview_sounds_cursor_changed"/>
- </widget>
- </child>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">Ma_nage...</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_manage_sounds_button_clicked"/>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="browse_sounds_hbox">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkEntry" id="sounds_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_sounds_entry_changed"/>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="browse_for_sounds_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">...</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_browse_for_sounds_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="play_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_play_button_clicked"/>
- <child>
- <widget class="GtkImage" id="image1370">
- <property name="visible">True</property>
- <property name="stock">gtk-media-play</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -686,6 +663,7 @@
</child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
Modified: branches/osx_newbuildsys/po/cs.po
===================================================================
--- branches/osx_newbuildsys/po/cs.po 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/po/cs.po 2009-02-14 11:37:46 UTC (rev 11090)
@@ -1030,7 +1030,7 @@
#: ../data/glade/chat_control_popup_menu.glade.h:3
msgid "Toggle End to End Encryption"
-msgstr "Přepnout Open_PGP šifrování"
+msgstr "Přepnout šifrování mezi uživateli"
#: ../data/glade/chat_control_popup_menu.glade.h:4
msgid "Toggle Open_PGP Encryption"
@@ -1338,17 +1338,13 @@
"If you plan to do massive deletions, please make sure Gajim is not running. "
"Generally avoid deletions with contacts you currently chat with."
msgstr ""
-"<big><b>Vítejte do Gajimova Správce Historie</b></big>\n"
-"\n"
-"Můžete zvolit záznamy nalevo a/nebo prohledat databázi dole.\n"
-"\n"
"<b>VAROVÁNÍ:</b>\n"
"Pokud plánujete rozsáhlé promazání, ujistěte se, že Gajim neběží. Obecně se "
"vyvarujte mazání historie kontaktu, se kterým si právě píšete."
#: ../data/glade/history_manager.glade.h:3
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "Gajimův Správce Historie"
+msgstr "<big><b>Vítejte do Gajimova Správce Historie</b></big>"
#: ../data/glade/history_manager.glade.h:4
msgid "Delete"
@@ -2223,7 +2219,7 @@
#: ../data/glade/profile_window.glade.h:9
#: ../data/glade/vcard_information_window.glade.h:11
msgid "<b>Extra Address:</b>"
-msgstr "<b>Další adresa:</b."
+msgstr "<b>Další adresa:</b>"
#. Family Name
#: ../data/glade/profile_window.glade.h:11
Modified: branches/osx_newbuildsys/src/common/config.py
===================================================================
--- branches/osx_newbuildsys/src/common/config.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/common/config.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -98,7 +98,7 @@
'last_status_msg_dnd': [ opt_str, '' ],
'last_status_msg_invisible': [ opt_str, '' ],
'last_status_msg_offline': [ opt_str, '' ],
- 'trayicon': [ opt_bool, True, '', True ],
+ 'trayicon': [opt_str, 'always', _("When to show systray icon. Can be 'never', 'on_event', 'always'."), True],
'iconset': [ opt_str, DEFAULT_ICONSET, '', True ],
'mood_iconset': [ opt_str, DEFAULT_MOOD_ICONSET, '', True ],
'activity_iconset': [ opt_str, DEFAULT_ACTIVITY_ICONSET, '', True ],
@@ -269,7 +269,7 @@
'attach_notifications_to_systray': [opt_bool, False, _('If True, notification windows from notification-daemon will be attached to systray icon.')],
'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')],
'latex_png_dpi': [opt_str, '108',_('Change the value to change the size of latex formulas displayed. The higher is larger.') ],
- 'uri_schemes': [opt_str, 'aaa aaas acap cap cid crid data dav dict dns fax file ftp go gopher h323 http https icap im imap info ipp iris iris.beep iris.xpc iris.xpcs iris.lwz ldap mid modem msrp msrps mtqp mupdate news nfs nntp opaquelocktoken pop pres rtsp service shttp sip sips snmp soap.beep soap.beeps tag tel telnet tftp thismessage tip tv urn vemmi xmlrpc.beep xmlrpc.beeps z39.50r z39.50s about cvs daap ed2k feed fish git iax2 irc ircs ldaps magnet mms rsync ssh svn sftp smb webcal', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled seperately)')],
+ 'uri_schemes': [opt_str, 'aaa aaas acap cap cid crid data dav dict dns fax file ftp go gopher h323 http https icap im imap info ipp iris iris.beep iris.xpc iris.xpcs iris.lwz ldap mid modem msrp msrps mtqp mupdate news nfs nntp opaquelocktoken pop pres rtsp service shttp sip sips snmp soap.beep soap.beeps tag tel telnet tftp thismessage tip tv urn vemmi xmlrpc.beep xmlrpc.beeps z39.50r z39.50s about cvs daap ed2k feed fish git iax2 irc ircs ldaps magnet mms rsync ssh svn sftp smb webcal', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled seperately)'), True],
}
__options_per_key = {
Modified: branches/osx_newbuildsys/src/common/connection_handlers.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection_handlers.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/common/connection_handlers.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -661,16 +661,26 @@
def request_register_agent_info(self, agent):
if not self.connection or self.connected < 2:
return None
- iq=common.xmpp.Iq('get', common.xmpp.NS_REGISTER, to=agent)
+ iq = common.xmpp.Iq('get', common.xmpp.NS_REGISTER, to=agent)
id_ = self.connection.getAnID()
iq.setID(id_)
# Wait the answer during 30 secondes
self.awaiting_timeouts[gajim.idlequeue.current_time() + 30] = (id_,
- _('Registration information for transport %s has not arrived in time') % \
- agent)
+ _('Registration information for transport %s has not arrived in time')\
+ % agent)
self.connection.SendAndCallForResponse(iq, self._ReceivedRegInfo,
{'agent': agent})
+ def _agent_registered_cb(self, con, resp, agent):
+ if resp.getType() == 'result':
+ self.dispatch('INFORMATION', (_('Registration succeeded'),
+ _('Resgitration with agent %s succeeded') % agent))
+ if resp.getType() == 'error':
+ self.dispatch('ERROR', (_('Registration failed'), _('Resgitration with'
+ ' agent %(agent)s failed with error %(error)s: %(error_msg)s') % {
+ 'agent': agent, 'error': resp.getError(),
+ 'error_msg': resp.getErrorMsg()}))
+
def register_agent(self, agent, info, is_form = False):
if not self.connection or self.connected < 2:
return
@@ -679,7 +689,8 @@
query = iq.getTag('query')
info.setAttr('type', 'submit')
query.addChild(node = info)
- self.connection.send(iq)
+ self.connection.SendAndCallForResponse(iq, self._agent_registered_cb,
+ {'agent': agent})
else:
# fixed: blocking
common.xmpp.features_nb.register(self.connection, agent, info, None)
Modified: branches/osx_newbuildsys/src/common/defs.py
===================================================================
--- branches/osx_newbuildsys/src/common/defs.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/common/defs.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -26,7 +26,7 @@
docdir = '../'
datadir = '../'
-version = '0.12.0.1-svn'
+version = '0.12.1.1-svn'
import sys, os.path
for base in ('.', 'common'):
Modified: branches/osx_newbuildsys/src/common/optparser.py
===================================================================
--- branches/osx_newbuildsys/src/common/optparser.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/common/optparser.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -187,6 +187,8 @@
self.update_config_to_01144()
if old < [0, 12, 0, 1] and new >= [0, 12, 0, 1]:
self.update_config_to_01201()
+ if old < [0, 12, 1, 1] and new >= [0, 12, 1, 1]:
+ self.update_config_to_01211()
gajim.logger.init_vars()
gajim.config.set('version', new_version)
@@ -563,8 +565,8 @@
cur.executescript(
'''
CREATE TABLE IF NOT EXISTS rooms_last_message_time(
- jid_id INTEGER PRIMARY KEY UNIQUE,
- time INTEGER
+ jid_id INTEGER PRIMARY KEY UNIQUE,
+ time INTEGER
);
'''
)
@@ -607,5 +609,13 @@
replace(' xmpp', '')
gajim.config.set('uri_schemes', new_values)
gajim.config.set('version', '0.12.0.1')
+
+ def update_config_to_01211(self):
+ if 'trayicon' in self.old_values:
+ if self.old_values['trayicon'] == 'False':
+ gajim.config.set('trayicon', 'never')
+ else:
+ gajim.config.set('trayicon', 'always')
+ gajim.config.set('version', '0.12.1.1')
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/config.py
===================================================================
--- branches/osx_newbuildsys/src/config.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/config.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -301,36 +301,21 @@
st = gajim.config.get('autopopupaway')
self.auto_popup_away_checkbutton.set_active(st)
+ # Systray
+ systray_combobox = self.xml.get_widget('systray_combobox')
+ if gajim.config.get('trayicon') == 'never':
+ systray_combobox.set_active(0)
+ elif gajim.config.get('trayicon') == 'on_event':
+ systray_combobox.set_active(1)
+ else:
+ systray_combobox.set_active(2)
+
# sounds
if gajim.config.get('sounds_on'):
self.xml.get_widget('play_sounds_checkbutton').set_active(True)
else:
- self.xml.get_widget('sounds_scrolledwindow').set_sensitive(False)
- self.xml.get_widget('browse_sounds_hbox').set_sensitive(False)
+ self.xml.get_widget('manage_sounds_button').set_sensitive(False)
- # sounds treeview
- self.sound_tree = self.xml.get_widget('sounds_treeview')
-
- # active, event ui name, path to sound file, event_config_name
- model = gtk.ListStore(bool, str, str, str)
- self.sound_tree.set_model(model)
-
- col = gtk.TreeViewColumn(_('Active'))
- self.sound_tree.append_column(col)
- renderer = gtk.CellRendererToggle()
- renderer.set_property('activatable', True)
- renderer.connect('toggled', self.sound_toggled_cb)
- col.pack_start(renderer)
- col.set_attributes(renderer, active = 0)
-
- col = gtk.TreeViewColumn(_('Event'))
- self.sound_tree.append_column(col)
- renderer = gtk.CellRendererText()
- col.pack_start(renderer)
- col.set_attributes(renderer, text = 1)
-
- self.fill_sound_treeview()
-
# Notify user of new gmail e-mail messages,
# make checkbox sensitive if user has a gtalk account
frame_gmail = self.xml.get_widget('frame_gmail')
@@ -500,8 +485,6 @@
self.xml.signal_autoconnect(self)
- self.sound_tree.get_model().connect('row-changed',
- self.on_sounds_treemodel_row_changed)
self.msg_tree.get_model().connect('row-changed',
self.on_msg_treemodel_row_changed)
self.msg_tree.get_model().connect('row-deleted',
@@ -510,6 +493,7 @@
self.on_default_msg_treemodel_row_changed)
self.theme_preferences = None
+ self.sounds_preferences = None
self.notebook.set_current_page(0)
@@ -745,22 +729,28 @@
def on_auto_popup_away_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'autopopupaway')
+ def on_systray_combobox_changed(self, widget):
+ active = widget.get_active()
+ if active == 0:
+ gajim.config.set('trayicon', 'never')
+ elif active == 1:
+ gajim.config.set('trayicon', 'on_event')
+ else:
+ gajim.config.set('trayicon', 'always')
+
def on_advanced_notifications_button_clicked(self, widget):
dialogs.AdvancedNotificationsWindow()
def on_play_sounds_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'sounds_on',
- [self.xml.get_widget('sounds_scrolledwindow'),
- self.xml.get_widget('browse_sounds_hbox')])
+ [self.xml.get_widget('manage_sounds_button')])
+
+ def on_manage_sounds_button_clicked(self, widget):
+ if self.sounds_preferences is None:
+ self.sounds_preferences = ManageSoundsWindow()
+ else:
+ self.sounds_preferences.window.present()
- def on_sounds_treemodel_row_changed(self, model, path, iter_):
- sound_event = model[iter_][3].decode('utf-8')
- gajim.config.set_per('soundevents', sound_event, 'enabled',
- bool(model[path][0]))
- gajim.config.set_per('soundevents', sound_event, 'path',
- model[iter_][2].decode('utf-8'))
- gajim.interface.save_config()
-
def update_text_tags(self):
'''Update color tags in Opened Chat Windows'''
for win in gajim.interface.msg_win_mgr.windows():
@@ -1032,88 +1022,6 @@
if event.keyval == gtk.keysyms.Delete:
self.on_delete_msg_button_clicked(widget)
- def sound_toggled_cb(self, cell, path):
- model = self.sound_tree.get_model()
- model[path][0] = not model[path][0]
-
- def fill_sound_treeview(self):
- model = self.sound_tree.get_model()
- model.clear()
- model.set_sort_column_id(1, gtk.SORT_ASCENDING)
-
- # NOTE: sounds_ui_names MUST have all items of
- # sounds = gajim.config.get_per('soundevents') as keys
- sounds_dict = {
- 'first_message_received': _('First Message Received'),
- 'next_message_received_focused': _('Next Message Received Focused'),
- 'next_message_received_unfocused':
- _('Next Message Received Unfocused'),
- 'contact_connected': _('Contact Connected'),
- 'contact_disconnected': _('Contact Disconnected'),
- 'message_sent': _('Message Sent'),
- 'muc_message_highlight': _('Group Chat Message Highlight'),
- 'muc_message_received': _('Group Chat Message Received'),
- 'gmail_received': _('GMail Email Received')
- }
-
- for sound_event_config_name, sound_ui_name in sounds_dict.items():
- enabled = gajim.config.get_per('soundevents',
- sound_event_config_name, 'enabled')
- path = gajim.config.get_per('soundevents',
- sound_event_config_name, 'path')
- model.append((enabled, sound_ui_name, path, sound_event_config_name))
-
- def on_treeview_sounds_cursor_changed(self, widget, data = None):
- (model, iter_) = self.sound_tree.get_selection().get_selected()
- sounds_entry = self.xml.get_widget('sounds_entry')
- if not iter_:
- sounds_entry.set_text('')
- return
- path_to_snd_file = model[iter_][2]
- sounds_entry.set_text(path_to_snd_file)
-
- def on_browse_for_sounds_button_clicked(self, widget, data = None):
- (model, iter_) = self.sound_tree.get_selection().get_selected()
- if not iter_:
- return
- def on_ok(widget, path_to_snd_file):
- self.dialog.destroy()
- model, iter_ = self.sound_tree.get_selection().get_selected()
- if not path_to_snd_file:
- model[iter_][2] = ''
- self.xml.get_widget('sounds_entry').set_text('')
- model[iter_][0] = False
- return
- directory = os.path.dirname(path_to_snd_file)
- gajim.config.set('last_sounds_dir', directory)
- self.xml.get_widget('sounds_entry').set_text(path_to_snd_file)
-
- model[iter_][2] = path_to_snd_file # set new path to sounds_model
- model[iter_][0] = True # set the sound to enabled
-
- def on_cancel(widget):
- self.dialog.destroy()
- model, iter_ = self.sound_tree.get_selection().get_selected()
- model[iter_][2] = ''
- model[iter_][0] = False
-
- path_to_snd_file = model[iter_][2].decode('utf-8')
- path_to_snd_file = os.path.join(os.getcwd(), path_to_snd_file)
- self.dialog = dialogs.SoundChooserDialog(path_to_snd_file, on_ok,
- on_cancel)
-
- def on_sounds_entry_changed(self, widget):
- path_to_snd_file = widget.get_text()
- model, iter_ = self.sound_tree.get_selection().get_selected()
- model[iter_][2] = path_to_snd_file # set new path to sounds_model
-
- def on_play_button_clicked(self, widget):
- model, iter_ = self.sound_tree.get_selection().get_selected()
- if not iter_:
- return
- snd_event_config_name = model[iter_][3]
- helpers.play_sound(snd_event_config_name)
-
def on_open_advanced_editor_button_clicked(self, widget, data = None):
if 'advanced_config' in gajim.interface.instances:
gajim.interface.instances['advanced_config'].window.present()
@@ -3608,4 +3516,135 @@
window.set_title(title)
window.show_all()
+class ManageSoundsWindow:
+ def __init__(self):
+ self.xml = gtkgui_helpers.get_glade('manage_sounds_window.glade')
+ self.window = self.xml.get_widget('manage_sounds_window')
+
+ # sounds treeview
+ self.sound_tree = self.xml.get_widget('sounds_treeview')
+
+ # active, event ui name, path to sound file, event_config_name
+ model = gtk.ListStore(bool, str, str, str)
+ self.sound_tree.set_model(model)
+
+ col = gtk.TreeViewColumn(_('Active'))
+ self.sound_tree.append_column(col)
+ renderer = gtk.CellRendererToggle()
+ renderer.set_property('activatable', True)
+ renderer.connect('toggled', self.sound_toggled_cb)
+ col.pack_start(renderer)
+ col.set_attributes(renderer, active = 0)
+
+ col = gtk.TreeViewColumn(_('Event'))
+ self.sound_tree.append_column(col)
+ renderer = gtk.CellRendererText()
+ col.pack_start(renderer)
+ col.set_attributes(renderer, text = 1)
+
+ self.fill_sound_treeview()
+
+ self.xml.signal_autoconnect(self)
+
+ self.sound_tree.get_model().connect('row-changed',
+ self.on_sounds_treemodel_row_changed)
+
+ self.window.show_all()
+
+ def on_sounds_treemodel_row_changed(self, model, path, iter_):
+ sound_event = model[iter_][3].decode('utf-8')
+ gajim.config.set_per('soundevents', sound_event, 'enabled',
+ bool(model[path][0]))
+ gajim.config.set_per('soundevents', sound_event, 'path',
+ model[iter_][2].decode('utf-8'))
+ gajim.interface.save_config()
+
+ def sound_toggled_cb(self, cell, path):
+ model = self.sound_tree.get_model()
+ model[path][0] = not model[path][0]
+
+ def fill_sound_treeview(self):
+ model = self.sound_tree.get_model()
+ model.clear()
+ model.set_sort_column_id(1, gtk.SORT_ASCENDING)
+
+ # NOTE: sounds_ui_names MUST have all items of
+ # sounds = gajim.config.get_per('soundevents') as keys
+ sounds_dict = {
+ 'first_message_received': _('First Message Received'),
+ 'next_message_received_focused': _('Next Message Received Focused'),
+ 'next_message_received_unfocused':
+ _('Next Message Received Unfocused'),
+ 'contact_connected': _('Contact Connected'),
+ 'contact_disconnected': _('Contact Disconnected'),
+ 'message_sent': _('Message Sent'),
+ 'muc_message_highlight': _('Group Chat Message Highlight'),
+ 'muc_message_received': _('Group Chat Message Received'),
+ 'gmail_received': _('GMail Email Received')
+ }
+
+ for sound_event_config_name, sound_ui_name in sounds_dict.items():
+ enabled = gajim.config.get_per('soundevents',
+ sound_event_config_name, 'enabled')
+ path = gajim.config.get_per('soundevents',
+ sound_event_config_name, 'path')
+ model.append((enabled, sound_ui_name, path, sound_event_config_name))
+
+ def on_treeview_sounds_cursor_changed(self, widget, data = None):
+ (model, iter_) = self.sound_tree.get_selection().get_selected()
+ sounds_entry = self.xml.get_widget('sounds_entry')
+ if not iter_:
+ sounds_entry.set_text('')
+ return
+ path_to_snd_file = model[iter_][2]
+ sounds_entry.set_text(path_to_snd_file)
+
+ def on_browse_for_sounds_button_clicked(self, widget, data = None):
+ (model, iter_) = self.sound_tree.get_selection().get_selected()
+ if not iter_:
+ return
+ def on_ok(widget, path_to_snd_file):
+ self.dialog.destroy()
+ model, iter_ = self.sound_tree.get_selection().get_selected()
+ if not path_to_snd_file:
+ model[iter_][2] = ''
+ self.xml.get_widget('sounds_entry').set_text('')
+ model[iter_][0] = False
+ return
+ directory = os.path.dirname(path_to_snd_file)
+ gajim.config.set('last_sounds_dir', directory)
+ self.xml.get_widget('sounds_entry').set_text(path_to_snd_file)
+
+ model[iter_][2] = path_to_snd_file # set new path to sounds_model
+ model[iter_][0] = True # set the sound to enabled
+
+ def on_cancel(widget):
+ self.dialog.destroy()
+ model, iter_ = self.sound_tree.get_selection().get_selected()
+ model[iter_][2] = ''
+ model[iter_][0] = False
+
+ path_to_snd_file = model[iter_][2].decode('utf-8')
+ path_to_snd_file = os.path.join(os.getcwd(), path_to_snd_file)
+ self.dialog = dialogs.SoundChooserDialog(path_to_snd_file, on_ok,
+ on_cancel)
+
+ def on_sounds_entry_changed(self, widget):
+ path_to_snd_file = widget.get_text()
+ model, iter_ = self.sound_tree.get_selection().get_selected()
+ model[iter_][2] = path_to_snd_file # set new path to sounds_model
+
+ def on_play_button_clicked(self, widget):
+ model, iter_ = self.sound_tree.get_selection().get_selected()
+ if not iter_:
+ return
+ snd_event_config_name = model[iter_][3]
+ helpers.play_sound(snd_event_config_name)
+
+ def on_close_button_clicked(self, widget):
+ self.window.hide()
+
+ def on_manage_sounds_window_delete_event(self, widget, event):
+ self.window.hide()
+ return True # do NOT destroy the window
# vim: se ts=3:
Modified: branches/osx_newbuildsys/src/gajim-remote.py
===================================================================
--- branches/osx_newbuildsys/src/gajim-remote.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/gajim-remote.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -28,6 +28,7 @@
import sys
import locale
+import urllib
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
@@ -48,6 +49,8 @@
import dbus
import dbus.service
import dbus.glib
+ # test if dbus-x11 is installed
+ bus = dbus.SessionBus()
except Exception:
print str(exceptions.DbusNotSupported())
sys.exit(1)
@@ -504,6 +507,10 @@
self.command = sys.argv[1] = 'open_chat'
return
(jid, action) = uri.split('?', 1)
+ try:
+ jid = urllib.unquote(jid)
+ except UnicodeDecodeError:
+ pass
sys.argv[2] = jid
if action == 'join':
self.command = sys.argv[1] = 'join_room'
Modified: branches/osx_newbuildsys/src/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/gajim.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/gajim.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -3276,7 +3276,7 @@
import dock
self.dock = dock.Dock()
- if self.systray_capabilities and gajim.config.get('trayicon'):
+ if self.systray_capabilities and gajim.config.get('trayicon') != 'never':
self.show_systray()
path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')
Modified: branches/osx_newbuildsys/src/message_window.py
===================================================================
--- branches/osx_newbuildsys/src/message_window.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/message_window.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -887,7 +887,6 @@
# we track the lifetime of this window
win.window.connect('delete-event', self._on_window_delete)
win.window.connect('destroy', self._on_window_destroy)
- win.window.connect('window-state-event', self._on_window_state_change)
return win
def _gtk_win_to_msg_win(self, gtk_win):
@@ -1024,10 +1023,6 @@
del self._windows[old_key]
win.change_key(old_jid, new_jid, acct)
- def _on_window_state_change(self,widget, event, *args):
- "track window state"
- self.win_maximized = (event.new_window_state == gtk.gdk.WINDOW_STATE_MAXIMIZED)
-
def _on_window_delete(self, win, event):
self.save_state(self._gtk_win_to_msg_win(win))
gajim.interface.save_config()
@@ -1123,7 +1118,9 @@
gajim.config.set_per('accounts', acct, pos_y_key, y)
else:
- gajim.config.set(max_win_key , self.win_maximized )
+ win_maximized = msg_win.window.window.get_state() == \
+ gtk.gdk.WINDOW_STATE_MAXIMIZED
+ gajim.config.set(max_win_key, win_maximized)
width += width_adjust
gajim.config.set(size_width_key, width)
gajim.config.set(size_height_key, height)
Modified: branches/osx_newbuildsys/src/systray.py
===================================================================
--- branches/osx_newbuildsys/src/systray.py 2009-02-14 10:07:31 UTC (rev 11089)
+++ branches/osx_newbuildsys/src/systray.py 2009-02-14 11:37:46 UTC (rev 11090)
@@ -99,6 +99,10 @@
state = 'event'
else:
state = self.status
+ if state != 'event' and gajim.config.get('trayicon') == 'on_event':
+ self.t.hide()
+ else:
+ self.t.show()
image = gajim.interface.jabber_state_images['16'][state]
if image.get_storage_type() == gtk.IMAGE_ANIMATION:
self.img_tray.set_from_animation(image.get_animation())
1
0
Author: asterix
Date: 2009-02-14 11:07:31 +0100 (Sat, 14 Feb 2009)
New Revision: 11089
Modified:
trunk/src/network_manager_listener.py
Log:
[shivan] network manager 0.7 support. Fixes #4536
Modified: trunk/src/network_manager_listener.py
===================================================================
--- trunk/src/network_manager_listener.py 2009-02-13 22:37:51 UTC (rev 11088)
+++ trunk/src/network_manager_listener.py 2009-02-14 10:07:31 UTC (rev 11089)
@@ -25,17 +25,32 @@
from common import gajim
def device_now_active(self, *args):
+ '''For Network Manager 0.6'''
for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.time_to_reconnect:
connection._reconnect()
def device_no_longer_active(self, *args):
+ '''For Network Manager 0.6'''
for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.connected > 1:
connection._disconnectedReconnCB()
+def state_changed(state):
+ '''For Network Manager 0.7'''
+ if props.Get("org.freedesktop.NetworkManager", "State") == 3:
+ for connection in gajim.connections.itervalues():
+ if gajim.config.get_per('accounts', connection.name,
+ 'listen_to_network_manager') and connection.time_to_reconnect:
+ connection._reconnect()
+ else:
+ for connection in gajim.connections.itervalues():
+ if gajim.config.get_per('accounts', connection.name,
+ 'listen_to_network_manager') and connection.connected > 1:
+ connection._disconnectedReconnCB()
+
supported = False
if sys.platform == 'darwin':
@@ -44,22 +59,36 @@
try:
from common.dbus_support import system_bus
- bus = system_bus.SystemBus()
+ bus = system_bus.bus()
if 'org.freedesktop.NetworkManager' in bus.list_names():
+ nm_object = bus.get_object('org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+ props = dbus.Interface(nm_object,"org.freedesktop.DBus.Properties")
+ bus.add_signal_receiver(state_changed,
+ 'StateChanged',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
supported = True
- bus.add_signal_receiver(device_no_longer_active,
- 'DeviceNoLongerActive',
- 'org.freedesktop.NetworkManager',
- 'org.freedesktop.NetworkManager',
- '/org/freedesktop/NetworkManager')
- bus.add_signal_receiver(device_now_active,
- 'DeviceNowActive',
- 'org.freedesktop.NetworkManager',
- 'org.freedesktop.NetworkManager',
- '/org/freedesktop/NetworkManager')
except Exception:
- pass
+ try:
+ if 'org.freedesktop.NetworkManager' in bus.list_names():
+ supported = True
+ bus.add_signal_receiver(device_no_longer_active,
+ 'DeviceNoLongerActive',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+
+ bus.add_signal_receiver(device_now_active,
+ 'DeviceNowActive',
+ 'org.freedesktop.NetworkManager',
+ 'org.freedesktop.NetworkManager',
+ '/org/freedesktop/NetworkManager')
+ except Exception:
+ pass
+
# vim: se ts=3:
1
0
Author: asterix
Date: 2009-02-13 23:37:51 +0100 (Fri, 13 Feb 2009)
New Revision: 11088
Modified:
trunk/src/common/xmpp/transports_nb.py
Log:
don't log as error, but as info, connection lost. Fixes #4800
Modified: trunk/src/common/xmpp/transports_nb.py
===================================================================
--- trunk/src/common/xmpp/transports_nb.py 2009-02-13 22:20:13 UTC (rev 11087)
+++ trunk/src/common/xmpp/transports_nb.py 2009-02-13 22:37:51 UTC (rev 11088)
@@ -529,7 +529,7 @@
return
if errnum:
- log.error("Connection to %s:%s lost: %s %s" % (self.server, self.port,
+ log.info("Connection to %s:%s lost: %s %s" % (self.server, self.port,
errnum, errstr), exc_info=True)
self.disconnect()
return
1
0