diff --git a/ChangeLog b/ChangeLog
index 2b73919447ea296bb7a0bf24507ad30fb52be21c..fd3d30f6384314cbb0cc168e1185e67b1782abf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Gajim 0.15 (XX XX 2011)
+
+ * Plugin system
+ * Whiteboard (via a plugin)
+ * Message archiving
+ * Stream managment
+ * IBB
+ * Nested roster group
+ * Roster filtrering
+ * UPower support
+ * GPG support for windows
+
+Gajim 0.14.4 (22 July 2011)
+
+ * Fix translation issue
+ * other minor fixes
+
+Gajim 0.14.3 (19 June 2011)
+
+ * Fix history viewer
+ * Fix closing roster window
+ * Prevent some erros with metacontacts
+
+Gajim 0.14.2 (07 June 2011)
+
+ * Fix CPU usage when testing file transfer proxies
+ * Fix invalid XML char regex
+ * Fix subscription request window handling
+ * Fix URL display in chat message banner
+ * Other minor bugfixes
+
Gajim 0.14.1 (26 October 2010)
* Fix changing account name
diff --git a/Makefile.am b/Makefile.am
index 14ddf443d5c53ed44c29b1b563e58b1f6b468fd8..99a13801879173f0b9e3f0a7adf63613141e506f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,12 @@
-SUBDIRS = src data plugins po icons
+SUBDIRS = src data po icons plugins
ACLOCAL_AMFLAGS = -I m4
bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote
-docfilesdir = $(docdir)
-docfiles_DATA = README \
- README.html \
- ChangeLog \
- COPYING \
- THANKS \
- THANKS.artists \
- AUTHORS
-
EXTRA_DIST = \
- $(docfiles_DATA) \
+ README.html \
+ THANKS.artists \
autogen.sh \
intltool-extract.in \
intltool-merge.in \
diff --git a/README.html b/README.html
index ad2b1e102fd0550d356dd2730147f31353a81072..df336233726aaf9ba2777a44377872c7843ca414 100644
--- a/README.html
+++ b/README.html
@@ -72,7 +72,7 @@ or if you use hg version and you didn't 'make install' you can also run from gaj
</ul>
<p>steps to compile gajim:</p>
<pre>
- $ sh autogen.sh
+ $ ./autogen.sh
$ ./configure
$ make
</pre>
@@ -95,7 +95,7 @@ If you want to remove it from custom directory provide it as:
<h2>Miscellaneous</h2>
<h3>XML & Debugging</h3>
-<p>If you want to see the xml stanzas and/or help us debugging
+<p>If you want to see the xml stanzas and/or help us debugging
you're advised to enable verbose via advanced configuration window.
If you don't want to make this permanent, execute gajim with --verbose
everytime you want to have verbose output.</p>
diff --git a/autogen.sh b/autogen.sh
index 433d39a4ed0eb48abff82a6306bd535cf95dab58..b2e46611afdfde1c33f84617cf35f1a2cbf2e9fd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.14.0.1"
+ gajimversion="0.15-beta2"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff --git a/data/gui/accounts_window.ui b/data/gui/accounts_window.ui
index 4a1b0be37cf8177dec1a1144ab5cc5843d0501a1..de088497e3c1118585f11c05c6b05523a0a1df75 100644
--- a/data/gui/accounts_window.ui
+++ b/data/gui/accounts_window.ui
@@ -63,13 +63,42 @@
</child>
<child>
<object class="GtkButton" id="add_button">
- <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">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="use_stock">True</property>
<signal name="clicked" handler="on_add_button_clicked"/>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Add</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -78,13 +107,42 @@
</child>
<child>
<object class="GtkButton" id="remove_button">
- <property name="label">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">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="use_stock">True</property>
<signal name="clicked" handler="on_remove_button_clicked"/>
+ <child>
+ <object class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Delete</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -99,52 +157,37 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<signal name="clicked" handler="on_rename_button_clicked"/>
<child>
- <object class="GtkHBox" id="hbox8">
+ <object class="GtkAlignment" id="alignment6">
<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="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label26">
- <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>
- </object>
- <packing>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="rename_image">
- <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="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label25">
- <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">Re_name</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkLabel" id="label27">
+ <object class="GtkHBox" id="hbox8">
<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="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="rename_image">
+ <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="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label25">
+ <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">Re_name</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="position">3</property>
- </packing>
</child>
</object>
</child>
@@ -451,48 +494,70 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label28">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Client Cert File:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">cert_entry1</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Client Cert File:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">cert_entry1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="cert_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="browse_for_client_cert_button">
+ <property name="label" translatable="yes">Browse...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_browse_for_client_cert_button_clicked"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="cert_entry1">
+ <object class="GtkCheckButton" id="client_cert_encrypted_checkbutton1">
+ <property name="label" translatable="yes">Certificate is e_ncrypted</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">The path to the client certificate and key in PKCS#12 format</property>
- <property name="invisible_char">●</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_client_cert_encrypted_checkbutton1_toggled"/>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="browse_for_client_cert_button">
- <property name="label" translatable="yes">Browse...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Choose Client Cert</property>
- <signal name="clicked" handler="on_browse_for_client_cert_button_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
</child>
<child type="label">
diff --git a/data/gui/chat_control.ui b/data/gui/chat_control.ui
index 52298b2e27cfec94a6b3133a41204527cafa09a4..cd71b42e4f52e2c2c96f64fd60f428278cbbbfb9 100644
--- a/data/gui/chat_control.ui
+++ b/data/gui/chat_control.ui
@@ -450,7 +450,7 @@
<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="stock">gtk-info</property>
- <property name="icon-size">2</property>
+ <property name="icon-size">1</property>
</object>
</child>
</object>
diff --git a/data/gui/contact_context_menu.ui b/data/gui/contact_context_menu.ui
index 06acb85722177a38473fbb453196dae15ae64847..dfd28cf14cd3383c4ca6593816d2109b5d884202 100644
--- a/data/gui/contact_context_menu.ui
+++ b/data/gui/contact_context_menu.ui
@@ -98,7 +98,7 @@
</child>
<child>
<object class="GtkImageMenuItem" id="manage_contact">
- <property name="label" translatable="yes">_Manage Contact</property>
+ <property name="label" translatable="yes">M_anage Contact</property>
<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="use_underline">True</property>
diff --git a/data/gui/history_window.ui b/data/gui/history_window.ui
index d6b77b799bbd86d40018810f359f0851ca95d065..0b36ff7f1435fac54aa191e1a2688ff1ca11907e 100644
--- a/data/gui/history_window.ui
+++ b/data/gui/history_window.ui
@@ -80,6 +80,22 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="search_in_date">
+ <property name="label" translatable="yes">_In date search</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">searching only in the selected day </property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -104,14 +120,17 @@
<object class="GtkCalendar" id="calendar">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="day_selected" handler="on_calendar_day_selected"/>
<signal name="month_changed" handler="on_calendar_month_changed"/>
+ <signal name="day_selected" handler="on_calendar_day_selected"/>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="resize">False</property>
diff --git a/data/gui/plugins_window.ui b/data/gui/plugins_window.ui
index b22be27245078aa0c30f8081506e7bb027872fae..2895e2502b515642071bc5be98d403da6a946b5a 100644
--- a/data/gui/plugins_window.ui
+++ b/data/gui/plugins_window.ui
@@ -25,24 +25,82 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="position">250</property>
- <property name="position_set">True</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">6</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="xalign">0</property>
<child>
- <object class="GtkTreeView" id="installed_plugins_treeview">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">never</property>
+ <child>
+ <object class="GtkTreeView" id="installed_plugins_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAspectFrame" id="aspectframe1">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <property name="xalign">0</property>
+ <child>
+ <object class="GtkButton" id="install_plugin_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_install_plugin_button_clicked"/>
+ <child>
+ <object class="GtkHBox" id="hbox8">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-apply</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="configure_plugin_button_label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Install from zip</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
</child>
</object>
<packing>
<property name="resize">False</property>
- <property name="shrink">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child>
@@ -166,7 +224,6 @@
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
@@ -181,15 +238,7 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
</object>
<packing>
@@ -220,58 +269,21 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox2">
+ <object class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="spacing">5</property>
<property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="install_plugin_button">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_install_plugin_button_clicked"/>
- <child>
- <object class="GtkHBox" id="hbox13">
- <property name="visible">True</property>
- <child>
- <object class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-apply</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="install_plugin_button_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Install</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkButton" id="uninstall_plugin_button">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_uninstall_plugin_button_clicked"/>
<child>
- <object class="GtkHBox" id="hbox11">
+ <object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<child>
- <object class="GtkImage" id="image1">
+ <object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-cancel</property>
</object>
@@ -280,7 +292,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="uninstall_plugin_button_label">
+ <object class="GtkLabel" id="uninstall_plugin_button_label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Uninstall</property>
@@ -305,10 +317,10 @@
<property name="receives_default">True</property>
<signal name="clicked" handler="on_configure_plugin_button_clicked"/>
<child>
- <object class="GtkHBox" id="hbox12">
+ <object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<child>
- <object class="GtkImage" id="image2">
+ <object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
</object>
@@ -317,7 +329,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="configure_plugin_button_label">
+ <object class="GtkLabel" id="configure_plugin_button_label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Configure</property>
@@ -358,264 +370,6 @@
<property name="tab_fill">False</property>
</packing>
</child>
- <child>
- <object class="GtkHPaned" id="hpaned2">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTreeView" id="treeview2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="plugin_name_label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><empty></property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Version:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="plugin_version_label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><empty></property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Authors:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="plugin_authors_label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><empty></property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Homepage:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="plugin_homepage_linkbutton1">
- <property name="label" translatable="yes">button</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="focus_on_click">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Descrition:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTextView" id="plugin_description_textview1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="uninstall_plugin_button1">
- <property name="label" translatable="yes">button</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="configure_plugin_button1">
- <property name="label" translatable="yes">button</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Available</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
<child>
<placeholder/>
</child>
diff --git a/data/gui/preferences_window.ui b/data/gui/preferences_window.ui
index 4fc92decc4d182cacf359d823142688a94b1b94b..c6929e1ea16815b3f93cb1a0f0d3568676ccc020 100644
--- a/data/gui/preferences_window.ui
+++ b/data/gui/preferences_window.ui
@@ -2,6 +2,20 @@
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="value">20</property>
+ <property name="lower">1</property>
+ <property name="upper">1440</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="value">12</property>
+ <property name="lower">1</property>
+ <property name="upper">720</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name item -->
@@ -124,6 +138,17 @@
</row>
</data>
</object>
+ <object class="GtkListStore" id="liststore8">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">None</col>
+ </row>
+ </data>
+ </object>
<object class="GtkWindow" id="preferences_window">
<property name="border_width">6</property>
<property name="title" translatable="yes">Preferences</property>
@@ -134,7 +159,6 @@
<child>
<object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkNotebook" id="preferences_notebook">
@@ -145,7 +169,6 @@
<object class="GtkVBox" id="vbox41">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
@@ -163,7 +186,6 @@
<object class="GtkVBox" id="vbox1">
<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="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton">
@@ -537,7 +559,6 @@
<object class="GtkVBox" id="vbox42">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame29">
@@ -552,7 +573,6 @@
<child>
<object class="GtkVBox" id="vbox67">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox1">
@@ -655,7 +675,6 @@
<child>
<object class="GtkVBox" id="vbox_gmail">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="notify_gmail_checkbutton">
@@ -778,7 +797,6 @@
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox4">
@@ -870,7 +888,6 @@
<object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame13">
@@ -1002,7 +1019,6 @@
<object class="GtkVBox" id="status_vbox">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame81">
@@ -1196,7 +1212,6 @@ $T will be replaced by auto-not-available timeout</property>
<object class="GtkVBox" id="vbox2">
<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="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox2934">
@@ -1268,8 +1283,6 @@ $T will be replaced by auto-not-available timeout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">If enabled, Gajim will not ask for a status message. The specified default message will be used instead.</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="default_msg_treeview">
@@ -1365,8 +1378,6 @@ $T will be replaced by auto-not-available timeout</property>
<object class="GtkScrolledWindow" id="scrolledwindow22">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="msg_treeview">
@@ -1439,7 +1450,6 @@ $T will be replaced by auto-not-available timeout</property>
<object class="GtkVBox" id="vbox58">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame9">
@@ -2062,7 +2072,6 @@ $T will be replaced by auto-not-available timeout</property>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="audio_frame">
@@ -2365,7 +2374,6 @@ to discover one from server.</property>
<object class="GtkVBox" id="vbox45">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="applications_frame">
@@ -2380,7 +2388,6 @@ to discover one from server.</property>
<child>
<object class="GtkVBox" id="vbox50">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkComboBox" id="applications_combobox">
@@ -2547,7 +2554,7 @@ to discover one from server.</property>
<object class="GtkTable" id="table3">
<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="n_rows">4</property>
+ <property name="n_rows">6</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
@@ -2567,7 +2574,7 @@ to discover one from server.</property>
</child>
<child>
<object class="GtkCheckButton" id="send_os_info_checkbutton">
- <property name="label" translatable="yes">Allow _OS information to be sent</property>
+ <property name="label" translatable="yes">Allow client / _OS information to be sent</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -2581,6 +2588,22 @@ to discover one from server.</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="send_time_info_checkbutton">
+ <property name="label" translatable="yes">Allow local system time information to be sent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">If checked, Gajim will allow others to detect the time on your system</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_send_time_info_checkbutton_toggled"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
<child>
<object class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
<property name="label" translatable="yes">Log _encrypted chat session</property>
@@ -2593,8 +2616,8 @@ to discover one from server.</property>
<signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -2608,8 +2631,58 @@ to discover one from server.</property>
<signal name="toggled" handler="on_send_idle_time_checkbutton_toggled"/>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Global proxy:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="proxies_combobox">
+ <property name="visible">True</property>
+ <property name="model">liststore8</property>
+ <signal name="changed" handler="on_proxies_combobox_changed"/>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext8"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="manage_proxies_button">
+ <property name="label" translatable="yes">_Manage...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_manage_proxies_button_clicked"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
</object>
@@ -2643,7 +2716,6 @@ to discover one from server.</property>
<child>
<object class="GtkVBox" id="vbox66">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="log_show_changes_checkbutton">
@@ -2817,18 +2889,4 @@ to discover one from server.</property>
</object>
</child>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="value">20</property>
- <property name="lower">1</property>
- <property name="upper">1440</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="value">12</property>
- <property name="lower">1</property>
- <property name="upper">720</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
diff --git a/data/gui/roster_window.ui b/data/gui/roster_window.ui
index 9566316a36cb318e85f7a2884069d6d88d901c40..1d222779aae1c3a76a0ab432e5705fe1b736e1dd 100644
--- a/data/gui/roster_window.ui
+++ b/data/gui/roster_window.ui
@@ -7,7 +7,7 @@
<property name="height_request">200</property>
<property name="title" translatable="yes">Gajim</property>
<property name="role">roster</property>
- <property name="default_width">200</property>
+ <property name="default_width">250</property>
<property name="default_height">400</property>
<accel-groups>
<group name="accelgroup1"/>
@@ -202,7 +202,7 @@
<child>
<object class="GtkCheckMenuItem" id="show_transports_menuitem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Show Trans_ports</property>
+ <property name="label" translatable="yes">Show T_rans_ports</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_show_transports_menuitem_activate"/>
</object>
@@ -218,16 +218,6 @@
<signal name="toggled" handler="on_show_roster_menuitem_toggled"/>
</object>
</child>
- <child>
- <object class="GtkCheckMenuItem" id="show_rfilter_menuitem">
- <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">Show Roster Fi_lter</property>
- <property name="use_underline">True</property>
- <accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="toggled" handler="on_show_rfilter_menuitem_toggled"/>
- </object>
- </child>
<child>
<object class="GtkSeparatorMenuItem" id="separator3">
<property name="visible">True</property>
diff --git a/debian/README.Debian b/debian/README.Debian
index 1c24acc9c2abedabfe3be35bc1f927fb92e5b635..f9444264361d90708761c3077d615b34b2beeab6 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,8 +1,6 @@
gajim for Debian
----------------
-If you want to use OpenPGP in gajim, you have to install python-gnupginterface.
-
For video chat support, you have to install python-farsight.
-- Yann Le Boulanger <asterix@lagaule.org>, Mon, 20 Jun 2005 12:02:31 +0200
diff --git a/debian/changelog b/debian/changelog
index 8029651ff041366d720b72594b4edace841346b7..fe9ca177c876ecd04425b541a90d4da4a2f193b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+gajim (0.15~alpha1-1) unstable; urgency=low
+
+ * New upstream release.
+ * remove 00_debian-copying.diff because upstream doesn't install it anymore
+ * remove 01_configure-ac.diff because upstream changed configure dependencies
+ * remove python-gnupginterface from recommands list, it's no more used
+
+ -- Yann Leboulanger <asterix@lagaule.org> Fri, 26 Aug 2011 12:13:51 +0200
+
+gajim (0.14.4-1) unstable; urgency=low
+
+ * New upstream release. Closes: #637071
+ * Fixes weird error. Closes: #632226
+ * Stop suggesting unused python-sexy. Closes: #633301
+ * Modify 00_debian-copying.diff to also not install ChangeLog file.
+ dh_changelogs will do it.
+
+ -- Yann Leboulanger <asterix@lagaule.org> Fri, 22 Jul 2011 12:56:30 +0200
+
+gajim (0.14.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fix closing roster window. Closes: #630315
+
+ -- Yann Leboulanger <asterix@lagaule.org> Sun, 19 Jun 2011 21:46:09 +0200
+
+gajim (0.14.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fix CPU usage when testing file transfer proxies. Closes: #626576
+
+ -- Yann Leboulanger <asterix@lagaule.org> Tue, 07 Jun 2011 19:30:43 +0200
+
gajim (0.14.1-1) unstable; urgency=low
[ Yann Leboulanger ]
diff --git a/debian/control b/debian/control
index bc78a4a837a7f9b184ca685099546b2093933733..0bd63d2fcbf2a5744048abdfa722d68777618985 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gajim
Section: net
Priority: optional
Maintainer: Yann Leboulanger <asterix@lagaule.org>
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), dh-autoreconf, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev
Standards-Version: 3.9.2
Homepage: http://www.gajim.org
Vcs-Hg: http://hg.gajim.org/gajim/
@@ -11,8 +11,8 @@ Vcs-Browser: http://hg.gajim.org/gajim/file
Package: gajim
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils
-Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl (>= 0.9), python-crypto
-Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly
+Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.9), python-crypto
+Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly
Description: Jabber client written in PyGTK
Gajim is a Jabber client. It has a tabbed user interface with normal chats,
group chats, and has many features such as, TLS, GPG, SSL, multiple accounts,
diff --git a/debian/copyright b/debian/copyright
index 2810d2df514676679da9d82b02cdd990a676c905..09a3c30c76b3945e3003f119ba7bd8116199199a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,8 @@ It was downloaded from:
http://www.gajim.org/downloads/
Upstream Authors:
- - Alexander Cherniuk <ts33kr@gmail.com>
- - Yann Le Boulanger <asterix@lagaule.org>
+ - Denis Fomin <fominde@gmail.com>
+ - Yann Leboulanger <asterix@lagaule.org>
Copyright: (c) 2003-2011 Gajim Team
diff --git a/debian/docs b/debian/docs
index e845566c06f9bf557d35e8292c37cf05d97a9769..daa30a3f752706bce3bc36b34a7aab39ee5484d4 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.html
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000000000000000000000000000000000000..a38ad6e6d6788fa6b2b7f5fea298fdf09dc2c9e5
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+debian/gajim.xpm usr/share/pixmaps
diff --git a/debian/patches/00_debian-copying.diff b/debian/patches/00_debian-copying.diff
deleted file mode 100644
index 6c9cc7700ba70a9922c0f42c5fcd75572e244be1..0000000000000000000000000000000000000000
--- a/debian/patches/00_debian-copying.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: don't install useless COPYING file
-Forwarded: not-neded
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,6 @@
- docfiles_DATA = README \
- README.html \
- ChangeLog \
-- COPYING \
- THANKS \
- THANKS.artists \
- AUTHORS
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -299,7 +299,6 @@
- docfiles_DATA = README \
- README.html \
- ChangeLog \
-- COPYING \
- THANKS \
- THANKS.artists \
- AUTHORS
diff --git a/debian/patches/01_configure-ac.diff b/debian/patches/01_configure-ac.diff
deleted file mode 100644
index cae1e23685b5da5419cc37a50489de97e188f863..0000000000000000000000000000000000000000
--- a/debian/patches/01_configure-ac.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: don't require python headers to remove build-dep on python-dev and python-gtk2-dev
-Author: Yann Leboulanger <asterix@lagaule.org>
-Origin: upstream,http://hg.gajim.org/gajim/diff/252bb3cf2c59/configure.ac
-Last-Update: 2011-05-07
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,25 +36,10 @@
- AM_NLS
-
-
--dnl ****
--dnl pygtk and gtk+
--dnl ****
--PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0])
--AC_SUBST(PYGTK_CFLAGS)
--AC_SUBST(PYGTK_LIBS)
--PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
--AC_SUBST(PYGTK_DEFS)
--
--AM_PATH_PYTHON([2.5])
--if test "x$PYTHON" = "x:"; then
-- AC_MSG_ERROR([Python not found])
--fi
--
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
- AC_SUBST(ACLOCAL_AMFLAGS)
-
--AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
--AC_SUBST([PYTHON_INCLUDES])
-+AM_PATH_PYTHON([2.5])
-
- dnl ****
- dnl enable installation in python-2.x/site-packages/gajim
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 789adce6e654df34f1ac6a07acac3f81b0436d07..0000000000000000000000000000000000000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-00_debian-copying.diff
-01_configure-ac.diff
diff --git a/debian/rules b/debian/rules
index e44603a7bc6db9b229a32ce8cf6ad83c943c850e..dd60f48b2677f8f94310b34595644fb662bc1b87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --with python2,autoreconf
+ dh $@ --with python2
# test target is broken
override_dh_auto_test:
@@ -10,10 +10,6 @@ override_dh_auto_configure:
convert icons/hicolor/64x64/apps/gajim.png -resize 32x32 debian/gajim.xpm
dh_auto_configure
-override_dh_auto_install:
- dh_auto_install
- rm debian/gajim/usr/share/gajim/src/common/GnuPGInterface.py*
-
override_dh_auto_clean:
-rm -f debian/gajim.xpm
dh_auto_clean
diff --git a/gajim.nsi b/gajim.nsi
index c09d90261526d34346f52d732bb40c2a537cd7ab..25df1453484732751993bb1573e48defa00ff8d5 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -146,6 +146,7 @@ Section "Gajim" SecGajim
File "THANKS.artists"
SetOutPath "$INSTDIR\bin"
+ File "bin\_bsddb.pyd"
File "bin\_ctypes.pyd"
File "bin\_hashlib.pyd"
File "bin\_socket.pyd"
@@ -158,20 +159,23 @@ Section "Gajim" SecGajim
File "bin\Crypto.Hash.SHA256.pyd"
File "bin\Crypto.Random.OSRNG.winrandom.pyd"
File "bin\Crypto.Util._counter.pyd"
+ File "bin\Crypto.Util.strxor.pyd"
File "bin\gajim.exe"
File "bin\gio._gio.pyd"
File "bin\glib._glib.pyd"
File "bin\gobject._gobject.pyd"
+ File "bin\goocanvas.pyd"
File "bin\gtk._gtk.pyd"
File "bin\history_manager.exe"
File "bin\OpenSSL.crypto.pyd"
File "bin\libeay32.dll"
+ File "bin\libgoocanvas-3.dll"
File "bin\library.zip"
File "bin\pangocairo.pyd"
File "bin\pango.pyd"
File "bin\pyexpat.pyd"
- File "bin\python26.dll"
- File "bin\pywintypes26.dll"
+ File "bin\python27.dll"
+ File "bin\pywintypes27.dll"
File "bin\OpenSSL.rand.pyd"
File "bin\select.pyd"
File "bin\sqlite3.dll"
@@ -188,7 +192,7 @@ Section "Gajim" SecGajim
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.1"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -234,6 +238,11 @@ Section "Gtk+ 2" SecGtk
File /r "bin\gtk\share\xml"
SectionEnd
+Section "Plugins" SecPlugins
+ SetOutPath "$INSTDIR\plugins"
+ File /r "plugins\plugin_installer"
+SectionEnd
+
SectionGroup $(NAME_Emoticons)
Section "animated" SecEmoticonsAnimated
@@ -641,6 +650,7 @@ Section "Uninstall"
RMDir /r "$INSTDIR\bin\gtk\share\xml"
RMDir "$INSTDIR\bin\gtk\share"
RMDir "$INSTDIR\bin\gtk"
+ Delete "$INSTDIR\bin\_bsddb.pyd"
Delete "$INSTDIR\bin\_ctypes.pyd"
Delete "$INSTDIR\bin\_hashlib.pyd"
Delete "$INSTDIR\bin\_socket.pyd"
@@ -653,13 +663,16 @@ Section "Uninstall"
Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd"
Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd"
Delete "$INSTDIR\bin\Crypto.Util._counter.pyd"
+ Delete "$INSTDIR\bin\Crypto.Util.strxor.pyd"
Delete "$INSTDIR\bin\gajim.exe"
Delete "$INSTDIR\bin\gio._gio.pyd"
Delete "$INSTDIR\bin\glib._glib.pyd"
Delete "$INSTDIR\bin\gobject._gobject.pyd"
+ Delete "$INSTDIR\bin\goocanvas.pyd"
Delete "$INSTDIR\bin\gtk._gtk.pyd"
Delete "$INSTDIR\bin\history_manager.exe"
Delete "$INSTDIR\bin\libeay32.dll"
+ Delete "$INSTDIR\bin\libgoocanvas-3.dll"
Delete "$INSTDIR\bin\library.zip"
Delete "$INSTDIR\bin\OpenSSL.crypto.pyd"
Delete "$INSTDIR\bin\OpenSSL.rand.pyd"
@@ -667,8 +680,8 @@ Section "Uninstall"
Delete "$INSTDIR\bin\pango.pyd"
Delete "$INSTDIR\bin\pangocairo.pyd"
Delete "$INSTDIR\bin\pyexpat.pyd"
- Delete "$INSTDIR\bin\python26.dll"
- Delete "$INSTDIR\bin\pywintypes26.dll"
+ Delete "$INSTDIR\bin\python27.dll"
+ Delete "$INSTDIR\bin\pywintypes27.dll"
Delete "$INSTDIR\bin\select.pyd"
Delete "$INSTDIR\bin\sqlite3.dll"
Delete "$INSTDIR\bin\ssleay32.dll"
@@ -677,7 +690,8 @@ Section "Uninstall"
Delete "$INSTDIR\bin\win32file.pyd"
Delete "$INSTDIR\bin\win32pipe.pyd"
Delete "$INSTDIR\bin\winsound.pyd"
- RMDir "$INSTDIR\bin"
+ Delete "$INSTDIR\bin\msvcr90.dll"
+ RMDir /r "$INSTDIR\bin"
RMDir /r "$INSTDIR\data\gui"
RMDir /r "$INSTDIR\data\moods"
RMDir /r "$INSTDIR\data\activities"
@@ -698,6 +712,8 @@ Section "Uninstall"
RMDir /r "$INSTDIR\data\iconsets\transports"
RMDir "$INSTDIR\data\iconsets"
RMDir "$INSTDIR\data"
+ RMDir /r "$INSTDIR\plugins\plugin_installer"
+ RMDir "$INSTDIR\plugins"
RMDir /r "$INSTDIR\icons\hicolor"
RMDir "$INSTDIR\icons"
RMDir /r "$INSTDIR\po\be"
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 8ae9bce2c7b9c81d80b23c8e7bbcd4ca5693a236..e6b04d04c79152c488aace10103e1f07c78679e5 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,15 +3,13 @@ INCLUDES = \
gajimpluginsdir = $(gajim_pluginsdir)
-installedplugins = acronyms_expander banner_tweaks ftp_manager length_notifier whiteboard
+dist_gajimplugins_PYTHON =
-installedpluginsfiles = $(wildcard ${srcdir}/${p}/*.py ${srcdir}/${p}/manifest.ini ${srcdir}/${p}/*.ui ${srcdir}/${p}/*.png)
+pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}}
-nobase_dist_gajimplugins_PYTHON = $(foreach p, ${installedplugins}, $(installedpluginsfiles))
+pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png)
+
+nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles))
-EXTRA_DIST = \
- $(srcdir)/*/*.py \
- $(srcdir)/*/manifest.ini \
- $(srcdir)/*/*.ui
MAINTAINERCLEANFILES = Makefile.in
diff --git a/plugins/acronyms_expander/acronyms_expander.py b/plugins/acronyms_expander/acronyms_expander.py
index 919f1a12c49d5c3ecc88e0f163bd402595d51247..d98e255ff2aae052068575852d36160cb0af3d81 100644
--- a/plugins/acronyms_expander/acronyms_expander.py
+++ b/plugins/acronyms_expander/acronyms_expander.py
@@ -36,6 +36,8 @@ class AcronymsExpanderPlugin(GajimPlugin):
@log_calls('AcronymsExpanderPlugin')
def init(self):
+ self.description = _('Replaces acronyms (or other strings) '
+ 'with given expansions/substitutes.')
self.config_dialog = None
self.gui_extension_points = {
@@ -44,7 +46,7 @@ class AcronymsExpanderPlugin(GajimPlugin):
}
self.config_default_values = {
- 'INVOKER': (' ', _('')),
+ 'INVOKER': (' ', ''),
'ACRONYMS': ({'RTFM': 'Read The Friendly Manual',
'/slap': '/me slaps',
'PS-': 'plug-in system',
@@ -53,7 +55,7 @@ class AcronymsExpanderPlugin(GajimPlugin):
'GW-': 'http://trac.gajim.org/',
'GTS-': 'http://trac.gajim.org/report',
},
- _('')),
+ ''),
}
@log_calls('AcronymsExpanderPlugin')
diff --git a/plugins/banner_tweaks/__init__.py b/plugins/banner_tweaks/__init__.py
deleted file mode 100644
index a328f68ee0ab591b645c7c2c3c600930175c29da..0000000000000000000000000000000000000000
--- a/plugins/banner_tweaks/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from plugin import BannerTweaksPlugin
diff --git a/plugins/banner_tweaks/config_dialog.ui b/plugins/banner_tweaks/config_dialog.ui
deleted file mode 100644
index 1994c1c9d0164814f1ee3af611a3149c847279ae..0000000000000000000000000000000000000000
--- a/plugins/banner_tweaks/config_dialog.ui
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkWindow" id="window1">
- <child>
- <object class="GtkVBox" id="banner_tweaks_config_vbox">
- <property name="visible">True</property>
- <property name="border_width">9</property>
- <property name="orientation">vertical</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkCheckButton" id="show_banner_image_checkbutton">
- <property name="label" translatable="yes">Display status icon</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">If checked, status icon will be displayed in chat window banner.</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_banner_image_checkbutton_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show_banner_online_msg_checkbutton">
- <property name="label" translatable="yes">Display status message of contact</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">If checked, status message of contact will be displayed in chat window banner.</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_banner_online_msg_checkbutton_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show_banner_resource_checkbutton">
- <property name="label" translatable="yes">Display resource name of contact</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">If checked, resource name of contact will be displayed in chat window banner.</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_banner_resource_checkbutton_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="banner_small_fonts_checkbutton">
- <property name="label" translatable="yes">Use small fonts for contact name and resource name</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">If checked, smaller font will be used to display resource name and contact name in chat window banner.</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_banner_small_fonts_checkbutton_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/plugins/banner_tweaks/manifest.ini b/plugins/banner_tweaks/manifest.ini
deleted file mode 100644
index 4cc3652f7f5d9b7e702831e4e982b8288d248a54..0000000000000000000000000000000000000000
--- a/plugins/banner_tweaks/manifest.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[info]
-name: Banner Tweaks
-short_name: banner_tweaks
-version: 0.1
-description: Allows user to tweak chat window banner appearance (eg. make it compact).
- Based on patch by pb in ticket #4133:
- http://trac.gajim.org/attachment/ticket/4133.
-authors = Mateusz Biliński <mateusz@bilinski.it>
-homepage = http://blog.bilinski.it
-
diff --git a/plugins/banner_tweaks/plugin.py b/plugins/banner_tweaks/plugin.py
deleted file mode 100644
index a100cfe456b4cb939aaef897c79f129173e6ed9e..0000000000000000000000000000000000000000
--- a/plugins/banner_tweaks/plugin.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- coding: utf-8 -*-
-
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-'''
-Adjustable chat window banner.
-
-Includes tweaks to make it compact.
-
-Based on patch by pb in ticket #4133:
-http://trac.gajim.org/attachment/ticket/4133/gajim-chatbanneroptions-svn10008.patch
-
-:author: Mateusz Biliński <mateusz@bilinski.it>
-:since: 30 July 2008
-:copyright: Copyright (2008) Mateusz Biliński <mateusz@bilinski.it>
-:license: GPL
-'''
-
-import sys
-
-import gtk
-import gobject
-import message_control
-from common import i18n
-from common import gajim
-from common import helpers
-
-from plugins import GajimPlugin
-from plugins.helpers import log, log_calls
-from plugins.gui import GajimPluginConfigDialog
-
-class BannerTweaksPlugin(GajimPlugin):
-
- @log_calls('BannerTweaksPlugin')
- def init(self):
- self.config_dialog = BannerTweaksPluginConfigDialog(self)
-
- self.gui_extension_points = {
- 'chat_control_base_draw_banner': (self.chat_control_base_draw_banner_called,
- self.chat_control_base_draw_banner_deactivation)
- }
-
- self.config_default_values = {
- 'show_banner_image': (True, _('If True, Gajim will display a status icon in the banner of chat windows.')),
- 'show_banner_online_msg': (True, _('If True, Gajim will display the status message of the contact in the banner of chat windows.')),
- 'show_banner_resource': (False, _('If True, Gajim will display the resource name of the contact in the banner of chat windows.')),
- 'banner_small_fonts': (False, _('If True, Gajim will use small fonts for contact name and resource name in the banner of chat windows.')),
- 'old_chat_avatar_height': (52, _('chat_avatar_height value before plugin was activated')),
- }
-
- @log_calls('BannerTweaksPlugin')
- def activate(self):
- self.config['old_chat_avatar_height'] = gajim.config.get('chat_avatar_height')
- #gajim.config.set('chat_avatar_height', 28)
-
- @log_calls('BannerTweaksPlugin')
- def deactivate(self):
- gajim.config.set('chat_avatar_height', self.config['old_chat_avatar_height'])
-
- @log_calls('BannerTweaksPlugin')
- def chat_control_base_draw_banner_called(self, chat_control):
- if not self.config['show_banner_online_msg']:
- chat_control.banner_status_label.hide()
- chat_control.banner_status_label.set_no_show_all(True)
- status_text = ''
- chat_control.banner_status_label.set_markup(status_text)
-
- if not self.config['show_banner_image']:
- if chat_control.TYPE_ID == message_control.TYPE_GC:
- banner_status_img = chat_control.xml.get_object(
- 'gc_banner_status_image')
- else:
- banner_status_img = chat_control.xml.get_object(
- 'banner_status_image')
- banner_status_img.clear()
-
- # TODO: part below repeats a lot of code from ChatControl.draw_banner_text()
- # This could be rewritten using re module: getting markup text from
- # banner_name_label and replacing some elements based on plugin config.
- # Would it be faster?
- if self.config['show_banner_resource'] or self.config['banner_small_fonts']:
- banner_name_label = chat_control.xml.get_object('banner_name_label')
- label_text = banner_name_label.get_label()
-
- contact = chat_control.contact
- jid = contact.jid
-
- name = contact.get_shown_name()
- if chat_control.resource:
- name += '/' + chat_control.resource
- elif contact.resource and self.config['show_banner_resource']:
- name += '/' + contact.resource
-
- if chat_control.TYPE_ID == message_control.TYPE_PM:
- name = _('%(nickname)s from group chat %(room_name)s') %\
- {'nickname': name, 'room_name': chat_control.room_name}
- name = gobject.markup_escape_text(name)
-
- # We know our contacts nick, but if another contact has the same nick
- # in another account we need to also display the account.
- # except if we are talking to two different resources of the same contact
- acct_info = ''
- for account in gajim.contacts.get_accounts():
- if account == chat_control.account:
- continue
- if acct_info: # We already found a contact with same nick
- break
- for jid in gajim.contacts.get_jid_list(account):
- other_contact_ = \
- gajim.contacts.get_first_contact_from_jid(account, jid)
- if other_contact_.get_shown_name() == chat_control.contact.get_shown_name():
- acct_info = ' (%s)' % \
- gobject.markup_escape_text(chat_control.account)
- break
-
- font_attrs, font_attrs_small = chat_control.get_font_attrs()
- if self.config['banner_small_fonts']:
- font_attrs = font_attrs_small
-
- st = gajim.config.get('displayed_chat_state_notifications')
- cs = contact.chatstate
- if cs and st in ('composing_only', 'all'):
- if contact.show == 'offline':
- chatstate = ''
- elif contact.composing_xep == 'XEP-0085':
- if st == 'all' or cs == 'composing':
- chatstate = helpers.get_uf_chatstate(cs)
- else:
- chatstate = ''
- elif contact.composing_xep == 'XEP-0022':
- if cs in ('composing', 'paused'):
- # only print composing, paused
- chatstate = helpers.get_uf_chatstate(cs)
- else:
- chatstate = ''
- else:
- # When does that happen ? See [7797] and [7804]
- chatstate = helpers.get_uf_chatstate(cs)
-
- label_text = '<span %s>%s</span><span %s>%s %s</span>' % \
- (font_attrs, name, font_attrs_small, acct_info, chatstate)
- else:
- # weight="heavy" size="x-large"
- label_text = '<span %s>%s</span><span %s>%s</span>' % \
- (font_attrs, name, font_attrs_small, acct_info)
-
- banner_name_label.set_markup(label_text)
-
- @log_calls('BannerTweaksPlugin')
- def chat_control_base_draw_banner_deactivation(self, chat_control):
- pass
- #chat_control.draw_banner()
-
-class BannerTweaksPluginConfigDialog(GajimPluginConfigDialog):
- def init(self):
- self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path(
- 'config_dialog.ui')
- self.xml = gtk.Builder()
- self.xml.set_translation_domain(i18n.APP)
- self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
- ['banner_tweaks_config_vbox'])
- self.config_vbox = self.xml.get_object('banner_tweaks_config_vbox')
- self.child.pack_start(self.config_vbox)
-
- self.show_banner_image_checkbutton = self.xml.get_object('show_banner_image_checkbutton')
- self.show_banner_online_msg_checkbutton = self.xml.get_object('show_banner_online_msg_checkbutton')
- self.show_banner_resource_checkbutton = self.xml.get_object('show_banner_resource_checkbutton')
- self.banner_small_fonts_checkbutton = self.xml.get_object('banner_small_fonts_checkbutton')
-
- self.xml.connect_signals(self)
-
- def on_run(self):
- self.show_banner_image_checkbutton.set_active(self.plugin.config['show_banner_image'])
- self.show_banner_online_msg_checkbutton.set_active(self.plugin.config['show_banner_online_msg'])
- self.show_banner_resource_checkbutton.set_active(self.plugin.config['show_banner_resource'])
- self.banner_small_fonts_checkbutton.set_active(self.plugin.config['banner_small_fonts'])
-
- def on_show_banner_image_checkbutton_toggled(self, button):
- self.plugin.config['show_banner_image'] = button.get_active()
-
- def on_show_banner_online_msg_checkbutton_toggled(self, button):
- self.plugin.config['show_banner_online_msg'] = button.get_active()
-
- def on_show_banner_resource_checkbutton_toggled(self, button):
- self.plugin.config['show_banner_resource'] = button.get_active()
-
- def on_banner_small_fonts_checkbutton_toggled(self, button):
- self.plugin.config['banner_small_fonts'] = button.get_active()
diff --git a/plugins/dbus_plugin/plugin.py b/plugins/dbus_plugin/plugin.py
index b7289aed0ad776d6102aaf681da6ac85d39557da..3a583a7cfab66f7afdcd9e41e0d76a71b8244f7d 100644
--- a/plugins/dbus_plugin/plugin.py
+++ b/plugins/dbus_plugin/plugin.py
@@ -688,6 +688,9 @@ class DBusPlugin(GajimPlugin):
@log_calls('DBusPlugin')
def init(self):
+ self.description = _('D-Bus support.'
+ ' Based on remote_control module from'
+ '\nGajim core but uses new events handling system.')
self.config_dialog = None
#self.gui_extension_points = {}
#self.config_default_values = {}
diff --git a/plugins/events_dump/plugin.py b/plugins/events_dump/plugin.py
index 0d102616597d22f976050f8a200996f28241acf6..19c5eccfcf41c64bfbebd55ab8b707f0281880a2 100644
--- a/plugins/events_dump/plugin.py
+++ b/plugins/events_dump/plugin.py
@@ -36,6 +36,7 @@ class EventsDumpPlugin(GajimPlugin):
@log_calls('EventsDumpPlugin')
def init(self):
+ self.description = _('Dumps info about selected events to console.')
self.config_dialog = None
#self.gui_extension_points = {}
#self.config_default_values = {}
diff --git a/plugins/ftp_manager/__init__.py b/plugins/ftp_manager/__init__.py
deleted file mode 100644
index f62c201a7425c75e1dce7cd201f384457dcdf0f2..0000000000000000000000000000000000000000
--- a/plugins/ftp_manager/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from ftp_manager import FtpManager
diff --git a/plugins/ftp_manager/config_dialog.ui b/plugins/ftp_manager/config_dialog.ui
deleted file mode 100644
index 20122f0e665af9a0207ee8ad5eab46c649da8a08..0000000000000000000000000000000000000000
--- a/plugins/ftp_manager/config_dialog.ui
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkTextBuffer" id="textbuffer1">
- <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property>
- </object>
- <object class="GtkWindow" id="window1">
- <child>
- <object class="GtkHPaned" id="hpaned2">
- <property name="width_request">600</property>
- <property name="height_request">350</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">340</property>
- <property name="position_set">True</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">6</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTreeView" id="available_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="search_column">1</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="plugin_name_label1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><empty></property>
- <property name="selectable">True</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Authors:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="plugin_authors_label1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">6</property>
- <property name="label" translatable="yes"><empty></property>
- <property name="selectable">True</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Homepage:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="plugin_homepage_linkbutton1">
- <property name="label" translatable="yes">button</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="focus_on_click">False</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Description:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTextView" id="plugin_description_textview1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="pixels_above_lines">6</property>
- <property name="wrap_mode">word</property>
- <property name="left_margin">6</property>
- <property name="right_margin">6</property>
- <property name="indent">1</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox15">
- <property name="visible">True</property>
- <child>
- <object class="GtkProgressBar" id="progressbar">
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="inslall_upgrade_button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_inslall_upgrade_clicked"/>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-refresh</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Install/Upgrade</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkWindow" id="window2">
- <child>
- <object class="GtkHBox" id="hbox111">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Ftp server:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="ftp_server">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/plugins/ftp_manager/ftp_manager.py b/plugins/ftp_manager/ftp_manager.py
deleted file mode 100644
index ba1aad6e4f77e6516579cd545de32121236477b1..0000000000000000000000000000000000000000
--- a/plugins/ftp_manager/ftp_manager.py
+++ /dev/null
@@ -1,460 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-## plugins/ftp_manager/ftp_manager.py
-##
-## Copyright (C) 2010 Denis Fomin <fominde AT gmail.com>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-import gtk
-import pango
-import gobject
-import ftplib
-import io
-import threading
-import ConfigParser
-import os
-import fnmatch
-import sys
-
-from common import gajim
-from plugins import GajimPlugin
-from plugins.helpers import log_calls, log
-from dialogs import WarningDialog, HigDialog
-from plugins.gui import GajimPluginConfigDialog
-from common import i18n
-
-
-class FtpManager(GajimPlugin):
-
- @log_calls('FtpManagerPlugin')
- def init(self):
- self.config_dialog = FtpManagerPluginConfigDialog(self)
- self.config_default_values = {'ftp_server': ('ftp.gajim.org', '')}
-
- @log_calls('FtpManagerPlugin')
- def activate(self):
- self.pl_menuitem = gajim.interface.roster.xml.get_object(
- 'plugins_menuitem')
- self.id_ = self.pl_menuitem.connect_after('activate', self.on_activate)
- if 'plugins' in gajim.interface.instances:
- self.on_activate(None)
-
- @log_calls('FtpManagerPlugin')
- def deactivate(self):
- self.pl_menuitem.disconnect(self.id_)
- if hasattr(self, 'page_num'):
- self.notebook.remove_page(self.page_num)
- self.notebook.set_current_page(0)
- if hasattr(self, 'ftp'):
- del self.ftp
-
- def on_activate(self, widget):
- if 'plugins' not in gajim.interface.instances:
- return
- self.installed_plugins_model = gajim.interface.instances[
- 'plugins'].installed_plugins_model
- self.notebook = gajim.interface.instances['plugins'].plugins_notebook
- self.id_n = self.notebook.connect('switch-page',
- self.on_notebook_switch_page)
- self.window = gajim.interface.instances['plugins'].window
- self.window.connect('destroy', self.on_win_destroy)
- self.GTK_BUILDER_FILE_PATH = self.local_file_path(
- 'config_dialog.ui')
- self.xml = gtk.Builder()
- self.xml.set_translation_domain(i18n.APP)
- self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
- ['hpaned2'])
- hpaned = self.xml.get_object('hpaned2')
- self.page_num = self.notebook.append_page(hpaned,
- gtk.Label('Ftp Manager'))
-
- widgets_to_extract = ('plugin_name_label1',
- 'available_treeview', 'progressbar', 'inslall_upgrade_button',
- 'plugin_authors_label1', 'plugin_authors_label1',
- 'plugin_homepage_linkbutton1', 'plugin_description_textview1')
-
- for widget_name in widgets_to_extract:
- setattr(self, widget_name, self.xml.get_object(widget_name))
-
- attr_list = pango.AttrList()
- attr_list.insert(pango.AttrWeight(pango.WEIGHT_BOLD, 0, -1))
- self.plugin_name_label1.set_attributes(attr_list)
-
- self.available_plugins_model = gtk.ListStore(gobject.TYPE_PYOBJECT,
- gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING,
- gobject.TYPE_BOOLEAN, gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT,
- gobject.TYPE_PYOBJECT)
- self.available_treeview.set_model(self.available_plugins_model)
-
- self.progressbar.set_property('no-show-all', True)
- renderer = gtk.CellRendererText()
- col = gtk.TreeViewColumn(_('Plugin'), renderer, text=1)
- col.set_resizable(True)
- col.set_property('expand', True)
- col.set_sizing(gtk.TREE_VIEW_COLUMN_GROW_ONLY)
- self.available_treeview.append_column(col)
- col = gtk.TreeViewColumn(_('Installed\nversion'), renderer, text=2)
- self.available_treeview.append_column(col)
- col = gtk.TreeViewColumn(_('Available\nversion'), renderer, text=3)
- col.set_property('expand', False)
- self.available_treeview.append_column(col)
-
- renderer = gtk.CellRendererToggle()
- renderer.set_property('activatable', True)
- renderer.connect('toggled', self.available_plugins_toggled_cb)
- col = gtk.TreeViewColumn(_('Install /\nUpgrade'), renderer, active=4)
- self.available_treeview.append_column(col)
-
- if gobject.signal_lookup('error_signal', self.window) is 0:
- gobject.signal_new('error_signal', self.window,
- gobject.SIGNAL_RUN_LAST, gobject.TYPE_STRING,
- (gobject.TYPE_STRING,))
- gobject.signal_new('plugin_downloaded', self.window,
- gobject.SIGNAL_RUN_LAST, gobject.TYPE_STRING,
- (gobject.TYPE_PYOBJECT,))
- self.window.connect('error_signal', self.on_some_ftp_error)
- self.window.connect('plugin_downloaded', self.on_plugin_downloaded)
-
- selection = self.available_treeview.get_selection()
- selection.connect('changed',
- self.available_plugins_treeview_selection_changed)
- selection.set_mode(gtk.SELECTION_SINGLE)
-
- self._clear_available_plugin_info()
- self.xml.connect_signals(self)
- self.window.show_all()
-
- def on_win_destroy(self, widget):
- if hasattr(self, 'ftp'):
- del self.ftp
-
- def available_plugins_toggled_cb(self, cell, path):
- is_active = self.available_plugins_model[path][4]
- self.available_plugins_model[path][4] = not is_active
- dir_list = []
- for i in xrange(len(self.available_plugins_model)):
- if self.available_plugins_model[i][4]:
- dir_list.append(self.available_plugins_model[i][0])
- if not dir_list:
- self.inslall_upgrade_button.set_property('sensitive', False)
- else:
- self.inslall_upgrade_button.set_property('sensitive', True)
-
- def on_notebook_switch_page(self, widget, page, page_num,):
- if not hasattr(self, 'ftp') and self.page_num == page_num:
- self.available_plugins_model.clear()
- self.progressbar.show()
- self.ftp = Ftp(self)
- self.ftp.remote_dirs = None
- self.ftp.start()
-
- def on_inslall_upgrade_clicked(self, widget):
- self.inslall_upgrade_button.set_property('sensitive', False)
- dir_list = []
- for i in xrange(len(self.available_plugins_model)):
- if self.available_plugins_model[i][4]:
- dir_list.append(self.available_plugins_model[i][0])
-
- ftp = Ftp(self)
- ftp.remote_dirs = dir_list
- ftp.start()
-
- def on_some_ftp_error(self, widget, error_text):
- for i in xrange(len(self.available_plugins_model)):
- self.available_plugins_model[i][4] = False
- self.progressbar.hide()
- WarningDialog('Ftp error', error_text, self.window)
-
- def on_plugin_downloaded(self, widget, plugin_dirs):
- for _dir in plugin_dirs:
- is_active = False
- plugins = None
- plugin_dir = os.path.join(gajim.PLUGINS_DIRS[1], _dir)
- plugin = gajim.plugin_manager.get_plugin_by_path(plugin_dir)
- if plugin:
- if plugin.active and plugin.name != self.name:
- is_active = True
- gobject.idle_add(gajim.plugin_manager.deactivate_plugin,
- plugin)
- gajim.plugin_manager.plugins.remove(plugin)
-
- model = self.installed_plugins_model
- for row in xrange(len(model)):
- if plugin == model[row][0]:
- model.remove(model.get_iter((row, 0)))
- break
-
- plugins = self.scan_dir_for_plugin(plugin_dir)
- if not plugins:
- continue
- gajim.plugin_manager.add_plugin(plugins[0])
- plugin = gajim.plugin_manager.plugins[-1]
- for row in xrange(len(self.available_plugins_model)):
- if plugin.name == self.available_plugins_model[row][1]:
- self.available_plugins_model[row][2] = plugin.version
- self.available_plugins_model[row][4] = False
- continue
- if is_active and plugin.name != self.name:
- gobject.idle_add(gajim.plugin_manager.activate_plugin, plugin)
- if plugin.name != 'Ftp Manager':
- self.installed_plugins_model.append([plugin, plugin.name,
- is_active])
- dialog = HigDialog(None, gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
- '', 'All selected plugins downloaded')
- dialog.set_modal(False)
- dialog.set_transient_for(self.window)
- dialog.popup()
-
- def available_plugins_treeview_selection_changed(self, treeview_selection):
- model, iter = treeview_selection.get_selected()
- if iter:
- self.plugin_name_label1.set_text(model.get_value(iter, 1))
- self.plugin_authors_label1.set_text(model.get_value(iter, 6))
- self.plugin_homepage_linkbutton1.set_uri(model.get_value(iter, 7))
- self.plugin_homepage_linkbutton1.set_label(model.get_value(iter, 7))
- label = self.plugin_homepage_linkbutton1.get_children()[0]
- label.set_ellipsize(pango.ELLIPSIZE_END)
- self.plugin_homepage_linkbutton1.set_property('sensitive', True)
- desc_textbuffer = self.plugin_description_textview1.get_buffer()
- desc_textbuffer.set_text(model.get_value(iter, 5))
- self.plugin_description_textview1.set_property('sensitive', True)
- else:
- self._clear_available_plugin_info()
-
- def _clear_available_plugin_info(self):
- self.plugin_name_label1.set_text('')
- self.plugin_authors_label1.set_text('')
- self.plugin_homepage_linkbutton1.set_uri('')
- self.plugin_homepage_linkbutton1.set_label('')
- self.plugin_homepage_linkbutton1.set_property('sensitive', False)
-
- desc_textbuffer = self.plugin_description_textview1.get_buffer()
- desc_textbuffer.set_text('')
- self.plugin_description_textview1.set_property('sensitive', False)
-
- def scan_dir_for_plugin(self, path):
- plugins_found = []
- conf = ConfigParser.ConfigParser()
- fields = ('name', 'short_name', 'version', 'description', 'authors',
- 'homepage')
- if not os.path.isdir(path):
- return plugins_found
-
- dir_list = os.listdir(path)
- dir_, mod = os.path.split(path)
- sys.path.insert(0, dir_)
-
- manifest_path = os.path.join(path, 'manifest.ini')
- if not os.path.isfile(manifest_path):
- return plugins_found
-
- for elem_name in dir_list:
- file_path = os.path.join(path, elem_name)
- module = None
-
- if os.path.isfile(file_path) and fnmatch.fnmatch(file_path, '*.py'):
- module_name = os.path.splitext(elem_name)[0]
- if module_name == '__init__':
- continue
- try:
- module = __import__('%s.%s' % (mod, module_name))
- except ValueError, value_error:
- pass
- except ImportError, import_error:
- pass
- except AttributeError, attribute_error:
- pass
- if module is None:
- continue
-
- for module_attr_name in [attr_name for attr_name in dir(module)
- if not (attr_name.startswith('__') or attr_name.endswith('__'))]:
- module_attr = getattr(module, module_attr_name)
- try:
- if not issubclass(module_attr, GajimPlugin) or \
- module_attr is GajimPlugin:
- continue
- module_attr.__path__ = os.path.abspath(os.path.dirname(
- file_path))
-
- # read metadata from manifest.ini
- conf.readfp(open(manifest_path, 'r'))
- for option in fields:
- if conf.get('info', option) is '':
- raise ConfigParser.NoOptionError, 'field empty'
- setattr(module_attr, option, conf.get('info', option))
- conf.remove_section('info')
- plugins_found.append(module_attr)
-
- except TypeError, type_error:
- pass
- except ConfigParser.NoOptionError, type_error:
- # all fields are required
- pass
- return plugins_found
-
-
-class Ftp(threading.Thread):
- def __init__(self, plugin):
- super(Ftp, self).__init__()
- self.window = plugin.window
- self.server = plugin.config['ftp_server']
- self.progressbar = plugin.progressbar
- self.model = plugin.available_plugins_model
- self.config = ConfigParser.ConfigParser()
- self.buffer_ = io.BytesIO()
- self.remote_dirs = None
- self.append_to_model = True
-
- def model_append(self, row):
- self.model.append(row)
- return False
-
- def progressbar_pulse(self):
- self.progressbar.pulse()
- return True
-
- def get_plugin_version(self, plugin_name):
- for plugin in gajim.plugin_manager.plugins:
- if plugin.name == plugin_name:
- return plugin.version
-
- def run(self):
- try:
- gobject.idle_add(self.progressbar.set_text,
- 'Connecting to server')
- self.ftp = ftplib.FTP(self.server)
- self.ftp.login()
- self.ftp.cwd('plugins')
- if not self.remote_dirs:
- self.plugins_dirs = self.ftp.nlst()
- progress_step = 1.0 / len(self.plugins_dirs)
- gobject.idle_add(self.progressbar.set_text,
- 'Scan files on the server')
- for dir_ in self.plugins_dirs:
- fract = self.progressbar.get_fraction() + progress_step
- gobject.idle_add(self.progressbar.set_fraction, fract)
- gobject.idle_add(self.progressbar.set_text,
- 'Read "%s"' % dir_)
- try:
- self.ftp.retrbinary('RETR %s/manifest.ini' % dir_,
- self.handleDownload)
- except Exception, error:
- if str(error).startswith('550'):
- continue
- self.config.readfp(io.BytesIO(self.buffer_.getvalue()))
- local_version = self.get_plugin_version(
- self.config.get('info', 'name'))
- gobject.idle_add(self.model_append, [dir_,
- self.config.get('info', 'name'), local_version,
- self.config.get('info', 'version'), False,
- self.config.get('info', 'description'),
- self.config.get('info', 'authors'),
- self.config.get('info', 'homepage'), ])
- self.plugins_dirs = None
- self.ftp.quit()
- gobject.idle_add(self.progressbar.set_fraction, 0)
- if self.remote_dirs:
- self.download_plugin()
- gobject.idle_add(self.progressbar.hide)
- except Exception, e:
- self.window.emit('error_signal', str(e))
-
- def handleDownload(self, block):
- self.buffer_.write(block)
-
- def download_plugin(self):
- gobject.idle_add(self.progressbar.show)
- self.pulse = gobject.timeout_add(150, self.progressbar_pulse)
- gobject.idle_add(self.progressbar.set_text,
- 'Create a list of files')
- for remote_dir in self.remote_dirs:
-
- def nlstr(dir_, subdir=None):
- if subdir:
- dir_ = dir_ + '/' + subdir
- list_ = self.ftp.nlst(dir_)
- for i in list_:
- name = i.split('/')[-1]
- if '.' not in name:
- try:
- if i == self.ftp.nlst(i)[0]:
- files.append(i[1:])
- del dirs[i[1:]]
- except Exception, e:
- # empty dir or file
- continue
- dirs.append(i[1:])
- subdirs = name
- nlstr(dir_, subdirs)
- else:
- files.append(i[1:])
- dirs, files = [], []
- nlstr('/plugins/' + remote_dir)
-
- if not os.path.isdir(gajim.PLUGINS_DIRS[1]):
- os.mkdir(gajim.PLUGINS_DIRS[1])
- local_dir = ld = os.path.join(gajim.PLUGINS_DIRS[1], remote_dir)
- if not os.path.isdir(local_dir):
- os.mkdir(local_dir)
- local_dir = os.path.split(gajim.PLUGINS_DIRS[1])[0]
-
- # creating dirs
- for dir_ in dirs:
- try:
- os.mkdir(os.path.join(local_dir, dir_))
- except OSError, e:
- if str(e).startswith('[Errno 17]'):
- continue
- raise
-
- # downloading files
- for filename in files:
- gobject.idle_add(self.progressbar.set_text,
- 'Downloading "%s"' % filename)
- full_filename = os.path.join(local_dir, filename)
- try:
- self.ftp.retrbinary('RETR /%s' % filename,
- open(full_filename, 'wb').write)
- #full_filename.close()
- except ftplib.error_perm:
- print 'ERROR: cannot read file "%s"' % filename
- os.unlink(filename)
- self.ftp.quit()
- self.window.emit('plugin_downloaded', self.remote_dirs)
- gobject.source_remove(self.pulse)
-
-
-class FtpManagerPluginConfigDialog(GajimPluginConfigDialog):
- def init(self):
- self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path(
- 'config_dialog.ui')
- self.xml = gtk.Builder()
- self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
- ['hbox111'])
- hbox = self.xml.get_object('hbox111')
- self.child.pack_start(hbox)
-
- self.xml.connect_signals(self)
- self.connect('hide', self.on_hide)
-
- def on_run(self):
- widget = self.xml.get_object('ftp_server')
- widget.set_text(str(self.plugin.config['ftp_server']))
-
- def on_hide(self, widget):
- widget = self.xml.get_object('ftp_server')
- self.plugin.config['ftp_server'] = widget.get_text()
diff --git a/plugins/ftp_manager/manifest.ini b/plugins/ftp_manager/manifest.ini
deleted file mode 100644
index 2689e51f1b39b5ee09ff7009b2e1832e4898061d..0000000000000000000000000000000000000000
--- a/plugins/ftp_manager/manifest.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[info]
-name: Ftp Manager
-short_name: ftp_manager
-version: 0.3
-description: Install and upgrade plugins from ftp
-authors: Denis Fomin <fominde@gmail.com>
-homepage: http://trac-plugins.gajim.org/wiki/
diff --git a/plugins/google_translation/__init__.py b/plugins/google_translation/__init__.py
deleted file mode 100644
index dc2c3bc369bad7a218fc4674d4ba8ae0765889ff..0000000000000000000000000000000000000000
--- a/plugins/google_translation/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from plugin import GoogleTranslationPlugin
diff --git a/plugins/google_translation/manifest.ini b/plugins/google_translation/manifest.ini
deleted file mode 100644
index 5abbe3d9fb2d3beed11993b9c8aac535272bb6f7..0000000000000000000000000000000000000000
--- a/plugins/google_translation/manifest.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[info]
-name: Google Translation
-short_name: google_translation
-version: 0.1
-description: Translates (currently only incoming) messages using Google Translate.
-authors = Mateusz Biliński <mateusz@bilinski.it>
-homepage = http://blog.bilinski.it
-
diff --git a/plugins/google_translation/plugin.py b/plugins/google_translation/plugin.py
deleted file mode 100644
index 9be29a8ef1e186d912af13be39e9992cf4f23237..0000000000000000000000000000000000000000
--- a/plugins/google_translation/plugin.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-'''
-Google Translation plugin.
-
-Translates (currently only incoming) messages using Google Translate.
-
-:note: consider this as proof-of-concept
-:author: Mateusz Biliński <mateusz@bilinski.it>
-:since: 25th August 2008
-:copyright: Copyright (2008) Mateusz Biliński <mateusz@bilinski.it>
-:license: GPL
-'''
-
-import re
-import urllib2
-import new
-from pprint import pformat
-from sys import getfilesystemencoding
-
-from common import helpers
-from common import gajim
-
-from plugins import GajimPlugin
-from plugins.helpers import log_calls, log
-from common import ged
-from common import nec
-
-class GoogleTranslationPlugin(GajimPlugin):
-
- @log_calls('GoogleTranslationPlugin')
- def init(self):
- self.config_dialog = None
- #self.gui_extension_points = {}
- self.config_default_values = {
- 'from_lang' :
- (u'en', _(u'Language of text to be translated')),
- 'to_lang' :
- (u'fr', _(u'Language to which translation will be made')),
- 'user_agent' :
- (u'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.12) '
- 'Gecko/20080213 Firefox/2.0.0.11',
- _(u'User Agent data to be used with urllib2 '
- 'when connecting to Google Translate service'))}
-
- #self.events_handlers = {}
-
- self.events = [GoogleTranslateMessageReceivedEvent]
-
- self.translated_text_re = re.compile(
- r'google.language.callbacks.id100\(\'22\','
- '{"translatedText":"(?P<text>[^"]*)"}, 200, null, 200\)')
-
- @log_calls('GoogleTranslationPlugin')
- def translate_text(self, text, from_lang, to_lang):
- # Converts text so it can be used within URL as query to Google
- # Translate.
- quoted_text = urllib2.quote(text.encode(getfilesystemencoding()))
- # prepare url
- headers = { 'User-Agent' : self.config['user_agent'] }
- translation_url = u'http://www.google.com/uds/Gtranslate?callback='\
- 'google.language.callbacks.id100&context=22&q=%(quoted_text)s&'\
- 'langpair=%(from_lang)s%%7C%(to_lang)s&key=notsupplied&v=1.0' % \
- locals()
- request = urllib2.Request(translation_url, headers=headers)
-
- try:
- response = urllib2.urlopen(request)
- except urllib2.URLError, e:
- # print e
- return text
-
- results = response.read()
- translated_text = self.translated_text_re.search(results).group('text')
-
- if translated_text:
- return translated_text
- return text
-
- @log_calls('GoogleTranslationPlugin')
- def activate(self):
- pass
-
- @log_calls('GoogleTranslationPlugin')
- def deactivate(self):
- pass
-
-class GoogleTranslateMessageReceivedEvent(nec.NetworkIncomingEvent):
- name = 'google-translate-message-received'
- base_network_events = ['raw-message-received']
-
- def generate(self):
- msg_type = self.base_event.stanza.attrs.get('type', None)
- if msg_type == u'chat':
- msg_text = "".join(self.base_event.stanza.kids[0].data)
- if msg_text:
- from_lang = self.plugin.config['from_lang']
- to_lang = self.plugin.config['to_lang']
- self.base_event.stanza.kids[0].setData(
- self.plugin.translate_text(msg_text, from_lang, to_lang))
-
- # We only want to modify old event, not emit another, so we return False
- # here.
- return False
diff --git a/plugins/length_notifier/__init__.py b/plugins/length_notifier/__init__.py
deleted file mode 100644
index 67c8c614aa62e20a5bc25a72e1eb0af1cba3d76e..0000000000000000000000000000000000000000
--- a/plugins/length_notifier/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from length_notifier import LengthNotifierPlugin
diff --git a/plugins/length_notifier/config_dialog.ui b/plugins/length_notifier/config_dialog.ui
deleted file mode 100644
index f06bfe1155cce882a64968f8c735348dc647f47b..0000000000000000000000000000000000000000
--- a/plugins/length_notifier/config_dialog.ui
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkWindow" id="window1">
- <child>
- <object class="GtkTable" id="length_notifier_config_table">
- <property name="visible">True</property>
- <property name="border_width">9</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">7</property>
- <property name="row_spacing">5</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="tooltip_text" translatable="yes">Message length at which notification is invoked.</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Message length:</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="tooltip_text" translatable="yes">Background color of text entry field in chat window when notification is invoked.</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Notification color:</property>
- </object>
- <packing>
- <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>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="tooltip_text" translatable="yes">JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). Use comma (without space) as separator. If empty plugin is used with every JID. </property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">JabberIDs to include:</property>
- </object>
- <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>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="jids_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). Use comma (without space) as separator. If empty plugin is used with every JID. </property>
- <signal name="editing_done" handler="on_jids_entry_editing_done"/>
- <signal name="changed" handler="on_jids_entry_changed"/>
- </object>
- <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">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <child>
- <object class="GtkColorButton" id="notification_colorbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Background color of text entry field in chat window when notification is invoked.</property>
- <property name="xalign">0</property>
- <property name="title" translatable="yes">Pick a color for notification</property>
- <property name="color">#000000000000</property>
- <signal name="color_set" handler="on_notification_colorbutton_color_set"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <child>
- <object class="GtkSpinButton" id="message_length_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Message length at which notification is invoked.</property>
- <property name="width_chars">6</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <signal name="value_changed" handler="on_message_length_spinbutton_value_changed"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/plugins/length_notifier/length_notifier.py b/plugins/length_notifier/length_notifier.py
deleted file mode 100644
index 5a05c91c623d485ae30c78117eda0aa8a93a09a5..0000000000000000000000000000000000000000
--- a/plugins/length_notifier/length_notifier.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# -*- coding: utf-8 -*-
-
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-'''
-Message length notifier plugin.
-
-:author: Mateusz Biliński <mateusz@bilinski.it>
-:since: 1st June 2008
-:copyright: Copyright (2008) Mateusz Biliński <mateusz@bilinski.it>
-:license: GPL
-'''
-
-import sys
-
-import gtk
-from common import i18n
-
-from plugins import GajimPlugin
-from plugins.helpers import log, log_calls
-from plugins.gui import GajimPluginConfigDialog
-
-class LengthNotifierPlugin(GajimPlugin):
-
- @log_calls('LengthNotifierPlugin')
- def init(self):
- self.config_dialog = LengthNotifierPluginConfigDialog(self)
-
- self.gui_extension_points = {
- 'chat_control' : (self.connect_with_chat_control,
- self.disconnect_from_chat_control)
- }
-
- self.config_default_values = {'MESSAGE_WARNING_LENGTH' : (140, _('Message length at which notification is invoked.')),
- 'WARNING_COLOR' : ('#F0DB3E', _('Background color of text entry field in chat window when notification is invoked.')),
- 'JIDS' : ([], _('JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). If empty plugin is used with every JID. [not implemented]'))
- }
-
- @log_calls('LengthNotifierPlugin')
- def textview_length_warning(self, tb, chat_control):
- tv = chat_control.msg_textview
- d = chat_control.length_notifier_plugin_data
- t = tb.get_text(tb.get_start_iter(), tb.get_end_iter())
- if t:
- len_t = len(t)
- #print("len_t: %d"%(len_t))
- if len_t>self.config['MESSAGE_WARNING_LENGTH']:
- if not d['prev_color']:
- d['prev_color'] = tv.style.copy().base[gtk.STATE_NORMAL]
- tv.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.config['WARNING_COLOR']))
- elif d['prev_color']:
- tv.modify_base(gtk.STATE_NORMAL, d['prev_color'])
- d['prev_color'] = None
-
- @log_calls('LengthNotifierPlugin')
- def connect_with_chat_control(self, chat_control):
- jid = chat_control.contact.jid
- if self.jid_is_ok(jid):
- d = {'prev_color' : None}
- tv = chat_control.msg_textview
- tb = tv.get_buffer()
- h_id = tb.connect('changed', self.textview_length_warning, chat_control)
- d['h_id'] = h_id
-
- t = tb.get_text(tb.get_start_iter(), tb.get_end_iter())
- if t:
- len_t = len(t)
- if len_t>self.config['MESSAGE_WARNING_LENGTH']:
- d['prev_color'] = tv.style.copy().base[gtk.STATE_NORMAL]
- tv.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(self.config['WARNING_COLOR']))
-
- chat_control.length_notifier_plugin_data = d
-
- return True
-
- return False
-
- @log_calls('LengthNotifierPlugin')
- def disconnect_from_chat_control(self, chat_control):
- try:
- d = chat_control.length_notifier_plugin_data
- tv = chat_control.msg_textview
- tv.get_buffer().disconnect(d['h_id'])
- if d['prev_color']:
- tv.modify_base(gtk.STATE_NORMAL, d['prev_color'])
- except AttributeError, error:
- pass
- #log.debug('Length Notifier Plugin was (probably) never connected with this chat window.\n Error: %s' % (error))
-
- @log_calls('LengthNotifierPlugin')
- def jid_is_ok(self, jid):
- if jid in self.config['JIDS'] or not self.config['JIDS']:
- return True
-
- return False
-
-class LengthNotifierPluginConfigDialog(GajimPluginConfigDialog):
- def init(self):
- self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path(
- 'config_dialog.ui')
- self.xml = gtk.Builder()
- self.xml.set_translation_domain(i18n.APP)
- self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
- ['length_notifier_config_table'])
- self.config_table = self.xml.get_object('length_notifier_config_table')
- self.child.pack_start(self.config_table)
-
- self.message_length_spinbutton = self.xml.get_object(
- 'message_length_spinbutton')
- self.message_length_spinbutton.get_adjustment().set_all(140, 0, 500, 1,
- 10, 0)
- self.notification_colorbutton = self.xml.get_object(
- 'notification_colorbutton')
- self.jids_entry = self.xml.get_object('jids_entry')
-
- self.xml.connect_signals(self)
-
- def on_run(self):
- self.message_length_spinbutton.set_value(self.plugin.config['MESSAGE_WARNING_LENGTH'])
- self.notification_colorbutton.set_color(gtk.gdk.color_parse(self.plugin.config['WARNING_COLOR']))
- #self.jids_entry.set_text(self.plugin.config['JIDS'])
- self.jids_entry.set_text(','.join(self.plugin.config['JIDS']))
-
- @log_calls('LengthNotifierPluginConfigDialog')
- def on_message_length_spinbutton_value_changed(self, spinbutton):
- self.plugin.config['MESSAGE_WARNING_LENGTH'] = spinbutton.get_value()
-
- @log_calls('LengthNotifierPluginConfigDialog')
- def on_notification_colorbutton_color_set(self, colorbutton):
- self.plugin.config['WARNING_COLOR'] = colorbutton.get_color().to_string()
-
- @log_calls('LengthNotifierPluginConfigDialog')
- def on_jids_entry_changed(self, entry):
- text = entry.get_text()
- if len(text)>0:
- self.plugin.config['JIDS'] = entry.get_text().split(',')
- else:
- self.plugin.config['JIDS'] = []
-
- @log_calls('LengthNotifierPluginConfigDialog')
- def on_jids_entry_editing_done(self, entry):
- pass
diff --git a/plugins/length_notifier/manifest.ini b/plugins/length_notifier/manifest.ini
deleted file mode 100644
index d50feaa8d14e6d49a22fc3681bf0968243ac32f6..0000000000000000000000000000000000000000
--- a/plugins/length_notifier/manifest.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[info]
-name: Message Length Notifier
-short_name: length_notifier
-version: 0.1
-description: Highlights message entry field in chat window when given length of message is exceeded.
-authors = Mateusz Biliński <mateusz@bilinski.it>
-homepage = http://blog.bilinski.it
-
-
diff --git a/plugins/new_events_example/plugin.py b/plugins/new_events_example/plugin.py
index d113bd54d3cd216165dabb15784a1bd6c9fe9eec..f66c0dda2383ffcaa0d2d9139ff838e617116854 100644
--- a/plugins/new_events_example/plugin.py
+++ b/plugins/new_events_example/plugin.py
@@ -41,6 +41,8 @@ class NewEventsExamplePlugin(GajimPlugin):
@log_calls('NewEventsExamplePlugin')
def init(self):
+ self.description = _('Shows how to generate new network events based '
+ 'on existing one using Network Events Controller.')
self.config_dialog = None
#self.gui_extension_points = {}
#self.config_default_values = {}
diff --git a/plugins/roster_buttons/plugin.py b/plugins/roster_buttons/plugin.py
index 398804407f0a9b1143cf17171641dcde228a33ff..026658b5e79ebf976f772ccbcf7e2979b1499d05 100644
--- a/plugins/roster_buttons/plugin.py
+++ b/plugins/roster_buttons/plugin.py
@@ -27,7 +27,6 @@ Roster buttons plug-in.
import sys
import gtk
-from common import i18n
from common import gajim
from plugins import GajimPlugin
@@ -37,6 +36,7 @@ class RosterButtonsPlugin(GajimPlugin):
@log_calls('RosterButtonsPlugin')
def init(self):
+ self.description = _('Adds quick action buttons to roster window.')
self.GTK_BUILDER_FILE_PATH = self.local_file_path('roster_buttons.ui')
self.roster_vbox = gajim.interface.roster.xml.get_object('roster_vbox2')
self.show_offline_contacts_menuitem = gajim.interface.roster.xml.get_object('show_offline_contacts_menuitem')
@@ -46,7 +46,7 @@ class RosterButtonsPlugin(GajimPlugin):
@log_calls('RosterButtonsPlugin')
def activate(self):
self.xml = gtk.Builder()
- self.xml.set_translation_domain(i18n.APP)
+ self.xml.set_translation_domain('gajim_plugins')
self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
['roster_buttons_buttonbox'])
self.buttonbox = self.xml.get_object('roster_buttons_buttonbox')
diff --git a/plugins/roster_buttons/roster_buttons.ui b/plugins/roster_buttons/roster_buttons.ui
index b91b0d2a63094cd5b149c89481dbd86bf7e40482..3ed25235b31c12b74dc02dd802f8987e180f742f 100644
--- a/plugins/roster_buttons/roster_buttons.ui
+++ b/plugins/roster_buttons/roster_buttons.ui
@@ -10,7 +10,7 @@
<property name="layout_style">spread</property>
<child>
<object class="GtkButton" id="roster_button_1">
- <property name="label" translatable="yes">1</property>
+ <property name="label">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -24,7 +24,7 @@
</child>
<child>
<object class="GtkButton" id="roster_button_2">
- <property name="label" translatable="yes">2</property>
+ <property name="label">2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -38,7 +38,7 @@
</child>
<child>
<object class="GtkButton" id="roster_button_3">
- <property name="label" translatable="yes">3</property>
+ <property name="label">3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -52,7 +52,7 @@
</child>
<child>
<object class="GtkButton" id="roster_button_4">
- <property name="label" translatable="yes">4</property>
+ <property name="label">4</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/plugins/snarl_notifications/plugin.py b/plugins/snarl_notifications/plugin.py
index 7dfe24d269c0e66ac6dd590adc71ea4392bc81d1..82247c5e6911c8f189d59ecfb328faf2cabe71cc 100644
--- a/plugins/snarl_notifications/plugin.py
+++ b/plugins/snarl_notifications/plugin.py
@@ -41,6 +41,10 @@ class SnarlNotificationsPlugin(GajimPlugin):
@log_calls('SnarlNotificationsPlugin')
def init(self):
+ self.description = _('Shows events notification using Snarl '
+ '(http://www.fullphat.net/) under Windows. '
+ 'Snarl needs to be installed in system.\n'
+ 'PySnarl bindings are used (http://code.google.com/p/pysnarl/).')
self.config_dialog = None
#self.gui_extension_points = {}
#self.config_default_values = {}
diff --git a/plugins/triggers/__init__.py b/plugins/triggers/__init__.py
deleted file mode 100644
index 4f8d9f87b5e8f8b9f38cc582865826ba91c54048..0000000000000000000000000000000000000000
--- a/plugins/triggers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from triggers import Triggers
diff --git a/plugins/triggers/config_dialog.ui b/plugins/triggers/config_dialog.ui
deleted file mode 100644
index 68a53be20a9994b9d156c12a84ab3ad6c24b1862..0000000000000000000000000000000000000000
--- a/plugins/triggers/config_dialog.ui
+++ /dev/null
@@ -1,900 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">contact(s)</col>
- </row>
- <row>
- <col id="0" translatable="yes">group(s)</col>
- </row>
- <row>
- <col id="0" translatable="yes">everybody</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="liststore2">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Receive a Message</col>
- </row>
- </data>
- </object>
- <object class="GtkWindow" id="advanced_notifications_window">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Advanced Notifications Control</property>
- <property name="role">Advanced Notifications Control</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">True</property>
- <child>
- <object class="GtkVBox" id="vbox">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkVBox" id="vbox100">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow23">
- <property name="height_request">90</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="conditions_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="cursor_changed" handler="on_conditions_treeview_cursor_changed"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment99">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="left_padding">212</property>
- <child>
- <object class="GtkHBox" id="hbox3045">
- <property name="visible">True</property>
- <child>
- <object class="GtkHButtonBox" id="hbuttonbox2">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <object class="GtkButton" id="new_button">
- <property name="label">gtk-new</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_new_button_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="up_button">
- <property name="label">gtk-go-up</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_up_button_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="down_button">
- <property name="label">gtk-go-down</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_down_button_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="delete_button">
- <property name="label">gtk-delete</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_delete_button_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="config_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label391">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Conditions</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox101">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkHBox" id="hbox3042">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label401">
- <property name="visible">True</property>
- <property name="label" translatable="yes">When </property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="event_combobox">
- <property name="visible">True</property>
- <property name="model">liststore2</property>
- <signal name="changed" handler="on_event_combobox_changed"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox3048">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label400">
- <property name="visible">True</property>
- <property name="label" translatable="yes">for </property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="recipient_type_combobox">
- <property name="visible">True</property>
- <property name="model">liststore1</property>
- <signal name="changed" handler="on_recipient_type_combobox_changed"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="recipient_list_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="no_show_all">True</property>
- <signal name="changed" handler="on_recipient_list_entry_changed"/>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox3049">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label402">
- <property name="visible">True</property>
- <property name="label" translatable="yes">when I'm in</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="status_hbox">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkRadioButton" id="all_status_rb">
- <property name="label" translatable="yes">All statuses</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_status_radiobutton_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="special_status_rb">
- <property name="label" translatable="yes">One or more special statuses...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">all_status_rb</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="online_cb">
- <property name="label" translatable="yes">Online / Free For Chat</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_status_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="away_cb">
- <property name="label" translatable="yes">Away</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_status_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="xa_cb">
- <property name="label" translatable="yes">Not Available</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_status_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="dnd_cb">
- <property name="label" translatable="yes">Busy </property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_status_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="invisible_cb">
- <property name="label" translatable="yes">Invisible</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_status_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox3053">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label408">
- <property name="visible">True</property>
- <property name="label" translatable="yes">and I </property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="tab_opened_cb">
- <property name="label" translatable="yes">Have </property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_tab_opened_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="not_tab_opened_cb">
- <property name="label" translatable="yes">Don't have </property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_not_tab_opened_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label409">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> a window/tab opened with that contact </property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label392">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Actions</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame35">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkHBox" id="hbox3027">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="use_popup_cb">
- <property name="label" translatable="yes">_Inform me with a popup window</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_use_popup_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="disable_popup_cb">
- <property name="label" translatable="yes">_Disable existing popup window</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_disable_popup_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkFrame" id="frame38">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment93">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox98">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkHBox" id="hbox3028">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkCheckButton" id="use_sound_cb">
- <property name="label" translatable="yes">Play a sound</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_use_sound_cb_toggled"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="sound_file_hbox">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkEntry" id="sound_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_sound_entry_changed"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button4">
- <property name="label">...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_browse_for_sounds_button_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="play_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="on_play_button_clicked"/>
- <child>
- <object class="GtkImage" id="image1372">
- <property name="visible">True</property>
- <property name="stock">gtk-media-play</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="disable_sound_cb">
- <property name="label" translatable="yes">_Disable existing sound for this event</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_disable_sound_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label394">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Sounds</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox3032">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="use_auto_open_cb">
- <property name="label" translatable="yes">_Open chat window with user</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_use_auto_open_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="disable_auto_open_cb">
- <property name="label" translatable="yes">_Disable auto opening chat window</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_disable_auto_open_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander" id="expander1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
- <child>
- <object class="GtkVBox" id="vbox99">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkHBox" id="hbox3033">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="run_command_cb">
- <property name="label" translatable="yes">Launch a command</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_run_command_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="command_entry">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_command_entry_changed"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox3035">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="use_systray_cb">
- <property name="label" translatable="yes">_Show event in notification area</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_use_systray_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="disable_systray_cb">
- <property name="label" translatable="yes">_Disable showing event in notification area</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_disable_systray_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox3052">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="use_roster_cb">
- <property name="label" translatable="yes">_Show event in roster</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_use_roster_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="disable_roster_cb">
- <property name="label" translatable="yes">_Disable showing event in roster</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_disable_roster_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="use_urgency_hint_cb">
- <property name="label" translatable="yes">_Activate window manager's UrgencyHint to make chat window in taskbar flash</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_use_urgency_hint_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="disable_urgency_hint_cb">
- <property name="label" translatable="yes">_Deactivate window manager's UrgencyHint</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_disable_urgency_hint_cb_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label395">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Advanced Actions</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
diff --git a/plugins/triggers/manifest.ini b/plugins/triggers/manifest.ini
deleted file mode 100644
index 79e85f38c6a41af1f065a89da96cda7a74c0c7c9..0000000000000000000000000000000000000000
--- a/plugins/triggers/manifest.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[info]
-name: Triggers
-short_name: triggers
-version: 0.0.1
-description: Configure Gajim's behaviour for each contact
-authors: Yann Leboulanger <asterix@lagaule.org>
-homepage: http://trac.gajim.org/wiki/
diff --git a/plugins/triggers/triggers.py b/plugins/triggers/triggers.py
deleted file mode 100644
index 5c968516ecb3e8bc4c8706427f8d5e1fcf6337d4..0000000000000000000000000000000000000000
--- a/plugins/triggers/triggers.py
+++ /dev/null
@@ -1,637 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-## plugins/triggers/triggers.py
-##
-## Copyright (C) 2011 Yann Leboulanger <asterix AT lagaule.org>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-import gtk
-import sys
-
-from common import gajim
-from plugins import GajimPlugin
-from plugins.helpers import log_calls, log
-from plugins.gui import GajimPluginConfigDialog
-from common import i18n
-from common import ged
-from common import helpers
-
-
-class Triggers(GajimPlugin):
-
- @log_calls('TriggersPlugin')
- def init(self):
- self.config_dialog = TriggersPluginConfigDialog(self)
- self.config_default_values = {}
-
- self.events_handlers = {'notification' : (ged.PREGUI, self._nec_notif),
- 'decrypted-message-received': (ged.PREGUI2,
- self._nec_decrypted_message_received)}
-
- def _check_rule_recipients(self, obj, rule):
- rule_recipients = [t.strip() for t in rule['recipients'].split(',')]
- if rule['recipient_type'] == 'contact' and obj.jid not in \
- rule_recipients:
- return False
- contact_groups = gajim.contacts.get_first_contact_from_jid(
- obj.conn.name, obj.jid).groups
- group_found = False
- for group in contact_groups:
- if group in rule_recipients:
- group_found = True
- break
- if rule['recipient_type'] == 'group' and not group_found:
- return False
-
- return True
-
- def _check_rule_status(self, obj, rule):
- rule_statuses = rule['status'].split()
- our_status = gajim.SHOW_LIST[obj.conn.connected]
- if rule['status'] != 'all' and our_status not in rule_statuses:
- return False
-
- return True
-
- def _check_rule_tab_opened(self, obj, rule):
- if rule['tab_opened'] == 'both':
- return True
- tab_opened = False
- if gajim.interface.msg_win_mgr.get_control(obj.jid, obj.conn.name):
- tab_opened = True
- if tab_opened and rule['tab_opened'] == 'no':
- return False
- elif not tab_opened and rule['tab_opened'] == 'yes':
- return False
-
- return True
-
- def check_rule_apply_notif(self, obj, rule):
- # Check notification type
- notif_type = ''
- if obj.notif_type == 'msg':
- notif_type = 'message_received'
- if notif_type != rule['event']:
- return False
-
- # notification type is ok. Now check recipient
- if not self._check_rule_recipients(obj, rule):
- return False
-
- # recipient is ok. Now check our status
- if not self._check_rule_status(obj, rule):
- return False
-
- # our_status is ok. Now check opened chat window
- if not self._check_rule_tab_opened(obj, rule):
- return False
-
- # All is ok
- return True
-
- def check_rule_apply_decrypted_msg(self, obj, rule):
- # Check notification type
- if rule['event'] != 'message_received':
- return False
-
- # notification type is ok. Now check recipient
- if not self._check_rule_recipients(obj, rule):
- return False
-
- # recipient is ok. Now check our status
- if not self._check_rule_status(obj, rule):
- return False
-
- # our_status is ok. Now check opened chat window
- if not self._check_rule_tab_opened(obj, rule):
- return False
-
- # All is ok
- return True
-
- def apply_rule(self, obj, rule):
- if rule['sound'] == 'no':
- obj.do_sound = False
- elif rule['sound'] == 'yes':
- obj.do_sound = True
- obj.sound_event = ''
- obj.sound_file = rule['sound_file']
-
- if rule['popup'] == 'no':
- obj.do_popup = False
- elif rule['popup'] == 'yes':
- obj.do_popup = True
-
- if rule['run_command']:
- obj.do_command = True
- obj.command = rule['command']
- else:
- obj.do_command = False
-
- if rule['systray'] == 'no':
- obj.show_in_notification_area = False
- elif rule['systray'] == 'yes':
- obj.show_in_notification_area = True
-
- if rule['roster'] == 'no':
- obj.show_in_roster = False
- elif rule['roster'] == 'yes':
- obj.show_in_roster = True
-
-# if rule['urgency_hint'] == 'no':
-# ?? not in obj actions
-# elif rule['urgency_hint'] == 'yes':
-
- def _nec_notif(self, obj):
- # check rules in order
- rules_num = [int(i) for i in self.config.keys()]
- rules_num.sort()
- for num in rules_num:
- if self.check_rule_apply_notif(obj, self.config[str(num)]):
- self.apply_rule(obj, self.config[str(num)])
- # Should we stop after first valid rule ?
- # break
-
- def _nec_decrypted_message_received(self, obj):
- rules_num = [int(i) for i in self.config.keys()]
- rules_num.sort()
- for num in rules_num:
- rule = self.config[str(num)]
- if self.check_rule_apply_decrypted_msg(obj, rule):
- if rule['auto_open'] == 'no':
- obj.popup = False
- elif rule['auto_open'] == 'yes':
- obj.popup = True
-
-
-class TriggersPluginConfigDialog(GajimPluginConfigDialog):
- events_list = ['message_received']#, 'contact_connected',
- #'contact_disconnected', 'contact_change_status', 'gc_msg_highlight',
- #'gc_msg']
- recipient_types_list = ['contact', 'group', 'all']
- config_options = ['event', 'recipient_type', 'recipients', 'status',
- 'tab_opened', 'sound', 'sound_file', 'popup', 'auto_open',
- 'run_command', 'command', 'systray', 'roster', 'urgency_hint']
-
- def init(self):
- self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path(
- 'config_dialog.ui')
- self.xml = gtk.Builder()
- self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
- ['vbox', 'liststore1', 'liststore2'])
- vbox = self.xml.get_object('vbox')
- self.child.pack_start(vbox)
-
- self.xml.connect_signals(self)
- self.connect('hide', self.on_hide)
-
- def on_run(self):
- # fill window
- for w in ('conditions_treeview', 'config_vbox', 'event_combobox',
- 'recipient_type_combobox', 'recipient_list_entry', 'delete_button',
- 'status_hbox', 'use_sound_cb', 'disable_sound_cb', 'use_popup_cb',
- 'disable_popup_cb', 'use_auto_open_cb', 'disable_auto_open_cb',
- 'use_systray_cb', 'disable_systray_cb', 'use_roster_cb',
- 'disable_roster_cb', 'tab_opened_cb', 'not_tab_opened_cb',
- 'sound_entry', 'sound_file_hbox', 'up_button', 'down_button',
- 'run_command_cb', 'command_entry', 'use_urgency_hint_cb',
- 'disable_urgency_hint_cb'):
- self.__dict__[w] = self.xml.get_object(w)
-
- self.config = {}
- for n in self.plugin.config:
- self.config[int(n)] = self.plugin.config[n]
-
- # Contains status checkboxes
- childs = self.status_hbox.get_children()
-
- self.all_status_rb = childs[0]
- self.special_status_rb = childs[1]
- self.online_cb = childs[2]
- self.away_cb = childs[3]
- self.xa_cb = childs[4]
- self.dnd_cb = childs[5]
- self.invisible_cb = childs[6]
-
- if not self.conditions_treeview.get_column(0):
- # window never opened
- model = gtk.ListStore(int, str)
- model.set_sort_column_id(0, gtk.SORT_ASCENDING)
- self.conditions_treeview.set_model(model)
-
- # means number
- col = gtk.TreeViewColumn(_('#'))
- self.conditions_treeview.append_column(col)
- renderer = gtk.CellRendererText()
- col.pack_start(renderer, expand=False)
- col.set_attributes(renderer, text=0)
-
- col = gtk.TreeViewColumn(_('Condition'))
- self.conditions_treeview.append_column(col)
- renderer = gtk.CellRendererText()
- col.pack_start(renderer, expand=True)
- col.set_attributes(renderer, text=1)
- else:
- model = self.conditions_treeview.get_model()
-
- model.clear()
-
- # Fill conditions_treeview
- num = 0
- while num in self.config:
- iter_ = model.append((num, ''))
- path = model.get_path(iter_)
- self.conditions_treeview.set_cursor(path)
- self.active_num = num
- self.initiate_rule_state()
- self.set_treeview_string()
- num += 1
-
- # No rule selected at init time
- self.conditions_treeview.get_selection().unselect_all()
- self.active_num = -1
- self.config_vbox.set_sensitive(False)
- self.delete_button.set_sensitive(False)
- self.down_button.set_sensitive(False)
- self.up_button.set_sensitive(False)
-
- def initiate_rule_state(self):
- """
- Set values for all widgets
- """
- if self.active_num < 0:
- return
- # event
- value = self.config[self.active_num]['event']
- if value:
- self.event_combobox.set_active(self.events_list.index(value))
- else:
- self.event_combobox.set_active(-1)
- # recipient_type
- value = self.config[self.active_num]['recipient_type']
- if value:
- self.recipient_type_combobox.set_active(
- self.recipient_types_list.index(value))
- else:
- self.recipient_type_combobox.set_active(-1)
- # recipient
- value = self.config[self.active_num]['recipients']
- if not value:
- value = ''
- self.recipient_list_entry.set_text(value)
- # status
- value = self.config[self.active_num]['status']
- if value == 'all':
- self.all_status_rb.set_active(True)
- else:
- self.special_status_rb.set_active(True)
- values = value.split()
- for v in ('online', 'away', 'xa', 'dnd', 'invisible'):
- if v in values:
- self.__dict__[v + '_cb'].set_active(True)
- else:
- self.__dict__[v + '_cb'].set_active(False)
- self.on_status_radiobutton_toggled(self.all_status_rb)
-
- # tab_opened
- value = self.config[self.active_num]['tab_opened']
- self.tab_opened_cb.set_active(True)
- self.not_tab_opened_cb.set_active(True)
- if value == 'no':
- self.tab_opened_cb.set_active(False)
- elif value == 'yes':
- self.not_tab_opened_cb.set_active(False)
-
- # sound_file
- value = self.config[self.active_num]['sound_file']
- self.sound_entry.set_text(value)
-
- # sound, popup, auto_open, systray, roster
- for option in ('sound', 'popup', 'auto_open', 'systray', 'roster',
- 'urgency_hint'):
- value = self.config[self.active_num][option]
- if value == 'yes':
- self.__dict__['use_' + option + '_cb'].set_active(True)
- else:
- self.__dict__['use_' + option + '_cb'].set_active(False)
- if value == 'no':
- self.__dict__['disable_' + option + '_cb'].set_active(True)
- else:
- self.__dict__['disable_' + option + '_cb'].set_active(False)
-
- # run_command
- value = self.config[self.active_num]['run_command']
- self.run_command_cb.set_active(value)
-
- # command
- value = self.config[self.active_num]['command']
- self.command_entry.set_text(value)
-
- def set_treeview_string(self):
- (model, iter_) = self.conditions_treeview.get_selection().get_selected()
- if not iter_:
- return
- event = self.event_combobox.get_active_text()
- recipient_type = self.recipient_type_combobox.get_active_text()
- recipient = ''
- if recipient_type != 'everybody':
- recipient = self.recipient_list_entry.get_text()
- if self.all_status_rb.get_active():
- status = ''
- else:
- status = _('when I am ')
- for st in ('online', 'away', 'xa', 'dnd', 'invisible'):
- if self.__dict__[st + '_cb'].get_active():
- status += helpers.get_uf_show(st) + ' '
- model[iter_][1] = "When %s for %s %s %s" % (event, recipient_type,
- recipient, status)
-
- def on_conditions_treeview_cursor_changed(self, widget):
- (model, iter_) = widget.get_selection().get_selected()
- if not iter_:
- self.active_num = ''
- return
- self.active_num = model[iter_][0]
- if self.active_num == '0':
- self.up_button.set_sensitive(False)
- else:
- self.up_button.set_sensitive(True)
- max = self.conditions_treeview.get_model().iter_n_children(None)
- if self.active_num == max - 1:
- self.down_button.set_sensitive(False)
- else:
- self.down_button.set_sensitive(True)
- self.initiate_rule_state()
- self.config_vbox.set_sensitive(True)
- self.delete_button.set_sensitive(True)
-
- def on_new_button_clicked(self, widget):
- model = self.conditions_treeview.get_model()
- num = self.conditions_treeview.get_model().iter_n_children(None)
- self.config[num] = {'event': '', 'recipient_type': 'all',
- 'recipients': '', 'status': 'all', 'tab_opened': 'both',
- 'sound': '', 'sound_file': '', 'popup': '', 'auto_open': '',
- 'run_command': False, 'command': '', 'systray': '', 'roster': '',
- 'urgency_hint': False}
- iter_ = model.append((num, ''))
- path = model.get_path(iter_)
- self.conditions_treeview.set_cursor(path)
- self.active_num = num
- self.set_treeview_string()
- self.config_vbox.set_sensitive(True)
-
- def on_delete_button_clicked(self, widget):
- (model, iter_) = self.conditions_treeview.get_selection().get_selected()
- if not iter_:
- return
- # up all others
- iter2 = model.iter_next(iter_)
- num = self.active_num
- while iter2:
- num = model[iter2][0]
- model[iter2][0] = num - 1
- self.config[num-1] = self.config[num].copy()
- iter2 = model.iter_next(iter2)
- model.remove(iter_)
- del self.config[num]
- self.active_num = ''
- self.config_vbox.set_sensitive(False)
- self.delete_button.set_sensitive(False)
- self.up_button.set_sensitive(False)
- self.down_button.set_sensitive(False)
-
- def on_up_button_clicked(self, widget):
- (model, iter_) = self.conditions_treeview.get_selection().get_selected()
- if not iter_:
- return
- conf = self.config[self.active_num].copy()
- self.config[self.active_num] = self.config[self.active_num - 1]
- self.config[self.active_num - 1] = conf
-
- model[iter_][0] =self.active_num - 1
- # get previous iter
- path = model.get_path(iter_)
- iter_ = model.get_iter((path[0] - 1,))
- model[iter_][0] = self.active_num
- self.on_conditions_treeview_cursor_changed(self.conditions_treeview)
-
- def on_down_button_clicked(self, widget):
- (model, iter_) = self.conditions_treeview.get_selection().get_selected()
- if not iter_:
- return
- conf = self.config[self.active_num].copy()
- self.config[self.active_num] = self.config[self.active_num + 1]
- self.config[self.active_num + 1] = conf
-
- model[iter_][0] = self.active_num + 1
- iter_ = model.iter_next(iter_)
- model[iter_][0] = self.active_num
- self.on_conditions_treeview_cursor_changed(self.conditions_treeview)
-
- def on_event_combobox_changed(self, widget):
- if self.active_num < 0:
- return
- active = self.event_combobox.get_active()
- if active == -1:
- event = ''
- else:
- event = self.events_list[active]
- self.config[self.active_num]['event'] = event
- self.set_treeview_string()
-
- def on_recipient_type_combobox_changed(self, widget):
- if self.active_num < 0:
- return
- recipient_type = self.recipient_types_list[
- self.recipient_type_combobox.get_active()]
- self.config[self.active_num]['recipient_type'] = recipient_type
- if recipient_type == 'all':
- self.recipient_list_entry.hide()
- else:
- self.recipient_list_entry.show()
- self.set_treeview_string()
-
- def on_recipient_list_entry_changed(self, widget):
- if self.active_num < 0:
- return
- recipients = widget.get_text().decode('utf-8')
- #TODO: do some check
- self.config[self.active_num]['recipients'] = recipients
- self.set_treeview_string()
-
- def set_status_config(self):
- if self.active_num < 0:
- return
- status = ''
- for st in ('online', 'away', 'xa', 'dnd', 'invisible'):
- if self.__dict__[st + '_cb'].get_active():
- status += st + ' '
- if status:
- status = status[:-1]
- self.config[self.active_num]['status'] = status
- self.set_treeview_string()
-
- def on_status_radiobutton_toggled(self, widget):
- if self.active_num < 0:
- return
- if self.all_status_rb.get_active():
- self.config[self.active_num]['status'] = 'all'
- # 'All status' clicked
- for st in ('online', 'away', 'xa', 'dnd', 'invisible'):
- self.__dict__[st + '_cb'].hide()
-
- self.special_status_rb.show()
- else:
- self.set_status_config()
- # 'special status' clicked
- for st in ('online', 'away', 'xa', 'dnd', 'invisible'):
- self.__dict__[st + '_cb'].show()
-
- self.special_status_rb.hide()
- self.set_treeview_string()
-
- def on_status_cb_toggled(self, widget):
- if self.active_num < 0:
- return
- self.set_status_config()
-
- # tab_opened OR (not xor) not_tab_opened must be active
- def on_tab_opened_cb_toggled(self, widget):
- if self.active_num < 0:
- return
- if self.tab_opened_cb.get_active():
- if self.not_tab_opened_cb.get_active():
- self.config[self.active_num]['tab_opened'] = 'both'
- else:
- self.config[self.active_num]['tab_opened'] = 'yes'
- else:
- self.not_tab_opened_cb.set_active(True)
- self.config[self.active_num]['tab_opened'] = 'no'
-
- def on_not_tab_opened_cb_toggled(self, widget):
- if self.active_num < 0:
- return
- if self.not_tab_opened_cb.get_active():
- if self.tab_opened_cb.get_active():
- self.config[self.active_num]['tab_opened'] = 'both'
- else:
- self.config[self.active_num]['tab_opened'] = 'no'
- else:
- self.tab_opened_cb.set_active(True)
- self.config[self.active_num]['tab_opened'] = 'yes'
-
- def on_use_it_toggled(self, widget, oposite_widget, option):
- if widget.get_active():
- if oposite_widget.get_active():
- oposite_widget.set_active(False)
- self.config[self.active_num][option] = 'yes'
- elif oposite_widget.get_active():
- self.config[self.active_num][option] = 'no'
- else:
- self.config[self.active_num][option] = ''
-
- def on_disable_it_toggled(self, widget, oposite_widget, option):
- if widget.get_active():
- if oposite_widget.get_active():
- oposite_widget.set_active(False)
- self.config[self.active_num][option] = 'no'
- elif oposite_widget.get_active():
- self.config[self.active_num][option] = 'yes'
- else:
- self.config[self.active_num][option] = ''
-
- def on_use_sound_cb_toggled(self, widget):
- self.on_use_it_toggled(widget, self.disable_sound_cb, 'sound')
- if widget.get_active():
- self.sound_file_hbox.set_sensitive(True)
- else:
- self.sound_file_hbox.set_sensitive(False)
-
- def on_browse_for_sounds_button_clicked(self, widget, data=None):
- if self.active_num < 0:
- return
-
- def on_ok(widget, path_to_snd_file):
- dialog.destroy()
- if not path_to_snd_file:
- path_to_snd_file = ''
- self.config[self.active_num]['sound_file'] = path_to_snd_file
- self.sound_entry.set_text(path_to_snd_file)
-
- path_to_snd_file = self.sound_entry.get_text().decode('utf-8')
- path_to_snd_file = os.path.join(os.getcwd(), path_to_snd_file)
- dialog = SoundChooserDialog(path_to_snd_file, on_ok)
-
- def on_play_button_clicked(self, widget):
- helpers.play_sound_file(self.sound_entry.get_text().decode('utf-8'))
-
- def on_disable_sound_cb_toggled(self, widget):
- self.on_disable_it_toggled(widget, self.use_sound_cb, 'sound')
-
- def on_sound_entry_changed(self, widget):
- self.config[self.active_num]['sound_file'] = widget.get_text().\
- decode('utf-8')
-
- def on_use_popup_cb_toggled(self, widget):
- self.on_use_it_toggled(widget, self.disable_popup_cb, 'popup')
-
- def on_disable_popup_cb_toggled(self, widget):
- self.on_disable_it_toggled(widget, self.use_popup_cb, 'popup')
-
- def on_use_auto_open_cb_toggled(self, widget):
- self.on_use_it_toggled(widget, self.disable_auto_open_cb, 'auto_open')
-
- def on_disable_auto_open_cb_toggled(self, widget):
- self.on_disable_it_toggled(widget, self.use_auto_open_cb, 'auto_open')
-
- def on_run_command_cb_toggled(self, widget):
- self.config[self.active_num]['run_command'] = widget.get_active()
- if widget.get_active():
- self.command_entry.set_sensitive(True)
- else:
- self.command_entry.set_sensitive(False)
-
- def on_command_entry_changed(self, widget):
- self.config[self.active_num]['command'] = widget.get_text().\
- decode('utf-8')
-
- def on_use_systray_cb_toggled(self, widget):
- self.on_use_it_toggled(widget, self.disable_systray_cb, 'systray')
-
- def on_disable_systray_cb_toggled(self, widget):
- self.on_disable_it_toggled(widget, self.use_systray_cb, 'systray')
-
- def on_use_roster_cb_toggled(self, widget):
- self.on_use_it_toggled(widget, self.disable_roster_cb, 'roster')
-
- def on_disable_roster_cb_toggled(self, widget):
- self.on_disable_it_toggled(widget, self.use_roster_cb, 'roster')
-
- def on_use_urgency_hint_cb_toggled(self, widget):
- self.on_use_it_toggled(widget, self.disable_urgency_hint_cb,
- 'uregency_hint')
-
- def on_disable_urgency_hint_cb_toggled(self, widget):
- self.on_disable_it_toggled(widget, self.use_urgency_hint_cb,
- 'uregency_hint')
-
- def on_hide(self, widget):
- # save config
- for n in self.plugin.config:
- del self.plugin.config[n]
- for n in self.config:
- self.plugin.config[str(n)] = self.config[n]
diff --git a/plugins/whiteboard/__init__.py b/plugins/whiteboard/__init__.py
deleted file mode 100644
index 802d00cdf4de510276bf4a4e9e2b8ab792a650a2..0000000000000000000000000000000000000000
--- a/plugins/whiteboard/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from plugin import WhiteboardPlugin
diff --git a/plugins/whiteboard/brush_tool.png b/plugins/whiteboard/brush_tool.png
deleted file mode 100644
index 266c321718d6e7a72245367223e7892de1fc9faa..0000000000000000000000000000000000000000
Binary files a/plugins/whiteboard/brush_tool.png and /dev/null differ
diff --git a/plugins/whiteboard/line_tool.png b/plugins/whiteboard/line_tool.png
deleted file mode 100644
index 151f584849108687627deacb1ecff87e29008c92..0000000000000000000000000000000000000000
Binary files a/plugins/whiteboard/line_tool.png and /dev/null differ
diff --git a/plugins/whiteboard/manifest.ini b/plugins/whiteboard/manifest.ini
deleted file mode 100644
index a9f67085ea3e19451ea0f87c20593df66260d446..0000000000000000000000000000000000000000
--- a/plugins/whiteboard/manifest.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[info]
-name: Whiteboard
-short_name: whiteboard
-version: 0.1
-description: Shows a whiteboard in chat. python-pygoocanvas is required.
-authors = Yann Leboulanger <asterix@lagaule.org>
-homepage = www.gajim.org
diff --git a/plugins/whiteboard/oval_tool.png b/plugins/whiteboard/oval_tool.png
deleted file mode 100644
index efd6f0ca18d8fca110d7290a2f71b0bd17ff40a1..0000000000000000000000000000000000000000
Binary files a/plugins/whiteboard/oval_tool.png and /dev/null differ
diff --git a/plugins/whiteboard/plugin.py b/plugins/whiteboard/plugin.py
deleted file mode 100644
index 2716c203ebbcb0260c937b390f19fbb28d0d2516..0000000000000000000000000000000000000000
--- a/plugins/whiteboard/plugin.py
+++ /dev/null
@@ -1,477 +0,0 @@
-## plugins/whiteboard/plugin.py
-##
-## Copyright (C) 2009 Jeff Ling <jeff.ummu AT gmail.com>
-## Copyright (C) 2010 Yann Leboulanger <asterix AT lagaule.org>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-'''
-Whiteboard plugin.
-
-:author: Yann Leboulanger <asterix@lagaule.org>
-:since: 1st November 2010
-:copyright: Copyright (2010) Yann Leboulanger <asterix@lagaule.org>
-:license: GPL
-'''
-
-
-from common import helpers
-from common import gajim
-from plugins import GajimPlugin
-from plugins.plugin import GajimPluginException
-from plugins.helpers import log_calls, log
-import common.xmpp
-import gtk
-import chat_control
-from common import ged
-from common.jingle_session import JingleSession
-from common.jingle_content import JingleContent
-from common.jingle_transport import JingleTransport, TransportType
-import dialogs
-from whiteboard_widget import Whiteboard, HAS_GOOCANVAS
-from common import xmpp
-from common import caps_cache
-
-NS_JINGLE_XHTML = 'urn:xmpp:tmp:jingle:apps:xhtml'
-NS_JINGLE_SXE = 'urn:xmpp:tmp:jingle:transports:sxe'
-NS_SXE = 'urn:xmpp:sxe:0'
-
-class WhiteboardPlugin(GajimPlugin):
- @log_calls('WhiteboardPlugin')
- def init(self):
- self.config_dialog = None
- self.events_handlers = {
- 'jingle-request-received': (ged.GUI1, self._nec_jingle_received),
- 'jingle-connected-received': (ged.GUI1, self._nec_jingle_connected),
- 'jingle-disconnected-received': (ged.GUI1,
- self._nec_jingle_disconnected),
- 'raw-message-received': (ged.GUI1, self._nec_raw_message),
- }
- self.gui_extension_points = {
- 'chat_control_base' : (self.connect_with_chat_control,
- self.disconnect_from_chat_control),
- 'chat_control_base_update_toolbar': (self.update_button_state,
- None),
- }
- self.controls = []
- self.sid = None
-
- @log_calls('WhiteboardPlugin')
- def _compute_caps_hash(self):
- for a in gajim.connections:
- gajim.caps_hash[a] = caps_cache.compute_caps_hash([
- gajim.gajim_identity], gajim.gajim_common_features + \
- gajim.gajim_optional_features[a])
- # re-send presence with new hash
- connected = gajim.connections[a].connected
- if connected > 1 and gajim.SHOW_LIST[connected] != 'invisible':
- gajim.connections[a].change_status(gajim.SHOW_LIST[connected],
- gajim.connections[a].status)
-
- @log_calls('WhiteboardPlugin')
- def activate(self):
- if not HAS_GOOCANVAS:
- raise GajimPluginException('python-pygoocanvas is missing!')
- if NS_JINGLE_SXE not in gajim.gajim_common_features:
- gajim.gajim_common_features.append(NS_JINGLE_SXE)
- if NS_SXE not in gajim.gajim_common_features:
- gajim.gajim_common_features.append(NS_SXE)
- self._compute_caps_hash()
-
- @log_calls('WhiteboardPlugin')
- def deactivate(self):
- if NS_JINGLE_SXE in gajim.gajim_common_features:
- gajim.gajim_common_features.remove(NS_JINGLE_SXE)
- if NS_SXE in gajim.gajim_common_features:
- gajim.gajim_common_features.remove(NS_SXE)
- self._compute_caps_hash()
-
- @log_calls('WhiteboardPlugin')
- def connect_with_chat_control(self, control):
- if isinstance(control, chat_control.ChatControl):
- base = Base(self, control)
- self.controls.append(base)
-
- @log_calls('WhiteboardPlugin')
- def disconnect_from_chat_control(self, chat_control):
- for base in self.controls:
- base.disconnect_from_chat_control()
- self.controls = []
-
- @log_calls('WhiteboardPlugin')
- def update_button_state(self, control):
- for base in self.controls:
- if base.chat_control == control:
- if control.contact.supports(NS_JINGLE_SXE) and \
- control.contact.supports(NS_SXE):
- base.button.set_sensitive(True)
- else:
- base.button.set_sensitive(False)
-
- @log_calls('WhiteboardPlugin')
- def show_request_dialog(self, account, fjid, jid, sid, content_types):
- def on_ok():
- session = gajim.connections[account].get_jingle_session(fjid, sid)
- self.sid = session.sid
- if not session.accepted:
- session.approve_session()
- for content in content_types:
- session.approve_content(content)
- for _jid in (fjid, jid):
- ctrl = gajim.interface.msg_win_mgr.get_control(_jid, account)
- if ctrl:
- break
- if not ctrl:
- # create it
- gajim.interface.new_chat_from_jid(account, jid)
- ctrl = gajim.interface.msg_win_mgr.get_control(jid, account)
- session = session.contents[('initiator', 'xhtml')]
- ctrl.draw_whiteboard(session)
-
- def on_cancel():
- session = gajim.connections[account].get_jingle_session(fjid, sid)
- session.decline_session()
-
- contact = gajim.contacts.get_first_contact_from_jid(account, jid)
- if contact:
- name = contact.get_shown_name()
- else:
- name = jid
- pritext = _('Incoming Whiteboard')
- sectext = _('%(name)s (%(jid)s) wants to start a whiteboard with '
- 'you. Do you want to accept?') % {'name': name, 'jid': jid}
- dialog = dialogs.NonModalConfirmationDialog(pritext, sectext=sectext,
- on_response_ok=on_ok, on_response_cancel=on_cancel)
- dialog.popup()
-
- @log_calls('WhiteboardPlugin')
- def _nec_jingle_received(self, obj):
- if not HAS_GOOCANVAS:
- return
- content_types = set(c[0] for c in obj.contents)
- if 'xhtml' not in content_types:
- return
- self.show_request_dialog(obj.conn.name, obj.fjid, obj.jid, obj.sid,
- content_types)
-
- @log_calls('WhiteboardPlugin')
- def _nec_jingle_connected(self, obj):
- if not HAS_GOOCANVAS:
- return
- account = obj.conn.name
- ctrl = (gajim.interface.msg_win_mgr.get_control(obj.fjid, account)
- or gajim.interface.msg_win_mgr.get_control(obj.jid, account))
- if not ctrl:
- return
- session = gajim.connections[obj.conn.name].get_jingle_session(obj.fjid,
- obj.sid)
-
- if ('initiator', 'xhtml') not in session.contents:
- return
-
- session = session.contents[('initiator', 'xhtml')]
- ctrl.draw_whiteboard(session)
-
- @log_calls('WhiteboardPlugin')
- def _nec_jingle_disconnected(self, obj):
- for base in self.controls:
- if base.sid == obj.sid:
- base.stop_whiteboard(reason = obj.reason)
-
- @log_calls('WhiteboardPlugin')
- def _nec_raw_message(self, obj):
- if not HAS_GOOCANVAS:
- return
- if obj.stanza.getTag('sxe', namespace=NS_SXE):
- account = obj.conn.name
-
- try:
- fjid = helpers.get_full_jid_from_iq(obj.stanza)
- except helpers.InvalidFormat:
- obj.conn.dispatch('ERROR', (_('Invalid Jabber ID'),
- _('A message from a non-valid JID arrived, it has been '
- 'ignored.')))
-
- jid = gajim.get_jid_without_resource(fjid)
- ctrl = (gajim.interface.msg_win_mgr.get_control(fjid, account)
- or gajim.interface.msg_win_mgr.get_control(jid, account))
- if not ctrl:
- return
- sxe = obj.stanza.getTag('sxe')
- if not sxe:
- return
- sid = sxe.getAttr('session')
- if (jid, sid) not in obj.conn._sessions:
- pass
-# newjingle = JingleSession(con=self, weinitiate=False, jid=jid, sid=sid)
-# self.addJingle(newjingle)
-
- # we already have such session in dispatcher...
- session = obj.conn.get_jingle_session(fjid, sid)
- cn = session.contents[('initiator', 'xhtml')]
- error = obj.stanza.getTag('error')
- if error:
- action = 'iq-error'
- else:
- action = 'edit'
-
- cn.on_stanza(obj.stanza, sxe, error, action)
-# def __editCB(self, stanza, content, error, action):
- #new_tags = sxe.getTags('new')
- #remove_tags = sxe.getTags('remove')
-
- #if new_tags is not None:
- ## Process new elements
- #for tag in new_tags:
- #if tag.getAttr('type') == 'element':
- #ctrl.whiteboard.recieve_element(tag)
- #elif tag.getAttr('type') == 'attr':
- #ctrl.whiteboard.recieve_attr(tag)
- #ctrl.whiteboard.apply_new()
-
- #if remove_tags is not None:
- ## Delete rids
- #for tag in remove_tags:
- #target = tag.getAttr('target')
- #ctrl.whiteboard.image.del_rid(target)
-
- # Stop propagating this event, it's handled
- return True
-
-
-class Base(object):
- def __init__(self, plugin, chat_control):
- self.plugin = plugin
- self.chat_control = chat_control
- self.chat_control.draw_whiteboard = self.draw_whiteboard
- self.contact = self.chat_control.contact
- self.account = self.chat_control.account
- self.jid = self.contact.get_full_jid()
- self.create_buttons()
- self.whiteboard = None
- self.sid = None
-
- def create_buttons(self):
- # create juick button
- actions_hbox = self.chat_control.xml.get_object('actions_hbox')
- self.button = gtk.ToggleButton(label=None, use_underline=True)
- self.button.set_property('relief', gtk.RELIEF_NONE)
- self.button.set_property('can-focus', False)
- img = gtk.Image()
- img_path = self.plugin.local_file_path('whiteboard.png')
- pixbuf = gtk.gdk.pixbuf_new_from_file(img_path)
- iconset = gtk.IconSet(pixbuf=pixbuf)
- factory = gtk.IconFactory()
- factory.add('whiteboard', iconset)
- img_path = self.plugin.local_file_path('brush_tool.png')
- pixbuf = gtk.gdk.pixbuf_new_from_file(img_path)
- iconset = gtk.IconSet(pixbuf=pixbuf)
- factory.add('brush_tool', iconset)
- img_path = self.plugin.local_file_path('line_tool.png')
- pixbuf = gtk.gdk.pixbuf_new_from_file(img_path)
- iconset = gtk.IconSet(pixbuf=pixbuf)
- factory.add('line_tool', iconset)
- img_path = self.plugin.local_file_path('oval_tool.png')
- pixbuf = gtk.gdk.pixbuf_new_from_file(img_path)
- iconset = gtk.IconSet(pixbuf=pixbuf)
- factory.add('oval_tool', iconset)
- factory.add_default()
- img.set_from_stock('whiteboard', gtk.ICON_SIZE_BUTTON)
- self.button.set_image(img)
- send_button = self.chat_control.xml.get_object('send_button')
- send_button_pos = actions_hbox.child_get_property(send_button,
- 'position')
- actions_hbox.add_with_properties(self.button, 'position',
- send_button_pos - 1, 'expand', False)
- id_ = self.button.connect('toggled', self.on_whiteboard_button_toggled)
- self.chat_control.handlers[id_] = self.button
- self.button.show()
-
- def draw_whiteboard(self, content):
- hbox = self.chat_control.xml.get_object('chat_control_hbox')
- if len(hbox.get_children()) == 1:
- self.whiteboard = Whiteboard(self.account, self.contact, content,
- self.plugin)
- # set minimum size
- self.whiteboard.hbox.set_size_request(300, 0)
- hbox.pack_start(self.whiteboard.hbox, expand=False, fill=False)
- self.whiteboard.hbox.show_all()
- self.button.set_active(True)
- content.control = self
- self.sid = content.session.sid
-
- def on_whiteboard_button_toggled(self, widget):
- """
- Popup whiteboard
- """
- if widget.get_active():
- if not self.whiteboard:
- self.start_whiteboard()
- else:
- self.stop_whiteboard()
-
- def start_whiteboard(self):
- conn = gajim.connections[self.chat_control.account]
- jingle = JingleSession(conn, weinitiate=True, jid=self.jid)
- self.sid = jingle.sid
- conn._sessions[jingle.sid] = jingle
- content = JingleWhiteboard(jingle)
- content.control = self
- jingle.add_content('xhtml', content)
- jingle.start_session()
-
- def stop_whiteboard(self, reason=None):
- conn = gajim.connections[self.chat_control.account]
- self.sid = None
- session = conn.get_jingle_session(self.jid, media='xhtml')
- if session:
- session.end_session()
- self.button.set_active(False)
- if reason:
- txt = _('Whiteboard stopped: %(reason)s') % {'reason': reason}
- self.chat_control.print_conversation(txt, 'info')
- if not self.whiteboard:
- return
- hbox = self.chat_control.xml.get_object('chat_control_hbox')
- if self.whiteboard.hbox in hbox.get_children():
- if hasattr(self.whiteboard, 'hbox'):
- hbox.remove(self.whiteboard.hbox)
- self.whiteboard = None
-
- def disconnect_from_chat_control(self):
- actions_hbox = self.chat_control.xml.get_object('actions_hbox')
- actions_hbox.remove(self.button)
-
-class JingleWhiteboard(JingleContent):
- ''' Jingle Whiteboard sessions consist of xhtml content'''
- def __init__(self, session, transport=None):
- if not transport:
- transport = JingleTransportSXE()
- JingleContent.__init__(self, session, transport)
- self.media = 'xhtml'
- self.negotiated = True # there is nothing to negotiate
- self.last_rid = 0
- self.callbacks['session-accept'] += [self._sessionAcceptCB]
- self.callbacks['session-terminate'] += [self._stop]
- self.callbacks['session-terminate-sent'] += [self._stop]
- self.callbacks['edit'] = [self._EditCB]
-
- def _EditCB(self, stanza, content, error, action):
- new_tags = content.getTags('new')
- remove_tags = content.getTags('remove')
-
- if new_tags is not None:
- # Process new elements
- for tag in new_tags:
- if tag.getAttr('type') == 'element':
- self.control.whiteboard.recieve_element(tag)
- elif tag.getAttr('type') == 'attr':
- self.control.whiteboard.recieve_attr(tag)
- self.control.whiteboard.apply_new()
-
- if remove_tags is not None:
- # Delete rids
- for tag in remove_tags:
- target = tag.getAttr('target')
- self.control.whiteboard.image.del_rid(target)
-
- def _sessionAcceptCB(self, stanza, content, error, action):
- log.debug('session accepted')
- self.session.connection.dispatch('WHITEBOARD_ACCEPTED',
- (self.session.peerjid, self.session.sid))
-
- def generate_rids(self, x):
- # generates x number of rids and returns in list
- rids = []
- for x in range(x):
- rids.append(str(self.last_rid))
- self.last_rid += 1
- return rids
-
- def send_whiteboard_node(self, items, rids):
- # takes int rid and dict items and sends it as a node
- # sends new item
- jid = self.session.peerjid
- sid = self.session.sid
- message = xmpp.Message(to=jid)
- sxe = message.addChild(name='sxe', attrs={'session': sid},
- namespace=NS_SXE)
-
- for x in rids:
- if items[x]['type'] == 'element':
- parent = x
- attrs = {'rid': x,
- 'name': items[x]['data'][0].getName(),
- 'type': items[x]['type']}
- sxe.addChild(name='new', attrs=attrs)
- if items[x]['type'] == 'attr':
- attr_name = items[x]['data']
- chdata = items[parent]['data'][0].getAttr(attr_name)
- attrs = {'rid': x,
- 'name': attr_name,
- 'type': items[x]['type'],
- 'chdata': chdata,
- 'parent': parent}
- sxe.addChild(name='new', attrs=attrs)
- self.session.connection.connection.send(message)
-
- def delete_whiteboard_node(self, rids):
- message = xmpp.Message(to=self.session.peerjid)
- sxe = message.addChild(name='sxe', attrs={'session': self.session.sid},
- namespace=NS_SXE)
-
- for x in rids:
- sxe.addChild(name='remove', attrs = {'target': x})
- self.session.connection.connection.send(message)
-
- def send_items(self, items, rids):
- # recieves dict items and a list of rids of items to send
- # TODO: is there a less clumsy way that doesn't involve passing
- # whole list
- self.send_whiteboard_node(items, rids)
-
- def del_item(self, rids):
- self.delete_whiteboard_node(rids)
-
- def encode(self, xml):
- # encodes it sendable string
- return 'data:text/xml,' + urllib.quote(xml)
-
- def _fill_content(self, content):
- content.addChild(NS_JINGLE_XHTML + ' description')
-
- def _stop(self, *things):
- pass
-
- def __del__(self):
- pass
-
-def get_content(desc):
- return JingleWhiteboard
-
-common.jingle_content.contents[NS_JINGLE_XHTML] = get_content
-
-class JingleTransportSXE(JingleTransport):
- def __init__(self):
- JingleTransport.__init__(self, TransportType.streaming)
-
- def make_transport(self, candidates=None):
- transport = JingleTransport.make_transport(self, candidates)
- transport.setNamespace(NS_JINGLE_SXE)
- transport.setTagData('host', 'TODO')
- return transport
-
-common.jingle_transport.transports[NS_JINGLE_SXE] = JingleTransportSXE
diff --git a/plugins/whiteboard/whiteboard.png b/plugins/whiteboard/whiteboard.png
deleted file mode 100644
index 13318e3a7e87e7e97fab65a2d009900f86c02d66..0000000000000000000000000000000000000000
Binary files a/plugins/whiteboard/whiteboard.png and /dev/null differ
diff --git a/plugins/whiteboard/whiteboard_widget.py b/plugins/whiteboard/whiteboard_widget.py
deleted file mode 100644
index 8b92b8bfbd70648c24ea8b4ec5f3f5182ff0cd73..0000000000000000000000000000000000000000
--- a/plugins/whiteboard/whiteboard_widget.py
+++ /dev/null
@@ -1,419 +0,0 @@
-## plugins/whiteboard/whiteboard_widget.py
-##
-## Copyright (C) 2009 Jeff Ling <jeff.ummu AT gmail.com>
-## Copyright (C) 2010 Yann Leboulanger <asterix AT lagaule.org>
-##
-## This file is part of Gajim.
-##
-## Gajim is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 3 only.
-##
-## Gajim is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-##
-
-import gtk
-import gtkgui_helpers
-try:
- import goocanvas
- HAS_GOOCANVAS = True
-except:
- HAS_GOOCANVAS = False
-from common.xmpp import Node
-from common import gajim
-from common import i18n
-from dialogs import FileChooserDialog
-
-'''
-A whiteboard widget made for Gajim.
-- Ummu
-'''
-
-class Whiteboard(object):
- def __init__(self, account, contact, session, plugin):
- self.plugin = plugin
- file_path = plugin.local_file_path('whiteboard_widget.ui')
- xml = gtk.Builder()
- xml.set_translation_domain(i18n.APP)
- xml.add_from_file(file_path)
- self.hbox = xml.get_object('whiteboard_hbox')
- self.canevas = goocanvas.Canvas()
- self.hbox.pack_start(self.canevas)
- self.hbox.reorder_child(self.canevas, 0)
- self.canevas.set_flags(gtk.CAN_FOCUS)
- self.fg_color_select_button = xml.get_object('fg_color_button')
- self.root = self.canevas.get_root_item()
- self.tool_buttons = []
- for tool in ('brush', 'oval', 'line', 'delete'):
- self.tool_buttons.append(xml.get_object(tool + '_button'))
- xml.get_object('brush_button').set_active(True)
-
- # Events
- self.canevas.connect('button-press-event', self.button_press_event)
- self.canevas.connect('button-release-event', self.button_release_event)
- self.canevas.connect('motion-notify-event', self.motion_notify_event)
- self.canevas.connect('item-created', self.item_created)
-
- # Config
- self.line_width = 2
- xml.get_object('size_scale').set_value(2)
- self.color = str(self.fg_color_select_button.get_color())
-
- # SVG Storage
- self.image = SVGObject(self.root, session)
-
- xml.connect_signals(self)
-
- # Temporary Variables for items
- self.item_temp = None
- self.item_temp_coords = (0, 0)
- self.item_data = None
-
- # Will be {ID: {type:'element', data:[node, goocanvas]}, ID2: {}} instance
- self.recieving = {}
-
- def on_tool_button_toggled(self, widget):
- for btn in self.tool_buttons:
- if btn == widget:
- continue
- btn.set_active(False)
-
- def on_brush_button_toggled(self, widget):
- if widget.get_active():
- self.image.draw_tool = 'brush'
- self.on_tool_button_toggled(widget)
-
- def on_oval_button_toggled(self, widget):
- if widget.get_active():
- self.image.draw_tool = 'oval'
- self.on_tool_button_toggled(widget)
-
- def on_line_button_toggled(self, widget):
- if widget.get_active():
- self.image.draw_tool = 'line'
- self.on_tool_button_toggled(widget)
-
- def on_delete_button_toggled(self, widget):
- if widget.get_active():
- self.image.draw_tool = 'delete'
- self.on_tool_button_toggled(widget)
-
- def on_clear_button_clicked(self, widget):
- self.image.clear_canvas()
-
- def on_export_button_clicked(self, widget):
- SvgChooserDialog(self.image.export_svg)
-
- def on_fg_color_button_color_set(self, widget):
- self.color = str(self.fg_color_select_button.get_color())
-
- def item_created(self, canvas, item, model):
- print 'item created'
- item.connect('button-press-event', self.item_button_press_events)
-
- def item_button_press_events(self, item, target_item, event):
- if self.image.draw_tool == 'delete':
- self.image.del_item(item)
-
- def on_size_scale_format_value(self, widget):
- self.line_width = int(widget.get_value())
-
- def button_press_event(self, widget, event):
- x = event.x
- y = event.y
- state = event.state
- self.item_temp_coords = (x, y)
-
- if self.image.draw_tool == 'brush':
- self.item_temp = goocanvas.Ellipse(parent=self.root,
- center_x=x,
- center_y=y,
- radius_x=1,
- radius_y=1,
- stroke_color=self.color,
- fill_color=self.color,
- line_width=self.line_width)
- self.item_data = 'M %s,%s L ' % (x, y)
-
- elif self.image.draw_tool == 'oval':
- self.item_data = True
-
- if self.image.draw_tool == 'line':
- self.item_data = 'M %s,%s L' % (x, y)
-
- def motion_notify_event(self, widget, event):
- x = event.x
- y = event.y
- state = event.state
- if self.item_temp is not None:
- self.item_temp.remove()
-
- if self.item_data is not None:
- if self.image.draw_tool == 'brush':
- self.item_data = self.item_data + '%s,%s ' % (x, y)
- self.item_temp = goocanvas.Path(parent=self.root,
- data=self.item_data, line_width=self.line_width,
- stroke_color=self.color)
- elif self.image.draw_tool == 'oval':
- self.item_temp = goocanvas.Ellipse(parent=self.root,
- center_x=self.item_temp_coords[0] + (x - self.item_temp_coords[0]) / 2,
- center_y=self.item_temp_coords[1] + (y - self.item_temp_coords[1]) / 2,
- radius_x=abs(x - self.item_temp_coords[0]) / 2,
- radius_y=abs(y - self.item_temp_coords[1]) / 2,
- stroke_color=self.color,
- line_width=self.line_width)
- elif self.image.draw_tool == 'line':
- self.item_data = 'M %s,%s L' % self.item_temp_coords
- self.item_data = self.item_data + ' %s,%s' % (x, y)
- self.item_temp = goocanvas.Path(parent=self.root,
- data=self.item_data, line_width=self.line_width,
- stroke_color=self.color)
-
- def button_release_event(self, widget, event):
- x = event.x
- y = event.y
- state = event.state
-
- if self.image.draw_tool == 'brush':
- self.item_data = self.item_data + '%s,%s' % (x, y)
- if x == self.item_temp_coords[0] and y == self.item_temp_coords[1]:
- goocanvas.Ellipse(parent=self.root,
- center_x=x,
- center_y=y,
- radius_x=1,
- radius_y=1,
- stroke_color=self.color,
- fill_color=self.color,
- line_width=self.line_width)
- self.image.add_path(self.item_data, self.line_width, self.color)
-
- if self.image.draw_tool == 'oval':
- cx = self.item_temp_coords[0] + (x - self.item_temp_coords[0]) / 2
- cy = self.item_temp_coords[1] + (y - self.item_temp_coords[1]) / 2
- rx = abs(x - self.item_temp_coords[0]) / 2
- ry = abs(y - self.item_temp_coords[1]) / 2
- self.image.add_ellipse(cx, cy, rx, ry, self.line_width, self.color)
-
- if self.image.draw_tool == 'line':
- self.item_data = 'M %s,%s L' % self.item_temp_coords
- self.item_data = self.item_data + ' %s,%s' % (x, y)
- if x == self.item_temp_coords[0] and y == self.item_temp_coords[1]:
- goocanvas.Ellipse(parent=self.root,
- center_x=x,
- center_y=y,
- radius_x=1,
- radius_y=1,
- stroke_color='black',
- fill_color='black',
- line_width=self.line_width)
- self.image.add_path(self.item_data, self.line_width, self.color)
-
- if self.image.draw_tool == 'delete':
- pass
-
- self.item_data = None
- if self.item_temp is not None:
- self.item_temp.remove()
- self.item_temp = None
-
- def recieve_element(self, element):
- node = self.image.g.addChild(name=element.getAttr('name'))
- self.image.g.addChild(node=node)
- self.recieving[element.getAttr('rid')] = {'type':'element',
- 'data':[node],
- 'children':[]}
-
- def recieve_attr(self, element):
- node = self.recieving[element.getAttr('parent')]['data'][0]
- node.setAttr(element.getAttr('name'), element.getAttr('chdata'))
-
- self.recieving[element.getAttr('rid')] = {'type':'attr',
- 'data':element.getAttr('name'),
- 'parent':node}
- self.recieving[element.getAttr('parent')]['children'].append(element.getAttr('rid'))
-
- def apply_new(self):
- for x in self.recieving.keys():
- if self.recieving[x]['type'] == 'element':
- self.image.add_recieved(x, self.recieving)
-
- self.recieving = {}
-
-class SvgChooserDialog(FileChooserDialog):
- def __init__(self, on_response_ok=None, on_response_cancel=None):
- '''
- Choose in which SVG file to store the image
- '''
- def on_ok(widget, callback):
- '''
- check if file exists and call callback
- '''
- path_to_file = self.get_filename()
- path_to_file = gtkgui_helpers.decode_filechooser_file_paths(
- (path_to_file,))[0]
- widget.destroy()
- callback(path_to_file)
-
- FileChooserDialog.__init__(self,
- title_text=_('Save Image as...'),
- action=gtk.FILE_CHOOSER_ACTION_SAVE,
- buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
- gtk.RESPONSE_OK),
- current_folder='',
- default_response=gtk.RESPONSE_OK,
- on_response_ok=(on_ok, on_response_ok),
- on_response_cancel=on_response_cancel)
-
- filter_ = gtk.FileFilter()
- filter_.set_name(_('All files'))
- filter_.add_pattern('*')
- self.add_filter(filter_)
-
- filter_ = gtk.FileFilter()
- filter_.set_name(_('SVG Files'))
- filter_.add_pattern('*.svg')
- self.add_filter(filter_)
- self.set_filter(filter_)
-
-
-class SVGObject():
- ''' A class to store the svg document and make changes to it.'''
-
- def __init__(self, root, session, height=300, width=300):
- # Will be {ID: {type:'element', data:[node, goocanvas]}, ID2: {}} instance
- self.items = {}
- self.root = root
- self.draw_tool = 'brush'
-
- # sxe session
- self.session = session
-
- # initialize svg document
- self.svg = Node(node='<svg/>')
- self.svg.setAttr('version', '1.1')
- self.svg.setAttr('height', str(height))
- self.svg.setAttr('width', str(width))
- self.svg.setAttr('xmlns', 'http://www.w3.org/2000/svg')
- # TODO: make this settable
- self.g = self.svg.addChild(name='g')
- self.g.setAttr('fill', 'none')
- self.g.setAttr('stroke-linecap', 'round')
-
- def add_path(self, data, line_width, color):
- ''' adds the path to the items listing, both minidom node and goocanvas
- object in a tuple '''
-
- goocanvas_obj = goocanvas.Path(parent=self.root, data=data,
- line_width=line_width, stroke_color=color)
- goocanvas_obj.connect('button-press-event', self.item_button_press_events)
-
- node = self.g.addChild(name='path')
- node.setAttr('d', data)
- node.setAttr('stroke-width', str(line_width))
- node.setAttr('stroke', color)
- self.g.addChild(node=node)
-
- rids = self.session.generate_rids(4)
- self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj], 'children':rids[1:]}
- self.items[rids[1]] = {'type':'attr', 'data':'d', 'parent':node}
- self.items[rids[2]] = {'type':'attr', 'data':'stroke-width', 'parent':node}
- self.items[rids[3]] = {'type':'attr', 'data':'stroke', 'parent':node}
-
- self.session.send_items(self.items, rids)
-
- def add_recieved(self, parent_rid, new_items):
- ''' adds the path to the items listing, both minidom node and goocanvas
- object in a tuple '''
- node = new_items[parent_rid]['data'][0]
-
- self.items[parent_rid] = new_items[parent_rid]
- for x in new_items[parent_rid]['children']:
- self.items[x] = new_items[x]
-
- if node.getName() == 'path':
- goocanvas_obj = goocanvas.Path(parent=self.root,
- data=node.getAttr('d'),
- line_width=int(node.getAttr('stroke-width')),
- stroke_color=node.getAttr('stroke'))
-
- if node.getName() == 'ellipse':
- goocanvas_obj = goocanvas.Ellipse(parent=self.root,
- center_x=float(node.getAttr('cx')),
- center_y=float(node.getAttr('cy')),
- radius_x=float(node.getAttr('rx')),
- radius_y=float(node.getAttr('ry')),
- stroke_color=node.getAttr('stroke'),
- line_width=float(node.getAttr('stroke-width')))
-
- self.items[parent_rid]['data'].append(goocanvas_obj)
- goocanvas_obj.connect('button-press-event', self.item_button_press_events)
-
- def add_ellipse(self, cx, cy, rx, ry, line_width, stroke_color):
- ''' adds the ellipse to the items listing, both minidom node and goocanvas
- object in a tuple '''
-
- goocanvas_obj = goocanvas.Ellipse(parent=self.root,
- center_x=cx,
- center_y=cy,
- radius_x=rx,
- radius_y=ry,
- stroke_color=stroke_color,
- line_width=line_width)
- goocanvas_obj.connect('button-press-event', self.item_button_press_events)
-
- node = self.g.addChild(name='ellipse')
- node.setAttr('cx', str(cx))
- node.setAttr('cy', str(cy))
- node.setAttr('rx', str(rx))
- node.setAttr('ry', str(ry))
- node.setAttr('stroke-width', str(line_width))
- node.setAttr('stroke', stroke_color)
- self.g.addChild(node=node)
-
- rids = self.session.generate_rids(7)
- self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj], 'children':rids[1:]}
- self.items[rids[1]] = {'type':'attr', 'data':'cx', 'parent':node}
- self.items[rids[2]] = {'type':'attr', 'data':'cy', 'parent':node}
- self.items[rids[3]] = {'type':'attr', 'data':'rx', 'parent':node}
- self.items[rids[4]] = {'type':'attr', 'data':'ry', 'parent':node}
- self.items[rids[5]] = {'type':'attr', 'data':'stroke-width', 'parent':node}
- self.items[rids[6]] = {'type':'attr', 'data':'stroke', 'parent':node}
-
- self.session.send_items(self.items, rids)
-
- def del_item(self, item):
- rids = []
- for x in self.items.keys():
- if self.items[x]['type'] == 'element':
- if self.items[x]['data'][1] == item:
- for y in self.items[x]['children']:
- rids.append(y)
- self.del_rid(y)
- rids.append(x)
- self.del_rid(x)
- break
- self.session.del_item(rids)
-
- def clear_canvas(self):
- for x in self.items.keys():
- if self.items[x]['type'] == 'element':
- self.del_rid(x)
-
- def del_rid(self, rid):
- if self.items[rid]['type'] == 'element':
- self.items[rid]['data'][1].remove()
- del self.items[rid]
-
- def export_svg(self, filename):
- f = open(filename, 'w')
- f.writelines(str(self.svg))
- f.close()
-
- def item_button_press_events(self, item, target_item, event):
- self.del_item(item)
diff --git a/plugins/whiteboard/whiteboard_widget.ui b/plugins/whiteboard/whiteboard_widget.ui
deleted file mode 100644
index fddd2cb75d531cb85df8bccd84b22ccb7b47401f..0000000000000000000000000000000000000000
--- a/plugins/whiteboard/whiteboard_widget.ui
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkHBox" id="whiteboard_hbox">
- <property name="visible">True</property>
- <property name="border_width">3</property>
- <property name="spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkVBox" id="vbuttonbox1">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkToggleButton" id="brush_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Brush Tool: Draw freehand lines</property>
- <signal name="toggled" handler="on_brush_button_toggled"/>
- <child>
- <object class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="stock">brush_tool</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="oval_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Oval Tool: Draw circles and ellipses</property>
- <signal name="toggled" handler="on_oval_button_toggled"/>
- <child>
- <object class="GtkImage" id="image6">
- <property name="visible">True</property>
- <property name="stock">oval_tool</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="line_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Line Tool: Draw straight lines</property>
- <signal name="toggled" handler="on_line_button_toggled"/>
- <child>
- <object class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="stock">line_tool</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="delete_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Delete Tool: Remove individual figures</property>
- <signal name="toggled" handler="on_delete_button_toggled"/>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="clear_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Clear Canvas: Cleanup canvas</property>
- <signal name="clicked" handler="on_clear_button_clicked"/>
- <child>
- <object class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="export_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Export Image: Save image to svg file</property>
- <signal name="clicked" handler="on_export_button_clicked"/>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-save-as</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkVScale" id="size_scale">
- <property name="height_request">68</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Line width</property>
- <property name="orientation">vertical</property>
- <property name="adjustment">adjustment1</property>
- <property name="inverted">True</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="value_changed" handler="on_size_scale_format_value"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkColorButton" id="fg_color_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Foreground color</property>
- <property name="color">#000000000000</property>
- <signal name="color_set" handler="on_fg_color_button_color_set"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">7</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="value">2</property>
- <property name="lower">1</property>
- <property name="upper">110</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
-</interface>
diff --git a/po/de.po b/po/de.po
index 292185e30d84dba7d51ccc5ca4a483fbe63e5c54..d86358644afea1c726eb3fe9ce89756f11d75c44 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,18 +5,14 @@
# Benjamin Drung <benjamin.drung@gmail.com>, 2007, 2008.
# Fabian Fingerle <fabian@datensalat.eu>, 2007, 2008.
# Sebastian Schäfer <sarek@uliweb.de>, 2007.
-# Nico Gulden <cilugnedon@gmx.de>, 2007, 2008, 2009.
+# Nico Gulden <cilugnedon@gmx.de>, 2007, 2008, 2009, 2010.
# Niklas Hambüchen <nh2@deditus.de>, 2009.
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
msgid ""
msgstr ""
"Project-Id-Version: gajim 0.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
-"PO-Revision-Date: 2009-12-13 23:46+0100\n"
+"POT-Creation-Date: 2011-07-26 16:01+0200\n"
+"PO-Revision-Date: 2010-08-03 22:43+0200\n"
"Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
"Language-Team: German <translators@gajim.org>\n"
"Language: de\n"
@@ -34,7 +30,7 @@ msgstr "_Gruppenchat betreten …"
msgid "_Add Contact..."
msgstr "Kont_akt hinzufügen …"
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
msgid "_Discover Services"
msgstr "_Dienste durchsuchen"
@@ -124,12 +120,12 @@ msgstr "Verwalten …"
#: ../data/gui/account_creation_wizard_window.ui.h:17
#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
+#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703
+#: ../src/config.py:1708 ../src/config.py:2274 ../src/config.py:2353
+#: ../src/config.py:2366 ../src/config.py:3644 ../src/config.py:3719
+#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
+#: ../src/dialogs.py:532 ../src/roster_window.py:3091
+#: ../src/roster_window.py:3097 ../src/roster_window.py:3102
msgid "None"
msgstr "Kein Proxy"
@@ -159,7 +155,7 @@ msgstr ""
"verbinden können."
#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
msgid "_Advanced"
msgstr "_Erweitert"
@@ -178,6 +174,7 @@ msgstr "_Jabber-ID:"
#: ../data/gui/account_creation_wizard_window.ui.h:28
#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "_Password:"
msgstr "_Passwort:"
@@ -186,6 +183,7 @@ msgid "_Port:"
msgstr "_Port:"
#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/manage_bookmarks_window.ui.h:9
msgid "_Server:"
msgstr "_Server:"
@@ -230,7 +228,6 @@ msgid "Auto-reconnect when connection is lost"
msgstr "Automatisch neu verbinden, falls die Verbindung abbricht"
#: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
msgid "Browse..."
msgstr "_Durchsuche"
@@ -251,9 +248,8 @@ msgstr ""
"Verbindung gesendet wird."
#: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
msgid "Choose Client Cert"
-msgstr "Datei auswählen …"
+msgstr "Clientzertifikat auswählen …"
#: ../data/gui/accounts_window.ui.h:16
msgid "Choose _Key..."
@@ -269,9 +265,8 @@ msgstr ""
"Klicken, um alle Kontakte eines anderen Kontos um Autorisierung zu fragen."
#: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
msgid "Client certificate"
-msgstr "Selbstsigniertes Zertifikat"
+msgstr "Clientzertifikat"
#: ../data/gui/accounts_window.ui.h:20
msgid "Co_nnect on Gajim startup"
@@ -293,18 +288,19 @@ msgstr "Vorname:"
#. No configured account
#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
+#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160
+#: ../src/notify.py:474 ../src/notify.py:497 ../src/notify.py:546
+#: ../src/notify.py:562
msgid "Gajim"
msgstr "Gajim"
#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124
+#: ../src/roster_window.py:3033 ../src/roster_window.py:5648
msgid "General"
msgstr "Allgemein"
@@ -366,8 +362,8 @@ msgid "Information about you, as stored in the server"
msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
+#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826
+#: ../src/dialogs.py:837
msgid "Jabber ID:"
msgstr "Jabber-ID:"
@@ -380,8 +376,8 @@ msgstr "Nachname:"
msgid "Mer_ge accounts"
msgstr "Konten _zusammenführen"
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
+#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
+#: ../src/config.py:2367
msgid "No key selected"
msgstr "Kein Schlüssel ausgewählt"
@@ -409,7 +405,7 @@ msgstr ""
"Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5598
msgid "Re_name"
msgstr "_Umbenennen"
@@ -454,7 +450,7 @@ msgstr "Kontakte synchronisieren"
#: ../data/gui/accounts_window.ui.h:53
msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgstr "Pfad zum Clientzertifikat und Schlüssel im PKCS#12 Format"
#: ../data/gui/accounts_window.ui.h:54
msgid "Use G_PG Agent"
@@ -474,7 +470,7 @@ msgstr "Dateiübertragungs-Proxys verwenden"
#: ../data/gui/accounts_window.ui.h:58
msgid "_Client Cert File:"
-msgstr ""
+msgstr "Datei für _Clientzertifikat:"
#: ../data/gui/accounts_window.ui.h:59
msgid "_Edit Personal Information..."
@@ -546,6 +542,7 @@ msgid "_Group:"
msgstr "_Gruppe:"
#: ../data/gui/add_new_contact_window.ui.h:12
+#: ../data/gui/manage_bookmarks_window.ui.h:7
msgid "_Nickname:"
msgstr "Spitz_name:"
@@ -558,9 +555,8 @@ msgid "_Register"
msgstr "_Registrieren"
#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
msgid "_Save subscription message"
-msgstr "_Abonnement"
+msgstr "_Abonnementnachricht speichern"
#: ../data/gui/add_new_contact_window.ui.h:16
msgid "_User ID:"
@@ -587,9 +583,8 @@ msgid "Error description..."
msgstr "Fehlerbeschreibung …"
#: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
msgid "F_inish"
-msgstr "_Beenden"
+msgstr "_Fertigstellen"
#: ../data/gui/adhoc_commands_window.ui.h:7
msgid "Please wait while retrieving command list..."
@@ -676,194 +671,6 @@ msgstr "_Administrator"
msgid "_Send Server Message..."
msgstr "Servernachricht _senden …"
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " ein Fenster/Tab mit diesem Kontakt geöffnet "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Aktionen</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Ereignisse</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Klänge</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Erweiterte Aktionen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Erweiterter Benachrichtigungseditor"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Alle Status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Abwesend"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Beschäftigt "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakt hat Status verändert"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakt nicht verbunden"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "habe nicht "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "Dateiübertragungen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "Anfrage zur Dateiübertragung"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "Dateiübertragung gestoppt"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Hervorhebung von Chatraum-Nachrichten"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Chatraum-Nachricht empfangen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "habe "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Unsichtbar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Einen Befehl ausführen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nicht verfügbar"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Einen oder mehrere spezielle Status …"
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Online / Frei zum Chatten"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Einen Klang abspielen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "Neue private Nachricht"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Wenn "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der "
-"Taskleiste blinken zu lassen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Deaktiviere sich von selbst öffnende Chatfenster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Deaktivere existierendes Popup-Fenster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Deaktivere existierenden Sound für dieses Ereignis"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "_Deaktiviere die Ereignisanzeige in der Kontaktliste"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Deaktiviere die Ereignisanzeige in der Kontaktliste"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informiere mich mit einem Popup-Fenster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "Ein _Chatfenster mit Benutzer öffnen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Zeige Ereignis in der Kontaktli_ste"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "Zeige Ereignis in der Kontaktli_ste"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "und ich "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "Kontakte"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "für "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "Gruppen"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "wenn ich bin"
-
#: ../data/gui/archiving_preferences_window.ui.h:1
msgid "<i>Method Auto</i>"
msgstr ""
@@ -930,8 +737,8 @@ msgstr "blockierte Kontakte"
# TODO: Review by german translators
#: ../data/gui/blocked_contacts_window.ui.h:2
#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5617
+#: ../src/roster_window.py:5744 ../src/roster_window.py:5877
msgid "_Unblock"
msgstr "_Entblocken"
@@ -1018,14 +825,13 @@ msgstr "Link im Br_owser öffnen"
msgid "_Start Chat"
msgstr "Chat _starten"
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
+#: ../data/gui/chat_control.ui.h:1
msgid "#"
msgstr "Nr."
#: ../data/gui/chat_control.ui.h:2
msgid "*"
-msgstr ""
+msgstr "*"
#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
msgid "0"
@@ -1033,39 +839,39 @@ msgstr "0"
#: ../data/gui/chat_control.ui.h:4
msgid "1"
-msgstr ""
+msgstr "1"
#: ../data/gui/chat_control.ui.h:5
msgid "2"
-msgstr ""
+msgstr "2"
#: ../data/gui/chat_control.ui.h:6
msgid "3"
-msgstr ""
+msgstr "3"
#: ../data/gui/chat_control.ui.h:7
msgid "4"
-msgstr ""
+msgstr "4"
#: ../data/gui/chat_control.ui.h:8
msgid "5"
-msgstr ""
+msgstr "5"
#: ../data/gui/chat_control.ui.h:9
msgid "6"
-msgstr ""
+msgstr "6"
#: ../data/gui/chat_control.ui.h:10
msgid "7"
-msgstr ""
+msgstr "7"
#: ../data/gui/chat_control.ui.h:11
msgid "8"
-msgstr ""
+msgstr "8"
#: ../data/gui/chat_control.ui.h:12
msgid "9"
-msgstr ""
+msgstr "9"
#: ../data/gui/chat_control.ui.h:13
msgid "Add this contact to roster (Ctrl+D)"
@@ -1105,13 +911,13 @@ msgstr "Zwischen Video-Sitzung umschalten"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:275
msgid "_Send"
msgstr "_Senden"
#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
msgid "label"
-msgstr ""
+msgstr "Bezeichung"
#: ../data/gui/chat_to_muc_window.ui.h:1
msgid "In_vite"
@@ -1160,8 +966,9 @@ msgstr "_Gruppen bearbeiten …"
#. Invite to
#. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5553
+#: ../src/roster_window.py:5712
msgid "In_vite to"
msgstr "_Einladen zu"
@@ -1173,12 +980,12 @@ msgstr "_Kontakte einladen"
msgid "Remo_ve"
msgstr "Ent_fernen"
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5563
+#: ../src/roster_window.py:5801
msgid "Send Cus_tom Status"
msgstr "Benu_tzerdefinierten Status senden"
-#: ../data/gui/contact_context_menu.ui.h:10
+#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
msgid "Send Single _Message..."
msgstr "Einzelne _Nachricht senden …"
@@ -1208,8 +1015,8 @@ msgid "_Allow him/her to see my status"
msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
#: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5625
+#: ../src/roster_window.py:5750 ../src/roster_window.py:5880
msgid "_Block"
msgstr "_Blockieren"
@@ -1219,8 +1026,8 @@ msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
#: ../data/gui/contact_context_menu.ui.h:20
#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5755
+#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
+#: ../src/roster_window.py:5951
msgid "_History"
msgstr "_Verlauf"
@@ -1329,7 +1136,7 @@ msgid "When a file transfer is complete show a popup notification"
msgstr ""
"Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
+#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
msgid "_Continue"
msgstr "_Fortsetzen"
@@ -1354,26 +1161,24 @@ msgid "<b>Chatstate Tab Colors</b>"
msgstr "<b>Tabellenfarben des Chat-Status</b>"
#: ../data/gui/gajim_themes_window.ui.h:2
-#, fuzzy
msgid "Account row"
-msgstr "Konto"
+msgstr "Kontoreihe"
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1029
msgid "Bold"
msgstr "Fett"
#: ../data/gui/gajim_themes_window.ui.h:4
msgid "Chat Banner"
-msgstr ""
+msgstr "Chat-Banner"
#: ../data/gui/gajim_themes_window.ui.h:5
msgid "Composing"
msgstr "Erstellen"
#: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
msgid "Contact row"
-msgstr "Kontakt"
+msgstr "Kontaktreihe"
#: ../data/gui/gajim_themes_window.ui.h:7
msgid "Font style:"
@@ -1388,15 +1193,14 @@ msgid "Gone"
msgstr "Weg"
#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
msgid "Group row"
-msgstr "Gruppe"
+msgstr "Gruppenreihe"
#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
msgid "Inactive"
msgstr "Inaktiv"
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1030
msgid "Italic"
msgstr "Kursiv"
@@ -1460,47 +1264,52 @@ msgstr "Chatraum _verwalten"
msgid "_Minimize on close"
msgstr "Beim Schließen _minimieren"
-#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Stimme verleihen"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
msgid "Mo_derator"
msgstr "Mo_derator"
-#: ../data/gui/gc_occupants_menu.ui.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:3
msgid "Occupant Actions"
msgstr "Benutzeraktionen"
-#: ../data/gui/gc_occupants_menu.ui.h:3
+#: ../data/gui/gc_occupants_menu.ui.h:4
msgid "Send _File"
msgstr "_Datei senden"
-#: ../data/gui/gc_occupants_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:5
msgid "_Add to Roster"
msgstr "Zur Kont_aktliste hinzufügen"
-#: ../data/gui/gc_occupants_menu.ui.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:6
msgid "_Admin"
msgstr "_Admin"
-#: ../data/gui/gc_occupants_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:7
msgid "_Ban"
msgstr "Ver_bannen"
-#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:10
msgid "_Kick"
msgstr "_Rausschmeißen"
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:11
msgid "_Member"
msgstr "_Mitglied"
-#: ../data/gui/gc_occupants_menu.ui.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:12
msgid "_Owner"
msgstr "_Besitzer"
-#: ../data/gui/gc_occupants_menu.ui.h:12
+#: ../data/gui/gc_occupants_menu.ui.h:13
msgid "_Send Private Message"
msgstr "Private Nachricht _senden"
-#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:15
msgid "_Voice"
msgstr "_Stimme verleihen"
@@ -1546,21 +1355,15 @@ msgstr ""
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
msgstr "<big><b>Willkommen im Gajim-Verlaufsmanager</b></big>"
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:4
msgid "Export"
msgstr "Export"
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:5
msgid "Gajim History Logs Manager"
msgstr "Gajim-Verlaufsmanager"
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:6
msgid ""
"This log manager is not intended for log viewing. If you are looking for "
"such functionality, use the history window instead.\n"
@@ -1575,28 +1378,25 @@ msgstr ""
"Benutzen Sie dieses Programm, um Logs zu löschen oder zu exportieren. Sie "
"können links Logeinträge auswählen und unten die Datenbank durchsuchen."
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:9
msgid "_Search Database"
msgstr "Durch_suche Datenbank"
#: ../data/gui/history_window.ui.h:1
-#, fuzzy
msgid "All Chat Histories"
-msgstr "Alle Status"
+msgstr "Alle Chatverläufe"
#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
msgid "Conversation History"
msgstr "Unterhaltungsverlauf"
#: ../data/gui/history_window.ui.h:3
-#, fuzzy
msgid "Enter JID or Contact name"
-msgstr "Name des Kontakts"
+msgstr "Bitte JID oder Kontaktnamen eingeben"
#: ../data/gui/history_window.ui.h:4
-#, fuzzy
msgid "Groupchat Histories"
-msgstr "Gruppenchat"
+msgstr "Gruppenchatverläufe"
#: ../data/gui/history_window.ui.h:5
msgid "Search:"
@@ -1612,8 +1412,9 @@ msgid "approve"
msgstr ""
#: ../data/gui/item_archiving_preferences_window.ui.h:2
+#, fuzzy
msgid "body"
-msgstr ""
+msgstr "Jeder"
#: ../data/gui/item_archiving_preferences_window.ui.h:3
msgid "concede"
@@ -1632,13 +1433,11 @@ msgid "forbid"
msgstr ""
#: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:229
msgid "jid"
msgstr "Jabber-ID"
#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
@@ -1671,26 +1470,22 @@ msgid "stream"
msgstr ""
#: ../data/gui/join_groupchat_window.ui.h:2
-#, fuzzy
msgid "Bro_wse Rooms"
-msgstr "_Durchsuche"
+msgstr "Räume _Durchsuchen"
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2298
msgid "Join Group Chat"
msgstr "Chatraum betreten"
#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
msgid "Join this room _automatically when I connect"
-msgstr "Betritt diesen Chatraum automatisch, wenn ich mich verbinde"
+msgstr "Betrete diesen Chatraum _automatisch, wenn ich mich verbinde"
#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
msgid "Nickname:"
msgstr "Spitzname:"
#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
msgid "Password:"
msgstr "Passwort:"
@@ -1699,28 +1494,26 @@ msgid "Recently:"
msgstr "Kürzlich:"
#: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "Room:"
msgstr "Chatraum:"
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
msgid "Server:"
msgstr "Server:"
# TODO: Synchronize with other strings concerning bookmarks
#: ../data/gui/join_groupchat_window.ui.h:10
-#, fuzzy
msgid "_Bookmark this room"
-msgstr "Diesen Chatraum merken (Strg+B)"
+msgstr "Diesen _Chatraum merken"
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
#: ../src/disco.py:1804
msgid "_Join"
msgstr "_Betreten"
#: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
+#, fuzzy
+msgid "A_uto join"
msgstr "Automatisch verbinden"
#: ../data/gui/manage_bookmarks_window.ui.h:2
@@ -1732,15 +1525,22 @@ msgid "Manage Bookmarks"
msgstr "Chatraum-Lesezeichen"
#: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
msgstr "Minimieren bei automatischem Beitritt"
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+#, fuzzy
+msgid "Pr_int status:"
msgstr "Status anzeigen:"
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "Roo_m:"
+msgstr ""
+
#: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
+#, fuzzy
+msgid "_Title:"
msgstr "Titel:"
#: ../data/gui/manage_pep_services_window.ui.h:1
@@ -1761,15 +1561,11 @@ msgstr "<b>Einstellungen</b>"
#: ../data/gui/manage_proxies_window.ui.h:3
msgid "BOSH"
-msgstr ""
+msgstr "BOSH"
#: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
msgid "HTTP Connect"
-msgstr ""
-"HTTP-Verbindung\n"
-"SOCKS5\n"
-"BOSH"
+msgstr "HTTP-Verbindung"
#: ../data/gui/manage_proxies_window.ui.h:5
msgid "Manage Proxy Profiles"
@@ -1789,7 +1585,7 @@ msgstr "Proxy-_Port:"
#: ../data/gui/manage_proxies_window.ui.h:9
msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
#: ../data/gui/manage_proxies_window.ui.h:10
msgid "Use HTTP prox_y"
@@ -1844,59 +1640,62 @@ msgstr "_Einstellen"
#: ../data/gui/plugins_window.ui.h:6
#, fuzzy
-msgid "Descrition:"
+msgid "Description:"
msgstr "Beschreibung: "
#: ../data/gui/plugins_window.ui.h:7
#, fuzzy
+msgid "Descrition:"
+msgstr "Beschreibung: "
+
+#: ../data/gui/plugins_window.ui.h:8
+#, fuzzy
msgid "Homepage:"
msgstr "<b>Homepage:</b>"
-#: ../data/gui/plugins_window.ui.h:8
+#: ../data/gui/plugins_window.ui.h:9
msgid "Install"
msgstr ""
-#: ../data/gui/plugins_window.ui.h:9
+#: ../data/gui/plugins_window.ui.h:10
#, fuzzy
msgid "Installed"
msgstr "Steht still"
-#: ../data/gui/plugins_window.ui.h:10
+#: ../data/gui/plugins_window.ui.h:11
msgid ""
"Plug-in decription should be displayed here. This text will be erased during "
"PluginsWindow initialization."
msgstr ""
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:12
msgid "Plugins"
msgstr ""
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:13
msgid "Uninstall"
msgstr ""
-#: ../data/gui/plugins_window.ui.h:13
+#: ../data/gui/plugins_window.ui.h:14
#, fuzzy
msgid "Version:"
msgstr "GTK+-Version:"
-#: ../data/gui/plugins_window.ui.h:14
+#: ../data/gui/plugins_window.ui.h:15
msgid "button"
msgstr ""
-#: ../data/gui/plugins_window.ui.h:15
+#: ../data/gui/plugins_window.ui.h:16
msgid "homepage url"
msgstr ""
#: ../data/gui/popup_notification_window.ui.h:1
-#, fuzzy
msgid "Event Type"
-msgstr "Ereignis"
+msgstr "Ereignisarten"
#: ../data/gui/popup_notification_window.ui.h:2
-#, fuzzy
msgid "Event desc"
-msgstr "Ereignis"
+msgstr "Ereignisbeschreibung"
#: ../data/gui/preferences_window.ui.h:1
msgid "<b>Advanced Configuration Editor</b>"
@@ -1907,9 +1706,8 @@ msgid "<b>Applications</b>"
msgstr "<b>Anwendungen</b>"
#: ../data/gui/preferences_window.ui.h:3
-#, fuzzy
msgid "<b>Audio</b>"
-msgstr "<b>Aktionen</b>"
+msgstr "<b>Audio</b>"
#: ../data/gui/preferences_window.ui.h:4
msgid "<b>Auto Status</b>"
@@ -1928,9 +1726,8 @@ msgid "<b>Chat state notifications</b>"
msgstr "<b>Chatstatus-Benachrichtigungen</b>"
#: ../data/gui/preferences_window.ui.h:8
-#, fuzzy
msgid "<b>Connection</b>"
-msgstr "<b>Ereignisse</b>"
+msgstr "<b>Verbindung</b>"
#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
#: ../data/gui/preferences_window.ui.h:10
@@ -1951,12 +1748,16 @@ msgstr "<b>Voreingestellte Statusnachrichten</b>"
#: ../data/gui/preferences_window.ui.h:15
msgid "<b>Privacy</b>"
-msgstr "<i>Privatsphäre</i>"
+msgstr "<b>Privatsphäre</b>"
#: ../data/gui/preferences_window.ui.h:16
msgid "<b>Roster Appearance</b>"
msgstr "<b>Aussehen der Kontaktliste</b>"
+#: ../data/gui/preferences_window.ui.h:17
+msgid "<b>Sounds</b>"
+msgstr "<b>Klänge</b>"
+
#: ../data/gui/preferences_window.ui.h:18
msgid "<b>Status Messages</b>"
msgstr "<b>Statusnachrichten</b>"
@@ -1966,9 +1767,8 @@ msgid "<b>Themes</b>"
msgstr "<b>Themen</b>"
#: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
msgid "<b>Video</b>"
-msgstr "<b>Zweiter Vorname:</b>"
+msgstr "<b>Video</b>"
#: ../data/gui/preferences_window.ui.h:21
msgid "<b>Visual Notifications</b>"
@@ -1976,141 +1776,132 @@ msgstr "<b>Visuelle Benachrichtigungen</b>"
#: ../data/gui/preferences_window.ui.h:22
msgid "<i>(example: stunserver.org)</i>"
-msgstr ""
+msgstr "<i>(Beispiel: stunserver.org)</i>"
#: ../data/gui/preferences_window.ui.h:23
msgid "Advanced"
msgstr "Erweitert"
#: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Erweitert …"
-
-#: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
msgid "All chat states"
-msgstr "Alle Status"
+msgstr "Alle Chatstatus"
-#: ../data/gui/preferences_window.ui.h:26
+#: ../data/gui/preferences_window.ui.h:25
msgid "Allow _OS information to be sent"
msgstr "Erlaube das Senden von Betriebssystem-Inf_ormation"
-#: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:26
msgid "Allow my _idle time to be sent"
-msgstr "Erlaube das Senden von Betriebssystem-Inf_ormation"
+msgstr "Erlaube das Senden meiner Ze_it der Untätigkeit"
-#: ../data/gui/preferences_window.ui.h:28
+#: ../data/gui/preferences_window.ui.h:27
msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
msgstr ""
"Popups/Benachrichtigungen zulassen, wenn ich _abwesend/nicht verfügbar/"
"beschäftigt/unsichtbar bin"
-#: ../data/gui/preferences_window.ui.h:29
+#: ../data/gui/preferences_window.ui.h:28
msgid "Allow sound when I'm _busy"
msgstr "Soundausgabe erlauben, wenn ich _beschäftigt bin"
-#: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:29
msgid "Always"
-msgstr "Abwesend"
+msgstr "Immer"
-#: ../data/gui/preferences_window.ui.h:31
+#: ../data/gui/preferences_window.ui.h:30
msgid "Ask status message when I:"
msgstr "Erfrage Statusnachricht beim:"
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
msgid "Audio / Video"
msgstr "Audio / Video"
-#: ../data/gui/preferences_window.ui.h:33
+#: ../data/gui/preferences_window.ui.h:32
msgid "Audio input device"
-msgstr ""
+msgstr "Audioaufnahmegerät"
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:33
msgid "Audio output device"
-msgstr ""
+msgstr "Audioausgabegerät"
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:34
msgid "Chat message:"
msgstr "Chat-Nachricht:"
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:35
msgid "Check on startup if Gajim is the _default Jabber client"
msgstr "Beim Starten überprüfen, ob Gajim der _Standard-Jabber-Client ist"
-#: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:36
msgid "Composing only"
-msgstr "Erstellen"
+msgstr "Nur verfassen"
-#: ../data/gui/preferences_window.ui.h:38
+#: ../data/gui/preferences_window.ui.h:37
msgid "Configure color and font of the interface"
msgstr "Farben und Schriftarten für die Oberfläche konfigurieren"
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:38
msgid "Contact's message:"
msgstr "Nachricht des Kontakts:"
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:39
msgid "Contact's nickname:"
msgstr "Spitzname des Kontakts:"
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:40
msgid "Custom"
msgstr "Benutzerdefiniert"
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:41
msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgstr "Abgelöste Kontaktliste mit Chat gruppiert nach Konto"
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:42
msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgstr "Abgelöste Kontaktliste mit Chat gruppiert nach Typ"
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:43
msgid "Detached roster with detached chats"
-msgstr ""
+msgstr "Abgelöste Kontaktliste mit abgelösten Chats"
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:44
msgid "Detached roster with single chat"
-msgstr ""
+msgstr "Abgelöste Kontaktliste mit einzigem Chat"
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
+#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
+#: ../src/config.py:672
msgid "Disabled"
msgstr "Deaktiviert"
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:46
msgid "Display _activity of contacts in roster"
msgstr "_Aktivitäten von Kontakten in der Kontaktliste anzeigen"
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:47
msgid "Display _extra email details"
msgstr "Zusätzliche _E-Mail-Details anzeigen"
-#: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:48
msgid "Display _location of contacts in roster"
-msgstr "_Stimmungen anzeigen"
+msgstr "Position der Kontakte in Kontakt_leiste anzeigen"
-#: ../data/gui/preferences_window.ui.h:50
+#: ../data/gui/preferences_window.ui.h:49
msgid "Display _tunes of contacts in roster"
msgstr "Die gerade abgespielten Musik_titel anzeigen"
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:50
msgid "Display a_vatars of contacts in roster"
msgstr "A_vatare der Kontakte in der Kontaktliste anzeigen"
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:51
msgid "Display m_ood of contacts in roster"
msgstr "_Stimmungen anzeigen"
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:52
msgid "Display status _messages of contacts in roster"
msgstr "Status_nachrichten anzeigen"
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:53
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 "
@@ -2120,7 +1911,7 @@ msgstr ""
"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
"in Ihrem Chatfenster anzeigt werden sollen."
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:54
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 "
@@ -2130,7 +1921,7 @@ msgstr ""
"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
"Sie Ihrem Gegenüber senden möchten."
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:55
msgid ""
"Gajim will notify you via a popup window in the bottom right of the screen "
"about contacts that just signed out"
@@ -2138,11 +1929,11 @@ msgstr ""
"Gajim informiert Sie über ein Popup-Fenster in der rechten unteren "
"Bildschirmecke über Kontakte, die sich gerade abgemeldet haben."
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:57
msgid "Hide all buttons in chat windows"
msgstr "Versteckt alle Schaltflächen im Chatfenster"
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:58
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
@@ -2150,7 +1941,7 @@ msgstr ""
"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
"festzustellen."
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:59
msgid ""
"If checked, Gajim will also include information about the sender of the new "
"emails"
@@ -2158,14 +1949,14 @@ msgstr ""
"Falls aktiviert, fügt Gajim auch Informationen über den Absender neuer E-"
"Mails hinzu."
-#: ../data/gui/preferences_window.ui.h:61
+#: ../data/gui/preferences_window.ui.h:60
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr ""
"Falls aktiviert, wird der Status in Abwesend geändert, wenn der Computer "
"nicht genutzt wird."
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:61
msgid ""
"If checked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
@@ -2173,7 +1964,7 @@ msgstr ""
"Falls aktiviert, wird der Status in Nicht Verfügbar geändert, wenn der "
"Computer längere Zeit nicht genutzt wird."
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:62
msgid ""
"If checked, Gajim will display avatars of contacts in roster window and in "
"group chats"
@@ -2181,7 +1972,7 @@ msgstr ""
"Falls aktiviert, werden die Avatare der Kontakte in der Kontaktliste und in "
"Chaträumen eingeblendet."
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:63
msgid ""
"If checked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
@@ -2189,36 +1980,34 @@ msgstr ""
"Falls aktiviert, wird unter dem Namen jeden Kontaktes in der Kontaktliste "
"und in Chaträumen die Statusnachricht angezeigt."
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:64
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr ""
"Falls aktiviert, wird die Aktivität der Kontakte in der Kontaktliste "
"angezeigt."
-#: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:65
msgid ""
"If checked, Gajim will display the location of contacts in the roster window"
msgstr ""
-"Falls aktiviert, wird die Stimmung der Kontakte in der Kontaktliste "
-"angezeigt."
+"Falls aktiviert, wird die Position der Kontakte in der Kontaktliste angezeigt"
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:66
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr ""
"Falls aktiviert, wird die Stimmung der Kontakte in der Kontaktliste "
"angezeigt."
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:67
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr ""
"Falls aktiviert, wird der gerade abgespielte Musiktitel der Kontakte in der "
"Kontaktliste angezeigt."
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:68
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 "
@@ -2229,7 +2018,7 @@ msgstr ""
"Rechtsklick), wird die Standardsprache für diesen Kontakt oder Chatraum "
"verwendet."
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:69
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
"Use with caution, because it blocks all messages from any contact that is "
@@ -2239,7 +2028,7 @@ msgstr ""
"Kontakten ignoriert. Vorsicht: Sie können nur noch Nachrichten von Kontakten "
"empfangen, die in Ihrer Kontaktliste sind."
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:70
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 "
@@ -2249,7 +2038,7 @@ msgstr ""
"Bitte bedenken Sie, dass bei der Benutzung von ESession-Verschlüsselung der "
"Chatpartner zustimmen muss; ansonsten wird nichts aufgezeichnet."
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:71
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
@@ -2257,7 +2046,7 @@ msgstr ""
"Falls aktiviert, wird eine Benachrichtigung angezeigt, wenn eine neue E-Mail "
"über Google-Mail empfangen wurde."
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:72
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, "
@@ -2267,7 +2056,7 @@ msgstr ""
"Beispiel wird für einen MSN-Kontakt das jeweilige MSN-Symbol für den Status "
"\"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. angezeigt.)"
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:73
msgid ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
@@ -2275,7 +2064,7 @@ msgstr ""
"Falls aktiviert, werden Sie nicht nach einer Statusnachricht gefragt. Die "
"Standardnachricht wird benutzt."
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:74
msgid ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
"animated or static graphical emoticons"
@@ -2283,6 +2072,11 @@ msgstr ""
"Falls aktiviert, werden ASCII-Smilies wie \":)\" mit äquivalenten "
"graphischen Emoticons ersetzt."
+#: ../data/gui/preferences_window.ui.h:75
+#, fuzzy
+msgid "Last state"
+msgstr "Letzter Status: %s"
+
#: ../data/gui/preferences_window.ui.h:76
msgid "Log _encrypted chat session"
msgstr "V_erschlüsselte Sitzungen aufzeichnen"
@@ -2296,9 +2090,8 @@ msgid "Ma_nage..."
msgstr "Verwalte_n …"
#: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
msgid "Never"
-msgstr "Server"
+msgstr "Nie"
#: ../data/gui/preferences_window.ui.h:80
msgid "Notifications"
@@ -2313,21 +2106,16 @@ msgid "Notify me about contacts that sign _out"
msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
msgid "Notify me about it"
-msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
+msgstr "Benachrichtige mich darüber"
#: ../data/gui/preferences_window.ui.h:84
msgid "Notify on new _GMail email"
msgstr "Bei neuen E-Mails bei _Google-Mail benachrichtigen"
#: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
msgid "Only when pending events"
-msgstr ""
-"Niemals\n"
-"Nur bei neuen Ereignissen\n"
-"Immer"
+msgstr "Nur bei anhängenden Ereignissen"
#: ../data/gui/preferences_window.ui.h:86
msgid "Personal Events"
@@ -2339,7 +2127,7 @@ msgstr "Klänge ab_spielen"
#: ../data/gui/preferences_window.ui.h:88
msgid "Pop it up"
-msgstr ""
+msgstr "Aufpoppen"
#: ../data/gui/preferences_window.ui.h:89
msgid "Preferences"
@@ -2350,20 +2138,20 @@ msgid ""
"STUN server hostname. If none given, Gajim will try\n"
"to discover one from server."
msgstr ""
+"STUN Server Rechnername. Falls nicht definiert, wird Gajim versuchen\n"
+"einen vom Server zu ermitteln."
#: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
msgid "STUN server:"
-msgstr "Server:"
+msgstr "STUN Server:"
#: ../data/gui/preferences_window.ui.h:93
msgid "Show notification area icon:"
msgstr ""
#: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
msgid "Show only in roster"
-msgstr "Zeige Ereignis in der Kontaktli_ste"
+msgstr "Nur in der Kontaktliste zeigen"
#: ../data/gui/preferences_window.ui.h:95
msgid "Sign _in"
@@ -2375,7 +2163,7 @@ msgstr "a_bmelden"
#: ../data/gui/preferences_window.ui.h:97
msgid "Single window for everything"
-msgstr ""
+msgstr "Ein Fenster für alles"
#: ../data/gui/preferences_window.ui.h:98
msgid ""
@@ -2390,7 +2178,7 @@ msgstr ""
msgid "Sort contacts by status"
msgstr "Kontakte nach Status sortieren"
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
msgid "Status"
msgstr "Status"
@@ -2439,7 +2227,7 @@ msgstr "_Transport-Symbole verwenden"
#: ../data/gui/preferences_window.ui.h:111
#, fuzzy
msgid "Use default applications"
-msgstr "Immer OS/X-Standardprogramme verwenden"
+msgstr "Immer KDE Standardanwendungen verwenden"
#: ../data/gui/preferences_window.ui.h:112
msgid "Use system _default"
@@ -2447,19 +2235,19 @@ msgstr "Benutze System-_Voreinstellung"
#: ../data/gui/preferences_window.ui.h:113
msgid "Video framerate"
-msgstr ""
+msgstr "Video Frame-Rate"
#: ../data/gui/preferences_window.ui.h:114
msgid "Video input device"
-msgstr ""
+msgstr "Videoaufnahmegeräte"
#: ../data/gui/preferences_window.ui.h:115
msgid "Video output device"
-msgstr ""
+msgstr "Videoausgabegerät"
#: ../data/gui/preferences_window.ui.h:116
msgid "Video size"
-msgstr ""
+msgstr "Videogröße"
#: ../data/gui/preferences_window.ui.h:117
msgid "When new event is received:"
@@ -2531,32 +2319,37 @@ msgid "_Send chat state notifications:"
msgstr "Benachrichtigungen über den Chatstatus _senden:"
#: ../data/gui/preferences_window.ui.h:134
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "_Kontaktliste anzeigen"
+
+#: ../data/gui/preferences_window.ui.h:135
msgid "_Status message:"
msgstr "_Statusnachricht:"
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:136
msgid "_URL highlight:"
msgstr "_URL hervorheben:"
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:137
msgid "_Window behavior:"
msgstr "_Fensterverhalten:"
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:138
msgid "in _group chats"
msgstr "in Chat_räumen"
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:139
msgid "in _roster"
msgstr "in der _Kontaktliste"
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:140
msgid "minutes"
msgstr "Minuten"
#: ../data/gui/privacy_lists_window.ui.h:1
msgid "Privacy Lists:"
-msgstr "Privatsphären-Liste:"
+msgstr "Privatsphären-Listen:"
#: ../data/gui/privacy_list_window.ui.h:1
msgid "<b>Add / Edit a rule</b>"
@@ -2602,7 +2395,7 @@ msgstr "der Jabber-ID:"
msgid "Order:"
msgstr "Reihenfolge:"
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3936
msgid "Privacy List"
msgstr "Privatsphären-Liste"
@@ -2615,24 +2408,20 @@ msgid "all in the group"
msgstr "allen in der Gruppe"
#: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
msgid "both"
msgstr "Beide"
#: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
msgid "from"
-msgstr "Von"
+msgstr "von"
#: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
msgid "none"
-msgstr "Eins"
+msgstr "Niemand"
#: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
msgid "to"
-msgstr "Zwei"
+msgstr "zu"
#: ../data/gui/privacy_list_window.ui.h:19
msgid "to send me messages"
@@ -2675,108 +2464,108 @@ msgid "<b>Company:</b>"
msgstr "<b>Firma:</b>"
#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:10
msgid "<b>Country:</b>"
msgstr "<b>Land:</b>"
#: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/vcard_information_window.ui.h:11
msgid "<b>Department:</b>"
msgstr "<b>Abteilung:</b>"
#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:12
msgid "<b>E-Mail:</b>"
msgstr "<b>E-Mail:</b>"
#: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:13
msgid "<b>Extra Address:</b>"
msgstr "<b>Zusatzadresse:</b>"
#. Family Name
#: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:15
msgid "<b>Family:</b>"
msgstr "<b>Nachname:</b>"
#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:16
msgid "<b>Full Name</b>"
msgstr "<b>Vollständiger Name</b>"
#. Given Name
#: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:18
msgid "<b>Given:</b>"
msgstr "<b>Vorname:</b>"
#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:19
msgid "<b>Homepage:</b>"
msgstr "<b>Homepage:</b>"
#. Middle Name
#: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:22
msgid "<b>Middle:</b>"
msgstr "<b>Zweiter Vorname:</b>"
#: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:23
msgid "<b>Name:</b>"
msgstr "<b>Name:</b>"
#: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:24
msgid "<b>Nickname:</b>"
msgstr "<b>Spitzname:</b>"
#: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:25
msgid "<b>Phone No.:</b>"
msgstr "<b>Telefonnummer:</b>"
#: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:26
msgid "<b>Position:</b>"
msgstr "<b>Position:</b>"
#: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:27
msgid "<b>Postal Code:</b>"
msgstr "<b>Postleitzahl:</b>"
#. Prefix in Name
#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:29
msgid "<b>Prefix:</b>"
msgstr "<b>Namenspräfix:</b>"
#: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:31
msgid "<b>Role:</b>"
msgstr "<b>Rolle:</b>"
#: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:32
msgid "<b>State:</b>"
msgstr "<b>Bundesland:</b>"
#: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:34
msgid "<b>Street:</b>"
msgstr "<b>Straße:</b>"
#. Suffix in Name
#: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:38
msgid "<b>Suffix:</b>"
msgstr "<b>Namenszusatz:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:42
msgid "About"
msgstr "Ãœber"
@@ -2785,12 +2574,12 @@ msgid "Click to set your avatar"
msgstr "Hier klicken, um den Avatar zu auszuwählen."
#: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:45
+#: ../data/gui/vcard_information_window.ui.h:46
msgid "Format: YYYY-MM-DD"
msgstr "Format: JJJJ-MM-TT"
#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:48
msgid "Personal Info"
msgstr "Persönliche Details"
@@ -2813,8 +2602,8 @@ msgstr "Konto entfernen (in Gajim und auf dem _Server)"
#. Remove group
#. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5635
+#: ../src/roster_window.py:5760 ../src/roster_window.py:5890
msgid "_Remove"
msgstr "_Entfernen"
@@ -2869,52 +2658,48 @@ msgstr ""
msgid "Profile, A_vatar"
msgstr "Profil und A_vatar"
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
msgid "Show Only _Active Contacts"
msgstr "Nur _aktive Kontakte anzeigen"
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
msgid "Show Trans_ports"
msgstr "Trans_porte anzeigen"
-#: ../data/gui/roster_window.ui.h:12
+#: ../data/gui/roster_window.ui.h:13
msgid "Show _Offline Contacts"
msgstr "Abgemeldete K_ontakte anzeigen"
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
msgid "Show _Roster"
msgstr "_Kontaktliste anzeigen"
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
msgid "_Accounts"
msgstr "_Konten"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/roster_window.ui.h:16
#: ../data/gui/subscription_request_window.ui.h:6
msgid "_Actions"
msgstr "_Aktionen"
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:18
msgid "_Contents"
msgstr "In_halte"
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
+#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
msgid "_Edit"
msgstr "Änd_ern"
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
msgid "_FAQ"
msgstr "_FAQ"
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:22
msgid "_Help"
msgstr "_Hilfe"
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Einzelne _Nachricht senden …"
-
#: ../data/gui/roster_window.ui.h:25
msgid "_View"
msgstr "A_nsicht"
@@ -2932,11 +2717,11 @@ msgid "_Add contact"
msgstr "_Kontakt hinzufügen"
#. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5902
msgid "_Information"
msgstr "_Informationen"
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
msgid "_Search"
msgstr "_Suche"
@@ -3050,59 +2835,60 @@ msgid "<b>Client:</b>"
msgstr "<b>Client:</b>"
#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
+msgstr "Gewählter Avatar:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
msgid "<b>Contact time:</b>"
msgstr "<b>Uhrzeit beim Kontakt:</b>"
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:20
msgid "<b>Jabber ID:</b>"
msgstr "<b>Jabber-ID:</b>"
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:30
msgid "<b>Resource:</b>"
msgstr "<b>Ressource:</b>"
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:33
msgid "<b>Status:</b>"
msgstr "<b>Status:</b>"
#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:36
msgid "<b>Subscription:</b>"
msgstr "<b>Abonnement:</b>"
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:39
msgid "<b>System:</b>"
msgstr "<b>System:</b>"
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:40
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:43
msgid "Comments"
msgstr "Kommentare"
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
-msgstr "Gewählter Avatar:"
-
-#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/vcard_information_window.ui.h:44
#: ../data/gui/zeroconf_information_window.ui.h:1
msgid "Contact"
msgstr "Kontakt"
-#: ../data/gui/vcard_information_window.ui.h:44
+#: ../data/gui/vcard_information_window.ui.h:45
msgid "Contact Information"
msgstr "Kontaktinformationen"
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:47
msgid "More"
msgstr "Mehr"
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Avatar auswählen"
-
#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
msgid "<b>Filter</b>"
-msgstr "<b>Schrift</b>"
+msgstr "<b>Filter</b>"
#: ../data/gui/xml_console_window.ui.h:2
msgid "<b>Jabber Traffic</b>"
@@ -3114,23 +2900,23 @@ msgstr "<b>XML-Direkteingabe</b>"
#: ../data/gui/xml_console_window.ui.h:4
msgid "Hide IN stanzas"
-msgstr ""
+msgstr "IN Strophen verstecken"
#: ../data/gui/xml_console_window.ui.h:5
msgid "Hide IQ stanzas"
-msgstr ""
+msgstr "IQ Strophen verstecken"
#: ../data/gui/xml_console_window.ui.h:6
msgid "Hide Message stanzas"
-msgstr ""
+msgstr "Nachrichtenstrophen verstecken"
#: ../data/gui/xml_console_window.ui.h:7
msgid "Hide OUT stanzas"
-msgstr ""
+msgstr "OUT Strophen verstecken"
#: ../data/gui/xml_console_window.ui.h:8
msgid "Hide Presence stanzas"
-msgstr ""
+msgstr "Presence Strophen verstecken"
#: ../data/gui/xml_console_window.ui.h:9
msgid "Info/Query"
@@ -3235,7 +3021,7 @@ msgstr "Ganzzahl"
msgid "Text"
msgstr "Text"
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1049
msgid "Color"
msgstr "Farbe"
@@ -3272,140 +3058,153 @@ msgstr[1] "Sie haben neue Einträge erhalten (und %d werden nicht angezeigt):"
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "English"
msgstr "Englisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Belarusian"
msgstr "Weißrussisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Bulgarian"
msgstr "Bulgarisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Breton"
msgstr "Bretonisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Czech"
msgstr "Tschechisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "German"
msgstr "Deutsch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Greek"
msgstr "Griechisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "British"
msgstr "Britisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Esperanto"
msgstr "Esperanto"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Spanish"
msgstr "Spanisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Basque"
msgstr "Baskisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "French"
msgstr "Französisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Croatian"
msgstr "Kroatisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Italian"
msgstr "Italienisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Norwegian (b)"
msgstr "Norwegisch (Bokmål)"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Dutch"
msgstr "Niederländisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Norwegian"
msgstr "Norwegisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Polish"
msgstr "Polnisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Portuguese"
msgstr "Portugiesisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Brazilian Portuguese"
msgstr "Brasilianisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Russian"
msgstr "Russsich"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Serbian"
msgstr "Serbisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Slovak"
msgstr "Slovakisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Swedish"
msgstr "Schwedisch"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Chinese (Ch)"
msgstr "Chinesisch"
-#: ../src/chat_control.py:496
+#: ../src/chat_control.py:226
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/chat_control.py:231
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/chat_control.py:236
+msgid "Error."
+msgstr "Fehler:"
+
+#: ../src/chat_control.py:561
msgid "Spelling language"
msgstr "Sprache für die Rechtschreibprüfung"
#. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:593 ../src/chat_control.py:809
msgid "A connection is not available"
msgstr "Keine Verbindung verfügbar"
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:594 ../src/chat_control.py:810
msgid "Your message can not be sent until you are connected."
msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1031
msgid "Underline"
msgstr "Unterstrichen"
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1032
msgid "Strike"
msgstr "Durchgestrichen"
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1055
msgid "Font"
msgstr "Schriftart"
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1064
msgid "Clear formating"
msgstr "Formatierung löschen"
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1141
msgid "Really send file?"
msgstr "Datei wirklich senden?"
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1142
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr ""
@@ -3413,49 +3212,53 @@ msgstr ""
"kennen."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1622 ../src/chat_control.py:2144
msgid "GPG encryption enabled"
msgstr "GPG-Verschlüsselung aktiviert"
+#: ../src/chat_control.py:1643 ../src/chat_control.py:1646
+msgid "Requires python-farsight."
+msgstr "Erfordert python-farsight."
+
#. Add to roster
-#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
-#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
-#: ../src/roster_window.py:3382
+#: ../src/chat_control.py:1672 ../src/common/contacts.py:158
+#: ../src/common/contacts.py:277 ../src/common/helpers.py:60
+#: ../src/common/helpers.py:254 ../src/dialogs.py:1099 ../src/dialogs.py:2192
+#: ../src/dialogs.py:2221 ../src/gui_interface.py:507
+#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:404
+#: ../src/roster_window.py:1644 ../src/roster_window.py:1646
+#: ../src/roster_window.py:1979 ../src/roster_window.py:3506
+#: ../src/roster_window.py:3533
msgid "Not in Roster"
msgstr "Nicht in der Kontaktliste"
-#: ../src/chat_control.py:1575
+#: ../src/chat_control.py:1702
msgid "This contact does not support file transfer."
msgstr "Der Kontakt unterstützt keine Dateiübertragung."
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1705
msgid "You need to know the real JID of the contact to send him or her a file."
msgstr ""
"Sie müssen die JID des Kontakts kennen, um ihm oder ihr eine Datei zu senden."
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1812
#, python-format
msgid "%(type)s state : %(state)s, reason: %(reason)s"
msgstr "%(type)s Status: %(state)s, Grund: %(reason)s"
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2003
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
msgstr "%(nickname)s aus dem Chatraum %(room_name)s"
# TODO: GPG/PGP unification in original strings needed
#. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
+#: ../src/chat_control.py:2124 ../src/dialogs.py:4997
msgid "No GPG key assigned"
msgstr "Kein GPG-Schlüssel zugewiesen"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2125
msgid ""
"No GPG key is assigned to this contact. So you cannot encrypt messages with "
"GPG."
@@ -3464,50 +3267,50 @@ msgstr ""
"GPG verschlüsselt werden."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2134
msgid "GPG encryption disabled"
msgstr "GPG-Verschlüsselung deaktiviert"
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2160
msgid "Session WILL be logged"
msgstr "Sitzung WIRD aufgezeichnet"
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2162
msgid "Session WILL NOT be logged"
msgstr "Sitzung WIRD NICHT aufgezeichnet"
#. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2179
msgid "is"
msgstr "ist"
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2179
msgid "is NOT"
msgstr "ist NICHT"
#. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2181
msgid "will"
msgstr "wird"
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2181
msgid "will NOT"
msgstr "wird NICHT"
#. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2185
msgid "and authenticated"
msgstr "und authentifiziert"
#. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2189
msgid "and NOT authenticated"
msgstr "und NICHT authentifiziert"
#. 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:2062
+#: ../src/chat_control.py:2196
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3516,32 +3319,32 @@ msgstr ""
"%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
"Ihre Chatsitzung %(logged)s mitgeschrieben."
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2357
msgid "Session negotiation cancelled"
msgstr "Sitzungsaushandlung abgebrochen"
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2367
msgid "This session WILL be archived on server"
msgstr ""
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2369
#, fuzzy
msgid "This session WILL NOT be archived on server"
msgstr "Sitzung WIRD NICHT aufgezeichnet"
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2378
msgid "This session is encrypted"
msgstr "Diese Sitzung ist verschlüsselt"
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2381
msgid " and WILL be logged"
msgstr " und wird AUFGEZEICHNET"
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2383
msgid " and WILL NOT be logged"
msgstr " und wird NICHT AUFGEZEICHNET"
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2388
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
@@ -3549,25 +3352,25 @@ msgstr ""
"Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
"Informationen durch Klicken auf das Schild-Symbol."
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2390
msgid "E2E encryption disabled"
msgstr "E2E-Verschlüsselung deaktiviert"
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2434 ../src/chat_control.py:2447
msgid "The following message was NOT encrypted"
msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2440
msgid "The following message was encrypted"
msgstr "Die folgende Nachricht wurde verschlüsselt übertragen"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2731
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2732
msgid ""
"If you close this tab and you have history disabled, this message will be "
"lost."
@@ -3575,13 +3378,15 @@ msgstr ""
"Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
"Nachricht verloren."
-#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
-#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
-#: ../src/gajim.py:159 ../src/session.py:138
+#: ../src/chat_control.py:2899 ../src/common/connection_handlers_events.py:871
+#: ../src/common/connection_handlers.py:945
+#: ../src/common/connection_handlers.py:1046
+#: ../src/common/connection_handlers.py:1703 ../src/common/connection.py:462
+#: ../src/common/logger.py:1126 ../src/gajim.py:203 ../src/session.py:97
msgid "Database Error"
msgstr "Datenbankfehler"
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2900
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3590,42 +3395,50 @@ msgstr ""
"Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
"reparieren oder zu löschen (dabei gehen alle Verläufe verloren)."
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3136 ../src/gui_interface.py:1059
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
+"Eventuell wurde sie verändert."
+
+#: ../src/chat_control.py:3169
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s ist jetzt %(status)s"
-#: ../src/common/check_paths.py:37
+#: ../src/common/check_paths.py:38
msgid "creating logs database"
msgstr "Erstelle Log-Datenbank"
-#: ../src/common/check_paths.py:85
-#, fuzzy
+#: ../src/common/check_paths.py:86
msgid "creating cache database"
-msgstr "Erstelle Log-Datenbank"
+msgstr "Erstelle Cache-Datenbank"
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
+#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
+#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
#, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s ist eine Datei, sollte aber ein Verzeichnis sein"
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
msgid "Gajim will now exit"
msgstr "Gajim wird nun beendet"
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
#, python-format
msgid "%s is a directory but should be a file"
msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:352
#, python-format
msgid "creating %s directory"
msgstr "Erstelle Verzeichnis %s"
@@ -3650,6 +3463,11 @@ msgstr "Frei zum Chatten"
msgid "Online"
msgstr "Online"
+#: ../src/common/commands.py:106 ../src/common/helpers.py:242
+#: ../src/tooltips.py:193
+msgid "Away"
+msgstr "Abwesend"
+
#: ../src/common/commands.py:107
msgid "Extended away"
msgstr "Längere Zeit abwesend"
@@ -3689,9 +3507,9 @@ msgstr "Wählen Sie die Chaträume, die Sie verlassen möchten"
#. Make special context menu if group is Groupchats
#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/helpers.py:60 ../src/roster_window.py:817
+#: ../src/roster_window.py:1648 ../src/roster_window.py:1650
+#: ../src/roster_window.py:2508 ../src/roster_window.py:5520
msgid "Groupchats"
msgstr "Gruppenchat"
@@ -3708,55 +3526,54 @@ msgid "All unread messages have been forwarded."
msgstr "Alle ungelesenen Nachrichten wurden weitergeleitet."
#: ../src/common/commands.py:295
-#, fuzzy
msgid "Forward unread message then disconnect"
-msgstr "Ungelesene Nachrichten weiterleiten"
+msgstr "Ungelesene Nachrichten weiterleiten, dann Verbindung trennen"
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
msgid "Play sound when user is busy"
msgstr "Klang abspielen, wenn der Benutzer beschäftigt ist"
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
msgid "Use D-Bus and Notification-Daemon to show notifications"
msgstr ""
"Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
msgid "Show only online and free for chat contacts in roster."
msgstr ""
"Nur die Kontakte in der Kontaktliste anzeigen, die Verfügbar oder Frei zum "
"Chatten sind."
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
msgid "Time in minutes, after which your status changes to away."
msgstr "Zeit in Minuten, nach der Ihr Status auf Abwesend gesetzt wird"
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
msgid "$S (Away as a result of being idle more than $T min)"
msgstr "$S (Abwesend wegen Untätigkeit für mehr als $T Minuten)"
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
msgid "$S will be replaced by current status message, $T by autoaway time."
msgstr ""
"$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die "
"Abwesenheitszeit."
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
msgid "Time in minutes, after which your status changes to not available."
msgstr "Zeit in Minuten, nach der Ihr Status auf nicht verfügbar gesetzt wird."
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
msgid "$S (Not available as a result of being idle more than $T min)"
msgstr "$S (Nicht verfügbar wegen Untätigkeit seit mehr als $T Minuten)"
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
msgid "$S will be replaced by current status message, $T by autoxa time."
msgstr ""
"$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-"
"Verfügbar-Zeit."
# FIXME: Check English
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
#, fuzzy
msgid ""
"When to show notification area icon. Can be 'never', 'on_event', 'always'."
@@ -3764,47 +3581,51 @@ msgstr ""
"Legt fest, wann das Systemleisten-Symbol angezeigt wird. Mögliche Werte: "
"'never', 'on_event', 'always'."
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
msgid "Incoming nickname color."
msgstr "Farbe des eingehenden Spitznamens."
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
msgid "Outgoing nickname color."
msgstr "Farbe des abgehenden Spitznamens."
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
msgid "Incoming text color."
msgstr "Farbe des eingehenden Textes."
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
msgid "Outgoing text color."
msgstr "Farbe des abgehende Textes."
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
msgid "Status message text color."
msgstr "Farbe der Statusnachricht."
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
msgid "Incoming nickname font."
msgstr "Schriftart des eingehenden Spitznamens."
-#: ../src/common/config.py:101
+#: ../src/common/config.py:103
msgid "Outgoing nickname font."
msgstr "Schriftart des ausgehenden Spitznamens."
-#: ../src/common/config.py:102
+#: ../src/common/config.py:104
msgid "Incoming text font."
msgstr "Schriftart des eingehenden Textes."
-#: ../src/common/config.py:103
+#: ../src/common/config.py:105
msgid "Outgoing text font."
msgstr "Schriftart des abgehenden Textes."
-#: ../src/common/config.py:104
+#: ../src/common/config.py:106
msgid "Status message text font."
msgstr "Schriftart der Statusnachricht"
-#: ../src/common/config.py:105
+#: ../src/common/config.py:107
msgid ""
"List (space separated) of rows (accounts and groups) that are collapsed."
msgstr ""
@@ -3812,17 +3633,17 @@ msgstr ""
"eingeklappt sind."
#. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/config.py:108 ../src/common/config.py:495
#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:2659
msgid "default"
msgstr "Standard"
-#: ../src/common/config.py:112
+#: ../src/common/config.py:114
msgid "Language used by speller"
msgstr "Sprache der Rechtschreibprüfung"
-#: ../src/common/config.py:113
+#: ../src/common/config.py:115
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3832,7 +3653,7 @@ msgstr ""
"'sometimes' - Zeige Zeit alle print_ichat_every_foo_minutes Minuten.\n"
"'never' - Zeige nie die Zeit."
-#: ../src/common/config.py:114
+#: ../src/common/config.py:116
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. "
@@ -3843,18 +3664,18 @@ msgstr ""
"ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn print_time auf "
"'sometimes' gesetzt ist."
-#: ../src/common/config.py:117
+#: ../src/common/config.py:119
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
-#: ../src/common/config.py:118
+#: ../src/common/config.py:120
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
"Falls aktiviert, wird */_ nicht entfernt. So wird *abc* fett gedruckt, aber "
"* * wird nicht entfernt."
-#: ../src/common/config.py:121
+#: ../src/common/config.py:123
msgid ""
"Uses ReStructured text markup to send HTML, plus ascii formatting if "
"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3865,7 +3686,7 @@ msgstr ""
"sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie "
"dieses Feature benutzen möchten, installieren Sie docutils.)"
-#: ../src/common/config.py:130
+#: ../src/common/config.py:132
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -3873,7 +3694,7 @@ msgstr ""
"Zeichen, das hinter Spitznamen angezeigt wird, wenn die "
"Spitznamenvervollständigung (Tab) in Chaträumen verwendet wird."
-#: ../src/common/config.py:131
+#: ../src/common/config.py:133
msgid ""
"Character to propose to add after desired nickname when desired nickname is "
"used by someone else in group chat."
@@ -3881,7 +3702,13 @@ msgstr ""
"Zeichen, das an den gewünschten Spitznamen gehängt wird, falls der dieser im "
"Chatraum bereits vergeben ist."
-#: ../src/common/config.py:159
+#: ../src/common/config.py:151
+msgid ""
+"If true, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:162
msgid ""
"This option let you customize timestamp that is printed in conversation. For "
"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3892,24 +3719,26 @@ msgstr ""
"Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" "
"unter http://docs.python.org/lib/module-time.html (Englisch)."
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
msgid "Characters that are printed before the nickname in conversations"
msgstr "Zeichen, die vor dem Spitznamen ausgegeben werden"
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
msgid "Characters that are printed after the nickname in conversations"
msgstr "Zeichen, die nach dem Spitznamen gedruckt werden"
-#: ../src/common/config.py:164
+#: ../src/common/config.py:167
msgid ""
"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
msgstr ""
+"Definieren Sie den auszuführenden Befehl, wenn neue E-Mails eintreffen, z."
+"B.: /usr/bin/getmail -q"
-#: ../src/common/config.py:166
+#: ../src/common/config.py:169
msgid "Add * and [n] in roster title?"
msgstr "Sollen * und [n] in den Titel der Kontaktleiste eingefügt werden?"
-#: ../src/common/config.py:167
+#: ../src/common/config.py:170
msgid ""
"How many lines to remember from previous conversation when a chat tab/window "
"is reopened."
@@ -3917,24 +3746,30 @@ msgstr ""
"Wie viele Zeilen von der vorherigen Unterhaltung angezeigt werden, wenn ein "
"Tab/Fenster wieder geöffnet wird."
-#: ../src/common/config.py:168
+#: ../src/common/config.py:171
msgid "How many minutes should last lines from previous conversation last."
msgstr ""
"Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:172
+#, fuzzy
+msgid ""
+"How many lines to request to server when entering a groupchat. -1 means no "
+"limit"
msgstr ""
"Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats "
"abgefragt werden?"
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:173
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when a entering a groupchat. -1 means "
+"no limit"
msgstr ""
"Wie viele Minuten zurück soll das Logfile beim Betreten eines Gruppenchats "
"abgefragt werden?"
-#: ../src/common/config.py:171
+#: ../src/common/config.py:174
msgid ""
"How many seconds to wait before trying to autorejoin to a conference you are "
"being disconnected from. Set to 0 to disable autorejoining."
@@ -3943,7 +3778,12 @@ msgstr ""
"automatisch betreten wird, von dem Sie getrennt worden sind? Setze den Wert "
"auf 0, um das automatische Betreten zu deaktivieren."
-#: ../src/common/config.py:173
+#: ../src/common/config.py:175
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:176
msgid ""
"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
"Client default behaviour)."
@@ -3951,11 +3791,11 @@ msgstr ""
"Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
"(Standardeinstellung im ICQ-Client Mirabilis)."
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
#, python-format
msgid ""
"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3964,13 +3804,13 @@ msgstr ""
"Entweder eine spezielle URL mit %s, wobei %s das Wort / die Phrase ist oder "
"'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet wird."
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr ""
"Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert "
"werden."
-#: ../src/common/config.py:182
+#: ../src/common/config.py:185
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 "
@@ -3982,14 +3822,14 @@ msgstr ""
"(vorausgesetzt, Sie haben listen_to_network_manager nicht auf False gesetzt "
"und Ihre Konten synchronisieren sich mit dem globalen Status)."
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
msgid ""
"Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr ""
"Senden von Chatstatus-Benachrichtigungen. Kann auf \"all\", \"composing_only"
"\" oder \"disabled\" gesetzt werden."
-#: ../src/common/config.py:184
+#: ../src/common/config.py:187
msgid ""
"Displayed chat state notifications in chat windows. Can be one of all, "
"composing_only, disabled."
@@ -3997,7 +3837,7 @@ msgstr ""
"Angezeigte Chatstatus-Benachrichtigungen im Chatfenster. Kann auf \"all\", "
"\"composing_only\" oder \"disabled\" gesetzt werden."
-#: ../src/common/config.py:186
+#: ../src/common/config.py:189
msgid ""
"When not printing time for every message (print_time==sometimes), print it "
"every x minutes."
@@ -4005,11 +3845,11 @@ msgstr ""
"Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll "
"(print_time==sometimes), wird sie alle x Minuten angezeigt."
-#: ../src/common/config.py:187
+#: ../src/common/config.py:190
msgid "Ask before closing a group chat tab/window."
msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
msgid ""
"Always ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -4017,7 +3857,7 @@ msgstr ""
"Immer fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
"Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
-#: ../src/common/config.py:189
+#: ../src/common/config.py:192
msgid ""
"Never ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -4025,7 +3865,7 @@ msgstr ""
"Niemals fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
"Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
msgid ""
"Ask before closing tabbed chat window if there are control that can loose "
"data (chat, private chat, groupchat that will not be minimized)"
@@ -4033,7 +3873,7 @@ msgstr ""
"Frage bevor ein Chatfenster mit mehreren Tabs geschlossen wird, wenn dadurch "
"Daten verloren gehen würden (Chat, Privatchat, nicht minimierter Gruppenchat)"
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
msgid ""
"Comma separated list of hosts that we send, in addition of local interfaces, "
"for File Transfer in case of address translation/port forwarding."
@@ -4042,28 +3882,28 @@ msgstr ""
"Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen "
"gesendet werden."
-#: ../src/common/config.py:195
+#: ../src/common/config.py:198
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "Der IEC-Standard legt fest: 1 KiB = 1024 Byte, 1 kB = 1000 Byte."
-#: ../src/common/config.py:197
+#: ../src/common/config.py:200
#, fuzzy
msgid "Notify of events in the notification area."
msgstr "Neue Ereignisse per Trayicon anzeigen"
-#: ../src/common/config.py:203
+#: ../src/common/config.py:206
msgid "Show tab when only one conversation?"
msgstr "Tableiste bei nur einer Unterhaltung anzeigen?"
-#: ../src/common/config.py:204
+#: ../src/common/config.py:207
msgid "Show tabbed notebook border in chat windows?"
msgstr "Tab-Grenze im Chatfenster anzeigen?"
-#: ../src/common/config.py:205
+#: ../src/common/config.py:208
msgid "Show close button in tab?"
msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
-#: ../src/common/config.py:206
+#: ../src/common/config.py:209
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 "
@@ -4076,18 +3916,18 @@ msgstr ""
"Werte sind sicherer, benötigen jedoch beim Start einer neuen Unterhaltung "
"mehr Rechenzeit."
-#: ../src/common/config.py:215
+#: ../src/common/config.py:218
msgid "Preview new messages in notification popup?"
msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
-#: ../src/common/config.py:220
+#: ../src/common/config.py:223
msgid ""
"A semicolon-separated list of words that will be highlighted in group chats."
msgstr ""
"Eine durch Semikola getrennte Liste von Worten, die in einem Chatraum "
"hervorgehoben werden sollen."
-#: ../src/common/config.py:221
+#: ../src/common/config.py:224
#, fuzzy
msgid ""
"If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4097,14 +3937,14 @@ msgstr ""
"geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet "
"wird."
-#: ../src/common/config.py:222
+#: ../src/common/config.py:225
msgid ""
"If True, Gajim will check if it's the default jabber client on each startup."
msgstr ""
"Falls aktiviert, wird beim Starten überprüft, ob Gajim der Standard-Jabber-"
"Client ist."
-#: ../src/common/config.py:223
+#: ../src/common/config.py:226
msgid ""
"If True, Gajim will display an icon on each tab containing unread messages. "
"Depending on the theme, this icon may be animated."
@@ -4112,7 +3952,7 @@ msgstr ""
"Falls aktiviert, wird auf jedem Tab, der ungelesene Nachrichten enthält, ein "
"Icon angezeigt. Abhängig vom Chat-Design kann dieses Icon auch animiert sein."
-#: ../src/common/config.py:224
+#: ../src/common/config.py:227
msgid ""
"If True, Gajim will display the status message, if not empty, for every "
"contact under the contact name in roster window."
@@ -4120,13 +3960,13 @@ msgstr ""
"Falls aktiviert, wird in der Kontaktliste unter dem Namen eines jeden "
"Kontaktes dessen Statusnachricht angezeigt, sofern diese nicht leer ist."
-#: ../src/common/config.py:230
+#: ../src/common/config.py:233
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr ""
"Legt die Position des Avatars in der Kontaktliste fest. \"left\" (links) "
"oder \"right\" (rechts) sind mögliche Optionen."
-#: ../src/common/config.py:231
+#: ../src/common/config.py:234
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."
@@ -4134,7 +3974,7 @@ msgstr ""
"Falls aktiviert, wird jeder Kontakt, der beim letzten Mal keinen Avatar "
"hatte oder dessen gespeicherter Avatar zu alt ist, nach einem neuen gefragt."
-#: ../src/common/config.py:232
+#: ../src/common/config.py:235
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."
@@ -4142,7 +3982,7 @@ msgstr ""
"Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein "
"Kontakt seinen Status oder seine Statusnachricht ändert."
-#: ../src/common/config.py:233
+#: ../src/common/config.py:236
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 "
@@ -4156,30 +3996,34 @@ msgstr ""
"Statusnachrichten anzeigt. Falls \"in_and_out\", wird nur dann ein Status "
"angezeigt, wenn jemand den Chatraum betritt oder verlässt."
-#: ../src/common/config.py:235
+#: ../src/common/config.py:238
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:239
msgid "Background color of contacts when they just signed in."
msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade angemeldet haben."
-#: ../src/common/config.py:236
+#: ../src/common/config.py:240
msgid "Background color of contacts when they just signed out."
msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade abgemeldet haben."
-#: ../src/common/config.py:238
+#: ../src/common/config.py:242
msgid ""
"If True, restored messages will use a smaller font than the default one."
msgstr ""
"Falls aktiviert, werden wiederhergestellte Nachrichten mit einer etwas "
"kleineren Schrift als normal dargestellt."
-#: ../src/common/config.py:239
+#: ../src/common/config.py:243
msgid "Don't show avatar for the transport itself."
msgstr "Zeige keinen Avatar für den Transport selbst an."
-#: ../src/common/config.py:240
+#: ../src/common/config.py:244
msgid "Don't show roster in the system taskbar."
msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
-#: ../src/common/config.py:241
+#: ../src/common/config.py:245
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 "
@@ -4189,7 +4033,7 @@ msgstr ""
"Ereignisse anstehen (Standardverhalten der meisten Fenster-Manager; benötigt "
"GTK+ und PyGTK >= Version 2.8)."
-#: ../src/common/config.py:243
+#: ../src/common/config.py:247
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 "
@@ -4200,7 +4044,7 @@ msgstr ""
"Informationen gesendet."
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:250
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
@@ -4222,32 +4066,40 @@ msgstr ""
"einem eigenen Fenster. Eine Änderung dieser Option tritt erst nach einem "
"Neustart von Gajim in Kraft."
-#: ../src/common/config.py:247
+#: ../src/common/config.py:251
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:252
msgid "If False, you will no longer see the avatar in the chat window."
msgstr ""
"Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
-#: ../src/common/config.py:248
+#: ../src/common/config.py:253
msgid "If True, pressing the escape key closes a tab/window."
msgstr "Falls aktiviert, schließt die Escape-Taste aktive Tabs und Fenster."
-#: ../src/common/config.py:249
+#: ../src/common/config.py:254
msgid "Hides the buttons in chat windows."
msgstr "Versteckt die Schaltflächen im Chatraum-Fenster."
-#: ../src/common/config.py:250
+#: ../src/common/config.py:255
msgid "Hides the banner in a group chat window"
msgstr "Versteckt das Banner im Chatraum-Fenster."
-#: ../src/common/config.py:251
+#: ../src/common/config.py:256
msgid "Hides the banner in two persons chat window"
msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster."
-#: ../src/common/config.py:252
+#: ../src/common/config.py:257
msgid "Hides the group chat occupants list in group chat window."
msgstr "Versteckt die Benutzerliste im Chatraum-Fenster."
-#: ../src/common/config.py:253
+#: ../src/common/config.py:258
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."
@@ -4255,17 +4107,17 @@ msgstr ""
"Der Spitzname wird im Chat nur dann vor einer Nachricht angezeigt, wenn sie "
"nicht von der Person stammt, die schon die letzte Nachricht geschrieben hat."
-#: ../src/common/config.py:254
+#: ../src/common/config.py:259
msgid "Indentation when using merge consecutive nickname."
msgstr ""
"Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen "
"verwendet wird."
-#: ../src/common/config.py:255
+#: ../src/common/config.py:260
msgid "Smooth scroll message in conversation window"
msgstr "Sanften Bildlauf im Unterhaltungsfenster verwenden"
-#: ../src/common/config.py:256
+#: ../src/common/config.py:261
msgid ""
"List of colors, separated by \":\", that will be used to color nicknames in "
"group chats."
@@ -4273,13 +4125,13 @@ msgstr ""
"Liste der Farben, die zum Einfärben der Spitznamen in Chaträumen verwendet "
"werden sollen (Werte getrennt durch \":\")."
-#: ../src/common/config.py:257
+#: ../src/common/config.py:262
msgid "Ctrl-Tab go to next composing tab when none is unread."
msgstr ""
"Strg+Tab, um zum nächsten Tab zu wechseln, wenn kein anderer Tab ungelesene "
"Nachrichten enthält."
-#: ../src/common/config.py:258
+#: ../src/common/config.py:263
msgid ""
"Should we show the confirm metacontacts creation dialog or not? Empty string "
"means we never show the dialog."
@@ -4287,7 +4139,7 @@ msgstr ""
"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
"werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
-#: ../src/common/config.py:259
+#: ../src/common/config.py:264
msgid ""
"Should we show the confirm block contact dialog or not? Empty string means "
"we never show the dialog."
@@ -4295,7 +4147,7 @@ msgstr ""
"Soll der Bestätigungsdialog zum Blockieren von Benutzern angezeigt werden? "
"Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
-#: ../src/common/config.py:260
+#: ../src/common/config.py:265
msgid ""
"Should we show the confirm custom status dialog or not? Empty string means "
"we never show the dialog."
@@ -4303,7 +4155,7 @@ msgstr ""
"Soll der Bestätigungsdialog für den speziellen Chatstatus angezeigt werden? "
"Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
-#: ../src/common/config.py:261
+#: ../src/common/config.py:266
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 "
@@ -4313,7 +4165,7 @@ msgstr ""
"Fenster setzen. VORSICHT: Wenn Sie mit einer negativen Priorität angemeldet "
"sind ehalten Sie keine Nachrichten mehr vom Server."
-#: ../src/common/config.py:262
+#: ../src/common/config.py:267
msgid ""
"If True, Gajim will use Gnome Keyring (if available) to store account "
"passwords."
@@ -4321,7 +4173,7 @@ msgstr ""
"Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
"um die Passwörter der Konten zu speichern."
-#: ../src/common/config.py:263
+#: ../src/common/config.py:268
msgid ""
"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
"account passwords."
@@ -4329,7 +4181,7 @@ msgstr ""
"Falls aktiviert, wird Gajim KDE Wallet (wenn kwalletcli verfügbar ist) um "
"Kontopasswörter zu speichern."
-#: ../src/common/config.py:264
+#: ../src/common/config.py:269
msgid ""
"If True, Gajim will show number of online and total contacts in account and "
"group rows."
@@ -4337,7 +4189,7 @@ msgstr ""
"Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in "
"den Konto- und Gruppenreihen angezeigt."
-#: ../src/common/config.py:265
+#: ../src/common/config.py:270
msgid ""
"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
"as if they were of this type"
@@ -4345,7 +4197,7 @@ msgstr ""
"Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, werden alle "
"eingehenden Nachrichten so behandelt, als wären sie vom gewählten Typ."
-#: ../src/common/config.py:266
+#: ../src/common/config.py:271
msgid ""
"If True, Gajim will scroll and select the contact who sent you the last "
"message, if chat window is not already opened."
@@ -4354,7 +4206,7 @@ msgstr ""
"auswählen, die die letzte Nachricht geschickt hat, falls das Chatfenster "
"nicht bereits geöffnet ist."
-#: ../src/common/config.py:267
+#: ../src/common/config.py:272
msgid ""
"If True, Gajim will convert string between $$ and $$ to an image using dvips "
"and convert before insterting it in chat window."
@@ -4362,12 +4214,12 @@ msgstr ""
"Falls aktiviert, wird Gajim eine Zeichenkette zwischen $$ und $$ mittels "
"dvips vor dem Einfügen in ein Chatfenster in ein Bild umwandeln."
-#: ../src/common/config.py:268
+#: ../src/common/config.py:273
msgid "Time of inactivity needed before the change status window closes down."
msgstr ""
"Wartezeit, bevor das \"Status ändern\"-Fenster automatisch geschlossen wird."
-#: ../src/common/config.py:269
+#: ../src/common/config.py:274
msgid ""
"Maximum number of lines that are printed in conversations. Oldest lines are "
"cleared."
@@ -4375,7 +4227,7 @@ msgstr ""
"Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
"Zeilen werden gelöscht."
-#: ../src/common/config.py:270
+#: ../src/common/config.py:275
#, fuzzy
msgid ""
"If True, notification windows from notification-daemon will be attached to "
@@ -4384,11 +4236,11 @@ msgstr ""
"Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
"an das Systray-Icon angehängt."
-#: ../src/common/config.py:271
+#: ../src/common/config.py:276
msgid "Choose interval between 2 checks of idleness."
msgstr "Legen Sie den Zeitabstand zwischen den Leerlaufüberprüfungen fest."
-#: ../src/common/config.py:272
+#: ../src/common/config.py:277
msgid ""
"Change the value to change the size of latex formulas displayed. The higher "
"is larger."
@@ -4396,7 +4248,7 @@ msgstr ""
"Legt die LaTeX-Anzeigengröße fest. Je höher der Wert, desto größer die "
"Anzeige."
-#: ../src/common/config.py:273
+#: ../src/common/config.py:278
msgid ""
"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
"uri. (mailto and xmpp are handled separately)"
@@ -4404,7 +4256,7 @@ msgstr ""
"Gültige URI-Schemata. Nur Schemata in dieser Liste werden als \"wirkliche\" "
"URIs akzeptiert. (mailto und xmpp werden separat behandelt)"
-#: ../src/common/config.py:274
+#: ../src/common/config.py:279
msgid ""
"Ask offline status message to all offline contacts when connection to an "
"accoutn is established. WARNING: This causes a lot of requests to be sent!"
@@ -4413,13 +4265,13 @@ msgstr ""
"Kontakten, sobald eine Verbindung zu einem Konto hergestellt wird. WARNUNG: "
"Diese Einstellung erfordert eine Menge Sendeanfragen an den Server!"
-#: ../src/common/config.py:275
+#: ../src/common/config.py:280
msgid "If True, completion in groupchats will be like a shell auto-completion"
msgstr ""
"Falls aktiviert, wird die Autovervollständigung in Gruppenchats ähnlich der "
"Autovervollständigung in der Shell sein."
-#: ../src/common/config.py:276
+#: ../src/common/config.py:281
msgid ""
"When is self contact row displayed. Can be \"always\", \"when_other_resource"
"\" or \"never\""
@@ -4428,31 +4280,37 @@ msgstr ""
"\" (immer), \"when_other_resource\" (wenn eine andere Ressource online ist) "
"oder \"never\" (niemals)"
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
msgstr ""
+"Jingle Videoausgabe-Framerate optional korrigieren. Beispiel: 10/1 oder 25/2"
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
msgid "Optionally resize jingle output video. Example: 320x240"
-msgstr ""
+msgstr "Jingle Videoausgabegröße optional ändern. Beispiel: 320x240"
-#: ../src/common/config.py:285
+#: ../src/common/config.py:290
msgid ""
"If True, Gajim will try to use a STUN server when using jingle. The one in "
"\"stun_server\" option, or the one given by the jabber server."
msgstr ""
+"Falls aktiviert, wird Gajim versuchen einen STUN server für Jingle zu "
+"verwenden. Entweder jenen in der \"stun_server\" Option, oder einen vom "
+"Jabber-Server vorgegebenen Server."
-#: ../src/common/config.py:286
+#: ../src/common/config.py:291
msgid "STUN server to use when using jingle"
-msgstr ""
+msgstr "Zu benutzender STUN server für Jingle"
-#: ../src/common/config.py:287
+#: ../src/common/config.py:292
msgid ""
"If True, Gajim will show affiliation of groupchat occupants by adding a "
"colored square to the status icon"
msgstr ""
+"Falls aktiviert, wird Gajim die Zuordnung der Teilnehmer im Gruppenchat "
+"anzeigen, indem ein farbiges Quadrat zum Status-Icon hinzugefügt wird."
-#: ../src/common/config.py:300
+#: ../src/common/config.py:305
msgid ""
"Priority will change automatically according to your status. Priorities are "
"defined in autopriority_* options."
@@ -4460,7 +4318,7 @@ msgstr ""
"Die Priorität ändert sich automatisch gemäß dem Status. Die Prioritäten "
"werden in den \"autopriority_*\"-Optionen festgelegt."
-#: ../src/common/config.py:308
+#: ../src/common/config.py:313
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"
@@ -4469,19 +4327,19 @@ msgstr ""
"Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. (Diese Option "
"kann nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist.)"
-#: ../src/common/config.py:309
+#: ../src/common/config.py:314
msgid "If enabled, restore the last status that was used."
msgstr ""
"Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
-#: ../src/common/config.py:311
+#: ../src/common/config.py:316
msgid ""
"If True, Contacts requesting authorization will be automatically accepted."
msgstr ""
"Falls aktiviert, werden Authorisationsanfragen von Kontakten automatisch "
"akzeptiert."
-#: ../src/common/config.py:312
+#: ../src/common/config.py:317
msgid ""
"If False, this account will be disabled and will not appear in roster window."
msgstr ""
@@ -4489,23 +4347,23 @@ msgstr ""
"Kontaktliste."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/common/config.py:315
+#: ../src/common/config.py:320
msgid ""
"If disabled, don't sign presences with GPG key, even if GPG is configured."
msgstr ""
"Falls deaktiviert, wird die Anwesenheit selbst dann nicht mit einem GPG-"
"Schlüssel signiert, wenn GPG konfiguriert ist."
-#: ../src/common/config.py:317
+#: ../src/common/config.py:322
msgid "Enable ESessions encryption for this account."
msgstr "Aktiviere die ESession-Verschlüsselung für dieses Konto."
-#: ../src/common/config.py:318
+#: ../src/common/config.py:323
msgid "Should Gajim automatically start an encrypted session when possible?"
msgstr ""
"Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
-#: ../src/common/config.py:319
+#: ../src/common/config.py:324
msgid ""
"Ordered list (space separated) of connection type to try. Can contain tls, "
"ssl or plain"
@@ -4513,41 +4371,41 @@ msgstr ""
"Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
"Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
-#: ../src/common/config.py:320
+#: ../src/common/config.py:325
msgid ""
"Show a warning dialog before sending password on an plaintext connection."
msgstr ""
"Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
"übertragen wird."
-#: ../src/common/config.py:321
+#: ../src/common/config.py:326
msgid "Show a warning dialog before using standard SSL library."
msgstr ""
"Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
"Bibliothek geschützte Verbindung übertragen wird."
-#: ../src/common/config.py:322
+#: ../src/common/config.py:327
#, fuzzy
msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
msgstr ""
-"Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
-"übertragen wird."
+"Warnmeldung anzeigen, bevor das PLAIN Passwort über eine unsichere "
+"Verbindung übertragen wird."
-#: ../src/common/config.py:324
+#: ../src/common/config.py:329
msgid "Space separated list of ssl errors to ignore."
msgstr ""
"Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
-#: ../src/common/config.py:333
+#: ../src/common/config.py:338
msgid "Whitespace sent after inactivity"
msgstr "Whitespace nach Untätigkeit gesendet"
-#: ../src/common/config.py:334
+#: ../src/common/config.py:339
msgid "XMPP ping sent after inactivity"
msgstr "XMPP Ping nach Untätigkeit gesendet"
-#: ../src/common/config.py:338
+#: ../src/common/config.py:343
msgid ""
"How many seconds to wait for the answer of ping alive packet before we try "
"to reconnect."
@@ -4556,11 +4414,11 @@ msgstr ""
"wieder hergestellt wird."
#. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:347
msgid "Jabberd2 workaround"
msgstr "Jabberd2-Workaround"
-#: ../src/common/config.py:345
+#: ../src/common/config.py:350
msgid ""
"If checked, Gajim will use your IP and proxies defined in "
"file_transfer_proxies option for file transfer."
@@ -4569,15 +4427,28 @@ msgstr ""
"file_transfer_proxies Option definierten Proxys für den Dateitransfer "
"verwenden."
-#: ../src/common/config.py:359
+#: ../src/common/config.py:364
msgid "Answer to receipt requests"
msgstr "Antwort auf Empfangsbestätigungsanfragen"
-#: ../src/common/config.py:360
+#: ../src/common/config.py:365
msgid "Sent receipt requests"
msgstr "Empfangsbestätigungen anfordern"
-#: ../src/common/config.py:370
+#: ../src/common/config.py:374
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
+"festzustellen."
+
+#: ../src/common/config.py:375
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s möchte Ihnen eine Datei senden."
+
+#: ../src/common/config.py:376
msgid ""
"When negotiating an encrypted session, should Gajim assume you want your "
"messages to be logged?"
@@ -4585,20 +4456,20 @@ msgstr ""
"Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass "
"Sie Ihre Nachrichten aufzeichnen wollen?"
-#: ../src/common/config.py:373
-#, fuzzy
+#: ../src/common/config.py:379
msgid "Message that is sent to contacts you want to add"
-msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
+msgstr ""
+"Nachricht, die an Kontakte gesendet wird, die hinzugefügt werden sollen"
-#: ../src/common/config.py:374
+#: ../src/common/config.py:380
msgid "Last time we syncronized with logs from server."
msgstr ""
-#: ../src/common/config.py:436
+#: ../src/common/config.py:442
msgid "Is OpenPGP enabled for this contact?"
msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
-#: ../src/common/config.py:437
+#: ../src/common/config.py:443
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
@@ -4606,109 +4477,94 @@ msgstr ""
"Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet "
"werden?"
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:444 ../src/common/config.py:447
msgid "Language for which we want to check misspelled words"
msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
-# TODO: Review by german translators: getrennte Status || getrennter Status
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "alle oder durch Leerzeichen getrennte Status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'ja', 'nein' oder 'beide'"
-
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'ja, 'nein' oder ''"
-
-#: ../src/common/config.py:460
+#: ../src/common/config.py:450
msgid ""
"State whether plugins should be activated on exit (this is saved on Gajim "
"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
"instead."
msgstr ""
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:455 ../src/common/pep.py:157
msgid "Sleeping"
msgstr "Schlafen"
-#: ../src/common/config.py:466
+#: ../src/common/config.py:456
msgid "Back soon"
msgstr "Bin gleich wieder da"
-#: ../src/common/config.py:466
+#: ../src/common/config.py:456
msgid "Back in some minutes."
msgstr "Bin in ein paar Minuten zurück."
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:457 ../src/common/pep.py:127
msgid "Eating"
msgstr "Essen"
-#: ../src/common/config.py:467
+#: ../src/common/config.py:457
msgid "I'm eating, so leave me a message."
msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
-#: ../src/common/config.py:468
+#: ../src/common/config.py:458
msgid "Movie"
msgstr "Film"
-#: ../src/common/config.py:468
+#: ../src/common/config.py:458
msgid "I'm watching a movie."
msgstr "Ich sehe mir einen Film an."
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:459 ../src/common/pep.py:186
msgid "Working"
msgstr "Arbeiten"
-#: ../src/common/config.py:469
+#: ../src/common/config.py:459
msgid "I'm working."
msgstr "Ich arbeite."
-#: ../src/common/config.py:470
+#: ../src/common/config.py:460
msgid "Phone"
msgstr "Telefon"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:460
msgid "I'm on the phone."
msgstr "Ich telefoniere."
-#: ../src/common/config.py:471
+#: ../src/common/config.py:461
msgid "Out"
msgstr "Draußen"
-#: ../src/common/config.py:471
+#: ../src/common/config.py:461
msgid "I'm out enjoying life."
msgstr "Ich bin draußen und genieße das Leben."
-#: ../src/common/config.py:482
+#: ../src/common/config.py:472
msgid "I'm available."
msgstr "Ich bin angemeldet."
-#: ../src/common/config.py:483
+#: ../src/common/config.py:473
msgid "I'm free for chat."
msgstr "Ich bin frei zum Chatten."
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:474 ../src/config.py:1609
msgid "Be right back."
msgstr "Bin gleich zurück."
-#: ../src/common/config.py:485
+#: ../src/common/config.py:475
msgid "I'm not available."
msgstr "Ich bin nicht verfügbar."
-#: ../src/common/config.py:486
+#: ../src/common/config.py:476
msgid "Do not disturb."
msgstr "Bitte nicht stören."
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:477 ../src/common/config.py:478
msgid "Bye!"
msgstr "Auf Wiedersehen!"
-#: ../src/common/config.py:498
+#: ../src/common/config.py:488
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."
@@ -4716,58 +4572,168 @@ msgstr ""
"Abzuspielender Ton, falls eine Chatraum-Nachricht eines der Wörter aus der "
"muc_highlights_works-Liste oder Ihren Spitznamen enthält."
-#: ../src/common/config.py:499
+#: ../src/common/config.py:489
msgid "Sound to play when any MUC message arrives."
msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:498 ../src/common/optparser.py:308
msgid "green"
msgstr "grün"
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:502 ../src/common/optparser.py:294
msgid "grocery"
msgstr "Lebensmittel"
-#: ../src/common/config.py:516
+#: ../src/common/config.py:506
msgid "human"
msgstr "Menschlich"
-#: ../src/common/config.py:520
+#: ../src/common/config.py:510
msgid "marine"
msgstr "Marine"
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+#: ../src/common/connection_handlers_events.py:355
+#, 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 ""
+"Die Jabber-ID %s ist nicht RFC-konform und wird nicht zu Ihrer Kontaktliste "
+"hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru."
+"jabberstudio.org/>, um sie zu entfernen."
+
+#: ../src/common/connection_handlers_events.py:784
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Anfrage zur Beendigung des Abonnements von %s"
+
+#: ../src/common/connection_handlers_events.py:868
+#: ../src/common/connection_handlers.py:339
+#: ../src/common/connection_handlers.py:943
+#: ../src/common/connection_handlers.py:1044
+#: ../src/common/connection_handlers.py:1701 ../src/common/connection.py:459
+#: ../src/common/logger.py:1124 ../src/gajim.py:385
+msgid "Disk Write Error"
+msgstr "Fehler beim Schreiben auf Festplatte"
+
+#: ../src/common/connection_handlers_events.py:872
+#: ../src/common/connection_handlers.py:946
+#: ../src/common/connection_handlers.py:1047
+#: ../src/common/connection_handlers.py:1704 ../src/common/connection.py:463
+#: ../src/common/logger.py:1127 ../src/gajim.py:204 ../src/session.py:98
+#, 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 ""
+"Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
+"reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
+"löschen (dabei gehen alle Verläufe verloren)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:893
+msgid "Room has been destroyed"
+msgstr "Der Chatraum wurde gelöscht"
+
+#: ../src/common/connection_handlers_events.py:901
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
+
+#: ../src/common/connection_handlers_events.py:974
+#: ../src/common/connection.py:258 ../src/config.py:2102 ../src/config.py:2111
+#: ../src/config.py:2179 ../src/config.py:3608 ../src/dataforms_widget.py:623
+#: ../src/dialogs.py:3049
+msgid "Invalid Jabber ID"
+msgstr "Ungültige Jabber-ID"
+
+#: ../src/common/connection_handlers_events.py:975
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+"Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die "
+"Nachricht wurde ignoriert."
+
+#: ../src/common/connection_handlers_events.py:1423
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Unbekannter SSL-Fehler: %d"
+
+#. single message
+#: ../src/common/connection_handlers_events.py:1947 ../src/dialogs.py:2741
+#: ../src/notify.py:194 ../src/notify.py:423
+msgid "New Single Message"
+msgstr "Neue einzelne Nachricht"
+
+#: ../src/common/connection_handlers_events.py:1949 ../src/notify.py:196
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Einzelne neue Nachricht von %(nickname)s"
+
+#. private message
+#: ../src/common/connection_handlers_events.py:1952 ../src/dialogs.py:2742
+#: ../src/notify.py:200 ../src/notify.py:424
+msgid "New Private Message"
+msgstr "Neue private Nachricht"
+
+#: ../src/common/connection_handlers_events.py:1954 ../src/notify.py:203
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Neue private Nachricht aus dem Chatraum %s"
+
+#: ../src/common/connection_handlers_events.py:1957 ../src/notify.py:205
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:1960 ../src/notify.py:208
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Neue Nachricht von %(nickname)s"
+
+#. chat message
+#: ../src/common/connection_handlers_events.py:1963 ../src/dialogs.py:2741
+#: ../src/notify.py:212 ../src/notify.py:423
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../src/common/connection_handlers_events.py:1965 ../src/notify.py:214
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Neue Nachricht von %(nickname)s"
+
+#: ../src/common/connection_handlers.py:95
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
msgid "Unable to load idle module"
msgstr "Konnte Idle-Modul nicht laden"
-#: ../src/common/connection_handlers.py:127
+#: ../src/common/connection_handlers.py:128
#, python-format
msgid "Registration information for transport %s has not arrived in time"
msgstr ""
"Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig "
"angekommen"
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
msgid "Registration succeeded"
msgstr "Registrierung war erfolgreich"
# FIXME: Type in original string. Should be
# Registration with agent %s succeeded
# FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
#, python-format
msgid "Registration with agent %s succeeded"
msgstr "Registrierung mit Agent %s war erfolgreich"
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
msgid "Registration failed"
msgstr "Registrierung ist fehlgeschlagen"
# FIXME: Type in original string. Should be
# Registration with agent ...
# FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
#, python-format
msgid ""
"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4775,45 +4741,18 @@ msgstr ""
"Registrierung mit Agent %(agent)s ist mit Fehler %(error)s fehlgeschlagen: "
"%(error_msg)s"
-#: ../src/common/connection_handlers.py:466
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "Fehler beim Schreiben auf Festplatte"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:564 ../src/common/connection.py:1520
msgid "Invisibility not supported"
msgstr "Unsichtbarkeit wird nicht unterstützt"
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:565 ../src/common/connection.py:1521
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
-#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
-#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
-#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
-msgid "Invalid Jabber ID"
-msgstr "Ungültige Jabber-ID"
-
-#: ../src/common/connection_handlers.py:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-"Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die "
-"Nachricht wurde ignoriert."
-
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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 ""
-"Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
-"reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
-"löschen (dabei gehen alle Verläufe verloren)."
+#: ../src/common/connection_handlers.py:1746
+msgid "I would like to add you to my roster."
+msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
#: ../src/common/connection.py:68
msgid "Unable to get issuer certificate"
@@ -4946,19 +4885,19 @@ msgstr ""
msgid "Application verification failure"
msgstr "Fehler beim Überprüfen der Anwendung"
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:259 ../src/dialogs.py:3050
#, python-format
msgid "It is not possible to send a message to %s, this JID is not valid."
msgstr ""
"Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:281
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr ""
"Weder ist die entfernte Präsenz signiert, noch wurde ein Schlüssel "
"zugewiesen."
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:284
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
msgstr ""
@@ -4967,11 +4906,11 @@ msgstr ""
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:333
+#: ../src/common/connection.py:337
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:446
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -4980,83 +4919,81 @@ msgstr ""
"Thema: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:839
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "Verbindung mit Konto \"%s\" abgebrochen"
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:840
msgid "Reconnect manually."
msgstr "Manuelle Neuverbindung."
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:851
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr ""
"Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
"%(error)s"
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:893
#, python-format
msgid "Server %s provided a different registration form"
msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Unbekannter SSL-Fehler: %d"
-
#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:909
msgid "Invalid answer"
msgstr "Ungültige Antwort"
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:910
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr ""
"Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
"%(error)s"
-#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
-#: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/connection.py:1198 ../src/common/connection.py:1332
+#: ../src/common/connection.py:1941
+#: ../src/common/zeroconf/connection_zeroconf.py:204
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1199 ../src/gui_interface.py:564
msgid "Check your connection or try again later."
msgstr ""
"Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1204
#, python-format
msgid "Server replied: %s"
msgstr "Server antwortete: %s"
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1217
msgid "Connection to proxy failed"
msgstr "Verbindung mit Proxy fehlgeschlagen"
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1249 ../src/common/connection.py:1311
#, python-format
msgid "Could not connect to account %s"
msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1312
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr ""
"Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird "
"wiederhergestellt."
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1275
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "Die Authentizität des %s Zertifikats könnte ungültig sein."
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1278
#, python-format
msgid ""
"\n"
@@ -5065,7 +5002,7 @@ msgstr ""
"\n"
"SSL-Fehler: <b>%s</b>"
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1280
#, python-format
msgid ""
"\n"
@@ -5074,24 +5011,24 @@ msgstr ""
"\n"
"Unbekannter SSL-Fehler: %d"
-#: ../src/common/connection.py:1297
+#: ../src/common/connection.py:1333
msgid "Check your connection or try again later"
msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal"
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1367
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1369
msgid "Please check your login and password for correctness."
msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1442
msgid "Error while removing privacy list"
msgstr "Fehler beim Entfernen der Privatsphären-Liste"
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1443
#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5101,39 +5038,39 @@ msgstr ""
"in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
"es erneut."
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:1808
#, python-format
msgid "Sent contact: \"%s\" (%s)"
msgstr "Kontakt gesendet: \"%s\" (%s)"
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:1811
msgid "Sent contacts:"
msgstr "Gesendete Kontakte:"
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:1958 ../src/common/connection.py:1981
msgid "Not fetched because of invisible status"
msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2511
msgid "Unregister failed"
msgstr "De-Registrierung fehlgeschlagen"
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2512
#, python-format
msgid "Unregistration with server %(server)s failed: %(error)s"
msgstr "De-Registrierung mit Server %(server)s fehlgeschlagen: %(error)s"
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:60
+#: ../src/gui_interface.py:507
msgid "Observers"
msgstr "Beobachter"
#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:854
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#: ../src/common/helpers.py:60 ../src/disco.py:120 ../src/disco.py:121
+#: ../src/disco.py:1517 ../src/roster_window.py:856
+#: ../src/roster_window.py:1552 ../src/roster_window.py:1640
+#: ../src/roster_window.py:1642 ../src/roster_window.py:1804
+#: ../src/roster_window.py:2485
msgid "Transports"
msgstr "Transporte"
@@ -5156,14 +5093,12 @@ msgid "D-Bus does not run correctly on this machine"
msgstr "D-Bus läuft nicht korrekt auf diesem Rechner"
#: ../src/common/dbus_support.py:54
-#, fuzzy
msgid "D-Bus does not run correctly on this machine: system bus not present"
-msgstr "D-Bus läuft nicht korrekt auf diesem Rechner"
+msgstr "D-Bus läuft nicht korrekt auf diesem Rechner: System Bus no present"
#: ../src/common/dbus_support.py:57
-#, fuzzy
msgid "D-Bus does not run correctly on this machine: session bus not present"
-msgstr "D-Bus läuft nicht korrekt auf diesem Rechner"
+msgstr "D-Bus läuft nicht korrekt auf diesem Rechner: Session Bus not present"
#: ../src/common/exceptions.py:45
msgid "Database cannot be read."
@@ -5175,28 +5110,28 @@ msgstr ""
"Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist "
"deaktiviert."
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
msgid "D-Bus is not present on this machine or python module is missing"
msgstr ""
"D-Bus ist auf diesem Computer nicht vorhanden oder das Python-Modul fehlt."
#: ../src/common/exceptions.py:78
-#, fuzzy, python-format
+#, python-format
msgid ""
"Session bus is not available.\n"
"Try reading %(url)s"
msgstr ""
-"Sitzungsbus ist nicht verfügbar.\n"
-"Bitte lesen Sie http://trac.gajim.org/wiki/GajimDBus (Englisch)"
+"Session Bus ist nicht verfügbar.\n"
+"Bitte lesen Sie %(url)s"
#: ../src/common/exceptions.py:90
-#, fuzzy, python-format
+#, python-format
msgid ""
"System bus is not available.\n"
"Try reading %(url)s"
msgstr ""
-"Sitzungsbus ist nicht verfügbar.\n"
-"Bitte lesen Sie http://trac.gajim.org/wiki/GajimDBus (Englisch)"
+"Session Bus ist nicht verfügbar.\n"
+"Bitte lesen Sie %(url)s"
#: ../src/common/fuzzyclock.py:38
msgid "twelve"
@@ -5361,265 +5296,271 @@ msgstr "Ende der Woche"
msgid "Weekend!"
msgstr "Wochenende!"
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:151
msgid "Username must be between 1 and 1023 chars"
msgstr ""
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:156
msgid "Invalid character in username."
msgstr "Ungültiges Zeichen im Benutzernamen"
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
msgid "Server must be between 1 and 1023 chars"
msgstr ""
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:167
msgid "Invalid character in hostname."
msgstr "Ungültiges Zeichen im Rechnernamen."
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
msgid "Server address required."
msgstr "Server-Adresse benötigt."
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
msgid "Resource must be between 1 and 1023 chars"
msgstr ""
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:178
msgid "Invalid character in resource."
msgstr "Ungültiges Zeichen in der Ressource."
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
msgid "_Busy"
msgstr "_Beschäftigt"
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:220 ../src/tooltips.py:195
msgid "Busy"
msgstr "Beschäftigt"
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
msgid "_Not Available"
msgstr "_Nicht verfügbar"
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+msgid "Not Available"
+msgstr "Nicht verfügbar"
+
+#: ../src/common/helpers.py:228
msgid "_Free for Chat"
msgstr "_Frei zum Chatten"
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:230 ../src/tooltips.py:191
msgid "Free for Chat"
msgstr "Frei zum Chatten"
-#: ../src/common/helpers.py:230
-#, fuzzy
+#: ../src/common/helpers.py:233
msgid "?user status:_Available"
-msgstr "?Transferstatus:Pausiert"
+msgstr "?Benutzerstatus:Verfügb_ar"
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
-#, fuzzy
+#: ../src/common/helpers.py:235 ../src/tooltips.py:189
msgid "?user status:Available"
-msgstr "?Transferstatus:Pausiert"
+msgstr "?Benutzerstatus:Verfügbar"
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
msgid "Connecting"
msgstr "Verbindung wird hergestellt"
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
msgid "A_way"
msgstr "Ab_wesend"
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:245
msgid "_Offline"
msgstr "A_bgemeldet"
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:247 ../src/tooltips.py:199
msgid "Offline"
msgstr "Abgemeldet"
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:250
msgid "_Invisible"
msgstr "_Unsichtbar"
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:252
+msgid "Invisible"
+msgstr "Unsichtbar"
+
+#: ../src/common/helpers.py:256
msgid "?contact has status:Unknown"
msgstr "?Kontakt hat Status: Unbekannt"
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:258
msgid "?contact has status:Has errors"
msgstr "?Kontakt hat Status: Hat einen Fehler"
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:263
msgid "?Subscription we already have:None"
msgstr "?Abonnement schon vorhanden:Keines"
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:265
msgid "To"
msgstr "An"
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
msgid "From"
msgstr "Von"
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
msgid "Both"
msgstr "Beide"
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:277
msgid "?Ask (for Subscription):None"
msgstr "?Frage nach Abonnement: Keine"
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:279
msgid "Subscribe"
msgstr "Abonnieren"
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
msgid "?Group Chat Contact Role:None"
msgstr "?Gruppenchat Kontaktrolle: Keine"
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
msgid "Moderators"
msgstr "Moderatoren"
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
msgid "Moderator"
msgstr "Moderator"
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:296
msgid "Participants"
msgstr "Teilnehmer"
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:298
msgid "Participant"
msgstr "Teilnehmer"
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:301
msgid "Visitors"
msgstr "Besucher"
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:303
msgid "Visitor"
msgstr "Besucher"
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:309 ../src/tooltips.py:210
msgid "?Group Chat Contact Affiliation:None"
msgstr "?Gruppenchat Kontaktverbindung:Keine"
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:311 ../src/tooltips.py:216
msgid "Owner"
msgstr "Besitzer"
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:313 ../src/tooltips.py:214
msgid "Administrator"
msgstr "Administrator"
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:315 ../src/tooltips.py:212
msgid "Member"
msgstr "Mitglied"
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:354
msgid "is paying attention to the conversation"
msgstr "beobachtet diese Unterhaltung"
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:356
msgid "is doing something else"
msgstr "tut etwas anderes"
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
msgid "is composing a message..."
msgstr "schreibt im Moment …"
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:361
msgid "paused composing a message"
msgstr "macht gerade eine Schreibpause"
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:363
msgid "has closed the chat window or tab"
msgstr "hat das Chatfenster oder den Tab geschlossen"
#. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:628
#, python-format
msgid "%s GiB"
msgstr "%s GiB"
#. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:631
#, python-format
msgid "%s GB"
msgstr "%s GB"
#. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:635
#, python-format
msgid "%s MiB"
msgstr "%s MiB"
#. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:638
#, python-format
msgid "%s MB"
msgstr "%s MB"
#. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:642
#, python-format
msgid "%s KiB"
msgstr "%s KiB"
#. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:645
#, python-format
msgid "%s KB"
msgstr "%s kB"
#. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:648
#, python-format
msgid "%s B"
msgstr "%s B"
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
msgstr[0] "%d neue Nachricht"
msgstr[1] "%d neue Nachrichten"
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1112
#, python-format
msgid " from room %s"
msgstr "Vom Chatraum %s"
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
#, python-format
msgid " from user %s"
msgstr "Â vom Benutzer %s"
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1117
#, python-format
msgid " from %s"
msgstr "Von %s"
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
msgstr[0] "%d neues Ereignis"
msgstr[1] "%d neue Ereignisse"
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1162
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
#: ../src/common/helpers.py:1341
msgid "Hello, I am $name."
-msgstr ""
+msgstr "Hallo, Ich bin $name"
#: ../src/common/jingle_rtp.py:107
-#, fuzzy, python-format
+#, python-format
msgid "%s configuration error"
-msgstr "Chatraum-Einstellungen"
+msgstr "%s Konfigurationsfehler"
#: ../src/common/jingle_rtp.py:108
#, python-format
@@ -5632,33 +5573,42 @@ msgid ""
"Error was:\n"
"%s"
msgstr ""
+"Konnte %s nicht aufsetzen. Überprüfen Sie Ihre Konfiguration\n"
+"\n"
+"Pipeline war:\n"
+"%s\n"
+"\n"
+"Fehler war:\n"
+"%s"
#: ../src/common/jingle_rtp.py:205
msgid "GStreamer error"
-msgstr ""
+msgstr "Fehler mit GStreamer"
#: ../src/common/jingle_rtp.py:206
-#, fuzzy, python-format
+#, python-format
msgid ""
"Error: %s\n"
"Debug: %s"
-msgstr "Fehlermeldung: %s"
+msgstr ""
+"Fehler: %s\n"
+"Debug: %s"
#: ../src/common/jingle_rtp.py:335
msgid "audio input"
-msgstr ""
+msgstr "Audioaufnahme"
#: ../src/common/jingle_rtp.py:338
msgid "audio output"
-msgstr ""
+msgstr "Audioausgabe"
#: ../src/common/jingle_rtp.py:381
msgid "video input"
-msgstr ""
+msgstr "Videoaufnahme"
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:390
msgid "video output"
-msgstr ""
+msgstr "Videoausgabe"
#: ../src/common/latex.py:109
#, python-format
@@ -5670,63 +5620,68 @@ msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
msgid "%s is not a valid loglevel"
msgstr "%s ist kein gültiger Loglevel."
-#: ../src/common/multimedia_helpers.py:37
-#, fuzzy
+#: ../src/common/multimedia_helpers.py:39
msgid " Default device"
-msgstr "Standard-Nachricht"
+msgstr "Standardgerät"
#. Test src
-#: ../src/common/multimedia_helpers.py:55
-#, fuzzy
+#: ../src/common/multimedia_helpers.py:60
msgid "Audio test"
-msgstr "Audio / Video"
+msgstr "Audiotest"
#. Auto src
#. Auto sink
#. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:63
+#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:111
msgid "Autodetect"
-msgstr ""
+msgstr "Automatische Erkennung"
#. Alsa src
#. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
-#, fuzzy, python-format
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:81
+#, python-format
msgid "ALSA: %s"
-msgstr "Größe: %s"
+msgstr "ALSA: %s"
+
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:83
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Datei: %s"
#. Fake sink
#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:105
msgid "Fake audio output"
-msgstr ""
+msgstr "Simulierte Audioausgabe"
#. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:90
msgid "Video test"
-msgstr ""
+msgstr "Videotest"
#. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:95
#, python-format
msgid "V4L2: %s"
-msgstr ""
+msgstr "V4L2: %s"
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:108
#, python-format
msgid "X Window System (X11/XShm/Xv): %s"
-msgstr ""
+msgstr "X Window System (X11/XShm/Xv): %s"
#. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:110
msgid "X Window System (without Xv)"
-msgstr ""
+msgstr "X Window System (ohne Xv)"
#. we talk about a file
#: ../src/common/optparser.py:53
@@ -6375,19 +6330,19 @@ msgstr "Lernen"
msgid "Writing"
msgstr "Schreiben"
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:339
msgid "Unknown Artist"
msgstr "Unbekannter Künstler"
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:342
msgid "Unknown Title"
msgstr "Unbekannter Titel"
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:345
msgid "Unknown Source"
msgstr "Unbekannte Quelle"
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:348
#, python-format
msgid ""
"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6409,7 +6364,7 @@ msgid ""
msgstr "Möglicherweise läuft Gajim bereits. Dateiübertragung wird abgebrochen."
#. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:424
msgid ""
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
@@ -6417,11 +6372,11 @@ msgstr ""
"[Dies ist ein Teil einer verschlüsselten Unterhaltung. Wenn Sie diese "
"Nachricht sehen, ist etwas schief gegangen.]"
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:192
msgid "Avahi error"
msgstr "Avahi-Fehler"
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
#, python-format
msgid ""
"%s\n"
@@ -6430,74 +6385,75 @@ msgstr ""
"%s\n"
"Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:205
msgid "Please check if Avahi or Bonjour is installed."
msgstr "Bitte überprüfen Sie, ob Avahi bzw. Bonjour installiert ist."
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:219
msgid "Could not start local service"
msgstr "Lokaler Dienst konnte nicht gestartet werden"
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:216
#, python-format
msgid "Unable to bind to port %d."
msgstr "Die Verbindung mit Port %d ist fehlgeschlagen."
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../src/common/zeroconf/connection_zeroconf.py:220
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
msgid "Please check if avahi-daemon is running."
msgstr "Bitte überprüfen Sie, ob avahi-daemon läuft."
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:303
+#: ../src/common/zeroconf/connection_zeroconf.py:316
+#: ../src/common/zeroconf/connection_zeroconf.py:332
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "Der Status des Kontos \"%s\" konnte nicht geändert werden."
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:351
+#: ../src/common/zeroconf/connection_zeroconf.py:390
msgid "Your message could not be sent."
msgstr "Die Nachricht konnte nicht gesendet werden."
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:404
msgid "Contact is offline. Your message could not be sent."
msgstr "Der Kontakt ist offline. Ihre Nachricht konnte nicht gesendet werden."
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:432
msgid ""
"Connection to host could not be established: Timeout while sending data."
msgstr ""
"Die Verbindung zum Server konnte nicht hergestellt werden: "
"Zeitüberschreitung beim Senden von Daten."
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_avahi.py:193
#: ../src/common/zeroconf/zeroconf_bonjour.py:191
#, python-format
msgid "Error while adding service. %s"
msgstr "Fehler beim Hinzufügen des Dienstes. %s"
-#: ../src/config.py:397
+#: ../src/config.py:406
msgid "Default Message"
msgstr "Standard-Nachricht"
-#: ../src/config.py:406
+#: ../src/config.py:415
msgid "Enabled"
msgstr "Aktiviert"
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3105
msgid "Default"
msgstr "Standard"
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:746 ../src/dialogs.py:1493
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Kein Wörterburch für die Sprache %s verfügbar"
-#: ../src/config.py:734
+#: ../src/config.py:747
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -6506,73 +6462,73 @@ msgstr ""
"Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
"um die Rechtschreibprüfung nutzen zu können."
-#: ../src/config.py:1214
+#: ../src/config.py:1223
msgid "status message title"
msgstr "Statusbetreff"
-#: ../src/config.py:1214
+#: ../src/config.py:1223
msgid "status message text"
msgstr "Statusnachricht"
#. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
-#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py:1523 ../src/dialogs.py:2498 ../src/dialogs.py:2565
+#: ../src/dialogs.py:3352 ../src/disco.py:886 ../src/disco.py:1744
+#: ../src/disco.py:2046 ../src/history_window.py:90
msgid "Name"
msgstr "Name"
-#: ../src/config.py:1609
+#: ../src/config.py:1618
msgid "Relogin now?"
msgstr "Jetzt erneut anmelden?"
-#: ../src/config.py:1610
+#: ../src/config.py:1619
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr ""
"Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
"anmelden."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1773 ../src/config.py:1902
msgid "OpenPGP is not usable on this computer"
msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1942 ../src/config.py:1989
msgid "Unread events"
msgstr "Ungelesene Ereignisse"
-#: ../src/config.py:1934
+#: ../src/config.py:1943
msgid "Read all pending events before removing this account."
msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
-#: ../src/config.py:1963
+#: ../src/config.py:1972
#, python-format
msgid "You have opened chat in account %s"
msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
-#: ../src/config.py:1964
+#: ../src/config.py:1973
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:1985 ../src/config.py:2521 ../src/config.py:2557
msgid "You are currently connected to the server"
msgstr "Sie sind mit dem Server verbunden."
-#: ../src/config.py:1977
+#: ../src/config.py:1986
msgid "To change the account name, you must be disconnected."
msgstr ""
"Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
-#: ../src/config.py:1981
+#: ../src/config.py:1990
msgid "To change the account name, you must read all pending events."
msgstr ""
"Damit der Kontoname geändert werden kann, müssen Sie zuvor alle neuen "
"Ereignisse lesen."
-#: ../src/config.py:1987
+#: ../src/config.py:1996
msgid "Account Name Already Used"
msgstr "Der Kontoname wird bereits verwendet."
-#: ../src/config.py:1988
+#: ../src/config.py:1997
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
@@ -6580,152 +6536,152 @@ msgstr ""
"Dieser Name wird bereits für eines Ihrer Konten verwendet. Bitte wählen Sie "
"einen anderen Namen."
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2001 ../src/config.py:2005
msgid "Invalid account name"
msgstr "Ungültiger Kontoname"
-#: ../src/config.py:1993
+#: ../src/config.py:2002
msgid "Account name cannot be empty."
msgstr "Der Kontoname darf nicht leer sein."
-#: ../src/config.py:1997
+#: ../src/config.py:2006
msgid "Account name cannot contain spaces."
msgstr "Der Kontoname darf keine Leerzeichen enthalten."
-#: ../src/config.py:2074
+#: ../src/config.py:2083
msgid "Rename Account"
msgstr "Konto umbenennen"
-#: ../src/config.py:2075
+#: ../src/config.py:2084
#, python-format
msgid "Enter a new name for account %s"
msgstr "Geben Sie einen neuen Namen für das Konto %s ein"
-#: ../src/config.py:2103
+#: ../src/config.py:2112
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Die Jabber-ID muss in der Form \"benutzer@servername\" sein."
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2329 ../src/config.py:3654
msgid "Invalid entry"
msgstr "Ungültiger Eintrag"
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2330 ../src/config.py:3655
msgid "Custom port must be a port number."
msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
-#: ../src/config.py:2342
+#: ../src/config.py:2351
msgid "Failed to get secret keys"
msgstr "Die geheimen Schlüssel konnten nicht empfangen werden."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2343
+#: ../src/config.py:2352
msgid "There is no OpenPGP secret key available."
msgstr "Kein GPG-Schlüssel verfügbar."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2377
+#: ../src/config.py:2386
msgid "OpenPGP Key Selection"
msgstr "OpenPGP-Schlüssel-Auswahl"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2378
+#: ../src/config.py:2387
msgid "Choose your OpenPGP key"
msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
-#: ../src/config.py:2385
+#: ../src/config.py:2394
msgid "No such account available"
msgstr "Das angegebene Konto ist nicht verfügbar"
-#: ../src/config.py:2386
+#: ../src/config.py:2395
msgid "You must create your account before editing your personal information."
msgstr ""
"Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen "
"ändern können."
-#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2402 ../src/dialogs.py:2251 ../src/dialogs.py:2487
+#: ../src/dialogs.py:2675 ../src/disco.py:515 ../src/profile_window.py:361
msgid "You are not connected to the server"
msgstr "Sie sind nicht mit dem Server verbunden."
-#: ../src/config.py:2394
+#: ../src/config.py:2403
msgid "Without a connection, you can not edit your personal information."
msgstr ""
"Sie müssen angemeldet sein, um Ihre persönlichen Informationen ändern zu "
"können."
-#: ../src/config.py:2398
+#: ../src/config.py:2407
msgid "Your server doesn't support Vcard"
msgstr "Ihr Server unterstützt keine vCard."
-#: ../src/config.py:2399
+#: ../src/config.py:2408
msgid "Your server can't save your personal information."
msgstr "Ihr Server kann keine persönlichen Informationen speichern."
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2522 ../src/config.py:2558
msgid "To disable the account, you must be disconnected."
msgstr "Zum Deaktivieren des Kontos, müssen Sie offline sein."
-#: ../src/config.py:2517
+#: ../src/config.py:2527
msgid "Account Local already exists."
msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
-#: ../src/config.py:2518
+#: ../src/config.py:2528
msgid "Please rename or remove it before enabling link-local messaging."
msgstr ""
"Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
"aktivieren."
-#: ../src/config.py:2675
+#: ../src/config.py:2685
#, python-format
msgid "Edit %s"
msgstr "%s bearbeiten"
-#: ../src/config.py:2677
+#: ../src/config.py:2687
#, python-format
msgid "Register to %s"
msgstr "Auf %s registrieren"
#. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2723
msgid "Ban List"
msgstr "Sperrliste"
-#: ../src/config.py:2714
+#: ../src/config.py:2724
msgid "Member List"
msgstr "Mitgliederliste"
-#: ../src/config.py:2714
+#: ../src/config.py:2724
msgid "Owner List"
msgstr "Besitzerliste"
-#: ../src/config.py:2715
+#: ../src/config.py:2725
msgid "Administrator List"
msgstr "Administratorliste"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2789 ../src/disco.py:893 ../src/history_manager.py:207
msgid "JID"
msgstr "Jabber-ID"
-#: ../src/config.py:2789
+#: ../src/config.py:2799
msgid "Reason"
msgstr "Grund"
-#: ../src/config.py:2796
+#: ../src/config.py:2806
msgid "Nick"
msgstr "Spitzname"
-#: ../src/config.py:2802
+#: ../src/config.py:2812
msgid "Role"
msgstr "Rolle"
-#: ../src/config.py:2829
+#: ../src/config.py:2839
msgid "Banning..."
msgstr "Verbannen …"
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2841
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -6733,11 +6689,11 @@ msgstr ""
"<b>Wen möchten Sie verbannen?</b>\n"
"\n"
-#: ../src/config.py:2833
+#: ../src/config.py:2843
msgid "Adding Member..."
msgstr "Mitglied hinzufügen …"
-#: ../src/config.py:2834
+#: ../src/config.py:2844
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -6745,11 +6701,11 @@ msgstr ""
"<b>Wen möchten Sie zum Mitglied machen?</b>\n"
"\n"
-#: ../src/config.py:2836
+#: ../src/config.py:2846
msgid "Adding Owner..."
msgstr "Besitzer hinzufügen …"
-#: ../src/config.py:2837
+#: ../src/config.py:2847
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -6757,11 +6713,11 @@ msgstr ""
"<b>Wen möchten Sie zum Besitzer machen?</b>\n"
"\n"
-#: ../src/config.py:2839
+#: ../src/config.py:2849
msgid "Adding Administrator..."
msgstr "Administrator hinzufügen …"
-#: ../src/config.py:2840
+#: ../src/config.py:2850
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -6769,7 +6725,7 @@ msgstr ""
"<b>Wen möchten Sie zum Administrator machen?</b>\n"
"\n"
-#: ../src/config.py:2841
+#: ../src/config.py:2851
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -6786,111 +6742,110 @@ msgstr ""
"benutzer@domain, jede domain/Ressource oder jede Adresse, die eine Subdomain "
"enthält)."
-#: ../src/config.py:2943
+#: ../src/config.py:2952
#, python-format
msgid "Removing %s account"
msgstr "Entferne Konto %s"
-#: ../src/config.py:2958
-#, fuzzy
+#: ../src/config.py:2967
msgid "Account is disabled"
-msgstr "Emoticons deaktiviert"
+msgstr "Konto ist deaktiviert"
-#: ../src/config.py:2959
+#: ../src/config.py:2968
msgid "To unregister from a server, account must be enabled."
-msgstr ""
+msgstr "Um sich vom Server abzumelden, muss das Konto aktiviert sein."
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:2981 ../src/gui_interface.py:271
+#: ../src/gui_interface.py:723
msgid "Password Required"
msgstr "Passwort benötigt"
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:2982 ../src/gui_interface.py:703
#, python-format
msgid "Enter your password for account %s"
msgstr "Bitte geben Sie Ihr Passwort für %s ein"
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:2983 ../src/gui_interface.py:723
msgid "Save password"
msgstr "Passwort speichern"
-#: ../src/config.py:2984
+#: ../src/config.py:2993
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
-#: ../src/config.py:2985
+#: ../src/config.py:2994
msgid "If you remove it, the connection will be lost."
msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
-#: ../src/config.py:2999
-#, fuzzy, python-format
+#: ../src/config.py:3008
+#, python-format
msgid "Connection to server %s failed"
-msgstr "Verbindung mit Proxy fehlgeschlagen"
+msgstr "Verbindung zu Server %s fehlgeschlagen"
-#: ../src/config.py:3000
-#, fuzzy
+#: ../src/config.py:3009
msgid "What would you like to do?"
msgstr "Was möchten Sie tun?"
-#: ../src/config.py:3001
-#, fuzzy
+#: ../src/config.py:3010
msgid "Remove only from Gajim"
-msgstr "Kont_o entfernen (nur in Gajim)"
+msgstr "Kont_o nur aus Gajim entfernen"
-#: ../src/config.py:3002
+#: ../src/config.py:3011
msgid "Don't remove anything. I'll try again later"
-msgstr ""
+msgstr "Bitte nichts entfernen. Ich versuche es später noch einmal"
-#: ../src/config.py:3095
+#: ../src/config.py:3105
msgid "?print_status:All"
msgstr "?print_status:Alle"
-#: ../src/config.py:3096
+#: ../src/config.py:3106
msgid "Enter and leave only"
msgstr "Nur betreten und verlassen"
-#: ../src/config.py:3097
+#: ../src/config.py:3107
msgid "?print_status:None"
msgstr "?print_status:Nichts"
-#: ../src/config.py:3167
+#: ../src/config.py:3179
msgid "New Group Chat"
msgstr "Neuer Gruppenchat"
# TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
-#: ../src/config.py:3200
+#: ../src/config.py:3212
msgid "This bookmark has invalid data"
msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
-#: ../src/config.py:3201
+#: ../src/config.py:3213
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr ""
"Bitte Server- und Chatraumfeld ausfüllen oder gespeicherten Chatraum löschen."
#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
+#: ../src/config.py:3338 ../src/dialogs.py:2040
msgid "Invalid nickname"
msgstr "Ungültiger Benutzername"
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3339 ../src/config.py:3350 ../src/config.py:3359
+#: ../src/config.py:3370 ../src/config.py:3378
msgid "Character not allowed"
msgstr "Zeichen nicht erlaubt"
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3350 ../src/config.py:3358 ../src/config.py:3370
+#: ../src/config.py:3630
msgid "Invalid server"
msgstr "Ungültiger Server"
-#: ../src/config.py:3347
+#: ../src/config.py:3377
msgid "Invalid room"
msgstr "Ungültiger Raum"
-#: ../src/config.py:3515
+#: ../src/config.py:3546
msgid "Account has been added successfully"
msgstr "Konto wurde erfolgreich hinzugefügt"
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3547 ../src/config.py:3553
msgid ""
"You can set advanced account options by pressing the Advanced button, or "
"later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6900,35 +6855,35 @@ msgstr ""
"Button drücken, oder später den Eintrag Konto im Ändern Menü in der "
"Kontaktliste auswählen."
-#: ../src/config.py:3521
+#: ../src/config.py:3552
msgid "Your new account has been created successfully"
msgstr "Ihr neues Konto wurde erfolgreich erstellt"
-#: ../src/config.py:3560
+#: ../src/config.py:3591
msgid "Invalid username"
msgstr "Ungültiger Benutzername"
-#: ../src/config.py:3562
+#: ../src/config.py:3593
msgid "You must provide a username to configure this account."
msgstr ""
"Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
-#: ../src/config.py:3600
+#: ../src/config.py:3631
msgid "Please provide a server on which you want to register."
msgstr "Bitte geben Sie den Server an, bei dem Sie sich registrieren möchten."
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3687 ../src/gui_interface.py:1201
msgid "Certificate Already in File"
msgstr "Zertifikat bereits in der Datei"
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3688 ../src/gui_interface.py:1202
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr ""
"Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der "
"Datei %s befindet."
-#: ../src/config.py:3734
+#: ../src/config.py:3765
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6943,7 +6898,7 @@ msgstr ""
"SSL-Fehler: %(error)s\n"
"Möchten Sie sich dennoch zum Server verbinden?"
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3771 ../src/gui_interface.py:1230
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6954,72 +6909,77 @@ msgstr ""
"SHA1-Fingerprint dieses Zertifikates:\n"
"%s"
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3803 ../src/config.py:3837
msgid "An error occurred during account creation"
msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
-#: ../src/config.py:3871
+#: ../src/config.py:3902
msgid "Account name is in use"
msgstr "Der Kontoname ist bereits vergeben"
-#: ../src/config.py:3872
+#: ../src/config.py:3903
msgid "You already have an account using this name."
msgstr "Sie haben bereits ein Konto mit diesem Namen."
-#: ../src/config.py:3991
+#: ../src/config.py:4033
msgid "PEP node was not removed"
msgstr "PEP-Knoten wurde nicht entfernt"
-#: ../src/config.py:3992
+#: ../src/config.py:4034
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
-#: ../src/config.py:4036
+#: ../src/config.py:4062
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Einstellen"
+
+#: ../src/config.py:4078 ../src/plugins/gui.py:73
msgid "Active"
msgstr "Aktiv"
-#: ../src/config.py:4044
+#: ../src/config.py:4086
msgid "Event"
msgstr "Ereignis"
-#: ../src/config.py:4079
+#: ../src/config.py:4121
msgid "First Message Received"
msgstr "Erste empfangene Nachricht"
-#: ../src/config.py:4080
+#: ../src/config.py:4122
msgid "Next Message Received Focused"
msgstr "Nächste empfangene Nachricht ausgewählt"
-#: ../src/config.py:4082
+#: ../src/config.py:4124
msgid "Next Message Received Unfocused"
msgstr "Nächste empfangene Nachricht nicht ausgewählt"
-#: ../src/config.py:4083
+#: ../src/config.py:4125
msgid "Contact Connected"
msgstr "Kontakt verbunden"
-#: ../src/config.py:4084
+#: ../src/config.py:4126
msgid "Contact Disconnected"
msgstr "Kontakt nicht verbunden"
-#: ../src/config.py:4085
+#: ../src/config.py:4127
msgid "Message Sent"
msgstr "Nachricht gesendet"
-#: ../src/config.py:4086
+#: ../src/config.py:4128
msgid "Group Chat Message Highlight"
msgstr "Hervorhebung von Chatraum-Nachrichten"
-#: ../src/config.py:4087
+#: ../src/config.py:4129
msgid "Group Chat Message Received"
msgstr "Chatraum-Nachricht empfangen"
-#: ../src/config.py:4088
+#: ../src/config.py:4130
msgid "GMail Email Received"
msgstr "E-Mail über Google-Mail empfangen"
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:603
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
@@ -7029,7 +6989,7 @@ msgstr ""
"am anderen Ende eingetroffen ist. Falls es längere\n"
"Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:622
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
@@ -7037,236 +6997,235 @@ msgstr ""
"Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
"diesem Chatraum gesagt wurde."
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:742
msgid "_Quote"
msgstr "_Zitieren"
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:749
#, python-format
msgid "_Actions for \"%s\""
msgstr "_Aktionen für \"%s\""
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
msgid "Read _Wikipedia Article"
msgstr "_Wikipedia-Artikel lesen"
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:767
msgid "Look it up in _Dictionary"
msgstr "Im Wörterbuch _suchen"
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:784
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "Im Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
#. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:797
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "In der URL für die Websuche fehlt ein \"%s\""
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:800
msgid "Web _Search for it"
msgstr "Im _Internet hiernach suchen"
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:806
msgid "Open as _Link"
msgstr "Als _Link öffnen"
#. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1309
#, python-format
msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
msgstr[0] "Gestern"
-msgstr[1] "vor %i Tagen"
+msgstr[1] "vor %(nb_days)i Tagen"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1358 ../src/history_window.py:480
#, python-format
msgid "Subject: %s\n"
msgstr "Thema: %s\n"
-#: ../src/dataforms_widget.py:545
-#, fuzzy
+#: ../src/dataforms_widget.py:565
msgid "Unable to load image"
-msgstr "Konnte Idle-Modul nicht laden"
+msgstr "Konnte Bild nicht laden"
-#: ../src/dataforms_widget.py:547
-#, fuzzy, python-format
+#: ../src/dataforms_widget.py:567
+#, python-format
msgid "Media type not supported: %s"
-msgstr "Unsichtbarkeit wird nicht unterstützt"
+msgstr "Medientyp wird nicht unterstützt"
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:582
msgid "This field is required"
msgstr ""
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:627
msgid "Jabber ID already in list"
msgstr "Die Jabber-ID steht bereits in der Liste"
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:628
msgid "The Jabber ID you entered is already in the list. Choose another one."
msgstr ""
"Die eingegebene Jabber-ID ist bereits in der Liste. Wählen Sie bitte eine "
"andere."
#. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:639
msgid "new@jabber.id"
msgstr "neu@jabber.id"
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
#, python-format
msgid "new%d@jabber.id"
msgstr "neu%d@jabber.id"
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:81
#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "Kontaktname: <i>%s</i>"
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:83
#, python-format
msgid "Jabber ID: <i>%s</i>"
msgstr "Jabber-ID: <i>%s</i>"
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:197
msgid "Group"
msgstr "Gruppe"
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:204
msgid "In the group"
msgstr "In der Gruppe"
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:295
msgid "KeyID"
msgstr "Schlüssel-ID"
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:300
msgid "Contact name"
msgstr "Name des Kontakts"
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:475
msgid "Set Mood"
msgstr "Stimmung setzen"
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:595
#, python-format
msgid "%s Status Message"
msgstr "%s Statusnachricht"
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:609
msgid "Status Message"
msgstr "Statusnachricht"
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:800
msgid "Overwrite Status Message?"
msgstr "Statusnachricht überschreiben"
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:801
msgid ""
"This name is already used. Do you want to overwrite this status message?"
msgstr ""
"Dieser Name wird bereits verwendet. Möchten Sie die Statusnachricht "
"überschreiben?"
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:809
msgid "Save as Preset Status Message"
msgstr "Als Vorlage für Statusnachrichten speichern"
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:810
msgid "Please type a name for this status message"
msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:838
msgid "AIM Address:"
msgstr "AIM-Adresse"
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:839
msgid "GG Number:"
msgstr "GG-Nummer"
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:840
msgid "ICQ Number:"
msgstr "ICQ-Nummer"
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:841
msgid "MSN Address:"
msgstr "MSN-Adresse"
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:842
msgid "Yahoo! Address:"
msgstr "Yahoo-Adresse"
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:879
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr ""
"Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
"hinzufügen wollen"
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:882
msgid "Please fill in the data of the contact you want to add"
msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
+#: ../src/dialogs.py:3585
msgid "Invalid User ID"
msgstr "Ungültige Benutzer-ID"
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1081
msgid "The user ID must not contain a resource."
msgstr "Die Benutzer-ID darf keine Ressource enthalten."
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1086
msgid "You cannot add yourself to your roster."
msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1100
msgid "Contact already in roster"
msgstr "Kontakt bereits in der Kontaktliste"
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1101
msgid "This contact is already listed in your roster."
msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
msgid "User ID:"
msgstr "_Benutzer-ID:"
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1273
msgid "A GTK+ jabber client"
msgstr "Ein Jabber-Client in GTK+"
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1274
msgid "GTK+ Version:"
msgstr "GTK+-Version:"
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1275
msgid "PyGTK Version:"
msgstr "PyGTK-Version"
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1285
msgid "Current Developers:"
msgstr "Derzeitige Entwickler:"
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1287
msgid "Past Developers:"
msgstr "Frühere Entwickler:"
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1293
msgid "THANKS:"
msgstr "DANKE:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1299
msgid "Last but not least, we would like to thank all the package maintainers."
msgstr "Zuletzt möchten wird gerne allen Paket-Verwaltern danken."
#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1311
msgid "translator-credits"
msgstr ""
"Fridtjof Busse\n"
@@ -7276,7 +7235,7 @@ msgstr ""
"Nico Gulden (cilugnedon AT gmx.de)\n"
"Niklas Hambüchen (nh2 AT deditus.de)"
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1494
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -7289,101 +7248,109 @@ msgstr ""
"\n"
"Falsch geschriebene Wörter können nicht hervorgehoben werden."
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1842
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1850
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2041 ../src/dialogs.py:2440
msgid "The nickname has not allowed characters."
msgstr "Die Jabber-ID enthält ungültige Zeichen."
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2159
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "Abonnement-Anfrage für das Konto %(account)s von %(jid)s"
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2162
#, python-format
msgid "Subscription request from %s"
msgstr "Abonnement-Anfrage von %s"
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2246 ../src/gui_interface.py:1950
#, python-format
msgid "You are already in group chat %s"
msgstr "Sie sind bereits im Chatraum %s"
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2252
msgid "You can not join a group chat unless you are connected."
msgstr "Sie können einen Chatraum erst betreten, wenn Sie verbunden sind."
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2296
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Chatraum betreten mit dem Konto %s"
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2427
msgid "Invalid Account"
msgstr "Ungültiges Konto"
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2428
msgid ""
"You have to choose an account from which you want to join the groupchat."
msgstr ""
"Sie müssen ein Konto auswählen, mit dem Sie den Gruppenchat betreten möchten."
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2439
msgid "Invalid Nickname"
msgstr "Ungültiger Benutzername"
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2444 ../src/dialogs.py:2450
+#: ../src/groupchat_control.py:2088
msgid "Invalid group chat Jabber ID"
msgstr "Ungültige Jabber-ID für den Chatraum"
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2445
msgid "Please enter the group chat Jabber ID as room@server."
msgstr "Bitte gib die Gruppenchat Jabber ID als raum@server ein."
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
+#: ../src/dialogs.py:2451 ../src/groupchat_control.py:2089
msgid "The group chat Jabber ID has not allowed characters."
msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2455 ../src/gui_interface.py:1932
msgid "This is not a group chat"
msgstr "Dies ist kein Chatraum"
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2456 ../src/gui_interface.py:1933
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s ist nicht der Name eines Chatraums."
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2488
msgid "Without a connection, you can not synchronise your contacts."
msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2501
msgid "Server"
msgstr "Server"
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2537
msgid "This account is not connected to the server"
msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2538
msgid "You cannot synchronize with an account unless it is connected."
msgstr ""
"Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2563
msgid "Synchronise"
msgstr "Synchronisieren"
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2624
#, python-format
msgid "Start Chat with account %s"
msgstr "Starte Chat mit Konto %s"
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2626
msgid "Start Chat"
msgstr "Chat starten"
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2627
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
@@ -7392,165 +7359,150 @@ msgstr ""
"an den Sie eine Chat-Nachricht schicken wollen:"
#. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2654 ../src/dialogs.py:3035 ../src/dialogs.py:3265
msgid "Connection not available"
msgstr "Verbindung nicht verfügbar"
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2655 ../src/dialogs.py:3036 ../src/dialogs.py:3266
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2664 ../src/dialogs.py:2667
msgid "Invalid JID"
msgstr "Ungültige Jabber-ID"
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2667
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Kann \"%s\" nicht parsen."
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2676
msgid "Without a connection, you can not change your password."
msgstr "Sie müssen verbunden sein, um Ihr Passwort ändern zu können."
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2695
msgid "Invalid password"
msgstr "Ungültiges Passwort"
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2695
msgid "You must enter a password."
msgstr "Sie müssen ein Passwort eingeben."
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2699
msgid "Passwords do not match"
msgstr "Die Passwörter stimmen nicht überein"
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2700
msgid "The passwords typed in both fields must be identical."
msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2737 ../src/notify.py:182 ../src/notify.py:419
msgid "Contact Signed In"
msgstr "Kontakt hat sich angemeldet"
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2739 ../src/notify.py:190 ../src/notify.py:421
msgid "Contact Signed Out"
msgstr "Kontakt hat sich abgemeldet"
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Neue einzelne Nachricht"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Neue private Nachricht"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2742 ../src/gui_interface.py:840 ../src/notify.py:433
msgid "New E-mail"
msgstr "Neue E-Mail"
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2744 ../src/gui_interface.py:895 ../src/notify.py:426
msgid "File Transfer Request"
msgstr "Anfrage zur Dateiübertragung"
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2746 ../src/gui_interface.py:802
+#: ../src/gui_interface.py:866 ../src/notify.py:428
msgid "File Transfer Error"
msgstr "Dateiübertragungsfehler"
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2748 ../src/gui_interface.py:941
+#: ../src/gui_interface.py:964 ../src/gui_interface.py:981
+#: ../src/notify.py:430
msgid "File Transfer Completed"
msgstr "Dateiübertragung beendet"
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2749 ../src/gui_interface.py:944 ../src/notify.py:431
msgid "File Transfer Stopped"
msgstr "Dateiübertragung gestoppt"
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
+#: ../src/dialogs.py:2751 ../src/gui_interface.py:649 ../src/notify.py:435
msgid "Groupchat Invitation"
msgstr "Gruppenchat-Einladung"
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2753 ../src/notify.py:174 ../src/notify.py:437
msgid "Contact Changed Status"
msgstr "Kontakt hat Status verändert"
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:2954
#, python-format
msgid "Single Message using account %s"
msgstr "Einzelne Nachricht über das Konto %s"
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:2956
#, python-format
msgid "Single Message in account %s"
msgstr "Einzelne Nachricht über das Konto %s"
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:2958
msgid "Single Message"
msgstr "Einzelne Nachricht"
#. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:2961
#, python-format
msgid "Send %s"
msgstr "Sende %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:2984
#, python-format
msgid "Received %s"
msgstr "%s empfangen"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3007
#, python-format
msgid "Form %s"
msgstr "Von %s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3086
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3087
#, python-format
msgid "%s wrote:\n"
msgstr "%s schrieb:\n"
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3146
#, python-format
msgid "XML Console for %s"
msgstr "XML-Konsole für %s"
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3148
msgid "XML Console"
msgstr "XML-Konsole"
#. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3295
msgid "add"
msgstr "hinzufügen"
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3295
msgid "modify"
msgstr "Verändern"
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3296
msgid "remove"
msgstr "Entfernen"
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3325
#, python-format
msgid ""
"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7560,192 +7512,189 @@ msgstr ""
"%(action)s</b>."
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
+#: ../src/dialogs.py:3341 ../src/dialogs.py:3387
msgid "Add"
msgstr "Hinzufügen"
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3343 ../src/dialogs.py:3418
msgid "Modify"
msgstr "Verändern"
-#: ../src/dialogs.py:3228
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3345 ../src/dialogs.py:3442
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../src/dialogs.py:3349
msgid "Jabber ID"
msgstr "Jabber ID"
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3355
msgid "Groups"
msgstr "Gruppen"
#. it is selected
#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3463
#, python-format
msgid "%s suggested me to add you in my roster."
msgstr ""
"%s hat mir vorgeschlagen Sie als Kontakt zu meiner Kontaktliste hinzuzufügen."
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3477
#, python-format
msgid "Added %s contacts"
msgstr "%s Kontakte hinzugefügt"
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3514
#, python-format
msgid "Removed %s contacts"
msgstr "%s Kontakte entfernt"
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3554 ../src/dialogs.py:3731
#, python-format
msgid "Archiving Preferences for %s"
msgstr ""
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3594
#, fuzzy
msgid "Invalid expire value"
msgstr "Ungültiger Servername"
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3595
msgid "Expire must be a valid positive integer."
msgstr ""
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3642
msgid "There is an error with the form"
msgstr ""
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:3862
#, fuzzy
msgid "There is an error"
msgstr "Der Dienst gab einen Fehler zurück."
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:3930
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Privatsphären-Liste <b><i>%s</i></b>"
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:3934
#, python-format
msgid "Privacy List for %s"
msgstr "Privatsphären-Liste für %s"
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4001
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr ""
"Sortierung: %(order)s, Aktion: %(action)s, Typ: %(type)s, Wert: %(value)s"
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4006
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "Sortierung: %(order)s, Aktion: %(action)s"
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4057
msgid "<b>Edit a rule</b>"
msgstr "<b>Eine Regel bearbeiten</b>"
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4168
msgid "<b>Add a rule</b>"
msgstr "<b>Eine Regel hinzufügen</b>"
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4267
#, python-format
msgid "Privacy Lists for %s"
msgstr "Privatsphären-Liste für %s"
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4269
msgid "Privacy Lists"
msgstr "Privatsphären-Listen"
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4358
msgid "Invalid List Name"
msgstr "Ungültiger Listenname"
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4359
msgid "You must enter a name to create a privacy list."
msgstr ""
"Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
"können."
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4391
msgid "You are invited to a groupchat"
msgstr "Sie wurden in einen Chatraum eingeladen"
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4394
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4396
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact hat Sie in den Chatraum %(room_jid)s eingeladen"
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4404
#, python-format
msgid "Comment: %s"
msgstr "Kommentar: %s"
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4406
msgid "Do you want to accept the invitation?"
msgstr "Möchten Sie die Einladung annehmen?"
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4468
msgid "Choose Client Cert #PCKS12"
-msgstr ""
+msgstr "Clientzertifikat #PCKS12 auswählen"
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4478 ../src/dialogs.py:4520 ../src/dialogs.py:4576
+#: ../src/dialogs.py:4664
msgid "All files"
msgstr "Alle Dateien"
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4483
msgid "PKCS12 Files"
-msgstr ""
+msgstr "PKCS12 Dateien"
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4510
msgid "Choose Sound"
msgstr "Sound wählen"
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4525
msgid "Wav Sounds"
msgstr "Wav-Dateien"
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4563
msgid "Choose Image"
msgstr "Bild auswählen"
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4581
msgid "Images"
msgstr "Bilder"
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4651
#, fuzzy
msgid "Choose Archive"
msgstr "Bild auswählen"
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4669
#, fuzzy
msgid "Zip files"
msgstr "Alle Dateien"
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4695
#, python-format
msgid "When %s becomes:"
msgstr "Wenn %s wird:"
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4697
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Füge speziellen Hinweis für %s hinzu"
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Bedingung"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "wenn Ich bin "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:4917
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7757,19 +7706,19 @@ msgstr ""
"Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>"
"%(sas)s</b>"
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:4920
msgid "You have already verified this contact's identity."
msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:4926 ../src/dialogs.py:5010
msgid "Contact's identity verified"
msgstr "Kontaktidentität wurde überprüft"
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:4932
msgid "Verify again..."
msgstr "Erneut überprüfen …"
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:4937
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 "
@@ -7779,19 +7728,19 @@ msgstr ""
"Nachrichten lesen oder Ihnen Nachrichten senden kann, müssen Sie seine "
"Identität überprüfen, indem Sie die Schaltfläche weiter unten betätigen."
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:4940 ../src/dialogs.py:4991 ../src/dialogs.py:5004
msgid "Contact's identity NOT verified"
msgstr "Kontaktidentität nicht überprüft"
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:4945
msgid "Verify..."
msgstr "Überprüfen …"
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:4956
msgid "Have you verified the contact's identity?"
msgstr "Haben Sie die Identität des Kontaktes überprüft?"
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:4957
#, python-format
msgid ""
"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7807,13 +7756,13 @@ msgstr ""
"Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</"
"b>"
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:4958
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr ""
"Haben Sie mit dem Kontakt gesprochen, um den kurzen Authentifizierungs-"
"Schluessel zu überprüfen?"
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:4992
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
msgstr ""
@@ -7821,14 +7770,14 @@ msgstr ""
"Schlüssel überein."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:5279
+#: ../src/dialogs.py:4998
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr ""
"Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht "
"verschlüsselt werden."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5005
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."
@@ -7839,7 +7788,7 @@ msgstr ""
"einzustufen."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5011
msgid ""
"GPG Key is assigned to this contact, and you trust his key, so messages will "
"be encrypted."
@@ -7847,19 +7796,19 @@ msgstr ""
"Ein vertrauenswürdiger GPG-Schlüssel ist dem Kontakt zugewiesen. Die "
"Nachrichten werden verschlüsselt."
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5076
msgid "an audio and video"
msgstr "eine Audio und Video"
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5078
msgid "an audio"
msgstr "eine Audio"
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5080
msgid "a video"
msgstr "eine Video"
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5084
#, python-format
msgid ""
"%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7868,6 +7817,37 @@ msgstr ""
"%(contact)s möchte eine %(type)s-Sitzung mit dir starten. Möchten Sie den "
"Anruf annehmen?"
+#: ../src/dialogs.py:5152
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "für das Konto %s"
+
+#: ../src/dialogs.py:5152
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5186 ../src/dialogs.py:5203
+msgid "View cert..."
+msgstr ""
+
#: ../src/disco.py:119
msgid "Others"
msgstr "Andere"
@@ -7877,24 +7857,24 @@ msgstr "Andere"
msgid "Conference"
msgstr "Konferenz"
-#: ../src/disco.py:513
+#: ../src/disco.py:516
msgid "Without a connection, you can not browse available services"
msgstr "Sie müssen angemeldet sein, um die Dienste durchsuchen zu können"
-#: ../src/disco.py:600
+#: ../src/disco.py:602
#, python-format
msgid "Service Discovery using account %s"
msgstr "Dienste des Kontos %s durchsuchen"
-#: ../src/disco.py:602
+#: ../src/disco.py:604
msgid "Service Discovery"
msgstr "Dienste durchsuchen"
-#: ../src/disco.py:758
+#: ../src/disco.py:760
msgid "The service could not be found"
msgstr "Der Dienst konnte nicht gefunden werden"
-#: ../src/disco.py:759
+#: ../src/disco.py:761
msgid ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
@@ -7903,37 +7883,37 @@ msgstr ""
"Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
"erneut."
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:765 ../src/disco.py:1102
msgid "The service is not browsable"
msgstr "Der Dienst ist nicht durchsuchbar"
-#: ../src/disco.py:764
+#: ../src/disco.py:766
msgid "This type of service does not contain any items to browse."
msgstr ""
"Dieser Art von Dienst enthält keine Objekte, die durchsucht werden können."
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:806 ../src/disco.py:816
msgid "Invalid Server Name"
msgstr "Ungültiger Servername"
-#: ../src/disco.py:868
+#: ../src/disco.py:870
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "Durchsuche %(address)s über das Konto %(account)s"
-#: ../src/disco.py:912
+#: ../src/disco.py:914
msgid "_Browse"
msgstr "_Durchsuche"
-#: ../src/disco.py:1101
+#: ../src/disco.py:1103
msgid "This service does not contain any items to browse."
msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
-#: ../src/disco.py:1341
+#: ../src/disco.py:1343
msgid "_Execute Command"
msgstr "_Befehl ausführen"
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1353 ../src/disco.py:1522
msgid "Re_gister"
msgstr "Re_gistrieren"
@@ -7957,188 +7937,192 @@ msgstr "Beschreibung"
msgid "Id"
msgstr "ID"
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1835 ../src/gui_interface.py:2468
msgid "Bookmark already set"
msgstr "Chatraum ist bereits gespeichert"
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1836 ../src/gui_interface.py:2469
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1845 ../src/gui_interface.py:2483
msgid "Bookmark has been added successfully"
msgstr "Chatraum wurde erfolgreich gespeichert"
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1846 ../src/gui_interface.py:2484
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr ""
"Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
"Kontaktliste bearbeiten"
-#: ../src/disco.py:2057
+#: ../src/disco.py:2055
msgid "Subscribed"
msgstr "Abonniert"
-#: ../src/disco.py:2065
+#: ../src/disco.py:2063
msgid "Node"
msgstr "Node"
-#: ../src/disco.py:2129
+#: ../src/disco.py:2127
msgid "New post"
msgstr "Neue Nachricht"
-#: ../src/disco.py:2135
+#: ../src/disco.py:2133
msgid "_Subscribe"
msgstr "_Abonnieren"
-#: ../src/disco.py:2141
+#: ../src/disco.py:2139
msgid "_Unsubscribe"
msgstr "_Abbestellen"
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+#, fuzzy
+msgid "SSL certificate validation"
msgstr "SSL/TLS-Zertifikatprüfung"
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
msgid ""
"A library used to validate server certificates to ensure a secure connection."
msgstr ""
"Ermöglicht die Validierung von Server-Zertifikaten, die eine sichere "
"Verbindung gewährleisten."
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:52 ../src/features_window.py:53
msgid "Requires python-pyopenssl."
msgstr "Erfordert python-pyopenssl."
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
msgid "Bonjour / Zeroconf"
msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
msgid "Serverless chatting with autodetected clients in a local network."
msgstr ""
"Ermöglicht serverloses Chatten mit automatischer Clienterkennung in lokalen "
"Netzwerken."
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
msgid "Requires python-avahi."
msgstr "Erfordert python-avahi."
-#: ../src/features_window.py:56
+#: ../src/features_window.py:57
msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
msgstr ""
"Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour (Englisch))."
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
msgid "Command line"
msgstr "Kommandozeilensteuerung"
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
msgid "A script to control Gajim via commandline."
msgstr "Ermöglicht es, Gajim per Skript über die Konsole zu steuern."
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
msgid "Requires python-dbus."
msgstr "Erfordert python-dbus."
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:85 ../src/features_window.py:89
+#: ../src/features_window.py:109
msgid "Feature not available under Windows."
msgstr "Funktion unter Windows nicht verfügbar."
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
msgid "OpenGPG message encryption"
msgstr "OpenPGP-Verschlüsselung"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
msgid "Encrypting chat messages with gpg keys."
msgstr "Ermöglicht die Verschlüsselung von Nachrichten per OpenPGP."
-# TODO: GPG/PGP unification in original strings needed
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Erfordert GnuPG und python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
#: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr ""
+
+#: ../src/features_window.py:66
msgid "Network-manager"
msgstr "Netzwerk-Manager"
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
msgid "Autodetection of network status."
msgstr "Ermöglicht die automatische Erkennung des Netzwerkstatus."
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
msgid "Requires gnome-network-manager and python-dbus."
msgstr "Erfordert gnome-network-manager und python-dbus."
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
msgid "Session Management"
msgstr "Sitzungsverwaltung"
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
msgid "Gajim session is stored on logout and restored on login."
msgstr ""
"Die Gajim-Sitzung kann beim Logout gespeichert und beim Login "
"wiederhergestellt werden."
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
msgid "Requires python-gnome2."
msgstr "Erfordert python-gnome2."
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
msgid "Password encryption"
msgstr "Sichere Kennwortverwaltung"
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
msgid "Passwords can be stored securely and not just in plaintext."
msgstr "Passwörter können sicher anstatt nur im Klartext gespeichert werden."
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
msgstr "Erfordert gnome-keyring und python-gnome2-desktop, oder kwalletcli."
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
msgid "SRV"
msgstr "SRV"
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
msgid "Ability to connect to servers which are using SRV records."
msgstr "Ermöglicht Verbindungen zu Servern, die SRV-DNS-Einträge verwenden."
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
msgid "Requires dnsutils."
msgstr "Erfordert dnsutils."
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
msgid "Requires nslookup to use SRV records."
msgstr "Erfordert nslookup zur Nutzung von SRV-Einträgen."
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
msgid "Spell Checker"
msgstr "Rechtschreibprüfung"
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
msgid "Spellchecking of composed messages."
msgstr ""
"Ermöglicht das Überprüfen verfasster Nachrichten auf Rechtschreibfehler."
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
msgid "Requires libgtkspell."
msgstr "Erfordert die libgtkspell-Bibliothek."
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
msgid "Notification"
msgstr "Benachrichtigungen"
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
msgid "Passive popups notifying for new events."
msgstr "Ermöglicht passive Popups, die über neue Ereignisse informieren."
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
msgid ""
"Requires python-notify or instead python-dbus in conjunction with "
"notification-daemon."
@@ -8146,35 +8130,35 @@ msgstr ""
"Erfordert python-notify oder stattdessen python-dbus in Verbindung mit "
"notification-daemon."
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
msgid "Automatic status"
msgstr "Automatischer Status"
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
msgid "Ability to measure idle time, in order to set auto status."
msgstr ""
"Emöglicht die Messung der Zeit, während der der Computer nicht benutzt wird, "
"um den Status automatisch zu setzen."
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
msgid "Requires libxss library."
msgstr "Erfordert die libxss-Bibliothek."
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
msgid "Requires python2.5."
msgstr "Erfordert python-gnome2 (Version 2.5)."
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
msgid "LaTeX"
msgstr "LaTeX"
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
msgid "Transform LaTeX expressions between $$ $$."
msgstr ""
"Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird als "
"LaTeX interpretiert."
-#: ../src/features_window.py:95
+#: ../src/features_window.py:96
#, fuzzy
msgid ""
"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
@@ -8183,7 +8167,7 @@ msgstr ""
"Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Im "
"erweiterten Konfigurationseditor muss 'use_latex' auf 'true' gesetzt werden."
-#: ../src/features_window.py:96
+#: ../src/features_window.py:97
#, fuzzy
msgid ""
"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
@@ -8192,23 +8176,23 @@ msgstr ""
"Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie müssen "
"'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
msgid "End to End message encryption"
msgstr "ESession-Verschlüsselung"
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
msgid "Encrypting chat messages."
msgstr "Nachrichten können per ESession verschlüsselt werden."
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:100 ../src/features_window.py:101
msgid "Requires python-crypto."
msgstr "Erfordert python-crypto"
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
msgid "RST Generator"
msgstr "RST-Generator"
-#: ../src/features_window.py:102
+#: ../src/features_window.py:103
msgid ""
"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
@@ -8216,24 +8200,24 @@ msgstr ""
"Kann aus RST-Code XHTML-Ausgaben erzeugen (siehe http://docutils.sourceforge."
"net/docs/ref/rst/restructuredtext.html (Englisch))."
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:104 ../src/features_window.py:105
msgid "Requires python-docutils."
msgstr "Erfordert python-docutils."
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
msgid "Ability to start audio and video chat."
msgstr "Audio und Video Chat sind möglich."
-#: ../src/features_window.py:107
-msgid "Requires python-farsight."
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Requires python-farsight and gstreamer-plugins-bad."
msgstr "Erfordert python-farsight."
-#: ../src/features_window.py:115
-#, fuzzy
+#: ../src/features_window.py:116
msgid "?features:Available"
-msgstr "Verfügbar"
+msgstr "?Features:Verfügbar"
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
msgid "Feature"
msgstr "Feature"
@@ -8254,7 +8238,7 @@ msgstr "Fortschritt"
msgid "Filename: %s"
msgstr "Dateiname: %s"
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
#, python-format
msgid "Size: %s"
msgstr "Größe: %s"
@@ -8262,7 +8246,7 @@ msgstr "Größe: %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/history_manager.py:541
msgid "You"
msgstr "Sie"
@@ -8271,7 +8255,7 @@ msgstr "Sie"
msgid "Sender: %s"
msgstr "Gespeichert in: %s"
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
#: ../src/tooltips.py:742
msgid "Recipient: "
msgstr "Empfänger: "
@@ -8307,48 +8291,48 @@ msgstr "Fehlermeldung: %s"
msgid "File transfer stopped"
msgstr "Dateiübertragung gestoppt"
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:266
msgid "Choose File to Send..."
msgstr "Datei auswählen …"
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
msgid "Description: "
msgstr "Beschreibung: "
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:295
msgid "Gajim cannot access this file"
msgstr "Auf diese Datei kann nicht zugegriffen werden"
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:296
msgid "This file is being used by another process."
msgstr "Diese Datei wird von einem anderen Prozess verwendet."
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:330
#, python-format
msgid "File: %s"
msgstr "Datei: %s"
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:336
#, python-format
msgid "Type: %s"
msgstr "Typ: %s"
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:338
#, python-format
msgid "Description: %s"
msgstr "Beschreibung: %s"
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:339
#, python-format
msgid "%s wants to send you a file:"
msgstr "%s möchte Ihnen eine Datei senden:"
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
msgid ""
"A file with this name already exists and you do not have permission to "
"overwrite it."
@@ -8356,35 +8340,35 @@ msgstr ""
"Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die "
"erforderlichen Rechte, um sie zu überschreiben."
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
msgid "This file already exists"
msgstr "Diese Datei existiert bereits"
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
msgid "What do you want to do?"
msgstr "Was möchten Sie tun?"
#. 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:369 ../src/gtkgui_helpers.py:918
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:862
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
msgid "You do not have permission to create files in this directory."
msgstr ""
"Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
"anzulegen."
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:389
msgid "Save File as..."
msgstr "Datei speichern unter …"
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
#. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:459
#, python-format
msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8392,69 +8376,65 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
#. This should make the string Kb/s,
#. where 'Kb' part is taken from %s.
#. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:552
#, python-format
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/s)"
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
msgid "Invalid File"
msgstr "Ungültige Datei"
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:595
msgid "File: "
msgstr "Datei: "
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:599
msgid "It is not possible to send empty files"
msgstr "Es nicht möglich, leere Dateien zu versenden"
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
msgid "Name: "
msgstr "Name: "
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
msgid "Sender: "
msgstr "Absender: "
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:787
msgid "Pause"
msgstr "Pause"
-#: ../src/gajim.py:142
+#: ../src/gajim.py:186
msgid "Gajim needs X server to run. Quiting..."
msgstr "Gajim benötigt einen laufenden X-Server. Abbruch …"
-#: ../src/gajim.py:144
+#: ../src/gajim.py:188
#, python-format
msgid "importing PyGTK failed: %s"
msgstr "Import von PyGTIK fehlgeschlagen: %s"
-#: ../src/gajim.py:186
-#, fuzzy
+#: ../src/gajim.py:230
msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim benötigt PyGTK 2.12 oder höher"
+msgstr "Gajim benötigt PyGTK 2.16 oder höher"
-#: ../src/gajim.py:187
-#, fuzzy
+#: ../src/gajim.py:231
msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim benötigt PyGTK 2.12 oder höher. Abbruch …"
+msgstr "Gajim benötigt PyGTK 2.16 oder höher. Abbruch …"
-#: ../src/gajim.py:189
-#, fuzzy
+#: ../src/gajim.py:233
msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim benötigt GTK 2.12 oder höher"
+msgstr "Gajim benötigt GTK 2.16 oder höher"
-#: ../src/gajim.py:190
-#, fuzzy
+#: ../src/gajim.py:234
msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim benötigt GTK 2.12 oder höher. Abbruch …"
+msgstr "Gajim benötigt GTK 2.16 oder höher. Abbruch …"
-#: ../src/gajim.py:199
+#: ../src/gajim.py:243
msgid "Gajim needs pywin32 to run"
msgstr "Gajim benötigt pywin32 zum Laufen"
-#: ../src/gajim.py:200
+#: ../src/gajim.py:244
#, python-format
msgid ""
"Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8464,11 +8444,11 @@ msgstr ""
"können es unter folgender URL herunterladen: %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:360
msgid "Gajim is already running"
msgstr "Gajim läuft bereits"
-#: ../src/gajim.py:317
+#: ../src/gajim.py:361
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -8476,41 +8456,34 @@ msgstr ""
"Gajim schein bereits zu laufen.\n"
"Soll eine weitere Instanz gestartet werden?"
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:77
msgid "Shows a help on specific command"
msgstr "Zeigt die Hilfe für einen bestimmten Befehl"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:80
msgid "command"
msgstr "Befehl"
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:81
msgid "show help on command"
msgstr "zeige Hilfe für Befehl"
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:85
msgid "Shows or hides the roster window"
msgstr "Ein- oder Ausblenden des Hauptfensters"
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:89
msgid "Pops up a window with the next pending event"
msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:93
msgid ""
"Prints a list of all contacts in the roster. Each contact appears on a "
"separate line"
msgstr ""
"Gibt eine Liste aller Kontakte in der Kontaktliste aus. Eine Zeile je Kontakt"
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8522,33 +8495,37 @@ msgstr ""
msgid "account"
msgstr "Konto"
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:96
msgid "show only contacts of the given account"
msgstr "zeige nur Kontakte für das gegebene Konto"
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:102
msgid "Prints a list of registered accounts"
msgstr "Gibt eine Liste registrierter Konten aus"
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:106
msgid "Changes the status of account or accounts"
msgstr "Ändert den Status eines oder mehrerer Konten"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:109
msgid "status"
msgstr "Status"
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:109
#, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "Mögliche Werte: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"Ein Wert von: offline, online, chat, away, xa, dnd, invisible. Wenn nicht "
+"definiert, wird der letzte Kontostatus verwendet"
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:110
msgid "status message"
msgstr "Statusnachricht"
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:111
msgid ""
"change status of account \"account\". If not specified, try to change status "
"of all accounts that have \"sync with global status\" option set"
@@ -8557,22 +8534,46 @@ msgstr ""
"aller Konten für die die Option \"Kontostatus mit globalem Status "
"synchronisieren\" aktiviert ist"
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Ändert die Priorität eines oder mehrerer Konten"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "Priorität"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "Priorität, die Sie dem Konto geben möchten"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Priorität für das Konto ändern. Falls nicht angegeben, ändere den Status "
+"aller Konten für die die Option \"Kontostatus mit globalem Status "
+"synchronisieren\" aktiviert ist"
+
+#: ../src/gajim-remote.py:127
msgid "Shows the chat dialog so that you can send messages to a contact"
msgstr ""
"Zeige Chatfenster, sodass eine Nachricht an einen Kontakt gesendet werden "
"kann"
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:129
msgid "JID of the contact that you want to chat with"
msgstr "Jabber-ID des Kontakts, mit dem Sie chatten möchten"
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
msgid "if specified, contact is taken from the contact list of this account"
msgstr "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "Nachrichteninhalt. Das Konto muss angegeben werden oder \"\""
+
+#: ../src/gajim-remote.py:139
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 "
@@ -8582,35 +8583,30 @@ msgstr ""
"Schlüssel und Konto sind optional. Falls nur das Konto ohne einen OpenGPG-"
"Schlüssel gesetzt werden soll, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
msgid "JID of the contact that will receive the message"
msgstr "Jabber-ID des Kontakts, der die Nachricht empfangen soll"
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
msgid "message contents"
msgstr "Nachrichteninhalt"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "pgp key"
msgstr "PGP-Schlüssel"
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "if specified, the message will be encrypted using this public key"
msgstr "falls angegeben, wird die Nachricht damit verschlüsselt"
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
msgid "if specified, the message will be sent using this account"
msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:152
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 "
@@ -8620,138 +8616,135 @@ msgstr ""
"Schlüssel und Konto sind optional. Falls nur das Konto ohne einen OpenGPG-"
"Schlüssel gesetzt werden soll, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
msgid "subject"
msgstr "Betreff"
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
msgid "message subject"
msgstr "Nachrichten-Betreff"
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:166
msgid "Sends new message to a groupchat you've joined."
msgstr "Sendet eine neue Nachricht an einen Chatraum, den Sie betreten haben."
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:168
msgid "JID of the room that will receive the message"
msgstr "Jabber-ID des Chatraums, der die Nachricht empfangen soll"
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:175
msgid "Gets detailed info on a contact"
msgstr "Zeige detaillierte Informationen über einen Kontakt"
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
msgid "JID of the contact"
msgstr "Jabber-ID des Kontakts"
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:181
msgid "Gets detailed info on a account"
msgstr "Zeige detaillierte Informationen über ein Konto"
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:183
msgid "Name of the account"
msgstr "Name des Kontos"
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:187
msgid "Sends file to a contact"
msgstr "Sendet dem Kontakt eine Datei"
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
msgid "file"
msgstr "Datei"
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
msgid "File path"
msgstr "Dateipfad"
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:191
msgid "if specified, file will be sent using this account"
msgstr "Wenn angegeben, wird die Nachricht über dieses Konto gesendet"
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:196
msgid "Lists all preferences and their values"
msgstr "Zeigt alle Einstellungen und ihre Werte"
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:200
msgid "Sets value of 'key' to 'value'."
msgstr "Setzt den Wert von 'Schlüssel' auf 'Wert'."
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
msgid "'key' is the name of the preference, 'value' is the value to set it to"
msgstr ""
"'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende "
"Wert"
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:207
msgid "Deletes a preference item"
msgstr "Löscht eine Einstellung"
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
msgid "key"
msgstr "Schlüssel"
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
msgid "name of the preference to be deleted"
msgstr "Name der zu löschenden Einstellung"
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:213
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "Schreibt die aktuellen Gajim-Einstellungen in die Konfigurationsdatei"
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:218
msgid "Removes contact from roster"
msgstr "Entfernt den Kontakt aus der Kontaktliste"
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:227
msgid "Adds contact to roster"
msgstr "Fügt den Kontakt der Kontaktliste hinzu"
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:230
msgid "Adds new contact to this account"
msgstr "Fügt einen neuen Kontakt zu diesem Konto hinzu"
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:235
msgid "Returns current status (the global one unless account is specified)"
msgstr ""
"Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es "
"wird ein Konto angegeben)"
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:242
msgid ""
-"Returns current status message(the global one unless account is specified)"
+"Returns current status message (the global one unless account is specified)"
msgstr ""
"Gibt die derzeitige Statusnachricht zurück (die globale, es sei denn, es "
"wird ein Konto angegeben)"
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:249
msgid "Returns number of unread messages"
msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:253
msgid "Opens 'Start Chat' dialog"
msgstr "Öffnet den Dialog zum Beginnen eines Chats"
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:255
msgid "Starts chat, using this account"
msgstr "Startet einen Chat über dieses Konto"
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:259
msgid "Sends custom XML"
msgstr "Benutzerdefinierten XML-Code senden"
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:261
msgid "XML to send"
msgstr "Zu sendender XML-Code"
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:262
msgid ""
"Account in which the xml will be sent; if not specified, xml will be sent to "
"all accounts"
@@ -8759,44 +8752,87 @@ msgstr ""
"Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
"der XML-Code an alle Konten gesendet"
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:268
+msgid "Change the avatar"
+msgstr "Avatar ändern"
+
+#: ../src/gajim-remote.py:270
+msgid "Picture to use"
+msgstr "Bild, das benutzt werden soll"
+
+#: ../src/gajim-remote.py:271
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Konto, für das der Avatar definiert wird; falls nicht angegeben, wird der "
+"Avatar allen Konten zugewiesen"
+
+#: ../src/gajim-remote.py:277
msgid "Handle a xmpp:/ uri"
msgstr "Verarbeite einen xmpp:/-URI"
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:279
msgid "uri"
msgstr "URI"
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "Zu verarbeitender URI"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "Konto, mit dem er verarbeitet werden soll"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "Nachrichteninhalt"
+
+#: ../src/gajim-remote.py:286
msgid "Join a MUC room"
msgstr "Neuen Chatraum betreten"
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:288
msgid "room"
msgstr "Chatraum"
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "Jabber-ID des Chatraums"
+
+#: ../src/gajim-remote.py:289
msgid "nick"
msgstr "Spitzname"
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "Spitzname, der benutzt werden soll"
+
+#: ../src/gajim-remote.py:290
msgid "password"
msgstr "Passwort"
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "Das Passwort, um den Chatraum zu betreten"
+
+#: ../src/gajim-remote.py:291
+msgid "Account from which you want to enter the room"
+msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
+
+#: ../src/gajim-remote.py:296
msgid "Check if Gajim is running"
msgstr "Bitte überprüfen Sie, ob Gajim läuft"
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
#: ../src/gajim-remote.py:300
msgid "Shows or hides the ipython window"
msgstr "Ein- oder Ausblenden des Hauptfensters"
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:327
msgid "Missing argument \"contact_jid\""
msgstr "Fehlendes Argument \"contact_Jabber-ID\""
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:349
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -8805,161 +8841,44 @@ msgstr ""
"'%s' ist nicht in Ihrer Kontaktliste.\n"
"Bitte geben Sie ein Konto zum Senden der Nachricht an."
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:352
msgid "You have no active account"
msgstr "Kein aktives Konto"
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:405
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr ""
"Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt "
"werden."
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:432
#, python-format
msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
msgstr ""
+"Verwendung: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:436
msgid "Arguments:"
msgstr "Parameter:"
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:440
#, python-format
msgid "%s not found"
msgstr "%s nicht gefunden"
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#: ../src/gajim-remote.py:446
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
"Command is one of:\n"
msgstr ""
"Verwendung: %s Befehl [Argumente]\n"
-"Der Befehl ist einer von:\n"
-
-#: ../src/gajim-remote-plugin.py:496
-#, fuzzy, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Zu viele Argumente.\n"
-"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
-"erhalten"
-
-#: ../src/gajim-remote-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Argument \"%(arg)s\" wurde nicht definiert. \n"
-"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
-"erhalten"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Falscher URI"
-
-#: ../src/gajim-remote.py:109
-#, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"account's previous status"
-msgstr "Mögliche Werte: offline, online, chat, away, xa, dnd, invisible "
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Ändert die Priorität eines oder mehrerer Konten"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "Priorität"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "Priorität, die Sie dem Konto geben möchten"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"Priorität für das Konto ändern. Falls nicht angegeben, ändere den Status "
-"aller Konten für die die Option \"Kontostatus mit globalem Status "
-"synchronisieren\" aktiviert ist"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "Nachrichteninhalt. Das Konto muss angegeben werden oder \"\""
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Gibt die derzeitige Statusnachricht zurück (die globale, es sei denn, es "
-"wird ein Konto angegeben)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Status ändern"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Spitzname, der benutzt werden soll"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
-"der XML-Code an alle Konten gesendet"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "Zu verarbeitender URI"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Konto, mit dem er verarbeitet werden soll"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Nachrichteninhalt"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Jabber-ID des Chatraums"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Spitzname, der benutzt werden soll"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Das Passwort, um den Chatraum zu betreten"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Verwendung: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+"Der Befehl ist einer von:\n"
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:515
#, python-format
msgid ""
"Too many arguments. \n"
@@ -8969,7 +8888,7 @@ msgstr ""
"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
"erhalten"
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:520
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8979,9 +8898,13 @@ msgstr ""
"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
"erhalten"
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:539
msgid "No uri given"
-msgstr ""
+msgstr "Kein URI angegeben"
+
+#: ../src/gajim-remote.py:541
+msgid "Wrong uri"
+msgstr "Falscher URI"
#: ../src/gajim_themes_window.py:59
msgid "Theme"
@@ -9009,183 +8932,222 @@ msgid "Please first choose another for your current theme."
msgstr ""
"Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1563
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s heißt jetzt %(new_nick)s"
+
+#: ../src/groupchat_control.py:202 ../src/groupchat_control.py:1761
+#: ../src/history_window.py:447 ../src/notify.py:169
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s ist jetzt %(status)s"
+
+#: ../src/groupchat_control.py:230
msgid "Sending private message failed"
msgstr "Senden privater Nachricht fehlgeschlagen"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:232
#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
msgstr ""
"Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
"den Chatraum verlassen."
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:561
msgid "Insert Nickname"
msgstr "Spitzname einfügen"
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:746
msgid "Conversation with "
msgstr "Unterhaltung mit "
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:748
msgid "Continued conversation"
msgstr "Unterhaltung fortsetzen"
+#: ../src/groupchat_control.py:1228
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s hat das Thema in %(subject)s geändert"
+
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1246 ../src/groupchat_control.py:1505
msgid "Any occupant is allowed to see your full JID"
msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
+#: ../src/groupchat_control.py:1249
+msgid "Room now shows unavailable member"
+msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
+
+#: ../src/groupchat_control.py:1251
+msgid "room now does not show unavailable members"
+msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
+
+#: ../src/groupchat_control.py:1253
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist "
+"aufgetreten"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1257
+msgid "Room logging is now enabled"
+msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
+
+#: ../src/groupchat_control.py:1259
+msgid "Room logging is now disabled"
+msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
+
+#: ../src/groupchat_control.py:1261
+msgid "Room is now non-anonymous"
+msgstr "Der Chatraum ist jetzt nicht mehr anonym"
+
+#: ../src/groupchat_control.py:1264
+msgid "Room is now semi-anonymous"
+msgstr "Der Chatraum ist jetzt semi-anonym"
+
+#: ../src/groupchat_control.py:1267
+msgid "Room is now fully-anonymous"
+msgstr "Der Chatraum ist jetzt komplett anonym"
+
#. Can be a message (see handle_event_gc_config_change in
#. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1510
msgid "Room logging is enabled"
msgstr "Chatraum-Aufzeichnung ist aktiviert"
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1512
msgid "A new room has been created"
msgstr "Ein neuer Chatraum wurde erstellt"
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1515
msgid "The server has assigned or modified your roomnick"
msgstr "Der Server hat Ihren Chatraum-Nick zugewiesen oder verändert"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1521
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1524
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr ""
"%(nick)s wurde von %(who)s aus dem Chatraum geworfen. Grund: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1533
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1536
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s wurde von %(who)s gebannt. Grund: %(reason)s"
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1547 ../src/groupchat_control.py:1651
#, python-format
msgid "You are now known as %s"
msgstr "Sie heißen nun %s"
-#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s heißt jetzt %(new_nick)s"
-
-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1605 ../src/groupchat_control.py:1610
+#: ../src/groupchat_control.py:1616
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1607
msgid "affiliation changed"
msgstr "Zugehörigkeit geändert:"
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1612
msgid "room configuration changed to members-only"
msgstr ""
"Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1618
msgid "system shutdown"
-msgstr "Server wird heruntergefahren"
+msgstr "Computer wird heruntergefahren"
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1701
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
msgstr ""
"** Mitgliedschaft von %(nick)s wurde von %(actor)s auf %(affiliation)s "
"gesetzt"
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1705
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
-msgstr "** Mitgliedschaft von %(nick)s wurde auf %(affiliation)s gesetzt"
+msgstr "** Mitgliedschaft von %(nick)s wurde an %(affiliation)s gesendet"
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1720
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
msgstr "** Die Rolle von %(nick)s wurde durch %(actor)s in %(role)s geändert"
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1724
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
msgstr "** Die Rolle von %(nick)s wurde in %(role)s geändert"
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1754
#, python-format
msgid "%s has left"
msgstr "%s ist gegangen"
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1759
#, python-format
msgid "%s has joined the group chat"
msgstr "%s hat den Chatraum betreten"
-#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s ist jetzt %(status)s"
-
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:2015
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2017
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr ""
"Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Chatraum "
"geschlossen."
-#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
-#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
-#: ../src/gui_interface.py:1853 ../src/message_window.py:224
-#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
-#: ../src/roster_window.py:4195
-#, fuzzy
+#: ../src/groupchat_control.py:2021 ../src/gui_interface.py:695
+#: ../src/gui_interface.py:1304 ../src/gui_interface.py:1344
+#: ../src/gui_interface.py:1385 ../src/message_window.py:224
+#: ../src/roster_window.py:2941 ../src/roster_window.py:3616
+#: ../src/roster_window.py:4385
msgid "_Do not ask me again"
msgstr "_Nicht noch einmal fragen"
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:2055
msgid "Changing Subject"
msgstr "Thema ändern"
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2056
msgid "Please specify the new subject:"
msgstr "Bitte wählen Sie ein neues Thema"
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2063
msgid "Changing Nickname"
msgstr "Spitzname ändern"
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2064
msgid "Please specify the new nickname you want to use:"
msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2095
#, python-format
msgid "Destroying %s"
msgstr "Lösche %s"
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2096
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
@@ -9193,22 +9155,22 @@ msgstr ""
"Der Chatraum wird endgültig gelöscht.\n"
"Sie können hier einen Grund angeben:"
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2098
msgid "You may also enter an alternate venue:"
msgstr "Sie können auch einen alternativen Chatraum eintragen:"
#. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2293
#, python-format
msgid "Kicking %s"
msgstr "%s rauswerfen"
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2294 ../src/groupchat_control.py:2631
msgid "You may specify a reason below:"
msgstr "Sie können eine Begründung angeben:"
#. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2630
#, python-format
msgid "Banning %s"
msgstr "%s verbannen"
@@ -9239,17 +9201,17 @@ msgstr "Details"
msgid "Error: cannot open %s for reading"
msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:348
msgid "Error reading file:"
msgstr "Fehler beim Lesen der Datei:"
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:351
msgid "Error parsing file:"
msgstr "Fehler bei der Dateianalyse:"
#. do not traceback (could be a permission problem)
#. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:392
#, python-format
msgid "Could not write to %s. Session Management support will not work"
msgstr ""
@@ -9257,44 +9219,44 @@ msgstr ""
"funktionieren"
#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
+#: ../src/gtkgui_helpers.py:766
msgid "Gajim is not the default Jabber client"
msgstr "Gajim ist nicht Ihr Standard-Jabber-Client"
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:767
msgid "Would you like to make Gajim the default Jabber client?"
msgstr "Möchten Sie Gajim zu Ihrem Standard-Jabber-Client machen?"
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:768
msgid "Always check to see if Gajim is the default Jabber client on startup"
msgstr ""
"Immer beim Programmstart prüfen, ob Gajim der Standard-Jabber-Client ist"
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:835
msgid "Extension not supported"
msgstr "Erweiterung wird nicht unterstützt."
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:836
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
msgstr ""
"Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s "
"speichern?"
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:872
msgid "Save Image as..."
msgstr "Bild speichern unter …"
#. we are banned
#. group chat does not exist
-#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
-#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
-#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
-#: ../src/gui_interface.py:348
+#: ../src/gui_interface.py:126 ../src/gui_interface.py:283
+#: ../src/gui_interface.py:292 ../src/gui_interface.py:297
+#: ../src/gui_interface.py:300 ../src/gui_interface.py:303
+#: ../src/gui_interface.py:308
msgid "Unable to join group chat"
msgstr "Fehler beim Betreten des Chatraums"
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:127
#, python-format
msgid ""
"Your desired nickname in group chat %s is in use or registered by another "
@@ -9305,93 +9267,93 @@ msgstr ""
"von einem anderen Benutzer registriert.\n"
"Bitte geben Sie einen anderen Benutzernamen an:"
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:130
msgid "Always use this nickname when there is a conflict"
msgstr "Benutze bei einem Konflikt immer diesen Spitznamen"
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:147
msgid "Do you accept this request?"
msgstr "Akzeptieren Sie diese Anfrage?"
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:149
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:152
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) Autorisierung für %(url)s (id: %(id)s)"
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:195 ../src/notify.py:439
msgid "Connection Failed"
msgstr "Verbindung fehlgeschlagen"
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:272
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "Für das Betreten des Chatraumes %s wird ein Passwort benötigt."
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:284
#, python-format
msgid "Maximum number of users for %s has been reached"
msgstr "Die maximale Anzahl an Benutzern für %s wurde erreicht"
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:293
#, python-format
msgid "You are banned from group chat %s."
msgstr "Sie wurden aus dem Chatraum %s verbannt."
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:298
#, python-format
msgid "Group chat %s does not exist."
msgstr "Der Chatraum %s existiert nicht."
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:301
msgid "Group chat creation is restricted."
msgstr "Die Chatraumerstellung ist eingeschränkt."
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:304
#, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr ""
"Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:309
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "Sie stehen nicht in der Mitgliedliste des Chatraums %s."
-#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
+#: ../src/gui_interface.py:440 ../src/gui_interface.py:444
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Fehler %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
+#: ../src/gui_interface.py:455 ../src/gui_interface.py:469
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:496 ../src/notify.py:441
msgid "Subscription request"
msgstr "Abonnementanfrage"
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:521
msgid "Authorization accepted"
msgstr "Autorisierung akzeptiert"
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:522
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "\"%s\" hat Sie autorisiert, seinen Status zu sehen."
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:530
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:531
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -9399,57 +9361,17 @@ msgstr ""
"Er wird Ihnen von nun an als offline angezeigt.\n"
"Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:552 ../src/notify.py:443
msgid "Unsubscribed"
msgstr "Abbestellt"
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:563
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
-#: ../src/gui_interface.py:859
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s hat das Thema in %(subject)s geändert"
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-"Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist "
-"aufgetreten"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Der Chatraum ist jetzt nicht mehr anonym"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Der Chatraum ist jetzt semi-anonym"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Der Chatraum ist jetzt komplett anonym"
-
# TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:661
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
@@ -9458,25 +9380,25 @@ msgstr ""
"jedoch kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:663 ../src/gui_interface.py:671
msgid "You are currently connected without your OpenPGP key."
msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:665
msgid "Your passphrase is incorrect"
msgstr "Ihre Passphrase ist falsch"
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:670
msgid "OpenGPG Passphrase Incorrect"
msgstr "OpenGPG Passphrase ist falsch"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:693
msgid "GPG key not trusted"
msgstr "GPG-Schlüssel ist nicht vertrauenswürdig"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:693
msgid ""
"The GPG key used to encrypt this chat is not trusted. Do you really want to "
"encrypt this message?"
@@ -9484,29 +9406,27 @@ msgstr ""
"Der GPG-Schlüssel zum Verschlüsseln dieses Chats ist nicht vertrauenswürdig. "
"Möchten Sie diese Nachricht wirklich verschlüsseln?"
-#: ../src/gui_interface.py:1031
-#, fuzzy
+#: ../src/gui_interface.py:706
msgid ""
"Gnome Keyring is installed but not correctly started "
"(environment variable probably not correctly set)"
msgstr ""
-"Gnome Keyring ist installiert, wurde aber nicht \t\t\t\t\t\t\tkorrekt "
-"gestartet (die Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t"
-"\tkorrekt gesetzt gesetzt)"
+"Gnome Keyring ist installiert, wurde aber nicht korrekt gestartet (die "
+"Umgebungsvariablen sind möglicherweise nicht korrekt gesetzt gesetzt)"
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:813
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:815
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
msgstr[0] "Sie haben %d ungelesene E-Mail"
msgstr[1] "Sie haben %d ungelesene E-Mails"
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:828
#, python-format
msgid ""
"\n"
@@ -9521,81 +9441,59 @@ msgstr ""
"Betreff: %(subject)s\n"
"%(snippet)s"
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:893
#, python-format
msgid "%s wants to send you a file."
msgstr "%s möchte Ihnen eine Datei senden."
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:930 ../src/roster_window.py:1891
msgid "Remote contact stopped transfer"
msgstr "Entfernter Kontakt unterbrach die Dateiübertragung"
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:933 ../src/roster_window.py:1893
msgid "Error opening file"
msgstr "Fehler beim Öffnen der Datei:"
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:965
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Die Ãœbermittlung der Datei %(filename)s von %(name)s war erfolgreich."
#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:969
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr ""
"Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
-#: ../src/gui_interface.py:1304
+#: ../src/gui_interface.py:982
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:986
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
-"Eventuell wurde sie verändert."
-
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1061
msgid "Unable to decrypt message"
msgstr "Die Nachricht konnte nicht entschlüsselt werden"
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1073
msgid "Username Conflict"
msgstr "Benutzernamenkonflikt"
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1074
msgid "Please type a new username for your local account"
msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Fehler:"
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1089
msgid "Resource Conflict"
msgstr "Ressourcenkonflikt"
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1090
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
@@ -9604,20 +9502,20 @@ msgstr ""
"geben Sie eine neue Ressource ein"
#. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1135
#, python-format
msgid "%s wants to start a voice chat."
msgstr "%s möchte einen Sprachchat beginnen."
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1138
msgid "Voice Chat Request"
msgstr "Anfrage für Sprachchat"
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1225
msgid "Error verifying SSL certificate"
msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1226
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: "
@@ -9628,17 +9526,17 @@ msgstr ""
"Servers auf: %(error)s\n"
"Möchten Sie sich dennoch zum Server verbinden?"
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1235
msgid "Ignore this error for this certificate."
msgstr "Ignoriere den Fehler für dieses Zertifikat."
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1260
msgid "SSL certificate error"
msgstr "SSL-Zertifikat-Fehler"
# FIXME: Check English. Should be:
# your connection has been hacked.
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1261
#, python-format
msgid ""
"It seems the SSL certificate of account %(account)s has changed or your "
@@ -9656,28 +9554,28 @@ msgstr ""
"Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
"aktualisieren?"
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
+#: ../src/gui_interface.py:1297 ../src/gui_interface.py:1339
+#: ../src/gui_interface.py:1381
msgid "Insecure connection"
msgstr "Unsichere Verbindung"
-#: ../src/gui_interface.py:1777
-#, fuzzy
+#: ../src/gui_interface.py:1298
+#, fuzzy, python-format
msgid ""
-"You are about to connect to the server with an insecure connection. This "
-"means all your conversations will be exchanged unencrypted. Are you sure you "
-"want to do that?"
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. Are you sure you want to do that?"
msgstr ""
-"Sie sind dabei, Ihr Passwort über eine unsichere Verbindung zu senden. Sind "
-"Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
-"installieren, um dieses Problem zu beheben.)"
+"Sie sind dabei, eine ungesicherte Verbindung zu einem Server aufzubauen. Das "
+"bedeutet, dass alle Unterhaltungen unverschlüsselt übertragen werden. Sind "
+"Sie sicher, dass Sie das tun wollen?"
-#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
+#: ../src/gui_interface.py:1303 ../src/gui_interface.py:1343
+#: ../src/gui_interface.py:1384
msgid "Yes, I really want to connect insecurely"
msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1340
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?"
@@ -9686,21 +9584,20 @@ msgstr ""
"Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
"installieren, um dieses Problem zu beheben.)"
-#: ../src/gui_interface.py:1850
-#, fuzzy
+#: ../src/gui_interface.py:1382
msgid ""
"You are about to send your password unencrypted on an insecure connection. "
"Are you sure you want to do that?"
msgstr ""
-"Sie sind dabei, Ihr Passwort über eine nicht verschlüsselte Verbindung zu "
-"senden. Sind Sie sicher, dass Sie dies tun möchten?"
+"Sie sind dabei, Ihr Passwort unverschlüsselt über eine unsichere Verbindung "
+"zu übertragen. Sind Sie sicher, dass Sie dies tun möchten?"
#. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1889 ../src/gui_interface.py:1912
msgid "Emoticons disabled"
msgstr "Emoticons deaktiviert"
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1890
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
@@ -9708,7 +9605,7 @@ msgstr ""
"Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
"deaktiviert."
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:1913
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 "
@@ -9718,22 +9615,22 @@ msgstr ""
"eventuell das Format der Datei emoticons.py aktualisieren. Besuchen Sie "
"http://trac.gajim.org/wiki/Emoticons (Englisch) für mehr Informationen."
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:1957 ../src/roster_window.py:3783
msgid "You cannot join a group chat while you are invisible"
msgstr "Sie können einen Chatraum nicht betreten, wenn Sie unsichtbar sind."
#. it is good to notify the user
#. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2871
+#: ../src/gui_interface.py:2344
msgid "Could not save your settings and preferences"
msgstr "Konnte Einstellungen nicht speichern"
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:2891
msgid "Passphrase Required"
msgstr "Passphrase benötigt"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:2892
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr ""
@@ -9741,13 +9638,13 @@ msgstr ""
"%(account)s)."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3426
+#: ../src/gui_interface.py:2906
msgid "GPG key expired"
msgstr "GPG-Schlüssel abgelaufen"
# TODO: GPG/PGP unification in original strings needed
# FIXME: should be "has expired"
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:2907
#, python-format
msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
msgstr ""
@@ -9755,12 +9652,12 @@ msgstr ""
"mit %s verbunden."
#. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:2916
msgid "Wrong Passphrase"
msgstr "Falsche Passphrase"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3437
+#: ../src/gui_interface.py:2917
msgid "Please retype your GPG passphrase or press Cancel."
msgstr ""
"Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
@@ -9770,42 +9667,42 @@ msgstr ""
msgid "_New Group Chat"
msgstr "Neuer Gruppenchat"
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:419
msgid "I would like to add you to my roster"
msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen"
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:116
msgid "Cannot find history logs database"
msgstr "Kann Verlaufs-Datenkbank nicht finden"
#. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:156
msgid "Contacts"
msgstr "Kontakte"
#. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_manager.py:169 ../src/history_manager.py:213
#: ../src/history_window.py:98
msgid "Date"
msgstr "Datum"
#. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:176 ../src/history_manager.py:232
msgid "Nickname"
msgstr "Spitzname"
#. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_manager.py:185 ../src/history_manager.py:220
#: ../src/history_window.py:106
msgid "Message"
msgstr "Nachricht"
#. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:193 ../src/history_manager.py:226
msgid "Subject"
msgstr "Thema"
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:252
msgid ""
"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
"RUNNING)"
@@ -9813,7 +9710,7 @@ msgstr ""
"Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE "
"LÄUFT)"
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:254
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 "
@@ -9827,26 +9724,40 @@ msgstr ""
"\n"
"Falls Sie JA klicken, warten Sie danach bitte einen Augenblick …"
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:259
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Datenbankfehler"
+
+#: ../src/history_manager.py:477
msgid "Exporting History Logs..."
msgstr "Exportiere Verlauf …"
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:554
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s sagte um %(time)s: %(message)s\n"
-#: ../src/history_manager.py:572
-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] "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
-msgstr[1] "Möchten Sie wirklich alle Logs der ausgewählten Kontakte löschen?"
+#: ../src/history_manager.py:592
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
+
+#: ../src/history_manager.py:596
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:598 ../src/history_manager.py:637
msgid "This is an irreversible operation."
msgstr "Dies ist ein unwiderruflicher Vorgang."
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Bestätigung abbrechen"
+
+#: ../src/history_manager.py:634
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
@@ -9885,14 +9796,19 @@ msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s"
msgid "Status is now: %(status)s"
msgstr "Der Status ist jetzt: %(status)s"
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:518 ../src/htmltextview.py:528
msgid "Timeout loading image"
msgstr "Konnte Bild nicht laden"
-#: ../src/htmltextview.py:535
+#: ../src/htmltextview.py:538
msgid "Image is too big"
msgstr "Das Bild ist zu groß"
+#: ../src/htmltextview.py:571
+#, fuzzy
+msgid "Loading"
+msgstr "Programmieren"
+
#: ../src/message_window.py:222
msgid "You are going to close several tabs"
msgstr "Sie sind dabei verschiedene Tabs zu schließen"
@@ -9901,19 +9817,19 @@ msgstr "Sie sind dabei verschiedene Tabs zu schließen"
msgid "Do you really want to close them all?"
msgstr "Möchten Sie wirklich alle schließen?"
-#: ../src/message_window.py:485
+#: ../src/message_window.py:497
msgid "Chats"
msgstr "Chats"
-#: ../src/message_window.py:487
+#: ../src/message_window.py:499
msgid "Group Chats"
msgstr "Chatraum"
-#: ../src/message_window.py:489
+#: ../src/message_window.py:501
msgid "Private Chats"
msgstr "Private Chats"
-#: ../src/message_window.py:495
+#: ../src/message_window.py:507
msgid "Messages"
msgstr "Nachrichten"
@@ -9925,102 +9841,121 @@ msgstr "- Nachrichten werden aufgezeichnet"
msgid "- messages will not be logged"
msgstr "- Nachrichten werden nicht aufgezeichnet"
-#: ../src/notify.py:232
+#: ../src/notify.py:167
#, python-format
msgid "%(nick)s Changed Status"
msgstr "%(nick)s änderte seinen Status"
-#: ../src/notify.py:242
+#: ../src/notify.py:177
#, python-format
msgid "%(nickname)s Signed In"
msgstr "%(nickname)s angemeldet"
-#: ../src/notify.py:250
+#: ../src/notify.py:185
#, python-format
msgid "%(nickname)s Signed Out"
msgstr "%(nickname)s abgemeldet"
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Einzelne neue Nachricht von %(nickname)s"
+#: ../src/notify.py:482
+msgid "Ignore"
+msgstr "Ignorieren"
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Neue private Nachricht aus dem Chatraum %s"
+#: ../src/plugins/gui.py:67
+msgid "Plugin"
+msgstr ""
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#: ../src/plugins/gui.py:160
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registrierung ist fehlgeschlagen"
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Neue Nachricht von %(nickname)s"
+#: ../src/plugins/gui.py:204
+msgid "Unable to properly remove the plugin"
+msgstr ""
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Neue Nachricht von %(nickname)s"
+#. members not safe
+#: ../src/plugins/gui.py:212 ../src/plugins/pluginmanager.py:495
+#: ../src/plugins/pluginmanager.py:503
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Der Dienst sendete unzureichende Daten."
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorieren"
+#: ../src/plugins/gui.py:235 ../src/plugins/gui.py:243
+#: ../src/plugins/pluginmanager.py:511
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Diese Datei existiert bereits"
+
+#: ../src/plugins/gui.py:235
+msgid "Overwrite?"
+msgstr ""
+
+#: ../src/plugins/gui.py:264
+#, fuzzy
+msgid "Configuration"
+msgstr "Chatraum-Einstellungen"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:481 ../src/plugins/pluginmanager.py:487
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:483
+#, fuzzy
+msgid "Archive empty"
+msgstr "Datei ist leer"
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
msgid "Retrieving profile..."
msgstr "Empfange Profil …"
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:125 ../src/roster_window.py:3136
msgid "File is empty"
msgstr "Datei ist leer"
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:128 ../src/roster_window.py:3139
msgid "File does not exist"
msgstr "Datei existiert nicht"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:142 ../src/profile_window.py:158
+#: ../src/roster_window.py:3141 ../src/roster_window.py:3152
msgid "Could not load image"
msgstr "Konnte Bild nicht laden"
-#: ../src/profile_window.py:215
-#, fuzzy
+#: ../src/profile_window.py:229
msgid "Wrong date format"
-msgstr "Kontaktinformationen"
+msgstr "Falsches Datumsformat"
-#: ../src/profile_window.py:216
-#, fuzzy
+#: ../src/profile_window.py:230
msgid "Format of the date must be YYYY-MM-DD"
-msgstr "Format: JJJJ-MM-TT"
+msgstr "Datumsformat muss JJJJ-MM-TT entsprechen"
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:284
msgid "Information received"
msgstr "Informationen empfangen"
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:362
msgid "Without a connection you can not publish your contact information."
msgstr ""
"Sie müssen angemeldet sein, um Kontaktinformationen veröffentlichen zu "
"können."
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:375
msgid "Sending profile..."
msgstr "Sende Profil …"
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:394
msgid "Information NOT published"
msgstr "Informationen NICHT veröffentlicht"
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:401
msgid "vCard publication failed"
msgstr "Veröffentlichung der vCard fehlgeschlagen"
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:402
msgid ""
"There was an error while publishing your personal information, try again "
"later."
@@ -10028,54 +9963,54 @@ msgstr ""
"Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
"aufgetreten. Versuchen Sie es später erneut."
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1028
msgid "Merged accounts"
msgstr "Alle Konten"
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:1956
msgid "Authorization has been sent"
msgstr "Autorisierung wurde erneut gesendet"
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1957
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "\"%s\" kennt jetzt Ihren Status."
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:1980
msgid "Subscription request has been sent"
msgstr "Abonnement-Anforderung wurde gesendet"
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:1981
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr ""
"Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:1995
msgid "Authorization has been removed"
msgstr "Autorisierung wurde entfernt"
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:1996
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "\"%s\" wird Sie nun immer als offline sehen."
# TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:2009
+#: ../src/roster_window.py:2023
msgid "GPG is not usable"
msgstr "GPG ist nicht benutzbar"
# TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2024
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2236 ../src/roster_window.py:3713
msgid "You are participating in one or more group chats"
msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2237 ../src/roster_window.py:3714
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -10083,38 +10018,40 @@ msgstr ""
"Wenn Sie Ihren Status auf unsichtbar setzen, werden Sie von diesen "
"Chaträumen getrennt. Sind Sie sicher, dass Sie unsichtbar werden möchten?"
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2263
msgid "desync'ed"
msgstr "Nicht synchronisiert"
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2329
msgid "Really quit Gajim?"
msgstr "Gajim wirklich beenden?"
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2330
msgid "Are you sure you want to quit Gajim?"
msgstr "Möchten Sie Gajim wirklich verlassen?"
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2331
msgid "Always close Gajim"
msgstr "Gajim immer schließen"
-#: ../src/roster_window.py:2396
-#, fuzzy
+#: ../src/roster_window.py:2415
msgid "You have running file transfers"
-msgstr "Dateiübertragung abbrechen"
+msgstr "Sie haben laufende Dateiübertragungen"
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2416
+#, fuzzy
msgid ""
"If you quit now, the file(s) being transferred will be stopped. Do you still "
"want to quit?"
msgstr ""
+"Wenn Sie jetzt beenden, werden die laufenden Dateiübertragungen abgebrochen. "
+"Möchten Sie noch beenden?"
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2447 ../src/roster_window.py:2855
msgid "You have unread messages"
msgstr "Sie haben ungelesene Nachrichten"
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2448
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
@@ -10122,16 +10059,16 @@ msgstr ""
"Nachrichten sind nur für das spätere Lesen verfügbar, wenn der Verlauf "
"aktiviert wurde und der Kontakt sich in der Kontaktliste befindet."
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2856
msgid "You must read them before removing this transport."
msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2859
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Der Transport \"%s\" wird entfernt"
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2860
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
@@ -10139,11 +10076,11 @@ msgstr ""
"Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
"austauschen."
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2863
msgid "Transports will be removed"
msgstr "Transporte werden entfernt"
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2868
#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
@@ -10152,12 +10089,12 @@ msgstr ""
"Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte "
"austauschen: %s"
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2936
msgid "You are about to block a contact. Are you sure you want to continue?"
msgstr ""
"Sie sind dabei, einen Kontakt zu blockieren. Wollen Sie wirklich fortfahren?"
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:2938
msgid ""
"This contact will see you offline and you will not receive messages he will "
"send you."
@@ -10166,57 +10103,57 @@ msgstr ""
"Nachrichten empfangen, die er Ihnen sendet."
#. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3028
msgid "Rename Contact"
msgstr "Kontakt umbenennen"
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3029
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Geben Sie einen Spitznamen für den Kontakt %s ein"
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3036
msgid "Rename Group"
msgstr "Gruppe umbenennen"
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3037
#, python-format
msgid "Enter a new name for group %s"
msgstr "Geben Sie einen neuen Namen für die Gruppe %s ein"
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3082
msgid "Remove Group"
msgstr "Gruppe entfernen"
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3083
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Möchten Sie wirklich die Gruppe %s von Ihrer Kontaktliste entfernen?"
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3084
msgid "Also remove all contacts in this group from your roster"
msgstr "Auch alle Kontakte dieser Gruppe von Ihrer Kontaktliste entfernen"
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3123
msgid "Assign OpenPGP Key"
msgstr "OpenPGP-Schlüssel zuweisen"
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3124
msgid "Select a key to apply to the contact"
msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3523
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3525
#, python-format
msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
msgstr ""
"Sie sind dabei, \"%(name)s\" (%(jid)s) aus der Kontaktliste zu entfernen.\n"
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3530
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -10226,11 +10163,11 @@ msgstr ""
"offline sehen wird."
#. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3536
msgid "Do you want to continue?"
msgstr "Möchten Sie fortsetzen?"
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3540
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -10239,17 +10176,17 @@ msgstr ""
"Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
"offline sehen wird."
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3543
msgid "I want this contact to know my status after removal"
msgstr ""
"Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3547
msgid "Contacts will be removed from your roster"
msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3552
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -10259,39 +10196,38 @@ msgstr ""
"entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch "
"die Kontakte Sie nur noch als offline sehen werden."
-#: ../src/roster_window.py:3459
-#, fuzzy
+#: ../src/roster_window.py:3610
msgid ""
"You are about to send a custom status. Are you sure you want to continue?"
msgstr ""
-"Sie sind dabei, einen speziellen Status zu senden. Wollen Sie wirklich "
+"Sie sind dabei, einen angepassten Status zu senden. Wollen Sie wirklich "
"fortfahren?"
-#: ../src/roster_window.py:3461
-#, fuzzy, python-format
+#: ../src/roster_window.py:3612
+#, python-format
msgid ""
"This contact will temporarily see you as %(status)s, but only until you "
"change your status. Then he or she will see your global status."
msgstr ""
-"Der Kontakt wird Sie vorläufig als %(status)s sehen, aber nur bis Sie Ihren "
-"Status ändern. Dann wird er Ihren globalen Status sehen."
+"Dieser Kontakt wird Sie vorläufig als %(status)s sehen, aber nur bis Sie "
+"Ihren Status ändern. Dann wird er Ihren globalen Status sehen."
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3631
msgid "No account available"
msgstr "Kein Konto vorhanden"
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3632
msgid "You must create an account before you can chat with other contacts."
msgstr ""
"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
"können."
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4285
msgid "Metacontacts storage not supported by your server"
msgstr ""
"Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4287
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
@@ -10300,14 +10236,14 @@ msgstr ""
"Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
"gespeichert."
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4379
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr ""
"Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
"fortfahren?"
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4381
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 "
@@ -10317,23 +10253,28 @@ msgstr ""
"gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
"Jabber- oder Transport-Konten hat."
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4502
msgid "Invalid file URI:"
msgstr "Ungültiger Datei-URI:"
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4514
#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
msgstr[0] "Wollen Sie die Datei an %s senden?"
msgstr[1] "Wollen Sie die Dateien an %s senden?"
-#: ../src/roster_window.py:4433
+#: ../src/roster_window.py:4649
#, python-format
msgid "Send %s to %s"
msgstr "Sende %s an %s"
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4660
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "%s und %s zu Metakontakt zusammenführen"
+
+#: ../src/roster_window.py:4663
#, python-format
msgid "Make %s and %s metacontacts"
msgstr "%s und %s zu Metakontakt zusammenführen"
@@ -10343,130 +10284,129 @@ msgstr "%s und %s zu Metakontakt zusammenführen"
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
-#: ../src/roster_window.py:4970 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5103 ../src/roster_window.py:5157
+#: ../src/roster_window.py:5166 ../src/statusicon.py:264
+#: ../src/statusicon.py:311 ../src/statusicon.py:317
#, python-format
msgid "using account %s"
msgstr "über das Konto %s"
#. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5173
#, python-format
msgid "to %s account"
msgstr "an das Konto %s"
#. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5178
#, python-format
msgid "using %s account"
msgstr "über das Konto %s"
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5217 ../src/statusicon.py:327
msgid "_Manage Bookmarks..."
msgstr "_Gespeicherte Chaträume …"
#. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5237
#, python-format
msgid "of account %s"
msgstr "des Kontos %s"
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5278
#, python-format
msgid "for account %s"
msgstr "für das Konto %s"
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5338 ../src/roster_window.py:5443
msgid "_Change Status Message"
msgstr "Ändere _Statusnachricht"
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5371
msgid "Publish Tune"
msgstr "Musiktitel veröffentlichen"
-#: ../src/roster_window.py:5176
-#, fuzzy
+#: ../src/roster_window.py:5373
msgid "Publish Location"
-msgstr "Musiktitel veröffentlichen"
+msgstr "Position veröffentlichen"
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5376
msgid "Configure Services..."
msgstr "Dienste konfigurieren …"
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5521
msgid "_Maximize All"
msgstr "Alle _maximieren"
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5531 ../src/roster_window.py:5704
msgid "Send Group M_essage"
msgstr "Nachricht an die Gruppe _senden"
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5539
msgid "To all users"
msgstr "An alle Benutzer"
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5543
msgid "To all online users"
msgstr "An alle angemeldeten Benutzer"
#. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5724
msgid "_Manage Contacts"
msgstr "Kontakte verwalten"
#. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5733
msgid "Edit _Groups"
msgstr "_Gruppen bearbeiten"
#. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5788
msgid "Send Single Message"
msgstr "Sende _einzelne Nachricht"
#. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:5835
msgid "Execute Command..."
msgstr "Befehl ausführen …"
#. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5845
msgid "_Manage Transport"
msgstr "_Transport verwalten"
#. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:5854
msgid "_Modify Transport"
msgstr "_Ändern"
#. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:5864
msgid "_Rename"
msgstr "_Umbenennen"
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5924
msgid "_Maximize"
msgstr "_Maximieren"
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5933
msgid "_Reconnect"
msgstr "Wieder ve_rbinden"
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:5940
msgid "_Disconnect"
msgstr "_Verbindung trennen"
#. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6029
msgid "History Manager"
msgstr "_Verlaufsmanager"
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6040
msgid "_Join New Group Chat"
msgstr "_Chatraum betreten …"
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6259
msgid "Change Status Message..."
msgstr "Ändere Statusnachricht …"
@@ -10483,20 +10423,15 @@ msgstr "Fehler im empfangenen Datenformular"
msgid "No result"
msgstr "Kein Ergebnis"
-#: ../src/session.py:136
+#: ../src/session.py:95
msgid "Disk WriteError"
msgstr "Fehler beim Schreiben auf Festplatte"
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Thema: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:431 ../src/session.py:475
msgid "Confirm these session options"
msgstr "Bestätigen Sie diese Sitzungsoptionen"
-#: ../src/session.py:448
+#: ../src/session.py:432
#, fuzzy, python-format
msgid ""
"The remote client wants '\n"
@@ -10508,11 +10443,11 @@ msgid ""
msgstr ""
"Der entfernte Client will eine Sitzung mit diesen Features aushandeln:\n"
"\n"
-"\t\t%s\n"
+"%s\n"
"\n"
-"\t\tSind diese Einstellungen akzeptabel?"
+"Sind diese Optionen akzeptabel?"
-#: ../src/session.py:492
+#: ../src/session.py:476
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -10527,16 +10462,15 @@ msgstr ""
"\n"
"Mit der Sitzung fortfahren?"
-#: ../src/statusicon.py:227
+#: ../src/statusicon.py:228
msgid "_Change Status Message..."
msgstr "Ändere _Statusnachricht …"
-#: ../src/statusicon.py:339
-#, fuzzy
+#: ../src/statusicon.py:342
msgid "Hide _Roster"
-msgstr "in der _Kontaktliste"
+msgstr "_Kontaktliste verstecken"
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:353
msgid "Hide this menu"
msgstr "Dieses Menü ausblenden"
@@ -10593,34 +10527,34 @@ msgid "OpenPGP: "
msgstr "OpenPGP: "
#: ../src/tooltips.py:646
-#, fuzzy, python-format
+#, python-format
msgid "Idle since %s"
-msgstr " seit %s"
+msgstr "Untätig seit %s"
#: ../src/tooltips.py:647
-#, fuzzy, python-format
+#, python-format
msgid "Idle for %s"
-msgstr "XML-Konsole für %s"
+msgstr "Untätig seit %s"
#: ../src/tooltips.py:698
-#, fuzzy, python-format
+#, python-format
msgid "Mood: %s"
-msgstr "Stimmung:"
+msgstr "Stimmung: %s"
#: ../src/tooltips.py:702
-#, fuzzy, python-format
+#, python-format
msgid "Activity: %s"
-msgstr "Aktivität:"
+msgstr "Aktivität: %s"
#: ../src/tooltips.py:706
-#, fuzzy, python-format
+#, python-format
msgid "Tune: %s"
-msgstr "Musiktitel:"
+msgstr "Musiktitel: %s"
#: ../src/tooltips.py:710
-#, fuzzy, python-format
+#, python-format
msgid "Location: %s"
-msgstr "Benachrichtigungen"
+msgstr "Position: %s"
#: ../src/tooltips.py:735
msgid "Download"
@@ -10675,32 +10609,32 @@ msgstr ""
"Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
"Er ist wahrscheinlich veraltet oder defekt"
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
msgid "?Client:Unknown"
msgstr "Unbekannt"
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
msgid "?OS:Unknown"
msgstr "?OS:Unbekannt"
-#: ../src/vcard.py:288
+#: ../src/vcard.py:310
msgid "?Time:Unknown"
msgstr "?Time:Unbekannt"
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
#, python-format
msgid "since %s"
msgstr "seit %s"
-#: ../src/vcard.py:345
+#: ../src/vcard.py:367
msgid "?Role in Group Chat:<b>Role:</b>"
-msgstr ""
+msgstr "?Rolle im Gruppenchat:<b>Rolle:</b>"
-#: ../src/vcard.py:349
+#: ../src/vcard.py:371
msgid "<b>Affiliation:</b>"
msgstr "<b>Mitgliedschaft:</b>"
-#: ../src/vcard.py:357
+#: ../src/vcard.py:379
msgid ""
"This contact is interested in your presence information, but you are not "
"interested in his/her presence"
@@ -10708,7 +10642,7 @@ msgstr ""
"Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an "
"seinem interessiert"
-#: ../src/vcard.py:359
+#: ../src/vcard.py:381
msgid ""
"You are interested in the contact's presence information, but he/she is not "
"interested in yours"
@@ -10716,12 +10650,12 @@ msgstr ""
"Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem "
"interessiert"
-#: ../src/vcard.py:361
+#: ../src/vcard.py:383
msgid "You and the contact are interested in each other's presence information"
msgstr "Sie und der Kontakt sind am Status des Anderen interessiert"
#. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:385
msgid ""
"You are not interested in the contact's presence, and neither he/she is "
"interested in yours"
@@ -10729,73 +10663,199 @@ msgstr ""
"Sie sind nicht am Status des Kontakts interessiert, und er ist nicht Ihrem "
"interessiert"
-#: ../src/vcard.py:370
+#: ../src/vcard.py:392
msgid "You are waiting contact's answer about your subscription request"
msgstr ""
"Sie warten auf die Antwort des Kontaktes bezüglich Ihrer Abonnement-Anfrage"
-#: ../src/vcard.py:372
+#: ../src/vcard.py:394
msgid "There is no pending subscription request."
msgstr "Es gibt keine offenen Abonnementanfragen."
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
msgid " resource with priority "
msgstr " Resource mit Priorität "
#~ msgid "@"
#~ msgstr "@"
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " ein Fenster/Tab mit diesem Kontakt geöffnet "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Aktionen</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Ereignisse</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Erweiterte Aktionen"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Erweiterter Benachrichtigungseditor"
+
+#~ msgid "All statuses"
+#~ msgstr "Alle Status"
+
+#~ msgid "Busy "
+#~ msgstr "Beschäftigt "
+
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakt ändert Status"
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakt nicht verbunden"
+
+#~ msgid "Don't have "
+#~ msgstr "habe nicht "
+
+#~ msgid "File Transfer Finished"
+#~ msgstr "Dateiübertragung abgeschlossen"
+
+#~ msgid "File Transfer Request "
+#~ msgstr "Anfrage zur Dateiübertragung"
+
+#~ msgid "File Transfer Started "
+#~ msgstr "Dateiübertragung gestartet "
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Hervorhebung von Chatraum-Nachrichten"
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Chatraum-Nachricht empfangen"
+
+#~ msgid "Have "
+#~ msgstr "habe "
+
+#~ msgid "Launch a command"
+#~ msgstr "Einen Befehl ausführen"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Einen oder mehrere spezielle Status …"
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Online / Frei zum Chatten"
+
+#~ msgid "Play a sound"
+#~ msgstr "Einen Klang abspielen"
+
+#~ msgid "Receive a Message"
+#~ msgstr "Eine Nachricht empfangen"
+
+#~ msgid "When "
+#~ msgstr "Wenn "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der "
+#~ "Taskleiste blinken zu lassen"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Deaktiviere sich von selbst öffnende Chatfenster"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Deaktivere existierendes Popup-Fenster"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Deaktivere existierenden Sound für dieses Ereignis"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Deaktiviere die Ereignisanzeige in der Kontaktliste"
+
#~ msgid "_Disable showing event in systray"
#~ msgstr "_Deaktiviere die Ereignisanzeige im Systray"
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informiere mich mit einem Popup-Fenster"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "Ein _Chatfenster mit Benutzer öffnen"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Zeige Ereignis in der Kontaktli_ste"
+
#~ msgid "_Show event in systray"
#~ msgstr "Zeige Ereignisse im _Systray"
-#, fuzzy
+#~ msgid "and I "
+#~ msgstr "und ich "
+
+#~ msgid "contact(s)"
+#~ msgstr "Kontakt(e)"
+
+#~ msgid "for "
+#~ msgstr "für "
+
+#~ msgid "group(s)"
+#~ msgstr "Gruppe(n)"
+
+#~ msgid "when I'm in"
+#~ msgstr "wenn ich bin"
+
+#~ msgid "Advanced..."
+#~ msgstr "Erweitert …"
+
#~ msgid "Always use GNOME default applications"
-#~ msgstr "Immer OS/X-Standardprogramme verwenden"
+#~ msgstr "Immer GNOME Standardanwendungen verwenden"
-#, fuzzy
#~ msgid "Always use Xfce default applications"
-#~ msgstr "Immer OS/X-Standardprogramme verwenden"
+#~ msgstr "Immer Xfce Standardanwendungen verwenden"
-#, fuzzy
#~ msgid "Autodetect on every Gajim startup"
-#~ msgstr "Beim Pr_ogrammstart verbinden"
+#~ msgstr "Automatische Erkennung bei jedem Gajim-Programmstart"
# FIXME: Check English. This should be called something like "Show systray icon"
# because the systray itself is always visible.
#~ msgid "Show systray:"
#~ msgstr "Symbol in der Systemleiste anzeigen:"
-#~ msgid "Nickname not allowed: %s"
-#~ msgstr "Spitzname nicht erlaubt: %s"
+#~ msgid "_Send Single Message..."
+#~ msgstr "Einzelne _Nachricht senden …"
+
+#~ msgid "User avatar:"
+#~ msgstr "Avatar auswählen"
-#~ msgid "Room has been destroyed"
-#~ msgstr "Der Chatraum wurde gelöscht"
+# TODO: Review by german translators: getrennte Status || getrennter Status
+#~ msgid "all or space separated status"
+#~ msgstr "alle oder durch Leerzeichen getrennte Status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'ja', 'nein' oder 'beide'"
-#~ msgid "You can join this room instead: %s"
-#~ msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'ja, 'nein' oder ''"
-#~ msgid "I would like to add you to my roster."
-#~ msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Spitzname nicht erlaubt: %s"
#~ msgid "we are now subscribed to %s"
#~ msgstr "Sie haben jetzt %s abonniert"
-#~ msgid "unsubscribe request from %s"
-#~ msgstr "Anfrage zur Beendigung des Abonnements von %s"
-
#~ msgid "we are now unsubscribed from %s"
#~ msgstr "%s hat das Abonnement beendet"
-#~ 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 ""
-#~ "Die Jabber-ID %s ist nicht RFC-konform und wird nicht zu Ihrer "
-#~ "Kontaktliste hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool "
-#~ "wie <http://jru.jabberstudio.org/>, um sie zu entfernen."
+#, fuzzy
+#~ msgid "Impossible join groupchat"
+#~ msgstr "Fehler beim Betreten des Chatraums"
+
+#, fuzzy
+#~ msgid "local account does not support groupchats."
+#~ msgstr "Der Kontakt unterstützt keine Dateiübertragung."
+
+#~ msgid "Condition"
+#~ msgstr "Bedingung"
+
+#~ msgid "when I am "
+#~ msgstr "wenn Ich bin "
+
+# TODO: GPG/PGP unification in original strings needed
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Erfordert GnuPG und python-GnuPGInterface."
+
+#~ msgid "Subject: %s"
+#~ msgstr "Thema: %s"
#~ msgid "Account Modification"
#~ msgstr "Kontoänderung"
@@ -11204,9 +11264,6 @@ msgstr " Resource mit Priorität "
#~ msgid "B_OSH Port:"
#~ msgstr "B_OSH-Port:"
-#~ msgid "Show _roster"
-#~ msgstr "_Kontaktliste anzeigen"
-
#~ msgid "Modify Account"
#~ msgstr "Konto bearbeiten"
diff --git a/po/fr.po b/po/fr.po
index b378970a960a1e3c453026b1ab1717abd696ff4e..d743565dbaed643d38a4b06ea9639f5b18b950f5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,27 +1,27 @@
# French translations for gajim package
# Copyright (C) 2004-2006 THE gajim'S COPYRIGHT HOLDER
# This file is distributed under the same license as the gajim package.
-#
+#
# See: http://live.gnome.org/GnomeFr/Traduire for translation guidelines
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: gajim 0.12 svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
-"PO-Revision-Date: 2009-11-15 15:50+0100\n"
+"POT-Creation-Date: 2011-07-19 00:05+0200\n"
+"PO-Revision-Date: 2011-05-30 08:28+0100\n"
"Last-Translator: Florent Le Coz <louizatakk@fedoraproject.org>\n"
"Language-Team: <>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/louiz/gajim\n"
"X-Poedit-Country: FRANCE\n"
"X-Poedit-Language: French\n"
+"X-Poedit-SearchPath-0: .\n"
#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
msgid "Join _Group Chat..."
@@ -31,7 +31,7 @@ msgstr "_Rejoindre un _salon de discussion..."
msgid "_Add Contact..."
msgstr "_Ajouter un contact..."
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:20
msgid "_Discover Services"
msgstr "_Découvrir les services"
@@ -51,7 +51,7 @@ msgstr "_Accéder au compte Gmail"
msgid "_Personal Events"
msgstr "Évènements P_ersonnels"
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:25
msgid "_Start Chat..."
msgstr "Commencer une _discussion..."
@@ -113,7 +113,8 @@ msgstr "Je veux _créer un nouveau compte"
#: ../data/gui/account_creation_wizard_window.ui.h:15
#: ../data/gui/accounts_window.ui.h:28
msgid "If checked, Gajim will remember the password for this account"
-msgstr "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
+msgstr ""
+"Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
#: ../data/gui/account_creation_wizard_window.ui.h:16
msgid "Manage..."
@@ -121,12 +122,12 @@ msgstr "Gérer..."
#: ../data/gui/account_creation_wizard_window.ui.h:17
#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
+#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703
+#: ../src/config.py:1708 ../src/config.py:2274 ../src/config.py:2353
+#: ../src/config.py:2366 ../src/config.py:3644 ../src/config.py:3719
+#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
+#: ../src/dialogs.py:532 ../src/roster_window.py:3096
+#: ../src/roster_window.py:3102 ../src/roster_window.py:3107
msgid "None"
msgstr "Aucun"
@@ -156,7 +157,7 @@ msgstr ""
"au réseau Jabber."
#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:18
msgid "_Advanced"
msgstr "_Avancées"
@@ -175,6 +176,7 @@ msgstr "Identifiant _Jabber : "
#: ../data/gui/account_creation_wizard_window.ui.h:28
#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "_Password:"
msgstr "Mot de _passe : "
@@ -183,6 +185,7 @@ msgid "_Port:"
msgstr "_Port :"
#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/manage_bookmarks_window.ui.h:9
msgid "_Server:"
msgstr "_Serveur :"
@@ -239,8 +242,12 @@ msgid "Chan_ge Password"
msgstr "Chan_ger le mot de passe"
#: ../data/gui/accounts_window.ui.h:14
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de passe via une connexion non-sécurisée"
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de "
+"passe via une connexion non-sécurisée"
#: ../data/gui/accounts_window.ui.h:15
msgid "Choose Client Cert"
@@ -256,7 +263,8 @@ msgstr "Cliquez pour changer le mot de passe du compte"
#: ../data/gui/accounts_window.ui.h:18
msgid "Click to request authorization to all contacts of another account"
-msgstr "Cliquez pour demander l'autorisation à tous les contacts d'un autre compte"
+msgstr ""
+"Cliquez pour demander l'autorisation à tous les contacts d'un autre compte"
#: ../data/gui/accounts_window.ui.h:19
msgid "Client certificate"
@@ -282,57 +290,80 @@ msgstr "Prénom :"
#. No configured account
#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
+#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160
+#: ../src/notify.py:474 ../src/notify.py:497 ../src/notify.py:546
+#: ../src/notify.py:562
msgid "Gajim"
msgstr "Gajim"
#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to
-#. General)
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124
+#: ../src/roster_window.py:3038 ../src/roster_window.py:5643
msgid "General"
msgstr "Général"
#: ../data/gui/accounts_window.ui.h:26
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la vôtre, les transferts de fichiers ont ainsi plus de chance de fonctionner."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la "
+"vôtre, les transferts de fichiers ont ainsi plus de chance de fonctionner."
#: ../data/gui/accounts_window.ui.h:27
msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Si cette case est cochée, Gajim obtiendra le mot de passe depuis un agent GPG comme seahorse"
+msgstr ""
+"Si cette case est cochée, Gajim obtiendra le mot de passe depuis un agent "
+"GPG comme seahorse"
#: ../data/gui/accounts_window.ui.h:29
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Si coché, Gajim enverra des paquets de maintien de connection pour prévenir des temps de latence pouvant entraîner des déconnexions"
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Si coché, Gajim enverra des paquets de maintien de connection pour prévenir "
+"des temps de latence pouvant entraîner des déconnexions"
#: ../data/gui/accounts_window.ui.h:30
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement à jabber en utilisant ce compte"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Si cette case est cochée, au démarrage, Gajim se connectera automatiquement "
+"Ã jabber en utilisant ce compte"
#: ../data/gui/accounts_window.ui.h:31
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Si cette case est cochée, toute modification de l'état global (accessible à l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état de ce compte"
+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 ""
+"Si cette case est cochée, toute modification de l'état global (accessible à "
+"l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état "
+"de ce compte"
#: ../data/gui/accounts_window.ui.h:32
msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
+"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 ""
-"Si le port par défaut utilisé pour les messages entrants n'est pas adapté à vos besoins, vous pouvez en spécifier un ici.\n"
-"Vous devriez considérer modifier les paramètres de votre pare-feu si vous en avez un."
+"Si le port par défaut utilisé pour les messages entrants n'est pas adapté à "
+"vos besoins, vous pouvez en spécifier un ici.\n"
+"Vous devriez considérer modifier les paramètres de votre pare-feu si vous en "
+"avez un."
#: ../data/gui/accounts_window.ui.h:34
msgid "Information about you, as stored in the server"
msgstr "Les informations vous concernant, stockées sur le serveur"
#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
+#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826
+#: ../src/dialogs.py:837
msgid "Jabber ID:"
msgstr "Identifiant Jabber :"
@@ -345,8 +376,8 @@ msgstr "Nom :"
msgid "Mer_ge accounts"
msgstr "_Regrouper les comptes"
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
+#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
+#: ../src/config.py:2367
msgid "No key selected"
msgstr "Pas de clé sélectionnée"
@@ -359,15 +390,21 @@ msgid "Priori_ty:"
msgstr "Priori_té :"
#: ../data/gui/accounts_window.ui.h:42
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "La priorité est utilisée par Jabber pour déterminer qui reçoit les événements du serveur quand plusieurs clients sont connectés avec le même compte. Le client ayant la plus haute priorité recevra les messages"
+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 ""
+"La priorité est utilisée par Jabber pour déterminer qui reçoit les "
+"événements du serveur quand plusieurs clients sont connectés avec le même "
+"compte. Le client ayant la plus haute priorité recevra les messages"
#: ../data/gui/accounts_window.ui.h:43
msgid "Priority will change automatically according to your status."
msgstr "La priorité va changer automatiquement selon votre état."
#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5593
msgid "Re_name"
msgstr "Re_nommer"
@@ -376,8 +413,18 @@ msgid "Resour_ce:"
msgstr "Ressour_ce: "
#: ../data/gui/accounts_window.ui.h:46
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "La ressource est envoyée au serveur Jabber pour différencier les clients connectés au même serveur avec le même compte. Vous pouvez donc être connecté avec le même compte avec les ressources « Maison » et « Travail » en même temps. La ressource avec la plus haute priorité recevra les messages (voir plus bas)."
+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 ""
+"La ressource est envoyée au serveur Jabber pour différencier les clients "
+"connectés au même serveur avec le même compte. Vous pouvez donc être "
+"connecté avec le même compte avec les ressources « Maison » et « Travail » "
+"en même temps. La ressource avec la plus haute priorité recevra les messages "
+"(voir plus bas)."
#: ../data/gui/accounts_window.ui.h:47
msgid "Save conversation _logs for all contacts"
@@ -402,7 +449,7 @@ msgstr "Synchroniser les contacts"
#: ../data/gui/accounts_window.ui.h:53
msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgstr "Chemin vers le certificat client et la clé au format PKCS#12"
#: ../data/gui/accounts_window.ui.h:54
msgid "Use G_PG Agent"
@@ -494,6 +541,7 @@ msgid "_Group:"
msgstr "_Groupe :"
#: ../data/gui/add_new_contact_window.ui.h:12
+#: ../data/gui/manage_bookmarks_window.ui.h:7
msgid "_Nickname:"
msgstr "_Surnom :"
@@ -539,7 +587,8 @@ msgstr "F_inir"
#: ../data/gui/adhoc_commands_window.ui.h:7
msgid "Please wait while retrieving command list..."
-msgstr "Merci de patienter pendant la récupération de la liste des commandes..."
+msgstr ""
+"Merci de patienter pendant la récupération de la liste des commandes..."
#: ../data/gui/adhoc_commands_window.ui.h:8
msgid "Please wait while the command is sending..."
@@ -560,7 +609,9 @@ msgstr "<b>Description</b>"
#: ../data/gui/advanced_configuration_window.ui.h:2
msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>NOTE :</b> Vous devriez redémarrer Gajim pour prendre en compte certaines de vos modifications."
+msgstr ""
+"<b>NOTE :</b> Vous devriez redémarrer Gajim pour prendre en compte certaines "
+"de vos modifications."
#: ../data/gui/advanced_configuration_window.ui.h:3
msgid "Advanced Configuration Editor"
@@ -618,183 +669,9 @@ msgstr "_Administrateur"
msgid "_Send Server Message..."
msgstr "_Envoyer un message au serveur..."
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "une fenêtre ou un onglet ouvert avec ce contact "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Actions</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Conditions</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sons</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Actions avancées"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Éditeur de configuration avancée"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Tous les états"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Absent(e)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Occupé(e) "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Le contact a changé d'état"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "Contact déconnecté"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "N'ai pas"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "Transfert de fichier terminé"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "Requête de transfert de fichier"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "Transfert de fichier commencé"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "Message d'un salon mis en surbrillance"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "Message reçu dans un salon"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Ai"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Lancer une commande"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Non disponible"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Un ou plusieurs états spéciaux..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "En ligne / Disponible pour discuter"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Jouer un son"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "Recevoir un message"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Quand"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Activer l'indice d'urgence du gestionnaire de fenêtres pour faire clignoter la fenêtre de discussion dans la liste des fenêtres"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Désactiver l'ouverture automatique de fenêtres de conversation"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Désactiver la fenêtre popup existante"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Désactiver le son existant pour cet événement"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr "_Désactiver l'affichage des événements dans la zone de notification"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Désactiver l'affichage des événements dans la liste de contacts"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "M'av_iser avec une fenêtre popup"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Ouvrir une fenêtre de conversation"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in notification area"
-msgstr "Afficher les événements dans la zone de notification"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "Ne le montrer que dans la _liste"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "et je "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "contact(s)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "tout le monde"
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "pour "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "groupes"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "lorsque je suis là "
-
#: ../data/gui/archiving_preferences_window.ui.h:1
msgid "<i>Method Auto</i>"
-msgstr ""
+msgstr "<i>Méthode Automatique</i>"
#: ../data/gui/archiving_preferences_window.ui.h:2
msgid "<i>Method Local</i>"
@@ -856,8 +733,8 @@ msgstr "Contacts Bloqués"
#: ../data/gui/blocked_contacts_window.ui.h:2
#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5612
+#: ../src/roster_window.py:5739 ../src/roster_window.py:5872
msgid "_Unblock"
msgstr "_Débloquer"
@@ -944,8 +821,7 @@ msgstr "_Ouvrir le lien dans votre navigateur"
msgid "_Start Chat"
msgstr "Commencer une _discussion"
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
+#: ../data/gui/chat_control.ui.h:1
msgid "#"
msgstr "#"
@@ -1029,10 +905,9 @@ msgstr "Démarrer/arrêter une session audio"
msgid "Toggle video session"
msgstr "Démarrer/arrêter une session vidéo"
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is
-#. supposed to show the Emoticon Selector)
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:275
msgid "_Send"
msgstr "En_voyer"
@@ -1086,8 +961,9 @@ msgstr "Éditer les _groupes..."
#. Invite to
#. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5548
+#: ../src/roster_window.py:5707
msgid "In_vite to"
msgstr "In_viter à "
@@ -1099,12 +975,12 @@ msgstr "Inviter des _Contacts"
msgid "Remo_ve"
msgstr "Suppri_mer"
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5558
+#: ../src/roster_window.py:5796
msgid "Send Cus_tom Status"
msgstr "Envoyer un Statut Personnalisé"
-#: ../data/gui/contact_context_menu.ui.h:10
+#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
msgid "Send Single _Message..."
msgstr "Envoyer un _message simple..."
@@ -1133,8 +1009,8 @@ msgid "_Allow him/her to see my status"
msgstr "L'autoriser à voir mon état"
#: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5620
+#: ../src/roster_window.py:5745 ../src/roster_window.py:5875
msgid "_Block"
msgstr "_Bloquer"
@@ -1144,8 +1020,8 @@ msgstr "Interdire de voir mon état"
#: ../data/gui/contact_context_menu.ui.h:20
#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5755
+#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:24
+#: ../src/roster_window.py:5946
msgid "_History"
msgstr "_Historique"
@@ -1211,7 +1087,8 @@ msgstr "Annule le transfert du fichier sélectionné"
#: ../data/gui/filetransfers.ui.h:4
msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Annule le transfert du fichier sélectionné et supprime le fichier incomplet"
+msgstr ""
+"Annule le transfert du fichier sélectionné et supprime le fichier incomplet"
#: ../data/gui/filetransfers.ui.h:5
msgid "Clean _up"
@@ -1231,21 +1108,28 @@ msgstr "Supprimer le transfert de fichier de la liste."
#: ../data/gui/filetransfers.ui.h:9
msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Supprimer les transferts de fichier terminés, annulés et échoués de la liste"
+msgstr ""
+"Supprimer les transferts de fichier terminés, annulés et échoués de la liste"
#: ../data/gui/filetransfers.ui.h:10
msgid "Shows a list of file transfers between you and others"
msgstr "Affiche une liste des transferts de fichiers entre vous et les autres"
#: ../data/gui/filetransfers.ui.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 "Cette action supprime les transferts de fichier de la liste. Si le transfert est actif, il est d'abord arrêté puis supprimé"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Cette action supprime les transferts de fichier de la liste. Si le transfert "
+"est actif, il est d'abord arrêté puis supprimé"
#: ../data/gui/filetransfers.ui.h:12
msgid "When a file transfer is complete show a popup notification"
-msgstr "Quand le transfert de fichier est terminé, montrer une fenêtre de notification"
+msgstr ""
+"Quand le transfert de fichier est terminé, montrer une fenêtre de "
+"notification"
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
+#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
msgid "_Continue"
msgstr "_Continuer"
@@ -1270,11 +1154,10 @@ msgid "<b>Chatstate Tab Colors</b>"
msgstr "<b>Couleurs des Onglets</b>"
#: ../data/gui/gajim_themes_window.ui.h:2
-#, fuzzy
msgid "Account row"
-msgstr "Compte"
+msgstr "Ligne de compte"
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1029
msgid "Bold"
msgstr "Gras"
@@ -1287,9 +1170,8 @@ msgid "Composing"
msgstr "En train d'écrire"
#: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
msgid "Contact row"
-msgstr "Contact"
+msgstr "Ligne de contact"
#: ../data/gui/gajim_themes_window.ui.h:7
msgid "Font style:"
@@ -1304,15 +1186,14 @@ msgid "Gone"
msgstr "Parti"
#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
msgid "Group row"
-msgstr "Groupe"
+msgstr "Ligne de groupe"
#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
msgid "Inactive"
msgstr "Inactif"
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1030
msgid "Italic"
msgstr "Italique"
@@ -1377,47 +1258,52 @@ msgstr "_Gérer le Salon"
msgid "_Minimize on close"
msgstr "_Minimiser à la fermeture"
-#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_S'exprimer"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
msgid "Mo_derator"
msgstr "Mo_dérer"
-#: ../data/gui/gc_occupants_menu.ui.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:3
msgid "Occupant Actions"
msgstr "Actions des Occupants"
-#: ../data/gui/gc_occupants_menu.ui.h:3
+#: ../data/gui/gc_occupants_menu.ui.h:4
msgid "Send _File"
msgstr "Envoyer un _fichier"
-#: ../data/gui/gc_occupants_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:5
msgid "_Add to Roster"
msgstr "_Ajouter à la liste de contacts"
-#: ../data/gui/gc_occupants_menu.ui.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:6
msgid "_Admin"
msgstr "_Administrateur"
-#: ../data/gui/gc_occupants_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:7
msgid "_Ban"
msgstr "_Bannir"
-#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:10
msgid "_Kick"
msgstr "_Éjecter"
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:11
msgid "_Member"
msgstr "_Membre"
-#: ../data/gui/gc_occupants_menu.ui.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:12
msgid "_Owner"
msgstr "Pr_opriétaire"
-#: ../data/gui/gc_occupants_menu.ui.h:12
+#: ../data/gui/gc_occupants_menu.ui.h:13
msgid "_Send Private Message"
msgstr "_Envoyer un message privé"
-#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:15
msgid "_Voice"
msgstr "_S'exprimer"
@@ -1450,61 +1336,61 @@ msgstr "Sujet :"
#: ../data/gui/history_manager.ui.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>ATTENTIONÂ :</b>\n"
-"Si vous comptez faire beaucoup de suppressions, vérifiez que Gajim n'est pas lancé. Évitez les suppressions de contacts avec qui vous êtes en train de parler."
+"Si vous comptez faire beaucoup de suppressions, vérifiez que Gajim n'est pas "
+"lancé. Évitez les suppressions de contacts avec qui vous êtes en train de "
+"parler."
#: ../data/gui/history_manager.ui.h:3
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
msgstr "<big><b>Bienvenue dans le Gestionnaire d'Archives Gajim</b></big>"
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Supprimer"
-
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:4
msgid "Export"
msgstr "Exporter"
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:5
msgid "Gajim History Logs Manager"
msgstr "Gestionnaire d'historique de Gajim"
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:6
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 ""
-"Ce gestionnaire d'archives n'est pas fait pour le visionnage des archives. Si vous cherchez cette fonctionnalité, utilise la fenêtre d'historiques à la place.\n"
+"Ce gestionnaire d'archives n'est pas fait pour le visionnage des archives. "
+"Si vous cherchez cette fonctionnalité, utilise la fenêtre d'historiques à la "
+"place.\n"
"\n"
-"Utilisez ce programme pour supprimer ou exporter des archives. Vous pouvez sélectionner les archives à droite et/ou chercher dans la base de donnée en bas."
+"Utilisez ce programme pour supprimer ou exporter des archives. Vous pouvez "
+"sélectionner les archives à droite et/ou chercher dans la base de donnée en "
+"bas."
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:9
msgid "_Search Database"
msgstr "_Rechercher dans la base de données"
#: ../data/gui/history_window.ui.h:1
-#, fuzzy
msgid "All Chat Histories"
-msgstr "Tous les états"
+msgstr "Tous les historiques"
#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
msgid "Conversation History"
msgstr "Historique de conversation"
#: ../data/gui/history_window.ui.h:3
-#, fuzzy
msgid "Enter JID or Contact name"
-msgstr "Nom du contact"
+msgstr "Entrer un JID ou un nom de contact"
#: ../data/gui/history_window.ui.h:4
-#, fuzzy
msgid "Groupchat Histories"
-msgstr "Salons de discussion"
+msgstr "Historique de salons de discussion"
#: ../data/gui/history_window.ui.h:5
msgid "Search:"
@@ -1521,7 +1407,7 @@ msgstr ""
#: ../data/gui/item_archiving_preferences_window.ui.h:2
msgid "body"
-msgstr ""
+msgstr "corps"
#: ../data/gui/item_archiving_preferences_window.ui.h:3
msgid "concede"
@@ -1540,13 +1426,11 @@ msgid "forbid"
msgstr "interdire"
#: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:229
msgid "jid"
msgstr "identifiant Jabber"
#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
@@ -1581,7 +1465,7 @@ msgstr "flux"
msgid "Bro_wse Rooms"
msgstr "_Parcourir les salons"
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2298
msgid "Join Group Chat"
msgstr "Rejoindre un salon de discussion"
@@ -1590,12 +1474,10 @@ msgid "Join this room _automatically when I connect"
msgstr "Joindre ce s_alon de discussion quand je me connecte"
#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
msgid "Nickname:"
msgstr "Surnom :"
#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
msgid "Password:"
msgstr "Mot de passe :"
@@ -1604,27 +1486,24 @@ msgid "Recently:"
msgstr "Récemment :"
#: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "Room:"
msgstr "Salon de discussion :"
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
msgid "Server:"
msgstr "Serveur :"
#: ../data/gui/join_groupchat_window.ui.h:10
-#, fuzzy
msgid "_Bookmark this room"
msgstr "Enregistrer ce salon dans les marque-pages"
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
#: ../src/disco.py:1804
msgid "_Join"
msgstr "Re_joindre"
#: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
+msgid "A_uto join"
msgstr "Rejoindre automatiquement"
#: ../data/gui/manage_bookmarks_window.ui.h:2
@@ -1636,15 +1515,20 @@ msgid "Manage Bookmarks"
msgstr "Gérer les marque-pages"
#: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
msgstr "Minimiser automatiquement"
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "Pr_int status:"
msgstr "Afficher l'état :"
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "Roo_m:"
+msgstr ""
+
#: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
+msgid "_Title:"
msgstr "Titre :"
#: ../data/gui/manage_pep_services_window.ui.h:1
@@ -1668,12 +1552,8 @@ msgid "BOSH"
msgstr "BOSH"
#: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
msgid "HTTP Connect"
-msgstr ""
-"Connexion HTTP\n"
-"SOCKS5\n"
-"BOSH"
+msgstr "Connexion HTTP"
#: ../data/gui/manage_proxies_window.ui.h:5
msgid "Manage Proxy Profiles"
@@ -1744,50 +1624,56 @@ msgid "Configure"
msgstr "Configurer"
#: ../data/gui/plugins_window.ui.h:6
-#, fuzzy
-msgid "Descrition:"
+msgid "Description:"
msgstr "Description :"
#: ../data/gui/plugins_window.ui.h:7
+msgid "Descrition:"
+msgstr "Description :"
+
+#: ../data/gui/plugins_window.ui.h:8
msgid "Homepage:"
msgstr "Site perso :"
-#: ../data/gui/plugins_window.ui.h:8
+#: ../data/gui/plugins_window.ui.h:9
msgid "Install"
msgstr "Installer"
-#: ../data/gui/plugins_window.ui.h:9
+#: ../data/gui/plugins_window.ui.h:10
msgid "Installed"
msgstr "Installé"
-#: ../data/gui/plugins_window.ui.h:10
-msgid "Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization."
+#: ../data/gui/plugins_window.ui.h:11
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
msgstr ""
+"La description du plugin doit se trouver ici. Ce teste sera effacé lors de "
+"l'initialisation de la fenêtre de plugins."
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:12
msgid "Plugins"
msgstr ""
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:13
msgid "Uninstall"
msgstr "Désintaller"
-#: ../data/gui/plugins_window.ui.h:13
+#: ../data/gui/plugins_window.ui.h:14
msgid "Version:"
msgstr "Version :"
-#: ../data/gui/plugins_window.ui.h:14
+#: ../data/gui/plugins_window.ui.h:15
msgid "button"
msgstr "bouton"
-#: ../data/gui/plugins_window.ui.h:15
+#: ../data/gui/plugins_window.ui.h:16
msgid "homepage url"
msgstr ""
#: ../data/gui/popup_notification_window.ui.h:1
-#, fuzzy
msgid "Event Type"
-msgstr "Événement"
+msgstr "Type d'événement"
#: ../data/gui/popup_notification_window.ui.h:2
#, fuzzy
@@ -1823,12 +1709,10 @@ msgid "<b>Chat state notifications</b>"
msgstr "<b>Notifications visuelles</b>"
#: ../data/gui/preferences_window.ui.h:8
-#, fuzzy
msgid "<b>Connection</b>"
-msgstr "<b>Conditions</b>"
+msgstr "<b>Connexions</b>"
-#. a header for custom browser/client/file manager. so translate sth like:
-#. Custom Settings
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
#: ../data/gui/preferences_window.ui.h:10
msgid "<b>Custom</b>"
msgstr "<b>Paramètres personnalisés</b>"
@@ -1853,6 +1737,10 @@ msgstr "<b>Vie privée</b>"
msgid "<b>Roster Appearance</b>"
msgstr "<b>Apparence de la fenêtre principale</b>"
+#: ../data/gui/preferences_window.ui.h:17
+msgid "<b>Sounds</b>"
+msgstr "<b>Sons</b>"
+
#: ../data/gui/preferences_window.ui.h:18
msgid "<b>Status Messages</b>"
msgstr "<b>Messages d'état prédéfinis</b>"
@@ -1878,214 +1766,300 @@ msgid "Advanced"
msgstr "Avancées"
#: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Avancées..."
-
-#: ../data/gui/preferences_window.ui.h:25
#, fuzzy
msgid "All chat states"
msgstr "Tous les états"
-#: ../data/gui/preferences_window.ui.h:26
+#: ../data/gui/preferences_window.ui.h:25
msgid "Allow _OS information to be sent"
msgstr "Envoyer des informations concernant votre _système d'exploitation"
-#: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:26
msgid "Allow my _idle time to be sent"
-msgstr "Envoyer des informations concernant votre _système d'exploitation"
+msgstr "Envoyer mon temps d'inactivité"
-#: ../data/gui/preferences_window.ui.h:28
+#: ../data/gui/preferences_window.ui.h:27
msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Autoriser les _notifications lorsque je suis absent(e)/indisponible/occupé(e)/invisible"
+msgstr ""
+"Autoriser les _notifications lorsque je suis absent(e)/indisponible/occupé"
+"(e)/invisible"
-#: ../data/gui/preferences_window.ui.h:29
+#: ../data/gui/preferences_window.ui.h:28
msgid "Allow sound when I'm _busy"
msgstr "Autoriser les sons quand je suis _occupé(e)"
-#: ../data/gui/preferences_window.ui.h:30
+#: ../data/gui/preferences_window.ui.h:29
msgid "Always"
msgstr "Toujours"
-#: ../data/gui/preferences_window.ui.h:31
+#: ../data/gui/preferences_window.ui.h:30
msgid "Ask status message when I:"
msgstr "Demander le message d'état lorsque je me : "
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
msgid "Audio / Video"
msgstr "Audio / Vidéo"
-#: ../data/gui/preferences_window.ui.h:33
+#: ../data/gui/preferences_window.ui.h:32
msgid "Audio input device"
-msgstr ""
+msgstr "Périphérique audio d'entrée"
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:33
msgid "Audio output device"
-msgstr ""
+msgstr "Périphérique audio de sortie"
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:34
msgid "Chat message:"
msgstr "Message de conversation :"
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:35
msgid "Check on startup if Gajim is the _default Jabber client"
msgstr "Vérifier que Gajim est le client Jabber par _défaut au démarrage"
-#: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:36
msgid "Composing only"
-msgstr "En train d'écrire"
+msgstr "Seulement en train d'écrire"
-#: ../data/gui/preferences_window.ui.h:38
+#: ../data/gui/preferences_window.ui.h:37
msgid "Configure color and font of the interface"
msgstr "Paramétrer la couleur et la police de texte de l'interface"
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:38
msgid "Contact's message:"
msgstr "Le message du contact :"
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:39
msgid "Contact's nickname:"
msgstr "Le pseudo du contact :"
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:40
msgid "Custom"
msgstr "Personnalisé"
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:41
msgid "Detached roster with chat grouped by account"
msgstr ""
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:42
msgid "Detached roster with chat grouped by type"
msgstr ""
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:43
msgid "Detached roster with detached chats"
msgstr ""
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:44
msgid "Detached roster with single chat"
msgstr ""
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
+#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
+#: ../src/config.py:672
msgid "Disabled"
msgstr "Désactivé"
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:46
msgid "Display _activity of contacts in roster"
msgstr "Afficher l'_activité des contacts dans la liste des contacts"
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:47
msgid "Display _extra email details"
msgstr "Afficher des informations détaillées de courriels"
-#: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:48
msgid "Display _location of contacts in roster"
-msgstr "Afficher l'humeur des contacts dans la liste des contacts"
+msgstr "Afficher la localisation des contacts dans la liste"
-#: ../data/gui/preferences_window.ui.h:50
+#: ../data/gui/preferences_window.ui.h:49
msgid "Display _tunes of contacts in roster"
msgstr "Afficher ce que mes contacts écoutent"
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:50
msgid "Display a_vatars of contacts in roster"
msgstr "Afficher l'a_vatar des contacts dans la liste des contacts"
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:51
msgid "Display m_ood of contacts in roster"
msgstr "Afficher l'humeur des contacts dans la liste des contacts"
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:52
msgid "Display status _messages of contacts in roster"
msgstr "Afficher les _messages d'état des contacts dans la liste des contacts"
+#: ../data/gui/preferences_window.ui.h:53
+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 peut envoyer et recevoir des méta-informations durant les "
+"conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
+"spécifier quels états de conversation vous voulez envoyer à vos contacts."
+
#: ../data/gui/preferences_window.ui.h:54
-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 peut envoyer et recevoir des méta-informations durant les conversations que vous pouvez avoir avec un contact. Vous pouvez ici spécifier quels états de conversation vous voulez envoyer à vos contacts."
+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 peut envoyer et recevoir des meta-informations concernant les "
+"conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
+"spécifier quel état de conversation vous voulez envoyer à vos contacts."
#: ../data/gui/preferences_window.ui.h:55
-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 peut envoyer et recevoir des meta-informations concernant les conversations que vous pouvez avoir avec un contact. Vous pouvez ici spécifier quel état de conversation vous voulez envoyer à vos contacts."
-
-#: ../data/gui/preferences_window.ui.h:56
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim vous signalera par une fenêtre de notification en bas à droite de l'écran qu'un contact s'est déconnecté"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim vous signalera par une fenêtre de notification en bas à droite de "
+"l'écran qu'un contact s'est déconnecté"
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:57
msgid "Hide all buttons in chat windows"
msgstr "Cacher tous les boutons dans les fenêtres de conversations"
+#: ../data/gui/preferences_window.ui.h:58
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Si cette case est cochée, Gajim autorisera les autres à détecter le système "
+"d'exploitation que vous utilisez"
+
#: ../data/gui/preferences_window.ui.h:59
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
-msgstr "Si cette case est cochée, Gajim autorisera les autres à détecter le système d'exploitation que vous utilisez"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Si cette case est cochée, Gajim affichera également des informations à "
+"propos de l'expéditeur des nouveaux courriels"
#: ../data/gui/preferences_window.ui.h:60
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Si cette case est cochée, Gajim affichera également des informations à propos de l'expéditeur des nouveaux courriels"
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Si cette case est cochée, Gajim changera votre statut en Absent(e) quand "
+"l'ordinateur est inutilisé."
#: ../data/gui/preferences_window.ui.h:61
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Si cette case est cochée, Gajim changera votre statut en Absent(e) quand l'ordinateur est inutilisé."
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"Si cette case est cochée, Gajim changera votre statut en Non disponible "
+"quand l'ordinateur n'a pas été utilisé pendant une plus longue période"
#: ../data/gui/preferences_window.ui.h:62
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Si cette case est cochée, Gajim changera votre statut en Non disponible quand l'ordinateur n'a pas été utilisé pendant une plus longue période"
-
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
+"fenêtre principale et les salons"
+
#: ../data/gui/preferences_window.ui.h:63
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la fenêtre principale et les salons"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
+"chaque contact dans la fenêtre principale et les salons"
#: ../data/gui/preferences_window.ui.h:64
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de chaque contact dans la fenêtre principale et les salons"
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Si cette case est cochée, Gajim affichera l'activité des contacts dans votre "
+"liste des contacts"
#: ../data/gui/preferences_window.ui.h:65
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Si cette case est cochée, Gajim affichera l'activité des contacts dans votre liste des contacts"
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Si cette case est cochée, Gajim affichera la localisation de chaque contact "
+"dans votre liste de contacts"
#: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
-msgid "If checked, Gajim will display the location of contacts in the roster window"
-msgstr "Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans votre roster"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans "
+"votre roster"
#: ../data/gui/preferences_window.ui.h:67
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans votre roster"
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Si cette case est cochée, Gajim affichera ce que chaque contact écoute dans "
+"votre roster"
#: ../data/gui/preferences_window.ui.h:68
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Si cette case est cochée, Gajim affichera ce que chaque contact écoute dans votre roster"
+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 ""
+"Si cette case est cochée, Gajim soulignera les erreurs d'orthographe dans le "
+"champ de saisie des fenêtres de conversation. Si aucune langue n'a été "
+"définie explicitement par clique droit sur le champ de saisie, la langue par "
+"défaut sera utilisée pour ce contact ou ce salon."
#: ../data/gui/preferences_window.ui.h:69
-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 "Si cette case est cochée, Gajim soulignera les erreurs d'orthographe dans le champ de saisie des fenêtres de conversation. Si aucune langue n'a été définie explicitement par clique droit sur le champ de saisie, la langue par défaut sera utilisée pour ce contact ou ce salon."
+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 ""
+"Si cette case est cochée, Gajim ignorera les événements en provenance des "
+"contacts non autorisés. Utilisez avec précaution car cela bloque tous les "
+"messages provenant des contacts qui ne sont pas dans votre liste"
#: ../data/gui/preferences_window.ui.h:70
-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 "Si cette case est cochée, Gajim ignorera les événements en provenance des contacts non autorisés. Utilisez avec précaution car cela bloque tous les messages provenant des contacts qui ne sont pas dans votre liste"
+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 ""
+"Si cette case est cochée, Gajim archivera les conversations chiffrées. "
+"Veuillez noter qu'en utilisant une encryption E2E, l'utilisateur distant "
+"doit l'accepter, sinon les messages ne seront pas archivés."
#: ../data/gui/preferences_window.ui.h:71
-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 "Si cette case est cochée, Gajim archivera les conversations chiffrées. Veuillez noter qu'en utilisant une encryption E2E, l'utilisateur distant doit l'accepter, sinon les messages ne seront pas archivés."
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Si cette case est cochée, Gajim affichera une notification quand un nouveau "
+"courriel GMail est reçu"
#: ../data/gui/preferences_window.ui.h:72
-msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
-msgstr "Si cette case est cochée, Gajim affichera une notification quand un nouveau courriel GMail est reçu"
+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 ""
+"Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux "
+"protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
+"disponible, absent(e), occupé(e), etc.)"
#: ../data/gui/preferences_window.ui.h:73
-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 "Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états disponible, absent(e), occupé(e), etc.)"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Si cette case est cochée, Gajim ne demandera pas de message de statut. Le "
+"message par défaut sera utilisé à la place."
#: ../data/gui/preferences_window.ui.h:74
-msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
-msgstr "Si cette case est cochée, Gajim ne demandera pas de message de statut. Le message par défaut sera utilisé à la place."
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Si cette case n'est pas décochée, Gajim va remplacer les émoticônes ASCII "
+"comme « :) » par un équivalent graphique statique ou dynamique"
#: ../data/gui/preferences_window.ui.h:75
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Si cette case n'est pas décochée, Gajim va remplacer les émoticônes ASCII comme « :) » par un équivalent graphique statique ou dynamique"
+msgid "Last state"
+msgstr "Dernier état"
#: ../data/gui/preferences_window.ui.h:76
msgid "Log _encrypted chat session"
@@ -2116,21 +2090,16 @@ msgid "Notify me about contacts that sign _out"
msgstr "Me signaler les contacts qui se _déconnectent"
#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
msgid "Notify me about it"
-msgstr "Me signaler les contacts qui se _déconnectent"
+msgstr "Me le signaler"
#: ../data/gui/preferences_window.ui.h:84
msgid "Notify on new _GMail email"
msgstr "M'avertir lors de l'arrivée d'un courrier électronique _Gmail"
#: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
msgid "Only when pending events"
-msgstr ""
-"Jamais\n"
-"Seulement lorsqu'il y a des évènements en attente\n"
-"Toujours"
+msgstr "Seulement lorsqu'il y a des évènements en attente"
#: ../data/gui/preferences_window.ui.h:86
msgid "Personal Events"
@@ -2142,7 +2111,7 @@ msgstr "_Jouer les sons"
#: ../data/gui/preferences_window.ui.h:88
msgid "Pop it up"
-msgstr ""
+msgstr "Faire surgir un pop up"
#: ../data/gui/preferences_window.ui.h:89
msgid "Preferences"
@@ -2165,9 +2134,8 @@ msgid "Show notification area icon:"
msgstr "Montrer l'icone de la zone de notification :"
#: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
msgid "Show only in roster"
-msgstr "Ne le montrer que dans la _liste"
+msgstr "Ne le montrer que dans la liste"
#: ../data/gui/preferences_window.ui.h:95
msgid "Sign _in"
@@ -2179,17 +2147,21 @@ msgstr "_déconnecte"
#: ../data/gui/preferences_window.ui.h:97
msgid "Single window for everything"
-msgstr ""
+msgstr "Une seule fenêtre pour tout"
#: ../data/gui/preferences_window.ui.h:98
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Certains messages peuvent contenir du texte complexe (formatage, couleurs, etc.). Si activé, Gajim l'affichera seulement en tant que texte non formaté. "
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Certains messages peuvent contenir du texte complexe (formatage, couleurs, "
+"etc.). Si activé, Gajim l'affichera seulement en tant que texte non formaté. "
#: ../data/gui/preferences_window.ui.h:99
msgid "Sort contacts by status"
msgstr "Trier les contacts par état"
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
msgid "Status"
msgstr "État"
@@ -2207,21 +2179,25 @@ msgstr "T_hème :"
#: ../data/gui/preferences_window.ui.h:104
msgid ""
-"The auto away status message. If empty, Gajim will not change the current status message\n"
+"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 ""
-"Le message de statut absent automatique. S'il est vide, Gajim ne changera pas le message de statut courant\n"
+"Le message de statut absent automatique. S'il est vide, Gajim ne changera "
+"pas le message de statut courant\n"
"$S sera remplacé par l'ancien message de statut\n"
"$T sera remplacé par le temps d'absence"
#: ../data/gui/preferences_window.ui.h:107
msgid ""
-"The auto not available status message. If empty, Gajim will not change the current status message\n"
+"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 ""
-"Le message de statut non-disponible automatique. S'il est vide, Gajim ne changera pas le message de statut courant\n"
+"Le message de statut non-disponible automatique. S'il est vide, Gajim ne "
+"changera pas le message de statut courant\n"
"$S sera remplacé par l'ancien message de statut\n"
"$T sera remplacé par le temps de non-activité"
@@ -2239,7 +2215,7 @@ msgstr "Utiliser la valeur par _défaut"
#: ../data/gui/preferences_window.ui.h:113
msgid "Video framerate"
-msgstr ""
+msgstr "Images par seconde"
#: ../data/gui/preferences_window.ui.h:114
msgid "Video input device"
@@ -2247,11 +2223,11 @@ msgstr "Périphérique d'entrée vidéo."
#: ../data/gui/preferences_window.ui.h:115
msgid "Video output device"
-msgstr ""
+msgstr "Périphérique vidéo de sortie"
#: ../data/gui/preferences_window.ui.h:116
msgid "Video size"
-msgstr ""
+msgstr "Taille de la vidéo"
#: ../data/gui/preferences_window.ui.h:117
msgid "When new event is received:"
@@ -2322,26 +2298,30 @@ msgid "_Send chat state notifications:"
msgstr "_Envoyer les notifications d'état :"
#: ../data/gui/preferences_window.ui.h:134
+msgid "_Show roster on startup:"
+msgstr "Montrer la _liste au démarrage:"
+
+#: ../data/gui/preferences_window.ui.h:135
msgid "_Status message:"
msgstr "Message d'état :"
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:136
msgid "_URL highlight:"
msgstr "Mise à valeur des _URL :"
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:137
msgid "_Window behavior:"
msgstr "Comportement de la _fenêtre :"
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:138
msgid "in _group chats"
msgstr "dans les _salons de discussion"
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:139
msgid "in _roster"
msgstr "dans le _roster"
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:140
msgid "minutes"
msgstr "minutes"
@@ -2393,7 +2373,7 @@ msgstr "Identifiant Jabber :"
msgid "Order:"
msgstr "Ordre :"
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3936
msgid "Privacy List"
msgstr "Liste privée"
@@ -2462,108 +2442,108 @@ msgid "<b>Company:</b>"
msgstr "<b>Entreprise :</b>"
#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:10
msgid "<b>Country:</b>"
msgstr "<b>Pays :</b>"
#: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/vcard_information_window.ui.h:11
msgid "<b>Department:</b>"
msgstr "<b>Département :</b>"
#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:12
msgid "<b>E-Mail:</b>"
msgstr "<b>Courriel :</b>"
#: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:13
msgid "<b>Extra Address:</b>"
msgstr "<b>Adresse 2 :</b>"
#. Family Name
#: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:15
msgid "<b>Family:</b>"
msgstr "<b>Nom de Famille :</b>"
#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:16
msgid "<b>Full Name</b>"
msgstr "<b>Nom complet</b>"
#. Given Name
#: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:18
msgid "<b>Given:</b>"
msgstr "<b>Prénom :</b>"
#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:19
msgid "<b>Homepage:</b>"
msgstr "<b>Site perso :</b>"
#. Middle Name
#: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:22
msgid "<b>Middle:</b>"
msgstr "<b>Deuxième :</b>"
#: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:23
msgid "<b>Name:</b>"
msgstr "<b>Nom :</b>"
#: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:24
msgid "<b>Nickname:</b>"
msgstr "<b>Surnom :</b>"
#: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:25
msgid "<b>Phone No.:</b>"
msgstr "<b>Téléphone :</b>"
#: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:26
msgid "<b>Position:</b>"
msgstr "<b>Position :</b>"
#: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:27
msgid "<b>Postal Code:</b>"
msgstr "<b>Code postal :</b>"
#. Prefix in Name
#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:29
msgid "<b>Prefix:</b>"
msgstr "<b>Préfixe :</b>"
#: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:31
msgid "<b>Role:</b>"
msgstr "<b>Rôle :</b>"
#: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:32
msgid "<b>State:</b>"
msgstr "<b>Région :</b>"
#: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:34
msgid "<b>Street:</b>"
msgstr "<b>Rue :</b>"
#. Suffix in Name
#: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:38
msgid "<b>Suffix:</b>"
msgstr "<b>Suffixe :</b>"
#. "About" is the text of a tab of vcard window
#: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:42
msgid "About"
msgstr "À propos"
@@ -2572,12 +2552,12 @@ msgid "Click to set your avatar"
msgstr "Cliquez pour choisir votre avatar"
#: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:45
+#: ../data/gui/vcard_information_window.ui.h:46
msgid "Format: YYYY-MM-DD"
msgstr "Format : AAAA-MM-JJ"
#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:48
msgid "Personal Info"
msgstr "Informations personnelles"
@@ -2600,14 +2580,18 @@ msgstr "Supprimer le compte de Gajim et du _serveur"
#. Remove group
#. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5630
+#: ../src/roster_window.py:5755 ../src/roster_window.py:5885
msgid "_Remove"
msgstr "_Supprimer"
#: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
-msgstr "<b>quelqu'un@quelquepart.com</b> aimerait que vous <b>ajoutiez</b> quelques contacts à votre roster."
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
+msgstr ""
+"<b>quelqu'un@quelquepart.com</b> aimerait que vous <b>ajoutiez</b> quelques "
+"contacts à votre roster."
#: ../data/gui/roster_item_exchange_window.ui.h:2
msgid "Message Body <currently unused, so it's hidden by default>"
@@ -2650,54 +2634,54 @@ msgstr ""
msgid "Profile, A_vatar"
msgstr "Profil et _avatar"
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
msgid "Show Only _Active Contacts"
msgstr "Afficher seulement les contacts _Actifs"
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
+#, fuzzy
+msgid "Show Roster Fi_lter"
+msgstr "Montrer le filtre de _liste de contacts"
+
+#: ../data/gui/roster_window.ui.h:13
msgid "Show Trans_ports"
msgstr "Afficher les Passerelles"
-#: ../data/gui/roster_window.ui.h:12
+#: ../data/gui/roster_window.ui.h:14
msgid "Show _Offline Contacts"
msgstr "Afficher les Contacts _déconnectés"
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:15 ../src/statusicon.py:346
msgid "Show _Roster"
msgstr "Montrer la _liste de contacts"
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:16
msgid "_Accounts"
msgstr "_Comptes"
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is
-#. supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/roster_window.ui.h:17
#: ../data/gui/subscription_request_window.ui.h:6
msgid "_Actions"
msgstr "Act_ions"
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:19
msgid "_Contents"
msgstr "_Sommaire"
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
+#: ../data/gui/roster_window.ui.h:21 ../src/disco.py:1520
msgid "_Edit"
msgstr "É_dition"
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:22
msgid "_FAQ"
msgstr "_FAQ"
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:23
msgid "_Help"
msgstr "Aid_e"
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Envoyer un _message simple..."
-
-#: ../data/gui/roster_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:26
msgid "_View"
msgstr "_Affichage"
@@ -2714,11 +2698,11 @@ msgid "_Add contact"
msgstr "_Ajouter un contact"
#. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5897
msgid "_Information"
msgstr "Information"
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
msgid "_Search"
msgstr "_Rechercher"
@@ -2775,8 +2759,12 @@ msgid "Authorize contact so he or she can know when you're connected"
msgstr "Autoriser le contact à savoir quand vous êtes connecté"
#: ../data/gui/subscription_request_window.ui.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Refuser l'autorisation au contact pour qu'il ne puisse pas savoir quand vous êtes connecté"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Refuser l'autorisation au contact pour qu'il ne puisse pas savoir quand vous "
+"êtes connecté"
#: ../data/gui/subscription_request_window.ui.h:4
msgid "Subscription Request"
@@ -2828,59 +2816,58 @@ msgid "<b>Client:</b>"
msgstr "<b>Client :</b>"
#: ../data/gui/vcard_information_window.ui.h:8
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>Avatar configuré :</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
msgid "<b>Contact time:</b>"
msgstr "<b>Heure du contact :</b>"
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:20
msgid "<b>Jabber ID:</b>"
msgstr "<b>Identifiant Jabber :</b>"
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:30
msgid "<b>Resource:</b>"
msgstr "<b>Ressource :</b>"
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:33
msgid "<b>Status:</b>"
msgstr "<b>Statut :</b>"
#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:36
msgid "<b>Subscription:</b>"
msgstr "<b>Abonnement :</b>"
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:39
msgid "<b>System:</b>"
msgstr "<b>Système :</b>"
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar :</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:43
msgid "Comments"
msgstr "Commentaires"
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
-msgstr "Avatar configuré :"
-
-#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/vcard_information_window.ui.h:44
#: ../data/gui/zeroconf_information_window.ui.h:1
msgid "Contact"
msgstr "Contact"
-#: ../data/gui/vcard_information_window.ui.h:44
+#: ../data/gui/vcard_information_window.ui.h:45
msgid "Contact Information"
msgstr "Informations du Contact"
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:47
msgid "More"
msgstr "Complément"
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Avatar de l'utilisateur :"
-
#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
msgid "<b>Filter</b>"
-msgstr "<b>Police d'écriture</b>"
+msgstr "<b>Filtre</b>"
#: ../data/gui/xml_console_window.ui.h:2
msgid "<b>Jabber Traffic</b>"
@@ -2914,9 +2901,7 @@ msgstr ""
msgid "Info/Query"
msgstr "Information/Requête"
-#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad
-#. idea unless you are sure your lang has this somehow else translated (NOTE:
-#. xml still will still say <iq in your language (of course))
+#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
#: ../data/gui/xml_console_window.ui.h:13
msgid "_IQ"
msgstr "_IQ"
@@ -2966,8 +2951,11 @@ msgid "Cancel confirmation"
msgstr "Annuler la confirmation"
#: ../src/adhoc_commands.py:324
-msgid "You are in process of executing command. Do you really want to cancel it?"
-msgstr "Vous êtes en train d'éxecuter une commande. Êtes vous sûr de vouloir l'annuler ?"
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+"Vous êtes en train d'éxecuter une commande. Êtes vous sûr de vouloir "
+"l'annuler ?"
#: ../src/adhoc_commands.py:370
msgid "Invalid Form"
@@ -3011,7 +2999,7 @@ msgstr "Entier"
msgid "Text"
msgstr "Texte"
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1049
msgid "Color"
msgstr "Couleur"
@@ -3037,243 +3025,267 @@ msgid "Hidden"
msgstr "Éléments masqués"
#: ../src/atom_window.py:123
-#, fuzzy, python-format
+#, python-format
msgid "You have received new entries (and %d not displayed):"
msgid_plural "You have received new entries (and %d not displayed):"
-msgstr[0] "Vous avez reçu de nouvelles entrées (et %(count)d non-affichées) :"
-msgstr[1] "Vous avez reçu de nouvelles entrées (et %(count)d non-affichées) :"
+msgstr[0] "Vous avez reçu de nouvelles entrées (et %d non-affichées) :"
+msgstr[1] "Vous avez reçu de nouvelles entrées (et %d non-affichées) :"
#. the next script, executed in the "po" directory,
#. generates the following list.
#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ;
-#. done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "English"
msgstr "Anglais"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Belarusian"
msgstr "Biélorusse"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Bulgarian"
msgstr "Bulgare"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Breton"
msgstr "Breton"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Czech"
msgstr "Tchèque"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "German"
msgstr "Allemand"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Greek"
msgstr "Grec"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "British"
msgstr "Anglais (Britannique)"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Esperanto"
msgstr "Esperanto"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Spanish"
msgstr "Espagnol"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Basque"
msgstr "Basque"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "French"
msgstr "Français"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Croatian"
msgstr "Croate"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Italian"
msgstr "Italien"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Norwegian (b)"
msgstr "Norvégien"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Dutch"
msgstr "Hollandais"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Norwegian"
msgstr "Norvégien"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Polish"
msgstr "Polonais"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Portuguese"
msgstr "Portugais"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Brazilian Portuguese"
msgstr "Portugais brésilien"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Russian"
msgstr "Russe"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Serbian"
msgstr "Serbe"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Slovak"
msgstr "Slovaque"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Swedish"
msgstr "Suédois"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
msgid "Chinese (Ch)"
msgstr "Chinois"
-#: ../src/chat_control.py:496
+#: ../src/chat_control.py:226
+msgid "Ping?"
+msgstr "Ping ?"
+
+#: ../src/chat_control.py:231
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong ! (%s s.)"
+
+#: ../src/chat_control.py:236
+msgid "Error."
+msgstr "Erreur."
+
+#: ../src/chat_control.py:561
msgid "Spelling language"
msgstr "Langue du correcteur orthographique"
#. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:593 ../src/chat_control.py:809
msgid "A connection is not available"
msgstr "Aucune connexion disponible"
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:594 ../src/chat_control.py:810
msgid "Your message can not be sent until you are connected."
msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1031
msgid "Underline"
msgstr "Souligné"
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1032
msgid "Strike"
msgstr "Barré"
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1055
msgid "Font"
msgstr "Police"
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1064
msgid "Clear formating"
msgstr "Style par défaut"
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1141
msgid "Really send file?"
msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1142
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Si vous envoyez un fichier à %s, il/elle connaîtra votre véritable identifiant Jabber."
+msgstr ""
+"Si vous envoyez un fichier à %s, il/elle connaîtra votre véritable "
+"identifiant Jabber."
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:1622 ../src/chat_control.py:2144
msgid "GPG encryption enabled"
msgstr "Chiffrement GPG activé"
+#: ../src/chat_control.py:1643 ../src/chat_control.py:1646
+msgid "Requires python-farsight."
+msgstr "Nécessite python-farsight."
+
#. Add to roster
-#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
-#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
-#: ../src/roster_window.py:3382
+#: ../src/chat_control.py:1672 ../src/common/contacts.py:158
+#: ../src/common/contacts.py:277 ../src/common/helpers.py:60
+#: ../src/common/helpers.py:254 ../src/dialogs.py:1099 ../src/dialogs.py:2192
+#: ../src/dialogs.py:2221 ../src/gui_interface.py:505
+#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:404
+#: ../src/roster_window.py:1649 ../src/roster_window.py:1651
+#: ../src/roster_window.py:1984 ../src/roster_window.py:3507
+#: ../src/roster_window.py:3534
msgid "Not in Roster"
msgstr "Absent de la liste"
-#: ../src/chat_control.py:1575
+#: ../src/chat_control.py:1702
msgid "This contact does not support file transfer."
msgstr "Ce contact ne prend pas en charge les transferts de fichier."
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1705
msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr "Vous avez besoin de connaître le vrai JID du contact pour lui envoyer un fichier."
+msgstr ""
+"Vous avez besoin de connaître le vrai JID du contact pour lui envoyer un "
+"fichier."
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1812
#, python-format
msgid "%(type)s state : %(state)s, reason: %(reason)s"
msgstr "État %(type)s : %(state)s, raison : %(reason)s"
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2003
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
msgstr "%(nickname)s du salon de discussion %(room_name)s"
#. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
+#: ../src/chat_control.py:2124 ../src/dialogs.py:4997
msgid "No GPG key assigned"
msgstr "Aucune clef GPG assignée"
-#: ../src/chat_control.py:1991
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas chiffrer les messages avec GPG."
+#: ../src/chat_control.py:2125
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+"Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
+"chiffrer les messages avec GPG."
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2134
msgid "GPG encryption disabled"
msgstr "Chiffrement GPG désactivé"
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2160
msgid "Session WILL be logged"
msgstr "La session SERA archivée"
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2162
msgid "Session WILL NOT be logged"
msgstr "La session ne sera PAS archivée"
#. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2179
msgid "is"
msgstr "est"
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2179
msgid "is NOT"
msgstr "N'est PAS"
#. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2181
msgid "will"
msgstr "sera"
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2181
msgid "will NOT"
msgstr "NE sera PAS"
#. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2185
msgid "and authenticated"
msgstr "et authentifiée"
#. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2189
msgid "and NOT authenticated"
msgstr "et NON authentifiée"
#. 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:2062
+#: ../src/chat_control.py:2196
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3282,102 +3294,125 @@ msgstr ""
"Chiffrement %(type)s %(status)s actif %(authenticated)s.\n"
"Votre discussion %(logged)s archivée."
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2357
msgid "Session negotiation cancelled"
msgstr "Négociation annulée"
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2367
msgid "This session WILL be archived on server"
msgstr "Cette session sera archivée sur le serveur"
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:2369
msgid "This session WILL NOT be archived on server"
msgstr "La session ne sera PAS archivée sur le serveur"
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2378
msgid "This session is encrypted"
msgstr "Cette session est chiffrée"
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2381
msgid " and WILL be logged"
msgstr " et SERA archivée"
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2383
msgid " and WILL NOT be logged"
msgstr " et NE SERA PAS archivée"
-#: ../src/chat_control.py:2236
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus de détails."
+#: ../src/chat_control.py:2388
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus "
+"de détails."
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2390
msgid "E2E encryption disabled"
msgstr "Chiffrement E2E désactivé"
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2434 ../src/chat_control.py:2447
msgid "The following message was NOT encrypted"
msgstr "Le message suivant n'a PAS été chiffré"
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2440
msgid "The following message was encrypted"
msgstr "Le message suivant n'a été chiffré"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2731
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "Vous venez de recevoir un nouveau message de \"%s\""
-#: ../src/chat_control.py:2567
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce message sera perdu."
+#: ../src/chat_control.py:2732
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
+"message sera perdu."
-#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
-#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
-#: ../src/gajim.py:159 ../src/session.py:138
+#: ../src/chat_control.py:2899 ../src/common/connection_handlers_events.py:871
+#: ../src/common/connection_handlers.py:945
+#: ../src/common/connection_handlers.py:1046
+#: ../src/common/connection_handlers.py:1703 ../src/common/connection.py:462
+#: ../src/common/logger.py:1126 ../src/gajim.py:203 ../src/session.py:97
msgid "Database Error"
msgstr "Erreur de base de données"
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2900
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+"Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer ou "
+"supprimez le (toutes les archives seront perdues)."
+
+#: ../src/chat_control.py:3136 ../src/gui_interface.py:1057
#, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer ou supprimez le (toutes les archives seront perdues)."
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"Impossible de déchiffrer le message de %s\n"
+"Il a peut-être été manipulé."
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3169
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s est maintenant %(status)s"
-#: ../src/common/check_paths.py:37
+#: ../src/common/check_paths.py:38
msgid "creating logs database"
msgstr "création de la base de donnée de l'historique"
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:86
msgid "creating cache database"
msgstr "création de la base de donnée de cache"
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
+#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
+#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
#, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s est un fichier mais devrait être un répertoire"
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
msgid "Gajim will now exit"
msgstr "Gajim va maintenant s'arrêter"
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
#, python-format
msgid "%s is a directory but should be a file"
msgstr "%s est un répertoire mais devrait être un fichier"
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:352
#, python-format
msgid "creating %s directory"
msgstr "crée le répertoire %s"
@@ -3402,6 +3437,11 @@ msgstr "Disponible pour Discuter"
msgid "Online"
msgstr "Connecté"
+#: ../src/common/commands.py:106 ../src/common/helpers.py:242
+#: ../src/tooltips.py:193
+msgid "Away"
+msgstr "Absent(e)"
+
#: ../src/common/commands.py:107
msgid "Extended away"
msgstr "Longue absence"
@@ -3441,9 +3481,9 @@ msgstr "Choisissez les groupes de discussion que vous voulez quitter"
#. Make special context menu if group is Groupchats
#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/helpers.py:60 ../src/roster_window.py:817
+#: ../src/roster_window.py:1653 ../src/roster_window.py:1655
+#: ../src/roster_window.py:2513 ../src/roster_window.py:5515
msgid "Groupchats"
msgstr "Salons de discussion"
@@ -3463,765 +3503,1216 @@ msgstr "Tous les messages non-lus ont été transmis."
msgid "Forward unread message then disconnect"
msgstr "Transférer les messages non-lus et se déconnecter"
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
msgid "Play sound when user is busy"
msgstr "Jouer les sons quand vous êtes occupé(e)"
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
msgid "Use D-Bus and Notification-Daemon to show notifications"
msgstr "Utiliser DBus et Notification-Daemon pour afficher les notifications"
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
msgid "Show only online and free for chat contacts in roster."
-msgstr "Afficher uniquement les contacts « disponible » et « Disponible pour discuter » dans le roster."
+msgstr ""
+"Afficher uniquement les contacts « disponible » et « Disponible pour "
+"discuter » dans le roster."
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
msgid "Time in minutes, after which your status changes to away."
msgstr "Temps en minutes, au bout duquel votre état basculera absent(e)."
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
msgid "$S (Away as a result of being idle more than $T min)"
msgstr "$S (Absent(e) car inactif depuis plus de $T min)"
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr "$S sera remplacé par le message de statut, $T par le temps d'auto-absence"
+msgstr ""
+"$S sera remplacé par le message de statut, $T par le temps d'auto-absence"
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
msgid "Time in minutes, after which your status changes to not available."
msgstr "Temps en minutes après lequel votre état basculera non disponible."
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
msgid "$S (Not available as a result of being idle more than $T min)"
msgstr "$S (Non disponible car inactif depuis plus de $T min)"
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr "$S sera remplacé par the message de statut, $T par le temps d'auto-idle"
+msgstr ""
+"$S sera remplacé par the message de statut, $T par le temps d'auto-idle"
-#: ../src/common/config.py:88
-#, fuzzy
-msgid "When to show notification area icon. Can be 'never', 'on_event', 'always'."
-msgstr "Quand afficher l'icône dans la zone de notifications. Peut être « never » (jamais), « on_event » (lorsqu'il y a un évènement en attente) ou « always » (toujours)"
+#: ../src/common/config.py:89
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+"Quand afficher l'icône dans la zone de notifications. Peut être \"never"
+"\" (jamais), \"on_event\" (lorsqu'il y a un évènement en attente) ou \"always"
+"\" (toujours)"
-#: ../src/common/config.py:93
+#: ../src/common/config.py:94
msgid "Incoming nickname color."
msgstr "Couleur des pseudos entrants"
-#: ../src/common/config.py:94
+#: ../src/common/config.py:95
msgid "Outgoing nickname color."
msgstr "Couleur du pseudo sortant."
-#: ../src/common/config.py:95
+#: ../src/common/config.py:96
msgid "Incoming text color."
msgstr "Couleur du texte entrant."
-#: ../src/common/config.py:96
+#: ../src/common/config.py:97
msgid "Outgoing text color."
msgstr "Couleur du texte sortant."
-#: ../src/common/config.py:97
+#: ../src/common/config.py:98
msgid "Status message text color."
msgstr "Colour des messages de statut"
-#: ../src/common/config.py:100
+#: ../src/common/config.py:101
msgid "Incoming nickname font."
msgstr "Police des pseudos entrants."
-#: ../src/common/config.py:101
+#: ../src/common/config.py:102
msgid "Outgoing nickname font."
msgstr "Police des pseudos sortants."
-#: ../src/common/config.py:102
+#: ../src/common/config.py:103
msgid "Incoming text font."
msgstr "Police du texte entrant."
-#: ../src/common/config.py:103
+#: ../src/common/config.py:104
msgid "Outgoing text font."
msgstr "Police du texte sortant."
-#: ../src/common/config.py:104
+#: ../src/common/config.py:105
msgid "Status message text font."
msgstr "Police du message de statut"
-#: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Liste (séparée par des espaces) de lignes (comptes et groupes) qui sont repliés."
+#: ../src/common/config.py:106
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (séparée par des espaces) de lignes (comptes et groupes) qui sont "
+"repliés."
#. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/config.py:107 ../src/common/config.py:494
#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:2657
msgid "default"
msgstr "Par défaut"
-#: ../src/common/config.py:112
+#: ../src/common/config.py:113
msgid "Language used by speller"
msgstr "Langue utilisée par le vérificateur orthographique"
-#: ../src/common/config.py:113
+#: ../src/common/config.py:114
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
"'never' - never print time."
msgstr ""
"'always' - afficher l'heure pour chaque message.\n"
-"'sometimes' - afficher l'heure pour chaque print_ichat_every_foo_minutes minute.\n"
+"'sometimes' - afficher l'heure pour chaque print_ichat_every_foo_minutes "
+"minute.\n"
"'never' - ne jamais afficher l'heure."
-#: ../src/common/config.py:114
-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 "Afficher l'horodatage dans les conversations à l'aide de l'« horloge approximative ». L'approximation peut prendre des valeurs comprises entre 1 (plus précis) et 4 (moins précis), ou peut être désactivée en utilisant la valeur 0. Ceci est utilisé seulement lorsque la valeur de print_time est 'sometimes'."
-
-#: ../src/common/config.py:117
-msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Traiter les paires de * / _ comme des éventuels caractères de formatage."
+#: ../src/common/config.py:115
+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 ""
+"Afficher l'horodatage dans les conversations à l'aide de l'« horloge "
+"approximative ». L'approximation peut prendre des valeurs comprises entre 1 "
+"(plus précis) et 4 (moins précis), ou peut être désactivée en utilisant la "
+"valeur 0. Ceci est utilisé seulement lorsque la valeur de print_time est "
+"'sometimes'."
#: ../src/common/config.py:118
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer les * *"
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr ""
+"Traiter les paires de * / _ comme des éventuels caractères de formatage."
-#: ../src/common/config.py:121
-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 "Utiliser la syntaxe ReStructured pour l'HTML, ainsi que du formattage ascii. Pour la syntaxe voir http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (si vous voulez utiliser cela, installez docutils)"
+#: ../src/common/config.py:119
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
+"les * *"
-#: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Caractère à ajouter après un surnom en utilisant la complétion automatique (tab) dans un salon de discussion."
+#: ../src/common/config.py:122
+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 ""
+"Utiliser la syntaxe ReStructured pour l'HTML, ainsi que du formattage ascii. "
+"Pour la syntaxe voir http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (si vous voulez utiliser cela, installez docutils)"
#: ../src/common/config.py:131
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Caractère ajouté automatiquement après un surnom s'il est déjà utilisé dans un salon de discussion."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Caractère à ajouter après un surnom en utilisant la complétion automatique "
+"(tab) dans un salon de discussion."
+
+#: ../src/common/config.py:132
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Caractère ajouté automatiquement après un surnom s'il est déjà utilisé dans "
+"un salon de discussion."
+
+#: ../src/common/config.py:150
+msgid ""
+"If true, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+"Si vrai, Gajim sauvera la position de la liste de contacts avant de la "
+"cacher et la restaurera en la faisant réapparaître"
-#: ../src/common/config.py:159
-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 "Cette option vous permet de configurer l'heure affichée dans les conversations. Par exemple \"[%H:%M] affichera \"[heure:minute] \". Voir la documentation python de strftime pour une documentation complète : http://docs.python.org/lib/module-time.html"
+#: ../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 ""
+"Cette option vous permet de configurer l'heure affichée dans les "
+"conversations. Par exemple \"[%H:%M] affichera \"[heure:minute] \". Voir la "
+"documentation python de strftime pour une documentation complète : http://"
+"docs.python.org/lib/module-time.html"
-#: ../src/common/config.py:160
+#: ../src/common/config.py:162
msgid "Characters that are printed before the nickname in conversations"
msgstr "Caractères affichés avant le surnom dans les conversations"
-#: ../src/common/config.py:161
+#: ../src/common/config.py:163
msgid "Characters that are printed after the nickname in conversations"
msgstr "Caractères affichés après le surnom dans les conversations"
-#: ../src/common/config.py:164
-msgid "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+#: ../src/common/config.py:166
+msgid ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
msgstr ""
+"Spécifie la commande a exécuter quand un nouveau courriel arrive, ex : /usr/"
+"bin/getmail -q"
-#: ../src/common/config.py:166
+#: ../src/common/config.py:168
msgid "Add * and [n] in roster title?"
msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
-#: ../src/common/config.py:167
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre de discussion est ouvert à nouveau."
-
-#: ../src/common/config.py:168
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Durée de vie en minutes des dernières lignes des conversations précédentes."
-
#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
-msgstr "Le nombre de lignes d'archives qui seront demandées en entrant dans un salon."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre "
+"de discussion est ouvert à nouveau."
#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "Le nombre de minutes d'archives qui seront demandées en entrant dans un salon."
+msgid "How many minutes should last lines from previous conversation last."
+msgstr ""
+"Durée de vie en minutes des dernières lignes des conversations précédentes."
#: ../src/common/config.py:171
-msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
-msgstr "Le nombre de secondes à attendre avant de tenter de se reconnecter automatiquement à un salon dont vous avez été déconnecté. Mettre à 0 pour désactiver."
+msgid ""
+"How many lines to request to server when entering a groupchat. -1 means no "
+"limit"
+msgstr ""
+"Le nombre de lignes d'archives qui seront demandées en entrant dans un "
+"salon. -1 signifie \"pas de limitation\""
+
+#: ../src/common/config.py:172
+msgid ""
+"How many minutes back to request logs when a entering a groupchat. -1 means "
+"no limit"
+msgstr ""
+"Le nombre de minutes d'archives qui seront demandées en entrant dans un "
+"salon. -1 signifie \"pas de limitation\""
#: ../src/common/config.py:173
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée (comportement par défaut du client ICQ de Mirabilis)."
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+"Le nombre de secondes à attendre avant de tenter de se reconnecter "
+"automatiquement à un salon dont vous avez été déconnecté. Mettre à 0 pour "
+"désactiver."
-#: ../src/common/config.py:175
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl+flèche vers le haut)."
+#: ../src/common/config.py:174
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
-#: ../src/common/config.py:178
-#, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Soit une url personnalisée contenant %s où %s est le mot/la phrase, soit \"WIKTIONARY\", ce qui signifie l'utilisation de wikitionary."
+#: ../src/common/config.py:175
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée "
+"(comportement par défaut du client ICQ de Mirabilis)."
-#: ../src/common/config.py:181
-msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-remote."
+#: ../src/common/config.py:177
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr ""
+"Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl"
+"+flèche vers le haut)."
-#: ../src/common/config.py:182
-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 "Si Vrai, utiliser les signaux D-Bus de NetworkManager et modifier automatiquement l'état des comptes (en autant que listen_to_network_manager n'est pas désactivé et qu'ils soient synchronisés à l'état global)."
+#: ../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 ""
+"Soit une url personnalisée contenant %s où %s est le mot/la phrase, soit "
+"\"WIKTIONARY\", ce qui signifie l'utilisation de wikitionary."
#: ../src/common/config.py:183
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Notifications d'états envoyées. Peut être all, composing_only ou disabled."
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-"
+"remote."
#: ../src/common/config.py:184
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Notifications d'états affichées dans les fenêtres de conversations. Peut être all, composing_only ou disabled."
+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 ""
+"Si Vrai, utiliser les signaux D-Bus de NetworkManager et modifier "
+"automatiquement l'état des comptes (en autant que listen_to_network_manager "
+"n'est pas désactivé et qu'ils soient synchronisés à l'état global)."
-#: ../src/common/config.py:186
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Au lieu d'afficher l'heure à chaque message (print_time==sometimes), l'afficher toutes les x minutes."
+#: ../src/common/config.py:185
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Notifications d'états envoyées. Peut être all, composing_only ou disabled."
-#: ../src/common/config.py:187
-msgid "Ask before closing a group chat tab/window."
-msgstr "Demander avant de fermer un onglet ou une fenêtre de discussion de salon."
+#: ../src/common/config.py:186
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Notifications d'états affichées dans les fenêtres de conversations. Peut "
+"être all, composing_only ou disabled."
#: ../src/common/config.py:188
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Toujours demander avant de fermer les onglets/fenêtres de salons de cette liste séparés par des espaces."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Au lieu d'afficher l'heure à chaque message (print_time==sometimes), "
+"l'afficher toutes les x minutes."
#: ../src/common/config.py:189
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Ne jamais demander avant de fermer onglets/fenêtres des salons de cette liste séparées par des espaces."
+msgid "Ask before closing a group chat tab/window."
+msgstr ""
+"Demander avant de fermer un onglet ou une fenêtre de discussion de salon."
#: ../src/common/config.py:190
-msgid "Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)"
-msgstr "Demander avant de fermer une fenêtre contenant des onglets si des données peuvent être perdues (conversations, conversations privées, salons qui se seront pas minimisés)"
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Toujours demander avant de fermer les onglets/fenêtres de salons de cette "
+"liste séparés par des espaces."
-#: ../src/common/config.py:193
-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 "Liste séparées par des espaces d'hôtes que nous envoyons, en plus des interfaces locales, pour les transferts de fichiers dans le cas de traduction d'adresse / redirection de port."
+#: ../src/common/config.py:191
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Ne jamais demander avant de fermer onglets/fenêtres des salons de cette "
+"liste séparées par des espaces."
+
+#: ../src/common/config.py:192
+msgid ""
+"Ask before closing tabbed chat window if there are control that can loose "
+"data (chat, private chat, groupchat that will not be minimized)"
+msgstr ""
+"Demander avant de fermer une fenêtre contenant des onglets si des données "
+"peuvent être perdues (conversations, conversations privées, salons qui se "
+"seront pas minimisés)"
#: ../src/common/config.py:195
+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 ""
+"Liste séparées par des espaces d'hôtes que nous envoyons, en plus des "
+"interfaces locales, pour les transferts de fichiers dans le cas de "
+"traduction d'adresse / redirection de port."
+
+#: ../src/common/config.py:197
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "D'après le standard IEC, KiB = 1024 bytes, KB = 1000 bytes."
-#: ../src/common/config.py:197
-#, fuzzy
+#: ../src/common/config.py:199
msgid "Notify of events in the notification area."
msgstr "M'alerter à l'aide de l'icône dans la zone de notifications."
-#: ../src/common/config.py:203
+#: ../src/common/config.py:205
msgid "Show tab when only one conversation?"
msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
-#: ../src/common/config.py:204
+#: ../src/common/config.py:206
msgid "Show tabbed notebook border in chat windows?"
msgstr "Afficher la bordure fenêtres de discussion à onglets ?"
-#: ../src/common/config.py:205
+#: ../src/common/config.py:207
msgid "Show close button in tab?"
msgstr "Afficher le bouton fermer sur l'onglet ?"
-#: ../src/common/config.py:206
-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 "Une list de groupe de modp à utiliser dans un Diffie-Hellman, préférence la plus haute en premier, séparée par des virgules. Les groupes valides sont 1, 2, 5, 14, 15, 16, 17 et 18. Les chiffres les plus grands sont plus sécurisés, mais prennent plus de temps pour le calcul quand vous commencez une session."
-
-#: ../src/common/config.py:215
+#: ../src/common/config.py:208
+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 ""
+"Une list de groupe de modp à utiliser dans un Diffie-Hellman, préférence la "
+"plus haute en premier, séparée par des virgules. Les groupes valides sont 1, "
+"2, 5, 14, 15, 16, 17 et 18. Les chiffres les plus grands sont plus "
+"sécurisés, mais prennent plus de temps pour le calcul quand vous commencez "
+"une session."
+
+#: ../src/common/config.py:217
msgid "Preview new messages in notification popup?"
msgstr "Aperçu des nouveaux messages dans un popup ?"
-#: ../src/common/config.py:220
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Une liste de mots séparés par des points-virgules qui seront mis en surbrillance dans les salons."
-
-#: ../src/common/config.py:221
-#, fuzzy
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if notification icon is used."
-msgstr "Si vrai, quitte Gajim quand on clique sur le bouton X du gestionnaire de fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de notification est utilisée."
-
#: ../src/common/config.py:222
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Si vrai, Gajim vérifiera qu'il est le client Jabber par défaut à chaque démarrage."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Une liste de mots séparés par des points-virgules qui seront mis en "
+"surbrillance dans les salons."
#: ../src/common/config.py:223
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages non lus. En fonction du thème, cette icône peut être animée."
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if notification icon is used."
+msgstr ""
+"Si vrai, quitte Gajim quand on clique sur le bouton X du gestionnaire de "
+"fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de "
+"notification est utilisée."
#: ../src/common/config.py:224
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Si Vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom de chaque contact dans la liste des contacts."
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Si vrai, Gajim vérifiera qu'il est le client Jabber par défaut à chaque "
+"démarrage."
-#: ../src/common/config.py:230
-msgid "Define the position of the avatar in roster. Can be left or right"
-msgstr "Définir la position de l'avatar dans le roster. Peut être à droite (right) ou à gauche (left)."
+#: ../src/common/config.py:225
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages "
+"non lus. En fonction du thème, cette icône peut être animée."
-#: ../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 "Si Vrai demandera son avatar à chaque contact qui n'en avait pas la fois précédente ou dont la version en cache a expiré."
+#: ../src/common/config.py:226
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Si Vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom "
+"de chaque contact dans la liste des contacts."
#: ../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 "Si Faux, vous ne verrez plus les lignes d'état dans les conversations quand un contact modifie son état et/ou son message d'état."
+msgid "Define the position of the avatar in roster. Can be left or right"
+msgstr ""
+"Définir la position de l'avatar dans le roster. Peut être à droite (right) "
+"ou à gauche (left)."
#: ../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 "peut être \"none\", \"all\" ou \"in_and_out\". Si c'est \"none\", Gajim n'affichera plus les lignes d'état dans les salons de discussion lorsqu'un participant change son état et/ou son message d'état. Si c'est \"all\", Gajim affichera tous les messages d'état. Si c'est \"in_and_out\", Gajim affichera seulement « TRUC vient de rejoindre/quitter le groupe de discussion »."
+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 ""
+"Si Vrai demandera son avatar à chaque contact qui n'en avait pas la fois "
+"précédente ou dont la version en cache a expiré."
+
+#: ../src/common/config.py:234
+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 ""
+"Si Faux, vous ne verrez plus les lignes d'état dans les conversations quand "
+"un contact modifie son état et/ou son message d'état."
#: ../src/common/config.py:235
-msgid "Background color of contacts when they just signed in."
-msgstr "Couleur d'arrière-plan des contacts lorsqu'ils viennent de se connecter."
+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 ""
+"peut être \"none\", \"all\" ou \"in_and_out\". Si c'est \"none\", Gajim "
+"n'affichera plus les lignes d'état dans les salons de discussion lorsqu'un "
+"participant change son état et/ou son message d'état. Si c'est \"all\", "
+"Gajim affichera tous les messages d'état. Si c'est \"in_and_out\", Gajim "
+"affichera seulement « TRUC vient de rejoindre/quitter le groupe de "
+"discussion »."
-#: ../src/common/config.py:236
-msgid "Background color of contacts when they just signed out."
-msgstr "Couleur d'arrière-plan des contacts lorsqu'ils viennent de se déconnecter."
+#: ../src/common/config.py:237
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
#: ../src/common/config.py:238
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Si Vrai, les messages restaurés utiliseront une police de texte plus petite que la normale."
+msgid "Background color of contacts when they just signed in."
+msgstr ""
+"Couleur d'arrière-plan des contacts lorsqu'ils viennent de se connecter."
#: ../src/common/config.py:239
+msgid "Background color of contacts when they just signed out."
+msgstr ""
+"Couleur d'arrière-plan des contacts lorsqu'ils viennent de se déconnecter."
+
+#: ../src/common/config.py:241
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Si Vrai, les messages restaurés utiliseront une police de texte plus petite "
+"que la normale."
+
+#: ../src/common/config.py:242
msgid "Don't show avatar for the transport itself."
msgstr "Ne pas afficher d'avatars particuliers pour les passerelles."
-#: ../src/common/config.py:240
+#: ../src/common/config.py:243
msgid "Don't show roster in the system taskbar."
msgstr "Ne pas afficher d'icône dans la barre des tâches."
-#: ../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 "Si Vrai et que les versions de GTK+ et PyGTK sont au moins 2.8, fait clignoter (comportement par défaut dans la plupart des gestionnaires de fenêtres) la fenêtre quand elle contient des événements non lus."
+#: ../src/common/config.py:244
+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 ""
+"Si Vrai et que les versions de GTK+ et PyGTK sont au moins 2.8, fait "
+"clignoter (comportement par défaut dans la plupart des gestionnaires de "
+"fenêtres) la fenêtre quand elle contient des événements non lus."
-#: ../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 n'aime pas l'information sha quand on rejoint un salon protégé par un mot de passe. Passez cette option à Faux pour ne plus envoyer l'information sha dans les salons."
+#: ../src/common/config.py:246
+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 n'aime pas l'information sha quand on rejoint un salon protégé "
+"par un mot de passe. Passez cette option à Faux pour ne plus envoyer "
+"l'information sha dans les salons."
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:249
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 ""
"Contrôle la fenêtre dans laquelle sont placées les nouvelles conversations.\n"
"'always' - Toutes les conversations dans une unique fenêtre.\n"
-"'always_with_roster' - Comme 'always' mais les conversations sont dans une unique fenêtre avec le roster.\n"
+"'always_with_roster' - Comme 'always' mais les conversations sont dans une "
+"unique fenêtre avec le roster.\n"
"'peracct' - Toutes les conversations d'un même compte dans la même fenêtre.\n"
-"'pertype' - Toutes les conversations d'un même type (discussion, salon) dans la même fenêtre."
+"'pertype' - Toutes les conversations d'un même type (discussion, salon) dans "
+"la même fenêtre."
-#: ../src/common/config.py:247
+#: ../src/common/config.py:250
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+"Montrer la liste de contacts au démarrage.\n"
+"'always' - Toujours montrer.\n"
+"'never' - Jamais montrer.\n"
+"'last_state' - Restaurer le dernier état."
+
+#: ../src/common/config.py:251
msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Si Faux, vous ne verrez plus les avatars dans les fenêtres de conversation."
+msgstr ""
+"Si Faux, vous ne verrez plus les avatars dans les fenêtres de conversation."
-#: ../src/common/config.py:248
+#: ../src/common/config.py:252
msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Si Vrai, appuyer sur la touche d'échappement fermera l'onglet ou la fenêtre de conversation."
+msgstr ""
+"Si Vrai, appuyer sur la touche d'échappement fermera l'onglet ou la fenêtre "
+"de conversation."
-#: ../src/common/config.py:249
+#: ../src/common/config.py:253
msgid "Hides the buttons in chat windows."
msgstr "Cacher les boutons dans les fenêtres de conversations."
-#: ../src/common/config.py:250
+#: ../src/common/config.py:254
msgid "Hides the banner in a group chat window"
msgstr "Cacher les boutons dans la fenêtre de discussion"
-#: ../src/common/config.py:251
+#: ../src/common/config.py:255
msgid "Hides the banner in two persons chat window"
msgstr "Cache la bannière dans les fenêtres de discussions"
-#: ../src/common/config.py:252
+#: ../src/common/config.py:256
msgid "Hides the group chat occupants list in group chat window."
-msgstr "Cache la liste des occupants du salon dans les fenêtres des salons de discussion."
+msgstr ""
+"Cache la liste des occupants du salon dans les fenêtres des salons de "
+"discussion."
-#: ../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 "Dans une conversation, affiche le surnom au début d'une ligne seulement lorsque ce n'est pas la même personne qui a écrit le dernier message."
+#: ../src/common/config.py:257
+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 ""
+"Dans une conversation, affiche le surnom au début d'une ligne seulement "
+"lorsque ce n'est pas la même personne qui a écrit le dernier message."
-#: ../src/common/config.py:254
+#: ../src/common/config.py:258
msgid "Indentation when using merge consecutive nickname."
msgstr "Indentation lors du fusionnement d'un surnom répété."
-#: ../src/common/config.py:255
+#: ../src/common/config.py:259
msgid "Smooth scroll message in conversation window"
msgstr "Défilement doux dans la fenêtre de conversation"
-#: ../src/common/config.py:256
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "Liste des couleurs, séparées par « : », qui seront utilisées pour colorier les surnoms dans les salons de discussion."
-
-#: ../src/common/config.py:257
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Ctrl-Tab pour basculer au prochain onglet lorsqu'aucun d'entre eux n'a de nouveaux messages non lus."
-
-#: ../src/common/config.py:258
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Doit-on afficher le dialogue de confirmation de la création de métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais affiché."
-
-#: ../src/common/config.py:259
-msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
-msgstr "Doit-on afficher le dialogue de confirmation de bloquage d'un contact ? Une valeur vide fera en sorte que le dialogue ne soit jamais affiché."
-
#: ../src/common/config.py:260
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
-msgstr "Doit-on afficher le dialogue de confirmation de l'envoi de statut personnalisé ? Une valeur vide fera en sorte que le dialogue ne soit jamais affiché."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Liste des couleurs, séparées par « : », qui seront utilisées pour colorier "
+"les surnoms dans les salons de discussion."
#: ../src/common/config.py:261
-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 "Si Vrai, vous serez en mesure de spécifier une priorité négative à votre compte dans la fenêtre de gestion de comptes. ATTENTION, lorsque vous êtes connecté avec une priorité négative, vous ne recevrez AUCUN message en provenance de votre serveur."
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr ""
+"Ctrl-Tab pour basculer au prochain onglet lorsqu'aucun d'entre eux n'a de "
+"nouveaux messages non lus."
#: ../src/common/config.py:262
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Si vrai, Gajim va utiliser Gnome Keyring (s'il est disponible) pour stocker les mots de passe des comptes."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Doit-on afficher le dialogue de confirmation de la création de "
+"métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
+"affiché."
#: ../src/common/config.py:263
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "Si vrai, Gajim va utiliser KDE Wallet (si kwalletcli est disponible) pour stocker les mots de passe des comptes."
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Doit-on afficher le dialogue de confirmation de bloquage d'un contact ? Une "
+"valeur vide fera en sorte que le dialogue ne soit jamais affiché."
#: ../src/common/config.py:264
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Si vrai, Gajim montrera le nombre de contacts connectés et totaux sur les lignes de groupe et de compte"
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Doit-on afficher le dialogue de confirmation de l'envoi de statut "
+"personnalisé ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
+"affiché."
#: ../src/common/config.py:265
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Peut être vide, 'chat' ou 'normal'. Si non vide, traite tous les messages entrant comme des messages de ce type"
+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 ""
+"Si Vrai, vous serez en mesure de spécifier une priorité négative à votre "
+"compte dans la fenêtre de gestion de comptes. ATTENTION, lorsque vous êtes "
+"connecté avec une priorité négative, vous ne recevrez AUCUN message en "
+"provenance de votre serveur."
#: ../src/common/config.py:266
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
-msgstr "Si Activé, Gajim scrollera et sélectionnera le contact qui vous a envoyé le dernier message, si la fenêtre de conversation n'est pas déjà ouverte."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Si vrai, Gajim va utiliser Gnome Keyring (s'il est disponible) pour stocker "
+"les mots de passe des comptes."
#: ../src/common/config.py:267
-msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
-msgstr "Si Activé, Gajim convertira les chaines de caractères entre $$ et $$ en une image, en utilisant dvips et convert avant de l'insérer dans la fenêtre de conversation."
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Si vrai, Gajim va utiliser KDE Wallet (si kwalletcli est disponible) pour "
+"stocker les mots de passe des comptes."
#: ../src/common/config.py:268
-msgid "Time of inactivity needed before the change status window closes down."
-msgstr "Temps d'inactivité nécessaire pour que la fenêtre de changement de statut se faire."
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Si vrai, Gajim montrera le nombre de contacts connectés et totaux sur les "
+"lignes de groupe et de compte"
#: ../src/common/config.py:269
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
-msgstr "Nombre maximum de lignes affichées dans les conversations. Les lignes les plus vieilles sont effacées."
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Peut être vide, 'chat' ou 'normal'. Si non vide, traite tous les messages "
+"entrant comme des messages de ce type"
#: ../src/common/config.py:270
-#, fuzzy
-msgid "If True, notification windows from notification-daemon will be attached to notification icon."
-msgstr "Si Activé, les fenêtres de notification du notification-daemon seront attachées à l'icône du Tray."
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Si Activé, Gajim scrollera et sélectionnera le contact qui vous a envoyé le "
+"dernier message, si la fenêtre de conversation n'est pas déjà ouverte."
#: ../src/common/config.py:271
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Choisissez l'intervalle en secondes entre deux vérifications de l'inactivité."
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Si Activé, Gajim convertira les chaines de caractères entre $$ et $$ en une "
+"image, en utilisant dvips et convert avant de l'insérer dans la fenêtre de "
+"conversation."
#: ../src/common/config.py:272
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
-msgstr "Modifiez la valeur pour changer la taille des formules latex affichées. Plus la valeur est grande, plus la taille l'est."
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+"Temps d'inactivité nécessaire pour que la fenêtre de changement de statut se "
+"faire."
#: ../src/common/config.py:273
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
-msgstr "Schémas d'uri valides. Seuls les schémas dans cette liste seront acceptés comment « vraies » uri. (mailto et xmpp sont gérés séparément)"
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Nombre maximum de lignes affichées dans les conversations. Les lignes les "
+"plus vieilles sont effacées."
#: ../src/common/config.py:274
-msgid "Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!"
-msgstr "Demander le message de statut à tous les contacts hors-ligne lorsque la connexion à un compte est établie. ATTENTION : cela provoque l'envoie de nombreuses requêtes !"
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
+msgstr ""
+"Si Activé, les fenêtres de notification du notification-daemon seront "
+"attachées à l'icône du Tray."
#: ../src/common/config.py:275
-msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr "Si Vrai, la complétion dans les salons sera similaire à celle d'un shell"
+msgid "Choose interval between 2 checks of idleness."
+msgstr ""
+"Choisissez l'intervalle en secondes entre deux vérifications de l'inactivité."
#: ../src/common/config.py:276
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
-msgstr "Quand doit-on s'afficher dans notre propre roster ? Peut être « always » (toujours), « when_other_resource » (quand d'autres ressources sont connectées) ou « never » (jamais)"
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+"Modifiez la valeur pour changer la taille des formules latex affichées. Plus "
+"la valeur est grande, plus la taille l'est."
-#: ../src/common/config.py:281
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: ../src/common/config.py:277
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
msgstr ""
+"Schémas d'uri valides. Seuls les schémas dans cette liste seront acceptés "
+"comment « vraies » uri. (mailto et xmpp sont gérés séparément)"
-#: ../src/common/config.py:282
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: ../src/common/config.py:278
+msgid ""
+"Ask offline status message to all offline contacts when connection to an "
+"accoutn is established. WARNING: This causes a lot of requests to be sent!"
+msgstr ""
+"Demander le message de statut à tous les contacts hors-ligne lorsque la "
+"connexion à un compte est établie. ATTENTION : cela provoque l'envoie de "
+"nombreuses requêtes !"
+
+#: ../src/common/config.py:279
+msgid "If True, completion in groupchats will be like a shell auto-completion"
msgstr ""
+"Si Vrai, la complétion dans les salons sera similaire à celle d'un shell"
+
+#: ../src/common/config.py:280
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+"Quand doit-on s'afficher dans notre propre roster ? Peut être « always "
+"» (toujours), « when_other_resource » (quand d'autres ressources sont "
+"connectées) ou « never » (jamais)"
#: ../src/common/config.py:285
-msgid "If True, Gajim will try to use a STUN server when using jingle. The one in \"stun_server\" option, or the one given by the jabber server."
+msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
msgstr ""
#: ../src/common/config.py:286
-msgid "STUN server to use when using jingle"
+msgid "Optionally resize jingle output video. Example: 320x240"
+msgstr ""
+
+#: ../src/common/config.py:289
+msgid ""
+"If True, Gajim will try to use a STUN server when using jingle. The one in "
+"\"stun_server\" option, or the one given by the jabber server."
msgstr ""
+"Si vrai, Gajim essaiera d'utiliser un serveur STUN lors de l'utilisation de "
+"jingle. Celui défini dans l'option \"stun_server\", ou celui donné par le "
+"serveur jabber."
-#: ../src/common/config.py:287
-msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
+#: ../src/common/config.py:290
+msgid "STUN server to use when using jingle"
+msgstr "Serveur STUN a utiliser avec jingle"
+
+#: ../src/common/config.py:291
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
msgstr ""
-#: ../src/common/config.py:300
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "La priorité va changer automatiquement selon votre état. Les priorités sont définies dans les options autopriority_*."
+#: ../src/common/config.py:304
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"La priorité va changer automatiquement selon votre état. Les priorités sont "
+"définies dans les options autopriority_*."
-#: ../src/common/config.py:308
-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 "Statut sous lequel se connecter automatiquement. Peut être online (En ligne), chat (Disponible pour discuter), away (Absent(e)), xa (indisponible), dnd (Occupé(e)) ou Invisible. NOTE : cette option n'est utilisée que si l'option restore_last_status est désactivée"
+#: ../src/common/config.py:312
+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 ""
+"Statut sous lequel se connecter automatiquement. Peut être online (En "
+"ligne), chat (Disponible pour discuter), away (Absent(e)), xa "
+"(indisponible), dnd (Occupé(e)) ou Invisible. NOTE : cette option n'est "
+"utilisée que si l'option restore_last_status est désactivée"
-#: ../src/common/config.py:309
+#: ../src/common/config.py:313
msgid "If enabled, restore the last status that was used."
msgstr "Si activé, restaure le dernier statut qui était utilisé."
-#: ../src/common/config.py:311
-msgid "If True, Contacts requesting authorization will be automatically accepted."
-msgstr "Si Vrai, les demandes d'autorisation de contact seront automatiquement acceptées."
+#: ../src/common/config.py:315
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+"Si Vrai, les demandes d'autorisation de contact seront automatiquement "
+"acceptées."
-#: ../src/common/config.py:312
-msgid "If False, this account will be disabled and will not appear in roster window."
-msgstr "Si Faux, ce compte sera désactivé et n'apparaîtra plus dans votre roster."
+#: ../src/common/config.py:316
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Si Faux, ce compte sera désactivé et n'apparaîtra plus dans votre roster."
-#: ../src/common/config.py:315
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr "Si désactivé, ne pas signaler les présences avec une clef GPG, même si GPG est configuré."
+#: ../src/common/config.py:319
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+"Si désactivé, ne pas signaler les présences avec une clef GPG, même si GPG "
+"est configuré."
-#: ../src/common/config.py:317
+#: ../src/common/config.py:321
msgid "Enable ESessions encryption for this account."
msgstr "Activer le chiffrage ESessions pour ce compte."
-#: ../src/common/config.py:318
+#: ../src/common/config.py:322
msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr "Gajim doit-il commencer automatiquement une discussion chiffrée quand cela est possible ?"
+msgstr ""
+"Gajim doit-il commencer automatiquement une discussion chiffrée quand cela "
+"est possible ?"
-#: ../src/common/config.py:319
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Liste ordonnée de types de connexion, séparés par des virgules, à essayer. Peut contenir tls, ssl ou plain."
+#: ../src/common/config.py:323
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Liste ordonnée de types de connexion, séparés par des virgules, à essayer. "
+"Peut contenir tls, ssl ou plain."
-#: ../src/common/config.py:320
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "Afficher un message d'avertissement avant d'envoyer un mot de passe via une connexion non-chiffrée."
+#: ../src/common/config.py:324
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+"Afficher un message d'avertissement avant d'envoyer un mot de passe via une "
+"connexion non-chiffrée."
-#: ../src/common/config.py:321
+#: ../src/common/config.py:325
msgid "Show a warning dialog before using standard SSL library."
-msgstr "Afficher un message d'avertissement avant d'utiliser la librairie SSL standard."
+msgstr ""
+"Afficher un message d'avertissement avant d'utiliser la librairie SSL "
+"standard."
-#: ../src/common/config.py:322
+#: ../src/common/config.py:326
#, fuzzy
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
-msgstr "Afficher un message d'avertissement avant d'envoyer un mot de passe via une connexion non-chiffrée."
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain connection."
+msgstr ""
+"Afficher un message d'avertissement avant d'envoyer un mot de passe via une "
+"connexion non-chiffrée."
-#: ../src/common/config.py:324
+#: ../src/common/config.py:328
msgid "Space separated list of ssl errors to ignore."
msgstr "Liste d'erreurs ssl, séparées par une virgule, à ignorer."
-#: ../src/common/config.py:333
+#: ../src/common/config.py:337
msgid "Whitespace sent after inactivity"
msgstr "Espace envoyée après inactivité"
-#: ../src/common/config.py:334
+#: ../src/common/config.py:338
msgid "XMPP ping sent after inactivity"
msgstr "ping XMPP envoyé après inactivité"
-#: ../src/common/config.py:338
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
-msgstr "Nombre de secondes d'attente pour la réponse du Paquet d'Entretien de Connexion avant de tenter de se connecter."
+#: ../src/common/config.py:342
+msgid ""
+"How many seconds to wait for the answer of ping alive packet before we try "
+"to reconnect."
+msgstr ""
+"Nombre de secondes d'attente pour la réponse du Paquet d'Entretien de "
+"Connexion avant de tenter de se connecter."
#. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:346
msgid "Jabberd2 workaround"
msgstr "Contournement de bug de jabberd2"
-#: ../src/common/config.py:345
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Si cette case est cochée, Gajim utilisera votre IP et les proxies définis dans l'option file_transfer_proxies pour les transferts de fichiers."
+#: ../src/common/config.py:349
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Si cette case est cochée, Gajim utilisera votre IP et les proxies définis "
+"dans l'option file_transfer_proxies pour les transferts de fichiers."
-#: ../src/common/config.py:359
+#: ../src/common/config.py:363
msgid "Answer to receipt requests"
msgstr "Répondre aux demandes d'accusés de réception"
-#: ../src/common/config.py:360
+#: ../src/common/config.py:364
msgid "Sent receipt requests"
msgstr "Envoyer des demandes d'accusés de réception"
-#: ../src/common/config.py:370
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Durant la négociation d'une session chiffrée, Gajim doit-il partir du principe que vous voulez archiver vos conversations ?"
-
#: ../src/common/config.py:373
-#, fuzzy
-msgid "Message that is sent to contacts you want to add"
-msgstr "Remplissez les informations sur le contact à ajouter"
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr ""
+"Si cette case est cochée, Gajim autorisera les autres à détecter le système "
+"d'exploitation que vous utilisez"
#: ../src/common/config.py:374
-msgid "Last time we syncronized with logs from server."
+msgid "Allow Gajim to send your local time."
+msgstr "Autorise Gajim à envoyer votre heure."
+
+#: ../src/common/config.py:375
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
msgstr ""
+"Durant la négociation d'une session chiffrée, Gajim doit-il partir du "
+"principe que vous voulez archiver vos conversations ?"
+
+#: ../src/common/config.py:378
+msgid "Message that is sent to contacts you want to add"
+msgstr "Message à envoyer aux contacts que vous souhaitez ajouter"
-#: ../src/common/config.py:436
+#: ../src/common/config.py:379
+msgid "Last time we syncronized with logs from server."
+msgstr "Date de la dernière synchronisation des logs avec le serveur."
+
+#: ../src/common/config.py:441
msgid "Is OpenPGP enabled for this contact?"
msgstr "Est-ce que OpenPGP est activé pour ce contact ?"
-#: ../src/common/config.py:437
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
-msgstr "Gajim doit-il commencer automatiquement une discussion chiffrée avec ce contact quand cela est possible ?"
+#: ../src/common/config.py:442
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+"Gajim doit-il commencer automatiquement une discussion chiffrée avec ce "
+"contact quand cela est possible ?"
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:443 ../src/common/config.py:446
msgid "Language for which we want to check misspelled words"
msgstr "Langue dans laquelle faire la vérification orthographique"
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "tous ou par état (séparé par des espaces)"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' ou 'both'"
-
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' ou ''"
-
-#: ../src/common/config.py:460
-msgid "State whether plugins should be activated on exit (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead."
+#: ../src/common/config.py:449
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
msgstr ""
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:454 ../src/common/pep.py:157
msgid "Sleeping"
msgstr "Dort"
-#: ../src/common/config.py:466
+#: ../src/common/config.py:455
msgid "Back soon"
msgstr "Bientôt de retour"
-#: ../src/common/config.py:466
+#: ../src/common/config.py:455
msgid "Back in some minutes."
msgstr "De retour dans quelques minutes."
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:456 ../src/common/pep.py:127
msgid "Eating"
msgstr "Mange"
-#: ../src/common/config.py:467
+#: ../src/common/config.py:456
msgid "I'm eating, so leave me a message."
msgstr "Je mange, donc laissez moi un message."
-#: ../src/common/config.py:468
+#: ../src/common/config.py:457
msgid "Movie"
msgstr "Film"
-#: ../src/common/config.py:468
+#: ../src/common/config.py:457
msgid "I'm watching a movie."
msgstr "Je regarde un film."
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:458 ../src/common/pep.py:186
msgid "Working"
msgstr "Travaille"
-#: ../src/common/config.py:469
+#: ../src/common/config.py:458
msgid "I'm working."
msgstr "Je travaille."
-#: ../src/common/config.py:470
+#: ../src/common/config.py:459
msgid "Phone"
msgstr "Téléphone"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:459
msgid "I'm on the phone."
msgstr "Je suis au téléphone."
-#: ../src/common/config.py:471
+#: ../src/common/config.py:460
msgid "Out"
msgstr "Dehors"
-#: ../src/common/config.py:471
+#: ../src/common/config.py:460
msgid "I'm out enjoying life."
msgstr "Je suis sorti profiter de la vie."
-#: ../src/common/config.py:482
+#: ../src/common/config.py:471
msgid "I'm available."
msgstr "Disponible"
-#: ../src/common/config.py:483
+#: ../src/common/config.py:472
msgid "I'm free for chat."
msgstr "Disponible pour discuter"
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:473 ../src/config.py:1609
msgid "Be right back."
msgstr "Revient de suite."
-#: ../src/common/config.py:485
+#: ../src/common/config.py:474
msgid "I'm not available."
msgstr "Non disponible"
-#: ../src/common/config.py:486
+#: ../src/common/config.py:475
msgid "Do not disturb."
msgstr "Ne pas déranger."
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:476 ../src/common/config.py:477
msgid "Bye!"
msgstr "Au revoir !"
-#: ../src/common/config.py:498
-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 "Son à jouer lorsqu'un message de salon contient un des mots de muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
+#: ../src/common/config.py:487
+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 ""
+"Son à jouer lorsqu'un message de salon contient un des mots de "
+"muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
-#: ../src/common/config.py:499
+#: ../src/common/config.py:488
msgid "Sound to play when any MUC message arrives."
msgstr "Son émis lors de l'arrivée d'un message de salon de discussion."
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:497 ../src/common/optparser.py:308
msgid "green"
msgstr "vert"
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:501 ../src/common/optparser.py:294
msgid "grocery"
msgstr "épicerie"
-#: ../src/common/config.py:516
+#: ../src/common/config.py:505
msgid "human"
msgstr "Humain"
-#: ../src/common/config.py:520
+#: ../src/common/config.py:509
msgid "marine"
msgstr "Marine"
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+#: ../src/common/connection_handlers_events.py:355
+#, 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 ""
+"L'identifiant Jabber %s ne respecte pas la norme RFC. Il ne sera pas ajouté "
+"Ã votre liste de contacts. Utilisez un outil de gestion de liste de contact "
+"tel que http://jru.jabberstudio.org pour le supprimer"
+
+#: ../src/common/connection_handlers_events.py:784
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "Requête de désinscription de la part de %s"
+
+#: ../src/common/connection_handlers_events.py:868
+#: ../src/common/connection_handlers.py:339
+#: ../src/common/connection_handlers.py:943
+#: ../src/common/connection_handlers.py:1044
+#: ../src/common/connection_handlers.py:1701 ../src/common/connection.py:459
+#: ../src/common/logger.py:1124 ../src/gajim.py:385
+msgid "Disk Write Error"
+msgstr "Erreur d'Écriture du disque"
+
+#: ../src/common/connection_handlers_events.py:872
+#: ../src/common/connection_handlers.py:946
+#: ../src/common/connection_handlers.py:1047
+#: ../src/common/connection_handlers.py:1704 ../src/common/connection.py:463
+#: ../src/common/logger.py:1127 ../src/gajim.py:204 ../src/session.py:98
+#, 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 ""
+"Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer "
+"(voir http://trac.gajim.org/wiki/DatabaseBackup) ou supprimez le (toutes les "
+"archives seront perdues)."
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:893
+msgid "Room has been destroyed"
+msgstr "Le salon de discussion a été détruit"
+
+#: ../src/common/connection_handlers_events.py:901
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Vous pouvez rejoindre le salon %s à la place"
+
+#: ../src/common/connection_handlers_events.py:974
+#: ../src/common/connection.py:258 ../src/config.py:2102 ../src/config.py:2111
+#: ../src/config.py:2179 ../src/config.py:3608 ../src/dataforms_widget.py:623
+#: ../src/dialogs.py:3049
+msgid "Invalid Jabber ID"
+msgstr "Identifiant Jabber invalide"
+
+#: ../src/common/connection_handlers_events.py:975
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Un message d'un JID invalide a été reçu, il a été ignoré."
+
+#: ../src/common/connection_handlers_events.py:1423
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Erreur SSL inconnue : %d"
+
+#. single message
+#: ../src/common/connection_handlers_events.py:1947 ../src/dialogs.py:2741
+#: ../src/notify.py:194 ../src/notify.py:423
+msgid "New Single Message"
+msgstr "Nouveau message simple"
+
+#: ../src/common/connection_handlers_events.py:1949 ../src/notify.py:196
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nouveau message simple de %(nickname)s"
+
+#. private message
+#: ../src/common/connection_handlers_events.py:1952 ../src/dialogs.py:2742
+#: ../src/notify.py:200 ../src/notify.py:424
+msgid "New Private Message"
+msgstr "Nouveau message privé"
+
+#: ../src/common/connection_handlers_events.py:1954 ../src/notify.py:203
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nouveau message privé dans le salon %s"
+
+#: ../src/common/connection_handlers_events.py:1957 ../src/notify.py:205
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s : %(message)s"
+
+#: ../src/common/connection_handlers_events.py:1960 ../src/notify.py:208
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Message de %(nickname)s"
+
+#. chat message
+#: ../src/common/connection_handlers_events.py:1963 ../src/dialogs.py:2741
+#: ../src/notify.py:212 ../src/notify.py:423
+msgid "New Message"
+msgstr "Nouveau message"
+
+#: ../src/common/connection_handlers_events.py:1965 ../src/notify.py:214
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nouveau message de %(nickname)s"
+
+#: ../src/common/connection_handlers.py:95
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
msgid "Unable to load idle module"
msgstr "Impossible de charger le module d'inactivité"
-#: ../src/common/connection_handlers.py:127
+#: ../src/common/connection_handlers.py:128
#, python-format
msgid "Registration information for transport %s has not arrived in time"
-msgstr "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à temps"
+msgstr ""
+"L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
+"temps"
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
msgid "Registration succeeded"
msgstr "L'inscription a réussi"
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
#, python-format
msgid "Registration with agent %s succeeded"
msgstr "Enregistrement avec l'agent %s réussi"
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
msgid "Registration failed"
msgstr "L'inscription a échoué"
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
#, python-format
-msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr "L'enregistrement avec l'agent %(agent)s a échoué avec l'erreur %(error)s : %(error_msg)s"
-
-#: ../src/common/connection_handlers.py:466
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "Erreur d'Écriture du disque"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"L'enregistrement avec l'agent %(agent)s a échoué avec l'erreur %(error)s : "
+"%(error_msg)s"
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:564 ../src/common/connection.py:1520
msgid "Invisibility not supported"
msgstr "Invisibilité non-supportée"
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:565 ../src/common/connection.py:1521
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Le compte %s ne supporte pas l'invisibilité."
-#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
-#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
-#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
-msgid "Invalid Jabber ID"
-msgstr "Identifiant Jabber invalide"
-
-#: ../src/common/connection_handlers.py:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "Un message d'un JID invalide a été reçu, il a été ignoré."
-
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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 "Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer (voir http://trac.gajim.org/wiki/DatabaseBackup) ou supprimez le (toutes les archives seront perdues)."
+#: ../src/common/connection_handlers.py:1746
+msgid "I would like to add you to my roster."
+msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
#: ../src/common/connection.py:68
msgid "Unable to get issuer certificate"
@@ -4351,27 +4842,29 @@ msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat"
msgid "Application verification failure"
msgstr "Echec de la vérification de l'application"
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:259 ../src/dialogs.py:3050
#, python-format
msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Il n'est pas possible d'envoyer un message à %s, ce JID n'est pas valide."
+msgstr ""
+"Il n'est pas possible d'envoyer un message à %s, ce JID n'est pas valide."
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:281
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "Le présence distante n'est pas signée et aucune clef n'a été assignée."
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:284
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "La clef du contact (%s) ne correspond pas à la clef assignée dans Gajim."
+msgstr ""
+"La clef du contact (%s) ne correspond pas à la clef assignée dans Gajim."
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:333
+#: ../src/common/connection.py:337
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:446
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -4380,76 +4873,79 @@ msgstr ""
"Sujet : %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:839
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "La connexion du compte \"%s\" a été perdue"
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:840
msgid "Reconnect manually."
msgstr "Reconnecter manuellement."
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:851
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Le serveur %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
+msgstr ""
+"Le serveur %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:893
#, python-format
msgid "Server %s provided a different registration form"
msgstr "Le serveur %s a fourni une forme d'inscription différente"
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Erreur SSL inconnue : %d"
-
#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:909
msgid "Invalid answer"
msgstr "Réponse non valide"
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:910
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr "La passerelle %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
+msgstr ""
+"La passerelle %(name)s a mal répondu à la requête d'enregistrement : "
+"%(error)s"
-#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
-#: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/connection.py:1198 ../src/common/connection.py:1332
+#: ../src/common/connection.py:1941
+#: ../src/common/zeroconf/connection_zeroconf.py:203
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Impossible de se connecter à \"%s\""
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1199 ../src/gui_interface.py:562
msgid "Check your connection or try again later."
msgstr "Vérifiez votre connexion ou réessayez plus tard."
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1204
#, python-format
msgid "Server replied: %s"
msgstr "le serveur a répondu : %s"
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1217
msgid "Connection to proxy failed"
msgstr "La connexion au proxy a échoué"
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1249 ../src/common/connection.py:1311
#, python-format
msgid "Could not connect to account %s"
msgstr "Impossible de se connecter au compte %s"
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1312
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "La connexion avec le compte %s a été perdue. Essayez de vous connecter à nouveau."
+msgstr ""
+"La connexion avec le compte %s a été perdue. Essayez de vous connecter à "
+"nouveau."
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1275
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "L'authentification du certificat %s peut être invalide."
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1278
#, python-format
msgid ""
"\n"
@@ -4458,7 +4954,7 @@ msgstr ""
"\n"
"Erreur SSLÂ : <b>%s</b>"
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1280
#, python-format
msgid ""
"\n"
@@ -4467,61 +4963,65 @@ msgstr ""
"\n"
"Erreur SSL inconnue : %d"
-#: ../src/common/connection.py:1297
+#: ../src/common/connection.py:1333
msgid "Check your connection or try again later"
msgstr "Vérifiez votre connexion ou réessayer plus tard"
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1367
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Echec de l'authentification avec \"%s\""
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1369
msgid "Please check your login and password for correctness."
msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1442
msgid "Error while removing privacy list"
msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1443
#, 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 "La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une des ressources connectées. Désactivez la et réessayez."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une "
+"des ressources connectées. Désactivez la et réessayez."
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:1808
#, python-format
msgid "Sent contact: \"%s\" (%s)"
msgstr "Contact envoyé : « %s » (%s)"
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:1811
msgid "Sent contacts:"
msgstr "Contacts envoyés :"
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:1958 ../src/common/connection.py:1981
msgid "Not fetched because of invisible status"
msgstr "Non récupéré à cause du statut invisible"
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2511
msgid "Unregister failed"
msgstr "La désinscription a échoué"
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2512
#, python-format
msgid "Unregistration with server %(server)s failed: %(error)s"
msgstr "Le désabonnement du server %(server)s a échoué : %(error)s"
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:60
+#: ../src/gui_interface.py:505
msgid "Observers"
msgstr "Observateurs"
#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:854
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#: ../src/common/helpers.py:60 ../src/disco.py:120 ../src/disco.py:121
+#: ../src/disco.py:1517 ../src/roster_window.py:856
+#: ../src/roster_window.py:1557 ../src/roster_window.py:1645
+#: ../src/roster_window.py:1647 ../src/roster_window.py:1809
+#: ../src/roster_window.py:2490
msgid "Transports"
msgstr "Passerelles"
@@ -4529,8 +5029,8 @@ msgstr "Passerelles"
msgid "Not in roster"
msgstr "Pas dans la liste"
-#. only say that to non Windows users
# Traduction moins mauvaise mais pas terrible: binding=lier, attacher
+#. only say that to non Windows users
#: ../src/common/dbus_support.py:40
msgid "D-Bus python bindings are missing in this computer"
msgstr "La passerelle python - D-Bus n'est pas installée sur cet ordinateur"
@@ -4545,14 +5045,16 @@ msgid "D-Bus does not run correctly on this machine"
msgstr "D-Bus n'est pas correctement lancé sur cette machine"
#: ../src/common/dbus_support.py:54
-#, fuzzy
msgid "D-Bus does not run correctly on this machine: system bus not present"
-msgstr "D-Bus n'est pas correctement lancé sur cette machine"
+msgstr ""
+"D-Bus n'est pas correctement lancé sur cette machine : le bus de session "
+"n'est pas disponible"
#: ../src/common/dbus_support.py:57
-#, fuzzy
msgid "D-Bus does not run correctly on this machine: session bus not present"
-msgstr "D-Bus n'est pas correctement lancé sur cette machine"
+msgstr ""
+"D-Bus n'est pas correctement lancé sur cette machine : le bus de session "
+"n'est pas disponible"
#: ../src/common/exceptions.py:45
msgid "Database cannot be read."
@@ -4560,29 +5062,30 @@ msgstr "La base de donnée ne peut être lue."
#: ../src/common/exceptions.py:56
msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Service indisponible : Gajim n'est pas lancé ou remote_control est False"
+msgstr ""
+"Service indisponible : Gajim n'est pas lancé ou remote_control est False"
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
msgid "D-Bus is not present on this machine or python module is missing"
msgstr "D-Bus n'est pas présent sur cette machine"
#: ../src/common/exceptions.py:78
-#, fuzzy, python-format
+#, python-format
msgid ""
"Session bus is not available.\n"
"Try reading %(url)s"
msgstr ""
"Le bus de session n'est pas disponible.\n"
-"Essayer en lisant http://trac.gajim.org/wiki/GajimDBus"
+"Essayer en lisant %(url)s"
#: ../src/common/exceptions.py:90
-#, fuzzy, python-format
+#, python-format
msgid ""
"System bus is not available.\n"
"Try reading %(url)s"
msgstr ""
"Le bus de session n'est pas disponible.\n"
-"Essayer en lisant http://trac.gajim.org/wiki/GajimDBus"
+"Essayer en lisant %(url)s"
#: ../src/common/fuzzyclock.py:38
msgid "twelve"
@@ -4632,8 +5135,7 @@ msgstr "dix"
msgid "eleven"
msgstr "onze"
-#. Strings to use for the output. %(0)s will be replaced with the preceding
-#. hour
+#. Strings to use for the output. %(0)s will be replaced with the preceding hour
#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
#: ../src/common/fuzzyclock.py:44
#, python-format
@@ -4748,265 +5250,271 @@ msgstr "Fin de la semaine"
msgid "Weekend!"
msgstr "Fin de semaine !"
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:151
msgid "Username must be between 1 and 1023 chars"
-msgstr ""
+msgstr "Le nom d'utilisateur doit comprendre entre 1 et 1023 caractères"
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:156
msgid "Invalid character in username."
msgstr "Caractère non valide dans le nom d'utilisateur."
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
msgid "Server must be between 1 and 1023 chars"
-msgstr ""
+msgstr "Le nom de serveur doit comprendre entre 1 et 1023 caractères"
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:167
msgid "Invalid character in hostname."
msgstr "Caractère non valide dans le nom d'hôte."
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
msgid "Server address required."
msgstr "Adresse du serveur requise."
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
msgid "Resource must be between 1 and 1023 chars"
-msgstr ""
+msgstr "La ressource doit comprendre entre 1 et 1023 caractères"
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:178
msgid "Invalid character in resource."
msgstr "Caractère non valide dans la ressource."
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
msgid "_Busy"
msgstr "O_ccupé(e)"
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:220 ../src/tooltips.py:195
msgid "Busy"
msgstr "Occupé(e)"
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
msgid "_Not Available"
msgstr "_Non disponible"
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+msgid "Not Available"
+msgstr "Non disponible"
+
+#: ../src/common/helpers.py:228
msgid "_Free for Chat"
msgstr "Dis_ponible pour discuter"
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:230 ../src/tooltips.py:191
msgid "Free for Chat"
msgstr "Disponible pour discuter"
-#: ../src/common/helpers.py:230
-#, fuzzy
+#: ../src/common/helpers.py:233
msgid "?user status:_Available"
-msgstr "?transfer status:En pause"
+msgstr "?user status:_Disponible"
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
-#, fuzzy
+#: ../src/common/helpers.py:235 ../src/tooltips.py:189
msgid "?user status:Available"
-msgstr "?transfer status:En pause"
+msgstr "?user status:Disponible"
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
msgid "Connecting"
msgstr "Connexion"
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
msgid "A_way"
msgstr "_Absent(e)"
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:245
msgid "_Offline"
msgstr "Déc_onnecté(e)"
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:247 ../src/tooltips.py:199
msgid "Offline"
msgstr "Déconnecté(e)"
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:250
msgid "_Invisible"
msgstr "_Invisible"
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:252
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../src/common/helpers.py:256
msgid "?contact has status:Unknown"
msgstr "Inconnu"
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:258
msgid "?contact has status:Has errors"
msgstr "en erreur"
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:263
msgid "?Subscription we already have:None"
msgstr "Aucune"
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:265
msgid "To"
msgstr "À"
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
msgid "From"
msgstr "De"
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
msgid "Both"
msgstr "Les deux"
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:277
msgid "?Ask (for Subscription):None"
msgstr "Aucune"
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:279
msgid "Subscribe"
msgstr "S'inscrire"
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
msgid "?Group Chat Contact Role:None"
msgstr "Aucun"
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
msgid "Moderators"
msgstr "Modérateurs"
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
msgid "Moderator"
msgstr "Modérateur"
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:296
msgid "Participants"
msgstr "Participants"
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:298
msgid "Participant"
msgstr "Participant"
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:301
msgid "Visitors"
msgstr "Visiteurs"
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:303
msgid "Visitor"
msgstr "Visiteur"
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:309 ../src/tooltips.py:210
msgid "?Group Chat Contact Affiliation:None"
msgstr "?Group Chat Contact Affiliation:Aucune"
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:311 ../src/tooltips.py:216
msgid "Owner"
msgstr "Propriétaire"
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:313 ../src/tooltips.py:214
msgid "Administrator"
msgstr "Administrateur"
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:315 ../src/tooltips.py:212
msgid "Member"
msgstr "Membre"
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:354
msgid "is paying attention to the conversation"
msgstr "prête attention à la conversation"
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:356
msgid "is doing something else"
msgstr "fait quelque chose d'autre"
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
msgid "is composing a message..."
msgstr "écrit un message..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:361
msgid "paused composing a message"
msgstr "a arrêté d'écrire un message"
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:363
msgid "has closed the chat window or tab"
msgstr "a fermé la fenêtre ou l'onglet de discussion"
#. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:628
#, python-format
msgid "%s GiB"
msgstr "%s Gio"
#. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:631
#, python-format
msgid "%s GB"
msgstr "%s Go"
#. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:635
#, python-format
msgid "%s MiB"
msgstr "%s Mio"
#. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:638
#, python-format
msgid "%s MB"
msgstr "%s Mo"
#. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:642
#, python-format
msgid "%s KiB"
msgstr "%s Kio"
#. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:645
#, python-format
msgid "%s KB"
msgstr "%s Ko"
#. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:648
#, python-format
msgid "%s B"
msgstr "%s o"
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
msgstr[0] "%d message en attente"
msgstr[1] "%d messages en attente"
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1112
#, python-format
msgid " from room %s"
msgstr " du salon %s"
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
#, python-format
msgid " from user %s"
msgstr "de l'utilisateur %s"
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1117
#, python-format
msgid " from %s"
msgstr "de %s"
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
msgstr[0] "%d évènement en attente"
msgstr[1] "%d événements en attente"
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1162
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
#: ../src/common/helpers.py:1341
msgid "Hello, I am $name."
-msgstr ""
+msgstr "Bonjour, je m'appelle $name."
#: ../src/common/jingle_rtp.py:107
-#, fuzzy, python-format
+#, python-format
msgid "%s configuration error"
-msgstr "Configuration du salon de discussion"
+msgstr "%s erreur de configuration"
#: ../src/common/jingle_rtp.py:108
#, python-format
@@ -5019,33 +5527,42 @@ msgid ""
"Error was:\n"
"%s"
msgstr ""
+"Impossible de configurer %s. Vérifiez votre configuration.\n"
+"\n"
+"Le pipeline était :\n"
+"%s\n"
+"\n"
+"L'error était :\n"
+"%s"
#: ../src/common/jingle_rtp.py:205
msgid "GStreamer error"
-msgstr ""
+msgstr "Erreur GStreamer"
#: ../src/common/jingle_rtp.py:206
-#, fuzzy, python-format
+#, python-format
msgid ""
"Error: %s\n"
"Debug: %s"
-msgstr "Message d'erreur : %s"
+msgstr ""
+"Message d'erreur : %s\n"
+"Debug : %s"
#: ../src/common/jingle_rtp.py:335
msgid "audio input"
-msgstr ""
+msgstr "Entrée audio"
#: ../src/common/jingle_rtp.py:338
msgid "audio output"
-msgstr ""
+msgstr "Sortie audio"
#: ../src/common/jingle_rtp.py:381
msgid "video input"
-msgstr ""
+msgstr "Entrée vidéo"
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:390
msgid "video output"
-msgstr ""
+msgstr "Sortie audio"
#: ../src/common/latex.py:109
#, python-format
@@ -5057,63 +5574,68 @@ msgstr "Erreur en exécutant « %(command)s » : %(error)s"
msgid "%s is not a valid loglevel"
msgstr "%s n'est pas un loglevel valide"
-#: ../src/common/multimedia_helpers.py:37
-#, fuzzy
+#: ../src/common/multimedia_helpers.py:39
msgid " Default device"
-msgstr "Message par défaut"
+msgstr "Périphérique par défaut"
#. Test src
-#: ../src/common/multimedia_helpers.py:55
-#, fuzzy
+#: ../src/common/multimedia_helpers.py:60
msgid "Audio test"
-msgstr "Audio / Vidéo"
+msgstr "Test audio"
#. Auto src
#. Auto sink
#. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:63
+#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:111
msgid "Autodetect"
-msgstr ""
+msgstr "Autodétection"
#. Alsa src
#. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
-#, fuzzy, python-format
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:81
+#, python-format
msgid "ALSA: %s"
-msgstr "Taille : %s"
+msgstr "ALSAÂ : %s"
+
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:83
+#, python-format
+msgid "Pulse: %s"
+msgstr "Pulse : %s"
#. Fake sink
#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:105
msgid "Fake audio output"
msgstr ""
#. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:90
msgid "Video test"
-msgstr ""
+msgstr "Test vidéo"
#. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:95
#, python-format
msgid "V4L2: %s"
-msgstr ""
+msgstr "V4L2 : %s"
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:108
#, python-format
msgid "X Window System (X11/XShm/Xv): %s"
-msgstr ""
+msgstr "X Window System (X11/XShm/Xv): %s"
#. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:110
msgid "X Window System (without Xv)"
-msgstr ""
+msgstr "X Window System (without Xv)"
#. we talk about a file
#: ../src/common/optparser.py:53
@@ -5762,19 +6284,19 @@ msgstr "Étudie"
msgid "Writing"
msgstr "Écrit"
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:339
msgid "Unknown Artist"
msgstr "Artiste Inconnu"
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:342
msgid "Unknown Title"
msgstr "Titre Iconnu"
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:345
msgid "Unknown Source"
msgstr "Source Inconnue"
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:348
#, python-format
msgid ""
"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5790,19 +6312,27 @@ msgid "Unable to bind to port %s."
msgstr "Impossible de débloquer le port %s."
#: ../src/common/socks5.py:92
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Il se peut qu'une autre instance de Gajim soit en cours d'exécution. Le transfert de fichiers sera annulé."
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Il se peut qu'une autre instance de Gajim soit en cours d'exécution. Le "
+"transfert de fichiers sera annulé."
#. we're not english
-#: ../src/common/stanza_session.py:423
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[Ceci fait partie d'une session chiffrée. Si vous voyez ce message, un problème a eu lieu.]"
+#: ../src/common/stanza_session.py:424
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[Ceci fait partie d'une session chiffrée. Si vous voyez ce message, un "
+"problème a eu lieu.]"
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:191
msgid "Avahi error"
msgstr "Erreur d'Avahi"
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:192
#, python-format
msgid ""
"%s\n"
@@ -5811,276 +6341,290 @@ msgstr ""
"%s\n"
"La messagerie en « link-local » pourrait ne pas fonctionner correctement."
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:204
msgid "Please check if Avahi or Bonjour is installed."
msgstr "Veuillez vérifier si Avahi ou Bonjour sont installés."
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/zeroconf/connection_zeroconf.py:218
msgid "Could not start local service"
msgstr "Impossible de lancer le service local"
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:215
#, python-format
msgid "Unable to bind to port %d."
msgstr "Impossible de débloquer le port %d."
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../src/common/zeroconf/connection_zeroconf.py:219
+#: ../src/common/zeroconf/connection_zeroconf.py:303
+#: ../src/common/zeroconf/connection_zeroconf.py:316
+#: ../src/common/zeroconf/connection_zeroconf.py:332
msgid "Please check if avahi-daemon is running."
msgstr "Vérifiez si avahi-daemon est actif."
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:302
+#: ../src/common/zeroconf/connection_zeroconf.py:315
+#: ../src/common/zeroconf/connection_zeroconf.py:331
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "Impossible de changer l'état du compte « %s »"
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:353
msgid "Your message could not be sent."
msgstr "Votre message n'a pas pu être envoyé."
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:367
msgid "Contact is offline. Your message could not be sent."
msgstr "Le destinataire est déconnecté. Votre message n'a pas pu être envoyé."
-#: ../src/common/zeroconf/connection_zeroconf.py:363
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "La connexion à l'hôte n'a pas pu être établie : délai d'envoi des données dépassé"
+#: ../src/common/zeroconf/connection_zeroconf.py:395
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"La connexion à l'hôte n'a pas pu être établie : délai d'envoi des données "
+"dépassé"
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_avahi.py:193
#: ../src/common/zeroconf/zeroconf_bonjour.py:191
#, python-format
msgid "Error while adding service. %s"
msgstr "Erreur en ajoutant le service. %s"
-#: ../src/config.py:397
+#: ../src/config.py:406
msgid "Default Message"
msgstr "Message par défaut"
-#: ../src/config.py:406
+#: ../src/config.py:415
msgid "Enabled"
msgstr "Activé"
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3105
msgid "Default"
msgstr "Par défaut"
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:746 ../src/dialogs.py:1493
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Le dictionnaire pour la langue %s est indisponible"
-#: ../src/config.py:734
+#: ../src/config.py:747
#, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Vous devez installer le dictionnaire %s pour la vérification orthographique, ou choisir un autre langage en paramétrant l'option speller_language."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Vous devez installer le dictionnaire %s pour la vérification orthographique, "
+"ou choisir un autre langage en paramétrant l'option speller_language."
-#: ../src/config.py:1214
+#: ../src/config.py:1223
msgid "status message title"
msgstr "titre du message d'état"
-#: ../src/config.py:1214
+#: ../src/config.py:1223
msgid "status message text"
msgstr "texte du message d'état :"
#. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
-#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py:1523 ../src/dialogs.py:2498 ../src/dialogs.py:2565
+#: ../src/dialogs.py:3352 ../src/disco.py:886 ../src/disco.py:1744
+#: ../src/disco.py:2046 ../src/history_window.py:90
msgid "Name"
msgstr "Nom"
-#: ../src/config.py:1609
+#: ../src/config.py:1618
msgid "Relogin now?"
msgstr "Reconnecter maintenant ?"
-#: ../src/config.py:1610
+#: ../src/config.py:1619
msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Si vous voulez que vos changements soit appliqués immédiatement, vous devez vous reconnecter."
+msgstr ""
+"Si vous voulez que vos changements soit appliqués immédiatement, vous devez "
+"vous reconnecter."
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1773 ../src/config.py:1902
msgid "OpenPGP is not usable on this computer"
msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1942 ../src/config.py:1989
msgid "Unread events"
msgstr "Événements non lus"
-#: ../src/config.py:1934
+#: ../src/config.py:1943
msgid "Read all pending events before removing this account."
msgstr "Lisez tous les événements avant de supprimer ce compte."
-#: ../src/config.py:1963
+#: ../src/config.py:1972
#, python-format
msgid "You have opened chat in account %s"
msgstr "Vous avez une conversation ouverte dans le compte %s"
-#: ../src/config.py:1964
+#: ../src/config.py:1973
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Toutes les fenêtres de conversation et de salons de discussion seront fermées. Voulez-vous continuer ?"
+msgstr ""
+"Toutes les fenêtres de conversation et de salons de discussion seront "
+"fermées. Voulez-vous continuer ?"
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:1985 ../src/config.py:2521 ../src/config.py:2557
msgid "You are currently connected to the server"
msgstr "Vous êtes actuellement connecté au serveur"
-#: ../src/config.py:1977
+#: ../src/config.py:1986
msgid "To change the account name, you must be disconnected."
msgstr "Pour changer le nom du compte, vous devez être déconnecté."
-#: ../src/config.py:1981
+#: ../src/config.py:1990
msgid "To change the account name, you must read all pending events."
msgstr "Pour changer le nom du compte, vous devez lire tous ses événements."
-#: ../src/config.py:1987
+#: ../src/config.py:1996
msgid "Account Name Already Used"
msgstr "Nom de Compte déjà utilisé"
-#: ../src/config.py:1988
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Ce nom est déjà utilisé par un autre de vos comptes. Choisissez un autre nom."
+#: ../src/config.py:1997
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Ce nom est déjà utilisé par un autre de vos comptes. Choisissez un autre nom."
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2001 ../src/config.py:2005
msgid "Invalid account name"
msgstr "Nom de compte invalide"
-#: ../src/config.py:1993
+#: ../src/config.py:2002
msgid "Account name cannot be empty."
msgstr "Le nom du compte ne peut pas être vide."
-#: ../src/config.py:1997
+#: ../src/config.py:2006
msgid "Account name cannot contain spaces."
msgstr "Le nom du compte ne peut pas contenir d'espaces."
-#: ../src/config.py:2074
+#: ../src/config.py:2083
msgid "Rename Account"
msgstr "Renommer le compte"
-#: ../src/config.py:2075
+#: ../src/config.py:2084
#, python-format
msgid "Enter a new name for account %s"
msgstr "Entrez un nouveau nom pour le compte %s"
-#: ../src/config.py:2103
+#: ../src/config.py:2112
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Un Identifiant Jabber doit être de la forme \"user@servername\"."
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2329 ../src/config.py:3654
msgid "Invalid entry"
msgstr "Entrée invalide"
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2330 ../src/config.py:3655
msgid "Custom port must be a port number."
msgstr "Le port personnalisé doit être un numéro de port"
-#: ../src/config.py:2342
+#: ../src/config.py:2351
msgid "Failed to get secret keys"
msgstr "Erreur en récupérant les clés secrètes"
-#: ../src/config.py:2343
+#: ../src/config.py:2352
msgid "There is no OpenPGP secret key available."
msgstr "Aucune clef OpenPGP disponible."
-#: ../src/config.py:2377
+#: ../src/config.py:2386
msgid "OpenPGP Key Selection"
msgstr "Sélection d'une clé OpenPGP"
-#: ../src/config.py:2378
+#: ../src/config.py:2387
msgid "Choose your OpenPGP key"
msgstr "Choisissez votre clé OpenPGP"
-#: ../src/config.py:2385
+#: ../src/config.py:2394
msgid "No such account available"
msgstr "Compte non disponible"
-#: ../src/config.py:2386
+#: ../src/config.py:2395
msgid "You must create your account before editing your personal information."
msgstr "Vous devez d'abord créer votre compte avant d'éditer vos informations."
-#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2402 ../src/dialogs.py:2251 ../src/dialogs.py:2487
+#: ../src/dialogs.py:2675 ../src/disco.py:515 ../src/profile_window.py:361
msgid "You are not connected to the server"
msgstr "Vous n'êtes pas connecté au serveur"
-#: ../src/config.py:2394
+#: ../src/config.py:2403
msgid "Without a connection, you can not edit your personal information."
msgstr "Vous devez être connecté pour éditer vos informations."
-#: ../src/config.py:2398
+#: ../src/config.py:2407
msgid "Your server doesn't support Vcard"
msgstr "Votre serveur ne supporte pas les Vcard"
-#: ../src/config.py:2399
+#: ../src/config.py:2408
msgid "Your server can't save your personal information."
msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2522 ../src/config.py:2558
msgid "To disable the account, you must be disconnected."
msgstr "Afin de désactiver un compte vous devez être déconnecté."
-#: ../src/config.py:2517
+#: ../src/config.py:2527
msgid "Account Local already exists."
msgstr "Ce compte existe déjà localement."
-#: ../src/config.py:2518
+#: ../src/config.py:2528
msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Veuillez le renommer et l'enlever avant d'activer la messagerie link-local."
+msgstr ""
+"Veuillez le renommer et l'enlever avant d'activer la messagerie link-local."
-#: ../src/config.py:2675
+#: ../src/config.py:2685
#, python-format
msgid "Edit %s"
msgstr "_Éditer %s"
-#: ../src/config.py:2677
+#: ../src/config.py:2687
#, python-format
msgid "Register to %s"
msgstr "S'enregistrer à %s"
#. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2723
msgid "Ban List"
msgstr "Liste des bannis"
-#: ../src/config.py:2714
+#: ../src/config.py:2724
msgid "Member List"
msgstr "Liste des membres"
-#: ../src/config.py:2714
+#: ../src/config.py:2724
msgid "Owner List"
msgstr "Liste des propriétaires"
-#: ../src/config.py:2715
+#: ../src/config.py:2725
msgid "Administrator List"
msgstr "Liste des administrateurs"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2789 ../src/disco.py:893 ../src/history_manager.py:207
msgid "JID"
msgstr "Identifiant Jabber"
-#: ../src/config.py:2789
+#: ../src/config.py:2799
msgid "Reason"
msgstr "Raison"
-#: ../src/config.py:2796
+#: ../src/config.py:2806
msgid "Nick"
msgstr "Pseudonyme"
-#: ../src/config.py:2802
+#: ../src/config.py:2812
msgid "Role"
msgstr "Rôle"
-#: ../src/config.py:2829
+#: ../src/config.py:2839
msgid "Banning..."
msgstr "Bannissement de ..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2841
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -6088,11 +6632,11 @@ msgstr ""
"<b>Qui voulez-vous bannir ?</b>\n"
"\n"
-#: ../src/config.py:2833
+#: ../src/config.py:2843
msgid "Adding Member..."
msgstr "Ajout d'un Membre ..."
-#: ../src/config.py:2834
+#: ../src/config.py:2844
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -6100,11 +6644,11 @@ msgstr ""
"<b>De qui voulez-vous faire un membre ?</b>\n"
"\n"
-#: ../src/config.py:2836
+#: ../src/config.py:2846
msgid "Adding Owner..."
msgstr "Ajout d'un Propriétaire ..."
-#: ../src/config.py:2837
+#: ../src/config.py:2847
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -6112,11 +6656,11 @@ msgstr ""
"<b>De qui voulez-vous faire un possesseur ?</b>\n"
"\n"
-#: ../src/config.py:2839
+#: ../src/config.py:2849
msgid "Adding Administrator..."
msgstr "Ajout d'un Administrateur ..."
-#: ../src/config.py:2840
+#: ../src/config.py:2850
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -6124,7 +6668,7 @@ msgstr ""
"<b>De qui voulez-vous faire un administrateur ?</b>\n"
"\n"
-#: ../src/config.py:2841
+#: ../src/config.py:2851
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -6137,140 +6681,148 @@ msgstr ""
"1. pseudo@domaine/ressource (seulement cette ressource correspond).\n"
"2. pseudo@domaine (toutes les ressources correspondent).\n"
"3. domaine/ressources (seulement cette ressource correspond).\n"
-"4. domaine (le domaine complet correspond, incluant tous les pseudo@domaine,\n"
+"4. domaine (le domaine complet correspond, incluant tous les "
+"pseudo@domaine,\n"
"domaine/ressource, ou les adresses comprenant un sous-domaine)."
-#: ../src/config.py:2943
+#: ../src/config.py:2952
#, python-format
msgid "Removing %s account"
msgstr "Supprimer le compte %s"
-#: ../src/config.py:2958
-#, fuzzy
+#: ../src/config.py:2967
msgid "Account is disabled"
-msgstr "Émoticônes désactivées"
+msgstr "Compte désactivé"
-#: ../src/config.py:2959
+#: ../src/config.py:2968
msgid "To unregister from a server, account must be enabled."
-msgstr ""
+msgstr "Pour se désinscrire d'un serveur, le compte doit être activé."
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:2981 ../src/gui_interface.py:269
+#: ../src/gui_interface.py:721
msgid "Password Required"
msgstr "Mot de passe requis"
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:2982 ../src/gui_interface.py:701
#, python-format
msgid "Enter your password for account %s"
msgstr "Entrez votre mot de passe pour le compte %s"
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:2983 ../src/gui_interface.py:721
msgid "Save password"
msgstr "Enregistrer le mot de passe"
-#: ../src/config.py:2984
+#: ../src/config.py:2993
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Le compte \"%s\" est connecté au serveur"
-#: ../src/config.py:2985
+#: ../src/config.py:2994
msgid "If you remove it, the connection will be lost."
msgstr "Si vous l'enlevez, la connection sera perdue."
-#: ../src/config.py:2999
-#, fuzzy, python-format
+#: ../src/config.py:3008
+#, python-format
msgid "Connection to server %s failed"
-msgstr "La connexion au proxy a échoué"
+msgstr "La connexion au serveur %s a échoué"
-#: ../src/config.py:3000
-#, fuzzy
+#: ../src/config.py:3009
msgid "What would you like to do?"
msgstr "Que voulez vous faire ?"
-#: ../src/config.py:3001
-#, fuzzy
+#: ../src/config.py:3010
msgid "Remove only from Gajim"
msgstr "Supprimer le compte de Gajim _uniquement"
-#: ../src/config.py:3002
+#: ../src/config.py:3011
msgid "Don't remove anything. I'll try again later"
-msgstr ""
+msgstr "Ne rien supprimer. Je réessaierai plus tard."
-#: ../src/config.py:3095
+#: ../src/config.py:3105
msgid "?print_status:All"
msgstr "?print_status:Tout"
-#: ../src/config.py:3096
+#: ../src/config.py:3106
msgid "Enter and leave only"
msgstr "Entrées et sorties seulement"
-#: ../src/config.py:3097
+#: ../src/config.py:3107
msgid "?print_status:None"
msgstr "Aucun"
-#: ../src/config.py:3167
+#: ../src/config.py:3179
msgid "New Group Chat"
msgstr "Créer un salon de discussion"
-#: ../src/config.py:3200
+#: ../src/config.py:3212
msgid "This bookmark has invalid data"
msgstr "Ce marque-page contient des données invalides"
-#: ../src/config.py:3201
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
+#: ../src/config.py:3213
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
+#: ../src/config.py:3338 ../src/dialogs.py:2040
msgid "Invalid nickname"
msgstr "Nom d'utilisateur invalide"
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3339 ../src/config.py:3350 ../src/config.py:3359
+#: ../src/config.py:3370 ../src/config.py:3378
msgid "Character not allowed"
msgstr "Caractère non-autorisé"
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3350 ../src/config.py:3358 ../src/config.py:3370
+#: ../src/config.py:3630
msgid "Invalid server"
msgstr "Serveur invalide"
-#: ../src/config.py:3347
+#: ../src/config.py:3377
msgid "Invalid room"
msgstr "Salon invalide"
-#: ../src/config.py:3515
+#: ../src/config.py:3546
msgid "Account has been added successfully"
msgstr "Compte ajouté avec succès"
-#: ../src/config.py:3516 ../src/config.py:3522
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menu item under the Edit menu from the main window."
-msgstr "Vous pouvez configurer les options avancées en cliquant sur le bouton Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la fenêtre principale."
+#: ../src/config.py:3547 ../src/config.py:3553
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menu item under the Edit menu from the main "
+"window."
+msgstr ""
+"Vous pouvez configurer les options avancées en cliquant sur le bouton "
+"Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
+"fenêtre principale."
-#: ../src/config.py:3521
+#: ../src/config.py:3552
msgid "Your new account has been created successfully"
msgstr "Votre nouveau compte a été créé avec succès"
-#: ../src/config.py:3560
+#: ../src/config.py:3591
msgid "Invalid username"
msgstr "Nom d'utilisateur non valide"
-#: ../src/config.py:3562
+#: ../src/config.py:3593
msgid "You must provide a username to configure this account."
msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte."
-#: ../src/config.py:3600
+#: ../src/config.py:3631
msgid "Please provide a server on which you want to register."
msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer."
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3687 ../src/gui_interface.py:1199
msgid "Certificate Already in File"
msgstr "Certificat déjà dans un Fichier"
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3688 ../src/gui_interface.py:1200
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "Ce certificat est déjà dans le fichier %s, il n'a donc pas été ajouté."
-#: ../src/config.py:3734
+#: ../src/config.py:3765
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6285,7 +6837,7 @@ msgstr ""
"Erreur SSLÂ %(error)s\n"
"Voulez vous toujours vous connecter au serveur ?"
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3771 ../src/gui_interface.py:1228
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6296,72 +6848,77 @@ msgstr ""
"Empreinte digitale SHA1 du certificat :\n"
"%s"
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3803 ../src/config.py:3837
msgid "An error occurred during account creation"
msgstr "Une erreur est survenue lors de la création du compte"
-#: ../src/config.py:3871
+#: ../src/config.py:3902
msgid "Account name is in use"
msgstr "Le nom du compte est utilisé"
-#: ../src/config.py:3872
+#: ../src/config.py:3903
msgid "You already have an account using this name."
msgstr "Vous avez déjà un compte avec ce nom."
-#: ../src/config.py:3991
+#: ../src/config.py:4033
msgid "PEP node was not removed"
msgstr "Le nœud PEP n'a pas été supprimé"
-#: ../src/config.py:3992
+#: ../src/config.py:4034
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
-#: ../src/config.py:4036
+#: ../src/config.py:4062
+#, python-format
+msgid "Configure %s"
+msgstr "Configurer %s"
+
+#: ../src/config.py:4078 ../src/plugins/gui.py:73
msgid "Active"
msgstr "Actif"
-#: ../src/config.py:4044
+#: ../src/config.py:4086
msgid "Event"
msgstr "Événement"
-#: ../src/config.py:4079
+#: ../src/config.py:4121
msgid "First Message Received"
msgstr "Premier message reçu"
-#: ../src/config.py:4080
+#: ../src/config.py:4122
msgid "Next Message Received Focused"
msgstr "Message Reçu Suivant Avec le Focus."
-#: ../src/config.py:4082
+#: ../src/config.py:4124
msgid "Next Message Received Unfocused"
msgstr "Message Reçu Suivant Sans le Focus"
-#: ../src/config.py:4083
+#: ../src/config.py:4125
msgid "Contact Connected"
msgstr "Contact connecté"
-#: ../src/config.py:4084
+#: ../src/config.py:4126
msgid "Contact Disconnected"
msgstr "Contact déconnecté"
-#: ../src/config.py:4085
+#: ../src/config.py:4127
msgid "Message Sent"
msgstr "Message envoyé"
-#: ../src/config.py:4086
+#: ../src/config.py:4128
msgid "Group Chat Message Highlight"
msgstr "Message d'un salon mis en surbrillance"
-#: ../src/config.py:4087
+#: ../src/config.py:4129
msgid "Group Chat Message Received"
msgstr "Message reçu dans un salon"
-#: ../src/config.py:4088
+#: ../src/config.py:4130
msgid "GMail Email Received"
msgstr "Courriel Gmail reçu"
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:603
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
@@ -6371,7 +6928,7 @@ msgstr ""
"été reçu par le contact distant. Si cette icône reste\n"
"pendant un long moment, le message a probablement été perdu."
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:622
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
@@ -6379,338 +6936,359 @@ msgstr ""
"Le texte sous cette règle correspond à ce qui a été dit depuis\n"
"la dernière fois que vous avez consulté ce salon de discussion"
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:742
msgid "_Quote"
msgstr "_Citation"
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:749
#, python-format
msgid "_Actions for \"%s\""
msgstr "_Actions pour \"%s\""
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
msgid "Read _Wikipedia Article"
msgstr "Lire l'Article _Wikipédia"
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:767
msgid "Look it up in _Dictionary"
msgstr "Chercher dans le _Dictionnaire"
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:784
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
-msgstr "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
+msgstr ""
+"Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:797
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "Il manque un \"%s\" dans l'URL de recherche sur Internet"
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:800
msgid "Web _Search for it"
msgstr "_Rechercher sur Internet"
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:806
msgid "Open as _Link"
msgstr "Ouvrir en tant que _lien"
#. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
-#, fuzzy, python-format
+#: ../src/conversation_textview.py:1309
+#, python-format
msgid "Yesterday"
-msgid_plural "%i days ago"
-msgstr[0] "Hier"
-msgstr[1] "Hier"
+msgid_plural "%(nb_days)i days ago"
+msgstr[0] ""
+msgstr[1] ""
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1358 ../src/history_window.py:480
#, python-format
msgid "Subject: %s\n"
msgstr "Sujet : %s\n"
-#: ../src/dataforms_widget.py:545
-#, fuzzy
+#: ../src/dataforms_widget.py:565
msgid "Unable to load image"
-msgstr "Impossible de charger le module d'inactivité"
+msgstr "Impossible de charger l'image"
-#: ../src/dataforms_widget.py:547
-#, fuzzy, python-format
+#: ../src/dataforms_widget.py:567
+#, python-format
msgid "Media type not supported: %s"
-msgstr "Invisibilité non-supportée"
+msgstr "Type de média non-supportée : %s"
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:582
msgid "This field is required"
-msgstr ""
+msgstr "Le champ est requis"
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:627
msgid "Jabber ID already in list"
msgstr "Identifiant Jabber déjà existant"
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:628
msgid "The Jabber ID you entered is already in the list. Choose another one."
-msgstr "L'identifiant Jabber que vous avez entré est déjà dans la liste. Veuillez en choisir un autre."
+msgstr ""
+"L'identifiant Jabber que vous avez entré est déjà dans la liste. Veuillez en "
+"choisir un autre."
#. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:639
msgid "new@jabber.id"
msgstr "nouveau@jabber.id"
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
#, python-format
msgid "new%d@jabber.id"
msgstr "nouveau%d@jabber.id"
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:81
#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "Nom du contact : <i>%s</i>"
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:83
#, python-format
msgid "Jabber ID: <i>%s</i>"
msgstr "Identifiant Jabber : <i>%s</i>"
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:197
msgid "Group"
msgstr "Groupe"
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:204
msgid "In the group"
msgstr "Dans le groupe"
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:295
msgid "KeyID"
msgstr "KeyID"
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:300
msgid "Contact name"
msgstr "Nom du contact"
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:475
msgid "Set Mood"
msgstr "Définir l'Humeur"
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:595
#, python-format
msgid "%s Status Message"
msgstr "Message d'état %s"
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:609
msgid "Status Message"
msgstr "Message d'état"
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:800
msgid "Overwrite Status Message?"
msgstr "Remplacer le message de statut ?"
-#: ../src/dialogs.py:795
-msgid "This name is already used. Do you want to overwrite this status message?"
+#: ../src/dialogs.py:801
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
msgstr "Ce nom est déjà utilisé. Voulez vous remplacer ce message de statut ?"
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:809
msgid "Save as Preset Status Message"
msgstr "Enregistrer comme messages d'état prédéfini"
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:810
msgid "Please type a name for this status message"
msgstr "Tapez un nom pour ce message d'état"
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:838
msgid "AIM Address:"
msgstr "Adresse AIM :"
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:839
msgid "GG Number:"
msgstr "Numéro GG :"
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:840
msgid "ICQ Number:"
msgstr "Numéro ICQ :"
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:841
msgid "MSN Address:"
msgstr "Adresse MSN :"
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:842
msgid "Yahoo! Address:"
msgstr "Adresse Yahoo! :"
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:879
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr "Remplissez les informations sur le contact à ajouter au compte %s"
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:882
msgid "Please fill in the data of the contact you want to add"
msgstr "Remplissez les informations sur le contact à ajouter"
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
+#: ../src/dialogs.py:3585
msgid "Invalid User ID"
msgstr "Identifiant utilisateur non valide"
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1081
msgid "The user ID must not contain a resource."
msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1086
msgid "You cannot add yourself to your roster."
msgstr "Vous ne pouvez pas vous ajouter à votre propre roster."
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1100
msgid "Contact already in roster"
msgstr "Contact déjà dans la liste"
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1101
msgid "This contact is already listed in your roster."
msgstr "Le contact est déjà dans votre liste."
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
msgid "User ID:"
msgstr "Identifiant :"
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1273
msgid "A GTK+ jabber client"
msgstr "Un client Jabber en GTK+"
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1274
msgid "GTK+ Version:"
msgstr "Version de GTK+ :"
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1275
msgid "PyGTK Version:"
msgstr "Version de PyGTK :"
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1285
msgid "Current Developers:"
msgstr "Développeurs actuels :"
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1287
msgid "Past Developers:"
msgstr "Anciens développeurs :"
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1293
msgid "THANKS:"
msgstr "MERCI :"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1299
msgid "Last but not least, we would like to thank all the package maintainers."
msgstr "Pour finir, nous voulons remercier tous les mainteneurs de paquet."
#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1311
msgid "translator-credits"
msgstr ""
"Yann Le Boulanger <asterix@lagaule.org>\n"
"Jonathan Ernst <jonathan@ernstfamily.ch>\n"
"Florent Le Coz <louizatakk@fedoraproject.org>"
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1494
#, 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 ""
-"Vous devez installer le dictionnaire %s pour la vérification orthographique, ou choisir un autre langage en paramétrant l'option speller_language.\n"
+"Vous devez installer le dictionnaire %s pour la vérification orthographique, "
+"ou choisir un autre langage en paramétrant l'option speller_language.\n"
"\n"
"Le soulignement des fautes d'orthographe ne sera pas utilisé"
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1842
+msgid "_Resume"
+msgstr "Reprendre"
+
+#: ../src/dialogs.py:1850
+msgid "Re_place"
+msgstr "Remplacer"
+
+#: ../src/dialogs.py:2041 ../src/dialogs.py:2440
msgid "The nickname has not allowed characters."
msgstr "Le pseudonyme contient des caractères non autorisés."
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2159
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "Requête d'inscription pour le compte %(account)s de la part de %(jid)s"
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2162
#, python-format
msgid "Subscription request from %s"
msgstr "Requête d'inscription de la part de %s"
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2246 ../src/gui_interface.py:1948
#, python-format
msgid "You are already in group chat %s"
msgstr "Vous êtes déjà dans le salon %s"
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2252
msgid "You can not join a group chat unless you are connected."
-msgstr "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas connecté."
+msgstr ""
+"Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas "
+"connecté."
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2296
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Rejoindre un salon de discussion en tant que %s"
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2427
msgid "Invalid Account"
msgstr "Compte invalide"
-#: ../src/dialogs.py:2326
-msgid "You have to choose an account from which you want to join the groupchat."
-msgstr "Vous devez choisir un compte depuis lequel vous souhaitez rejoindre le salon de discussion."
+#: ../src/dialogs.py:2428
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr ""
+"Vous devez choisir un compte depuis lequel vous souhaitez rejoindre le salon "
+"de discussion."
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2439
msgid "Invalid Nickname"
msgstr "Nom d'utilisateur invalide"
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2444 ../src/dialogs.py:2450
+#: ../src/groupchat_control.py:2087
msgid "Invalid group chat Jabber ID"
msgstr "Identifiant Jabber de salon invalide"
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2445
msgid "Please enter the group chat Jabber ID as room@server."
msgstr "Veuillez entrer l'identifiant Jabber du salon, comme salon@serveur"
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
+#: ../src/dialogs.py:2451 ../src/groupchat_control.py:2088
msgid "The group chat Jabber ID has not allowed characters."
-msgstr "L'identifiant jabber du salon de discussion contient des caractères interdits."
+msgstr ""
+"L'identifiant jabber du salon de discussion contient des caractères "
+"interdits."
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2455 ../src/gui_interface.py:1930
msgid "This is not a group chat"
msgstr "Ceci n'est pas une conversation multi-utilisateurs"
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2456 ../src/gui_interface.py:1931
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s n'est pas un nom de salon de discussion valide"
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2488
msgid "Without a connection, you can not synchronise your contacts."
msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2501
msgid "Server"
msgstr "Serveur"
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2537
msgid "This account is not connected to the server"
msgstr "Ce compte est connecté au serveur"
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2538
msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Vous ne pouvez pas vous synchroniser avec un compte sauf s'il est connecté."
+msgstr ""
+"Vous ne pouvez pas vous synchroniser avec un compte sauf s'il est connecté."
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2563
msgid "Synchronise"
msgstr "Synchroniser"
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2624
#, python-format
msgid "Start Chat with account %s"
msgstr "Commencer une discussion avec le compte %s"
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2626
msgid "Start Chat"
msgstr "Commencer une discussion"
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2627
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
@@ -6719,355 +7297,337 @@ msgstr ""
"envoyer un message :"
#. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2654 ../src/dialogs.py:3035 ../src/dialogs.py:3265
msgid "Connection not available"
msgstr "Connexion non disponible"
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2655 ../src/dialogs.py:3036 ../src/dialogs.py:3266
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2664 ../src/dialogs.py:2667
msgid "Invalid JID"
msgstr "Identifiant Jabber invalide"
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2667
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Impossible d'interpréter \"%s\"."
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2676
msgid "Without a connection, you can not change your password."
msgstr "Vous devez être connecté pour changer votre mot de passe."
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2695
msgid "Invalid password"
msgstr "Mot de passe invalide"
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2695
msgid "You must enter a password."
msgstr "Vous devez entrer un mot de passe."
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2699
msgid "Passwords do not match"
msgstr "Les mots de passe ne correspondent pas"
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2700
msgid "The passwords typed in both fields must be identical."
msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2737 ../src/notify.py:182 ../src/notify.py:419
msgid "Contact Signed In"
msgstr "Contact connecté"
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2739 ../src/notify.py:190 ../src/notify.py:421
msgid "Contact Signed Out"
msgstr "Contact déconnecté"
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nouveau message"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Nouveau message simple"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nouveau message privé"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2742 ../src/gui_interface.py:838 ../src/notify.py:433
msgid "New E-mail"
msgstr "Nouveau courrier électronique"
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2744 ../src/gui_interface.py:893 ../src/notify.py:426
msgid "File Transfer Request"
msgstr "Requête de transfert de fichier"
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2746 ../src/gui_interface.py:800
+#: ../src/gui_interface.py:864 ../src/notify.py:428
msgid "File Transfer Error"
msgstr "Erreur de Transfert de fichier"
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2748 ../src/gui_interface.py:939
+#: ../src/gui_interface.py:962 ../src/gui_interface.py:979
+#: ../src/notify.py:430
msgid "File Transfer Completed"
msgstr "Transfert de fichier terminé"
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2749 ../src/gui_interface.py:942 ../src/notify.py:431
msgid "File Transfer Stopped"
msgstr "Transfert de fichier interrompu"
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
+#: ../src/dialogs.py:2751 ../src/gui_interface.py:647 ../src/notify.py:435
msgid "Groupchat Invitation"
msgstr "Invitation à un salon"
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2753 ../src/notify.py:174 ../src/notify.py:437
msgid "Contact Changed Status"
msgstr "Le contact a changé d'état"
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:2954
#, python-format
msgid "Single Message using account %s"
msgstr "Message simple en tant que %s"
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:2956
#, python-format
msgid "Single Message in account %s"
msgstr "Message simple dans le compte %s"
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:2958
msgid "Single Message"
msgstr "Message simple"
#. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:2961
#, python-format
msgid "Send %s"
msgstr "Envoyer %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:2984
#, python-format
msgid "Received %s"
msgstr "%s Reçu"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3007
#, python-format
msgid "Form %s"
msgstr "De %s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3086
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3087
#, python-format
msgid "%s wrote:\n"
msgstr "%s a écrit :\n"
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3146
#, python-format
msgid "XML Console for %s"
msgstr "Console XML pour %s"
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3148
msgid "XML Console"
msgstr "Console XML"
#. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
-#, fuzzy
+#: ../src/dialogs.py:3295
msgid "add"
-msgstr "Triste"
+msgstr "Ajouter"
-#: ../src/dialogs.py:3175
-#, fuzzy
+#: ../src/dialogs.py:3295
msgid "modify"
msgstr "Modifier"
-#: ../src/dialogs.py:3176
-#, fuzzy
+#: ../src/dialogs.py:3296
msgid "remove"
-msgstr "Suppri_mer"
+msgstr "Supprimer"
-#: ../src/dialogs.py:3204
-#, fuzzy, python-format
-msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
-msgstr "<b>%s</b> aimerait que vous <b>%s</b> quelques contacts dans votre roster."
+#: ../src/dialogs.py:3325
+#, python-format
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%(jid)s</b> aimerait que vous <b>%(action)s</b> quelques contacts dans "
+"votre liste."
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
+#: ../src/dialogs.py:3341 ../src/dialogs.py:3387
msgid "Add"
msgstr "Ajouter"
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3343 ../src/dialogs.py:3418
msgid "Modify"
msgstr "Modifier"
-#: ../src/dialogs.py:3228
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3345 ../src/dialogs.py:3442
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../src/dialogs.py:3349
msgid "Jabber ID"
msgstr "Identifiant Jabber"
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3355
msgid "Groups"
msgstr "Groupes"
#. it is selected
#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3463
#, python-format
msgid "%s suggested me to add you in my roster."
msgstr "%s m'a conseillé de vous ajouter à mes contacts."
-#: ../src/dialogs.py:3356
-#, fuzzy, python-format
+#: ../src/dialogs.py:3477
+#, python-format
msgid "Added %s contacts"
-msgstr "_Ajouter un contact"
+msgstr "%s contacts ajoutés"
-#: ../src/dialogs.py:3393
-#, fuzzy, python-format
+#: ../src/dialogs.py:3514
+#, python-format
msgid "Removed %s contacts"
-msgstr "Enlever le contact de la liste"
+msgstr "Enlever %s contacts"
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3554 ../src/dialogs.py:3731
#, python-format
msgid "Archiving Preferences for %s"
-msgstr ""
+msgstr "Sauvegarde des préférences pour %s"
-#: ../src/dialogs.py:3473
-#, fuzzy
+#: ../src/dialogs.py:3594
msgid "Invalid expire value"
-msgstr "Nom de serveur invalide"
+msgstr ""
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3595
msgid "Expire must be a valid positive integer."
msgstr ""
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3642
msgid "There is an error with the form"
msgstr ""
-#: ../src/dialogs.py:3732
-#, fuzzy
+#: ../src/dialogs.py:3862
msgid "There is an error"
msgstr "Le service a renvoyé une erreur."
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:3930
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Liste privée <b><i>%s</i></b>"
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:3934
#, python-format
msgid "Privacy List for %s"
msgstr "Liste privée pour %s"
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4001
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr "Ordre : %(order)s, action : %(action)s, type : %(type)s, valeur : %(value)s"
+msgstr ""
+"Ordre : %(order)s, action : %(action)s, type : %(type)s, valeur : %(value)s"
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4006
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "Ordre : %(order)s, action: %(action)s"
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4057
msgid "<b>Edit a rule</b>"
msgstr "<b>Modifier une règle</b>"
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4168
msgid "<b>Add a rule</b>"
msgstr "<b>Ajouter une règle</b>"
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4267
#, python-format
msgid "Privacy Lists for %s"
msgstr "Listes privées pour %s"
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4269
msgid "Privacy Lists"
msgstr "Listes privées"
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4358
msgid "Invalid List Name"
msgstr "Nom de liste invalide"
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4359
msgid "You must enter a name to create a privacy list."
msgstr "Vous devez entrer un nom pour créer une liste privée."
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4391
msgid "You are invited to a groupchat"
msgstr "Vous êtes invité(e) dans un groupe de discussion"
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4394
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact vous a invité dans un salon de discussion"
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4396
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact vous a invité dans le salon de discussion %(room_jid)s"
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4404
#, python-format
msgid "Comment: %s"
msgstr "Commentaire : %s"
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4406
msgid "Do you want to accept the invitation?"
msgstr "Voulez-vous accepter l'invitation ?"
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4468
msgid "Choose Client Cert #PCKS12"
msgstr ""
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4478 ../src/dialogs.py:4520 ../src/dialogs.py:4576
+#: ../src/dialogs.py:4664
msgid "All files"
msgstr "Tous les fichiers"
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4483
msgid "PKCS12 Files"
-msgstr ""
+msgstr "Fichier PKCS12"
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4510
msgid "Choose Sound"
msgstr "Choisissez un son"
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4525
msgid "Wav Sounds"
msgstr "Sons wav"
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4563
msgid "Choose Image"
msgstr "Choisissez une Image"
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4581
msgid "Images"
msgstr "Images"
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:4651
#, fuzzy
msgid "Choose Archive"
msgstr "Choisissez une Image"
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:4669
#, fuzzy
msgid "Zip files"
msgstr "Tous les fichiers"
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4695
#, python-format
msgid "When %s becomes:"
msgstr "Quand %s devient :"
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4697
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Ajout de notifications spéciales pour %s"
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condition"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "quand je suis "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:4917
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7078,82 +7638,140 @@ msgstr ""
"\n"
"La Short Authentication String cette session est <b>%(sas)s</b>."
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:4920
msgid "You have already verified this contact's identity."
msgstr "Vous avez déjà vérifié l'identité de ce contact."
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:4926 ../src/dialogs.py:5010
msgid "Contact's identity verified"
msgstr "Identité du contact vérifiée"
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:4932
msgid "Verify again..."
msgstr "Vérifier à nouveau..."
-#: ../src/dialogs.py:5218
-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 "Afin d'être certain que <b>seule</b> la personne prévue puisse lire vos messages et vous en envoyer, vous devez vérifier son identité en cliquant sur le bouton en-dessous."
+#: ../src/dialogs.py:4937
+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 ""
+"Afin d'être certain que <b>seule</b> la personne prévue puisse lire vos "
+"messages et vous en envoyer, vous devez vérifier son identité en cliquant "
+"sur le bouton en-dessous."
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:4940 ../src/dialogs.py:4991 ../src/dialogs.py:5004
msgid "Contact's identity NOT verified"
msgstr "Identité du contact NON vérifiée"
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:4945
msgid "Verify..."
msgstr "Vérifier..."
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:4956
msgid "Have you verified the contact's identity?"
msgstr "Avez-vous vérifié l'identité du contact ?"
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:4957
#, 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 ""
-"Afin d'éviter de parler à un inconnu, vous devriez parler à <b>%(jid)s</b> directement (en personne ou au téléphone) et vérifier qu'ils voient la même Short Authentication String (SAS) que vous.\n"
+"Afin d'éviter de parler à un inconnu, vous devriez parler à <b>%(jid)s</b> "
+"directement (en personne ou au téléphone) et vérifier qu'ils voient la même "
+"Short Authentication String (SAS) que vous.\n"
"\n"
"La Short Authentication String de cette session est : <b>%(sas)s</b>."
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:4958
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "Avec vous parlé au contact et vérifié la SAS ?"
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:4992
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr "La clef du contact (%s) <b>ne correspond pas</b> à la clef assignée dans Gajim."
+msgstr ""
+"La clef du contact (%s) <b>ne correspond pas</b> à la clef assignée dans "
+"Gajim."
-#: ../src/dialogs.py:5279
+#: ../src/dialogs.py:4998
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas chiffrer les messages."
+msgstr ""
+"Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
+"chiffrer les messages."
-#: ../src/dialogs.py:5286
-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 "Une clef GPG est assignée à ce contact, mais vous <b>n'avez pas confiance en sa clef</b>, les messages <b>ne peuvent</b> donc <b>pas</b> être chiffrés. Utilisez votre client GPG pour avoir confiance en cette clef."
+#: ../src/dialogs.py:5005
+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 ""
+"Une clef GPG est assignée à ce contact, mais vous <b>n'avez pas confiance en "
+"sa clef</b>, les messages <b>ne peuvent</b> donc <b>pas</b> être chiffrés. "
+"Utilisez votre client GPG pour avoir confiance en cette clef."
-#: ../src/dialogs.py:5292
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "Une clef GPG est assignée à ce contact, et vous avez confiance en sa clef, les messages seront donc chiffrés."
+#: ../src/dialogs.py:5011
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+"Une clef GPG est assignée à ce contact, et vous avez confiance en sa clef, "
+"les messages seront donc chiffrés."
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5076
msgid "an audio and video"
msgstr "audio et vidéo"
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5078
msgid "an audio"
msgstr "audio"
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5080
msgid "a video"
msgstr "vidéo"
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5084
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+"%(contact)s veut démarrer un session %(type)s avec vous. Voulez-vous "
+"répondre à son appel ?"
+
+#: ../src/dialogs.py:5152
+#, python-format
+msgid "Certificate for account %s"
+msgstr "Certificat pour le compte %s"
+
+#: ../src/dialogs.py:5152
#, python-format
-msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
-msgstr "%(contact)s veut démarrer un session %(type)s avec vous. Voulez-vous répondre à son appel ?"
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5186 ../src/dialogs.py:5203
+msgid "View cert..."
+msgstr "Voir cert..."
#: ../src/disco.py:119
msgid "Others"
@@ -7164,57 +7782,61 @@ msgstr "Autres"
msgid "Conference"
msgstr "Conférences"
-#: ../src/disco.py:513
+#: ../src/disco.py:516
msgid "Without a connection, you can not browse available services"
msgstr "Vous devez être connecté pour parcourir les services disponibles"
-#: ../src/disco.py:600
+#: ../src/disco.py:602
#, python-format
msgid "Service Discovery using account %s"
msgstr "Gestion des Services du compte %s"
-#: ../src/disco.py:602
+#: ../src/disco.py:604
msgid "Service Discovery"
msgstr "Gestion des Services"
-#: ../src/disco.py:758
+#: ../src/disco.py:760
msgid "The service could not be found"
msgstr "Le service n'a pu être trouvé"
-#: ../src/disco.py:759
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. Veuillez vérifier l'adresse et réessayer."
+#: ../src/disco.py:761
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. "
+"Veuillez vérifier l'adresse et réessayer."
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:765 ../src/disco.py:1102
msgid "The service is not browsable"
msgstr "Le service ne peut pas être parcouru"
-#: ../src/disco.py:764
+#: ../src/disco.py:766
msgid "This type of service does not contain any items to browse."
msgstr "Ce type de service ne contient pas d'élément à parcourir."
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:806 ../src/disco.py:816
msgid "Invalid Server Name"
msgstr "Nom de serveur invalide"
-#: ../src/disco.py:868
+#: ../src/disco.py:870
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "Parcourt %(address)s en utilisant le compte %(account)s"
-#: ../src/disco.py:912
+#: ../src/disco.py:914
msgid "_Browse"
msgstr "_Parcourir"
-#: ../src/disco.py:1101
+#: ../src/disco.py:1103
msgid "This service does not contain any items to browse."
msgstr "Ce service ne contient aucun élément à parcourir."
-#: ../src/disco.py:1341
+#: ../src/disco.py:1343
msgid "_Execute Command"
msgstr "_Exécuter une commande"
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1353 ../src/disco.py:1522
msgid "Re_gister"
msgstr "_Souscrire"
@@ -7228,8 +7850,8 @@ msgstr "Scanne %(current)d / %(total)d.."
msgid "Users"
msgstr "Utilisateurs"
-#. Description column
# ccount). Description column
+#. Description column
#: ../src/disco.py:1762
msgid "Description"
msgstr "Description"
@@ -7239,250 +7861,282 @@ msgstr "Description"
msgid "Id"
msgstr "Id"
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1835 ../src/gui_interface.py:2466
msgid "Bookmark already set"
msgstr "Marque-page déjà spécifié"
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1836 ../src/gui_interface.py:2467
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1845 ../src/gui_interface.py:2481
msgid "Bookmark has been added successfully"
msgstr "Marque-page ajouté avec succès"
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1846 ../src/gui_interface.py:2482
msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de contacts."
+msgstr ""
+"Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
+"contacts."
-#: ../src/disco.py:2057
+#: ../src/disco.py:2055
msgid "Subscribed"
msgstr "Inscrit"
-#: ../src/disco.py:2065
+#: ../src/disco.py:2063
msgid "Node"
msgstr "NÅ“ud"
-#: ../src/disco.py:2129
+#: ../src/disco.py:2127
msgid "New post"
msgstr "Nouvel article"
-#: ../src/disco.py:2135
+#: ../src/disco.py:2133
msgid "_Subscribe"
msgstr "_Ajouter"
-#: ../src/disco.py:2141
+#: ../src/disco.py:2139
msgid "_Unsubscribe"
msgstr "_Désinscrire"
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
msgstr "Validation de certificat SSL"
-#: ../src/features_window.py:50
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "Une librairie utilisée pour valider les certificats des serveurs afin d'assurer une connexion sécurisée."
+#: ../src/features_window.py:51
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Une librairie utilisée pour valider les certificats des serveurs afin "
+"d'assurer une connexion sécurisée."
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:52 ../src/features_window.py:53
msgid "Requires python-pyopenssl."
msgstr "Nécessite python-pyopenssl."
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
msgid "Bonjour / Zeroconf"
msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Conversation sans serveur avec détection automatique des clients dans un réseau local."
+msgstr ""
+"Conversation sans serveur avec détection automatique des clients dans un "
+"réseau local."
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
msgid "Requires python-avahi."
msgstr "Nécessite python-avahi"
-#: ../src/features_window.py:56
+#: ../src/features_window.py:57
msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
msgstr "Nécessite pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
msgid "Command line"
msgstr "Ligne de commandes"
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
msgid "A script to control Gajim via commandline."
msgstr "Un script permettant de contrôler Gajim avec des lignes de commande."
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
msgid "Requires python-dbus."
msgstr "Nécessite python-dbus."
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:85 ../src/features_window.py:89
+#: ../src/features_window.py:109
msgid "Feature not available under Windows."
msgstr "Fonctionnalité indisponible sous Windows."
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
msgid "OpenGPG message encryption"
msgstr "Chiffrement OpenGPG"
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
msgid "Encrypting chat messages with gpg keys."
msgstr "Chiffrement des messages avec des clefs GPG."
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Nécessite gpg et python-GnuPGInterface."
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
#: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr "gpg.exe doit être dans le PATH."
+
+#: ../src/features_window.py:66
msgid "Network-manager"
msgstr "network-manager"
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
msgid "Autodetection of network status."
msgstr "Auto-détection du statut de la connexion."
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
msgid "Requires gnome-network-manager and python-dbus."
msgstr "Nécessite gnome-network-manager et python-dbus."
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
msgid "Session Management"
msgstr "Gestion de la Session"
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
msgid "Gajim session is stored on logout and restored on login."
-msgstr "La session Gajim est enregistrée à la déconnexion et restaurée à la connexion."
+msgstr ""
+"La session Gajim est enregistrée à la déconnexion et restaurée à la "
+"connexion."
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
msgid "Requires python-gnome2."
msgstr "Nécessite python-gnome2"
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
msgid "Password encryption"
msgstr "Chiffrement du mot de passe"
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
msgid "Passwords can be stored securely and not just in plaintext."
-msgstr "Les mots de passe peuvent être stockés de façon sécurisée et non pas seulement en texte."
+msgstr ""
+"Les mots de passe peuvent être stockés de façon sécurisée et non pas "
+"seulement en texte."
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
msgstr "Nécessite gnome-keyring et python-gnome2-desktop, ou kwalletcli."
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
msgid "SRV"
msgstr "SRV"
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
msgid "Ability to connect to servers which are using SRV records."
-msgstr "Possibilité de se connecter à des serveurs qui utilisent des entrées SRV."
+msgstr ""
+"Possibilité de se connecter à des serveurs qui utilisent des entrées SRV."
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
msgid "Requires dnsutils."
msgstr "Nécessite dnsutils."
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
msgid "Requires nslookup to use SRV records."
msgstr "Nécessite nslookup afin d'utiliser les enregistrements SRV."
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
msgid "Spell Checker"
msgstr "Vérificateur d'Orthographe"
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
msgid "Spellchecking of composed messages."
msgstr "Vérification ortohgraphique des messages composés."
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
msgid "Requires libgtkspell."
msgstr "Nécessite libgtkspell"
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
msgid "Notification"
msgstr "Notification"
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
msgid "Passive popups notifying for new events."
msgstr "Notification de nouveaux événements via des popups."
-#: ../src/features_window.py:87
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
-msgstr "Nécessite python-notify ou python-dbus en conjonction avec notification-daemon."
+#: ../src/features_window.py:88
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+"Nécessite python-notify ou python-dbus en conjonction avec notification-"
+"daemon."
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
msgid "Automatic status"
msgstr "Statut automatique"
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Possibilité de mesurer le temps d'inactivité, afin de définir un statut automatique."
+msgstr ""
+"Possibilité de mesurer le temps d'inactivité, afin de définir un statut "
+"automatique."
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
msgid "Requires libxss library."
msgstr "Nécessite la librairie libxss."
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
msgid "Requires python2.5."
msgstr "Nécessite python2.5"
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
msgid "LaTeX"
msgstr "LaTeX"
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
msgid "Transform LaTeX expressions between $$ $$."
msgstr "Transforme les expressions LaTeX entre $$ $$."
-#: ../src/features_window.py:95
-#, fuzzy
-msgid "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Nécessite texlive-latex-base et dvipng. Vous devez définir « use_latex » à True dans l'éditeur de configuration avancée."
-
#: ../src/features_window.py:96
-#, fuzzy
-msgid "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Nécessite texlive-latex-base et dvipng (tout est dans MikTeX). Vous devez définir « use_latex » à True dans l'éditeur de configuration avancée."
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Nécessite texlive-latex-base et (dvipng ou ImageMagick). Vous devez définir "
+"« use_latex » à True dans l'éditeur de configuration avancée."
#: ../src/features_window.py:97
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Nécessite texlive-latex-base et (dvipng ou ImageMagick) (tout est dans "
+"MikTeX). Vous devez définir « use_latex » à True dans l'éditeur de "
+"configuration avancée."
+
+#: ../src/features_window.py:98
msgid "End to End message encryption"
msgstr "Chiffrement des messages de bout en bout"
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
msgid "Encrypting chat messages."
msgstr "Chiffrement des messages de la conversation."
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:100 ../src/features_window.py:101
msgid "Requires python-crypto."
msgstr "Nécessite python-crypto."
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
msgid "RST Generator"
msgstr "Générateur RST"
-#: ../src/features_window.py:102
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Génère une sortie XHTML à partir d'un code RST (voir http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+#: ../src/features_window.py:103
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Génère une sortie XHTML à partir d'un code RST (voir http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:104 ../src/features_window.py:105
msgid "Requires python-docutils."
msgstr "Nécessite python-docutils."
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
msgid "Ability to start audio and video chat."
msgstr "Possibilité de démarrer une conversation audio et vidéo."
-#: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "Nécessite python-farsight."
+#: ../src/features_window.py:108
+msgid "Requires python-farsight and gstreamer-plugins-bad."
+msgstr "Nécessite python-farsight et gstreamer-plugins-bad."
-#: ../src/features_window.py:115
-#, fuzzy
+#: ../src/features_window.py:116
msgid "?features:Available"
-msgstr "Disponible"
+msgstr "?features:Disponible"
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
msgid "Feature"
msgstr "Fonctionnalité"
@@ -7503,7 +8157,7 @@ msgstr "Progression"
msgid "Filename: %s"
msgstr "Nom du Fichier : %s"
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
#, python-format
msgid "Size: %s"
msgstr "Taille : %s"
@@ -7511,7 +8165,7 @@ msgstr "Taille : %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/history_manager.py:541
msgid "You"
msgstr "Vous"
@@ -7520,7 +8174,7 @@ msgstr "Vous"
msgid "Sender: %s"
msgstr "Expéditeur : %s"
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
#: ../src/tooltips.py:742
msgid "Recipient: "
msgstr "Destinataire : "
@@ -7556,78 +8210,82 @@ msgstr "Message d'erreur : %s"
msgid "File transfer stopped"
msgstr "Transfert de fichier interrompu"
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:266
msgid "Choose File to Send..."
msgstr "Choisissez un fichier à envoyer..."
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
msgid "Description: "
msgstr "Description :"
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:295
msgid "Gajim cannot access this file"
msgstr "Gajim ne peut accéder à ce fichier"
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:296
msgid "This file is being used by another process."
msgstr "Ce fichier est utilisé par un autre processus."
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:330
#, python-format
msgid "File: %s"
msgstr "Fichier : %s"
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:336
#, python-format
msgid "Type: %s"
msgstr "Type : %s"
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:338
#, python-format
msgid "Description: %s"
msgstr "Description : %s"
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:339
#, python-format
msgid "%s wants to send you a file:"
msgstr "%s souhaite vous envoyer un fichier :"
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "Impossible de remplacer le fichier existant \"%s\""
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "Un fichier du même nom existe déjà et vous n'avez pas la permission de l'écraser."
+#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"Un fichier du même nom existe déjà et vous n'avez pas la permission de "
+"l'écraser."
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
msgid "This file already exists"
msgstr "Ce fichier existe déjà "
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
msgid "What do you want to do?"
msgstr "Que voulez vous faire ?"
#. 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:369 ../src/gtkgui_helpers.py:918
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:862
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "Le dossier \"%s\" n'est pas accessible en écriture"
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
msgid "You do not have permission to create files in this directory."
msgstr "Vous n'avez pas les permissions de créer des fichiers dans ce dossier."
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:389
msgid "Save File as..."
msgstr "Enregistrer le Fichier sous..."
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
#. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:459
#, python-format
msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7635,79 +8293,78 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
#. This should make the string Kb/s,
#. where 'Kb' part is taken from %s.
#. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:552
#, python-format
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/s)"
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
msgid "Invalid File"
msgstr "Fichier non valide"
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:595
msgid "File: "
msgstr "Fichier : "
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:599
msgid "It is not possible to send empty files"
msgstr "Il n'est pas possible d'envoyer un fichier vide"
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
msgid "Name: "
msgstr "Nom : "
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
msgid "Sender: "
msgstr "Expéditeur : "
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:787
msgid "Pause"
msgstr "Pause"
-#: ../src/gajim.py:142
+#: ../src/gajim.py:186
msgid "Gajim needs X server to run. Quiting..."
msgstr "Gajim a besoin d'un serveur X pour démarrer. Fermeture..."
-#: ../src/gajim.py:144
+#: ../src/gajim.py:188
#, python-format
msgid "importing PyGTK failed: %s"
msgstr "l'import de PyGTK a échoué : %s"
-#: ../src/gajim.py:186
-#, fuzzy
+#: ../src/gajim.py:230
msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim a besoin de PyGTK 2.12 pour s'exécuter"
+msgstr "Gajim a besoin de PyGTK 2.16 pour s'exécuter"
-#: ../src/gajim.py:187
-#, fuzzy
+#: ../src/gajim.py:231
msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim a besoin de PyGTK 2.1é ou supérieur pour s'exécuter. Fermeture..."
+msgstr ""
+"Gajim a besoin de PyGTK 2.16 ou supérieur pour s'exécuter. Fermeture..."
-#: ../src/gajim.py:189
-#, fuzzy
+#: ../src/gajim.py:233
msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim a besoin de GTK 2.12 ou supérieur"
+msgstr "Gajim a besoin de GTK 2.16 ou supérieur"
-#: ../src/gajim.py:190
-#, fuzzy
+#: ../src/gajim.py:234
msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim a besoin de GTK 2.12 ou supérieur pour s'exécuter. Fermeture..."
+msgstr "Gajim a besoin de GTK 2.16 ou supérieur pour s'exécuter. Fermeture..."
-#: ../src/gajim.py:199
+#: ../src/gajim.py:243
msgid "Gajim needs pywin32 to run"
msgstr "Gajim a besoin de pywin32 pour s'exécuter"
-#: ../src/gajim.py:200
+#: ../src/gajim.py:244
#, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
msgstr "Assurez-vous que Pywin32 est installé. Vous pouvez l'obtenir ici : %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:360
msgid "Gajim is already running"
msgstr "Gajim est déjà en cours d'exécution"
-#: ../src/gajim.py:317
+#: ../src/gajim.py:361
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7715,38 +8372,35 @@ msgstr ""
"Gajim semble déjà être en cours d'exécution\n"
"Démarrer quand même ?"
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:77
msgid "Shows a help on specific command"
msgstr "Afficher l'aide pour une commande"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:80
msgid "command"
msgstr "commande"
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:81
msgid "show help on command"
msgstr "montrer l'aide sur la commande"
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:85
msgid "Shows or hides the roster window"
msgstr "Montre ou cache la fenêtre principale"
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:89
msgid "Pops up a window with the next pending event"
msgstr "Afficher une fenêtre avec le prochain message non lu"
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Affiche une liste de tous les contacts de la liste. Chaque contact apparaît sur une ligne séparée"
-
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
+#: ../src/gajim-remote.py:93
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Affiche une liste de tous les contacts de la liste. Chaque contact apparaît "
+"sur une ligne séparée"
+
#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -7758,250 +8412,338 @@ msgstr "Affiche une liste de tous les contacts de la liste. Chaque contact appar
msgid "account"
msgstr "compte"
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:96
msgid "show only contacts of the given account"
msgstr "montrer seulement les contacts du compte spécifié"
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:102
msgid "Prints a list of registered accounts"
msgstr "Affiche la liste des comptes enregistrés"
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:106
msgid "Changes the status of account or accounts"
msgstr "Change l'état du ou des compte(s)"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:109
msgid "status"
msgstr "état"
-#: ../src/gajim-remote-plugin.py:106
-#, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
+#: ../src/gajim-remote.py:109
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"un parmi : offline, online, chat, away, xa, dnd, invisible. Si non défini, "
+"le précédant statut est utilisé"
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:110
msgid "status message"
msgstr "Message d'état"
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
-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 "Change l'état du compte \"compte\". Si aucun n'est spécifié, essaye de changer l'état de tous les compte qui ont l'option \"synchroniser avec l'état global\" activée"
+#: ../src/gajim-remote.py:111
+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 ""
+"Change l'état du compte \"compte\". Si aucun n'est spécifié, essaye de "
+"changer l'état de tous les compte qui ont l'option \"synchroniser avec "
+"l'état global\" activée"
+
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Change la priorité du ou des compte(s)"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "Priorité :"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "priorité que vous voulez donner au compte"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Change la priorité du compte spécifié. Si aucun compte n'est spécifié, "
+"change la priorité de tous les comptes qui ont l'option « synchroniser avec "
+"l'état global » activée"
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:127
msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "Montre la fenêtre de discussion pour que vous puissiez envoyer un message à un contact"
+msgstr ""
+"Montre la fenêtre de discussion pour que vous puissiez envoyer un message à "
+"un contact"
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:129
msgid "JID of the contact that you want to chat with"
msgstr "L'identifiant Jabber du contact avec lequel vous voulez discuter"
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
msgid "if specified, contact is taken from the contact list of this account"
msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
-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 "Envoyer un nouveau message à un contact dans la liste. La clé OpenPGP et le compte sont facultatifs. Si vous voulez seulement renseigner le paramètre 'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "contenu du message. Le compte doit être spécifié ou \"\""
+
+#: ../src/gajim-remote.py:139
+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 ""
+"Envoyer un nouveau message à un contact dans la liste. La clé OpenPGP et le "
+"compte sont facultatifs. Si vous voulez seulement renseigner le paramètre "
+"'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
msgid "JID of the contact that will receive the message"
msgstr "L'identifiant Jabber du contact qui recevra le message"
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
msgid "message contents"
msgstr "contenu du message"
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "pgp key"
msgstr "clé pgp"
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "if specified, the message will be encrypted using this public key"
msgstr "Si spécifié, le message sera chiffré en utilisant cette clé publique"
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
msgid "if specified, the message will be sent using this account"
msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
-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 "Envoyer un nouveau message simple à un contact dans la liste. La clé OpenPGP et le compte sont facultatifs. Si vous voulez seulement renseigner le paramètre 'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
+#: ../src/gajim-remote.py:152
+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 ""
+"Envoyer un nouveau message simple à un contact dans la liste. La clé OpenPGP "
+"et le compte sont facultatifs. Si vous voulez seulement renseigner le "
+"paramètre 'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
msgid "subject"
msgstr "sujet"
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
msgid "message subject"
msgstr "sujet du message"
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:166
msgid "Sends new message to a groupchat you've joined."
msgstr "Envoie un nouveau message à un salon que vous avez rejoint."
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:168
msgid "JID of the room that will receive the message"
msgstr "L'identifiant Jabber du salon qui recevra le message"
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:175
msgid "Gets detailed info on a contact"
msgstr "Récupère les informations détaillées d'un contact"
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
msgid "JID of the contact"
msgstr "L'identifiant Jabber du contact"
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:181
msgid "Gets detailed info on a account"
msgstr "Récupère les informations détaillées d'un compte"
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:183
msgid "Name of the account"
msgstr "Nom du compte"
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:187
msgid "Sends file to a contact"
msgstr "Envoyer un fichier à un contact"
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
msgid "file"
msgstr "fichier"
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
msgid "File path"
msgstr "Chemin du fichier"
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:191
msgid "if specified, file will be sent using this account"
msgstr "si spécifié, le message sera envoyé en utilisant ce compte"
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:196
msgid "Lists all preferences and their values"
msgstr "Liste toutes les préférences et leurs valeurs"
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:200
msgid "Sets value of 'key' to 'value'."
msgstr "Définir la valeur de 'clé' à 'valeur'."
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
msgid "key=value"
msgstr "clé=valeur"
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
msgid "'key' is the name of the preference, 'value' is the value to set it to"
msgstr "'clé' est le nom de la préférence, 'valeur' est la valeur à assigner"
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:207
msgid "Deletes a preference item"
msgstr "Supprime une option de préférence"
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
msgid "key"
msgstr "touche"
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
msgid "name of the preference to be deleted"
msgstr "nom de la préférence a supprimer"
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:213
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:218
msgid "Removes contact from roster"
msgstr "Enlever le contact de la liste"
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:227
msgid "Adds contact to roster"
msgstr "Ajouter le contact à la liste"
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:230
msgid "Adds new contact to this account"
msgstr "Ajoute un nouveau contact à ce compte"
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:235
msgid "Returns current status (the global one unless account is specified)"
msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "Renvoie le message d'état actuel (global à moins qu'un compte ne soit spécifié)"
+#: ../src/gajim-remote.py:242
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
+"spécifié)"
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:249
msgid "Returns number of unread messages"
msgstr "Renvoie le nombre de messages non-lus"
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:253
msgid "Opens 'Start Chat' dialog"
msgstr "Ouvre la fenêtre « Commencer une discussion »"
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:255
msgid "Starts chat, using this account"
msgstr "Commencer une discussion en utilisant ce compte"
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:259
msgid "Sends custom XML"
msgstr "Envoyer du XML personnalisé"
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:261
msgid "XML to send"
msgstr "XML Ã envoyer"
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé à tous les comptes"
+#: ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
+"Ã tous les comptes"
+
+#: ../src/gajim-remote.py:268
+msgid "Change the avatar"
+msgstr "Modifier l'avatar"
+
+#: ../src/gajim-remote.py:270
+msgid "Picture to use"
+msgstr "Image à utiliser"
+
+#: ../src/gajim-remote.py:271
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Compte dans lequel l'avatar sera envoyé ; si non spécifié, l'avatar sera "
+"envoyé à tous les comptes"
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:277
msgid "Handle a xmpp:/ uri"
msgstr "Gère une URI du type xmpp:"
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:279
msgid "uri"
msgstr "URI"
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "URI à gérer"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "Compte avec lequel vous voulez le gérer"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "Contenu du message"
+
+#: ../src/gajim-remote.py:286
msgid "Join a MUC room"
msgstr "Joindre un groupe de discussions"
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:288
msgid "room"
msgstr "groupe de discussion"
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "JID du salon"
+
+#: ../src/gajim-remote.py:289
msgid "nick"
msgstr "pseudonyme"
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "Surnom à utiliser"
+
+#: ../src/gajim-remote.py:290
msgid "password"
msgstr "mot de passe"
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "Mot de passe pour entrer dans le salon"
+
+#: ../src/gajim-remote.py:291
+msgid "Account from which you want to enter the room"
+msgstr "Le compte avec lequel vous voulez entrer dans le salon"
+
+#: ../src/gajim-remote.py:296
msgid "Check if Gajim is running"
msgstr "Vérifie si Gajim est lancé"
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
#: ../src/gajim-remote.py:300
msgid "Shows or hides the ipython window"
msgstr "Montre ou cache la fenêtre ipython"
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:327
msgid "Missing argument \"contact_jid\""
msgstr "Argument manquant \"jid_contact\""
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:349
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -8010,33 +8752,35 @@ msgstr ""
"'%s' n'est pas dans votre liste de contact.\n"
"Précisez le compte pour envoyer le message."
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:352
msgid "You have no active account"
msgstr "Vous n'avez aucun compte actif"
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:405
msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr "Il semble que Gajim ne soit pas lancé. Vous ne pouvez donc pas utiliser gajim-remote."
+msgstr ""
+"Il semble que Gajim ne soit pas lancé. Vous ne pouvez donc pas utiliser "
+"gajim-remote."
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:432
#, python-format
msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
msgstr ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Utilisation : %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:436
msgid "Arguments:"
msgstr "Arguments :"
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:440
#, python-format
msgid "%s not found"
msgstr "%s non trouvé"
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#: ../src/gajim-remote.py:446
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -8045,110 +8789,7 @@ msgstr ""
"Utilisation : %s commande [arguments]\n"
"commande est l'une de :\n"
-#: ../src/gajim-remote-plugin.py:496
-#, fuzzy, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Trop d'arguments.\n"
-"Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
-
-#: ../src/gajim-remote-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"L'argument \"%(arg)s\" n'est pas précisé.\n"
-"Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Mauvaise adresse (URI)"
-
-#: ../src/gajim-remote.py:109
-#, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account's previous status"
-msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Change la priorité du ou des compte(s)"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "Priorité :"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "priorité que vous voulez donner au compte"
-
-#: ../src/gajim-remote.py:121
-msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
-msgstr "Change la priorité du compte spécifié. Si aucun compte n'est spécifié, change la priorité de tous les comptes qui ont l'option « synchroniser avec l'état global » activée"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "contenu du message. Le compte doit être spécifié ou \"\""
-
-#: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Renvoie le message d'état actuel (global à moins qu'un compte ne soit spécifié)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Modifier le statut"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Surnom à utiliser"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid "Account in which the avatar will be set; if not specified, the avatar will be set for all accounts"
-msgstr "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé à tous les comptes"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI à gérer"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Compte avec lequel vous voulez le gérer"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Contenu du message"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "JID du salon"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Surnom à utiliser"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Mot de passe pour entrer dans le salon"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Le compte avec lequel vous voulez entrer dans le salon"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Utilisation : %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:515
#, python-format
msgid ""
"Too many arguments. \n"
@@ -8157,7 +8798,7 @@ msgstr ""
"Trop d'arguments.\n"
"Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:520
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8166,10 +8807,14 @@ msgstr ""
"L'argument \"%(arg)s\" n'est pas précisé.\n"
"Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:539
msgid "No uri given"
msgstr ""
+#: ../src/gajim-remote.py:541
+msgid "Wrong uri"
+msgstr "Mauvaise adresse (URI)"
+
#: ../src/gajim_themes_window.py:59
msgid "Theme"
msgstr "Thème"
@@ -8193,176 +8838,219 @@ msgstr "Vous ne pouvez pas supprimer le thème actuellement utilisé"
#: ../src/gajim_themes_window.py:187
msgid "Please first choose another for your current theme."
-msgstr "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
+msgstr ""
+"Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
+
+#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1562
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"
+
+#: ../src/groupchat_control.py:202 ../src/groupchat_control.py:1760
+#: ../src/history_window.py:447 ../src/notify.py:169
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s est maintenant %(status)s"
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:230
msgid "Sending private message failed"
msgstr "L'envoi du message privé a échoué"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:232
#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr "Vous n'êtes plus dans le salon « %(room)s » ou « %(nick)s » l'a quitté."
+msgstr ""
+"Vous n'êtes plus dans le salon « %(room)s » ou « %(nick)s » l'a quitté."
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:561
msgid "Insert Nickname"
msgstr "Insérer un surnom"
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:746
msgid "Conversation with "
msgstr "Conversation avec "
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:748
msgid "Continued conversation"
msgstr "Conversation continuée"
+#: ../src/groupchat_control.py:1228
+#, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s a changé le sujet en %(subject)s"
+
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1246 ../src/groupchat_control.py:1505
msgid "Any occupant is allowed to see your full JID"
-msgstr "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
+msgstr ""
+"N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
+
+#: ../src/groupchat_control.py:1249
+msgid "Room now shows unavailable member"
+msgstr "Le salon affiche dorénavant les membres non-disponibles"
+
+#: ../src/groupchat_control.py:1251
+msgid "room now does not show unavailable members"
+msgstr "Le salon n'affiche plus les membres non-disponibles"
+
+#: ../src/groupchat_control.py:1253
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Un changement de la configuration du salon relatif à la vie-privée a eu lieu"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1257
+msgid "Room logging is now enabled"
+msgstr "L'enregistrement des conversations du salon est maintenant activé"
+
+#: ../src/groupchat_control.py:1259
+msgid "Room logging is now disabled"
+msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
+
+#: ../src/groupchat_control.py:1261
+msgid "Room is now non-anonymous"
+msgstr "Le salon n'est plus anonyme"
+
+#: ../src/groupchat_control.py:1264
+msgid "Room is now semi-anonymous"
+msgstr "Le salon est maintenant sami-anonyme"
+
+#: ../src/groupchat_control.py:1267
+msgid "Room is now fully-anonymous"
+msgstr "Le salon est maintenant totalement anonyme"
#. Can be a message (see handle_event_gc_config_change in
#. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1509
msgid "Room logging is enabled"
msgstr "L'enregistrement des conversations du salon est activé"
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1511
msgid "A new room has been created"
msgstr "Un nouveau salon a été créé"
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1514
msgid "The server has assigned or modified your roomnick"
msgstr "Le serveur à défini ou midifié votre Surnom de salon"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1520
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s a été éjecté : %(reason)s"
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1523
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1532
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s a été banni : %(reason)s"
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1535
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s a été banni par %(who)s : %(reason)s"
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1546 ../src/groupchat_control.py:1650
#, python-format
msgid "You are now known as %s"
msgstr "Vous êtes désormais connu sous le nom de %s"
-#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"
-
-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1604 ../src/groupchat_control.py:1609
+#: ../src/groupchat_control.py:1615
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s a été éjecté du salon (%(reason)s)"
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1606
msgid "affiliation changed"
msgstr "Changement d'affiliation"
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1611
msgid "room configuration changed to members-only"
msgstr "La configuration du salon a changé pour « membres seulement »"
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1617
msgid "system shutdown"
msgstr "Extinction du système"
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1700
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
-msgstr "** L'affiliation de %(nick)s a été définie à %(affiliation)s par %(actor)s"
+msgstr ""
+"** L'affiliation de %(nick)s a été définie à %(affiliation)s par %(actor)s"
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1704
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr "** L'affiliation de %(nick)s a été définie à %(affiliation)s"
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1719
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
msgstr "** Le rôle de %(nick)s a été défini à %(role)s par %(actor)s"
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1723
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
msgstr "** Le rôle de %(nick)s a été défini à %(role)s"
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1753
#, python-format
msgid "%s has left"
msgstr "%s est parti"
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1758
#, python-format
msgid "%s has joined the group chat"
msgstr "%s a rejoint le salon de discussion"
-#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s est maintenant %(status)s"
-
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:2014
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
-#: ../src/groupchat_control.py:1776
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:2016
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
msgstr "Si vous fermez cette fenêtre, vous serez déconnecté(e) de ce salon."
-#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
-#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
-#: ../src/gui_interface.py:1853 ../src/message_window.py:224
-#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
-#: ../src/roster_window.py:4195
-#, fuzzy
+#: ../src/groupchat_control.py:2020 ../src/gui_interface.py:693
+#: ../src/gui_interface.py:1302 ../src/gui_interface.py:1342
+#: ../src/gui_interface.py:1383 ../src/message_window.py:224
+#: ../src/roster_window.py:2946 ../src/roster_window.py:3617
+#: ../src/roster_window.py:4380
msgid "_Do not ask me again"
msgstr "_Ne plus me poser la question"
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:2054
msgid "Changing Subject"
msgstr "Changement de Sujet"
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2055
msgid "Please specify the new subject:"
msgstr "Saisissez le nouveau sujet :"
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2062
msgid "Changing Nickname"
msgstr "Changement de Surnom"
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2063
msgid "Please specify the new nickname you want to use:"
msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
#. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2094
#, python-format
msgid "Destroying %s"
msgstr "Destruction de %s"
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2095
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
@@ -8370,22 +9058,22 @@ msgstr ""
"Vous êtes sur le point de supprimer définitivement ce salon.\n"
"Vous pouvez spécifier une raison ci-dessous :"
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2097
msgid "You may also enter an alternate venue:"
msgstr "Vous pouvez également entrer une juridiction alternative :"
#. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2292
#, python-format
msgid "Kicking %s"
msgstr "Exclusion de %s"
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2293 ../src/groupchat_control.py:2630
msgid "You may specify a reason below:"
msgstr "Vous pouvez saisir une raison ci-dessous :"
#. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2629
#, python-format
msgid "Banning %s"
msgstr "Bannissement de %s"
@@ -8395,8 +9083,12 @@ msgid "A programming error has been detected"
msgstr "Une erreur de programmation a été détectée"
#: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Elle n'est probablement pas fatale mais devrait quand même être communiquée aux développeurs."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Elle n'est probablement pas fatale mais devrait quand même être communiquée "
+"aux développeurs."
#: ../src/gtkexcepthook.py:54
msgid "_Report Bug"
@@ -8412,151 +9104,157 @@ msgstr "Détails"
msgid "Error: cannot open %s for reading"
msgstr "Erreur : impossible d'ouvrir %s en lecture"
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:348
msgid "Error reading file:"
msgstr "Erreur de lecture du fichier :"
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:351
msgid "Error parsing file:"
msgstr "Erreur lors de l'analyse du fichier :"
#. do not traceback (could be a permission problem)
#. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:392
#, python-format
msgid "Could not write to %s. Session Management support will not work"
msgstr "N'a pas pu écrire dans %s. La gestion des sessions ne fonctionnera pas"
#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
+#: ../src/gtkgui_helpers.py:766
msgid "Gajim is not the default Jabber client"
msgstr "Gajim n'est pas le client Jabber par défaut"
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:767
msgid "Would you like to make Gajim the default Jabber client?"
msgstr "Voulez vous faire de Gajim le client Jabber par défaut ?"
-#: ../src/gtkgui_helpers.py:824
+#: ../src/gtkgui_helpers.py:768
msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Toujours vérifier que Gajim est le client Jabber par défaut au démarrage"
+msgstr ""
+"Toujours vérifier que Gajim est le client Jabber par défaut au démarrage"
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:835
msgid "Extension not supported"
msgstr "Extension non supportée"
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:836
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "L'image ne peut être enregistrée en format %(type)s. Enregistrer en tant que %(new_filename)s ?"
+msgstr ""
+"L'image ne peut être enregistrée en format %(type)s. Enregistrer en tant que "
+"%(new_filename)s ?"
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:872
msgid "Save Image as..."
msgstr "Enregistrer l'image sous..."
#. we are banned
#. group chat does not exist
-#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
-#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
-#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
-#: ../src/gui_interface.py:348
+#: ../src/gui_interface.py:126 ../src/gui_interface.py:281
+#: ../src/gui_interface.py:290 ../src/gui_interface.py:295
+#: ../src/gui_interface.py:298 ../src/gui_interface.py:301
+#: ../src/gui_interface.py:306
msgid "Unable to join group chat"
msgstr "Impossible de rejoindre le salon"
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:127
#, 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 ""
-"Le surnom que vous vouliez utiliser dans le salon %s est actuellement utilisé ou enregistré par un autre occupant.\n"
+"Le surnom que vous vouliez utiliser dans le salon %s est actuellement "
+"utilisé ou enregistré par un autre occupant.\n"
"Veuillez entrer un autre surnom ci-dessous :"
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:130
msgid "Always use this nickname when there is a conflict"
msgstr "Toujours utiliser ce pseudo en cas de conflit"
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:147
msgid "Do you accept this request?"
msgstr "Acceptez vous sa requête ?"
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:149
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "Acceptez vous cette requête sur le compte %s ?"
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:152
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "Autorisation HTTP (%(method)s) pour %(url)s (id : %(id)s)"
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:195 ../src/notify.py:439
msgid "Connection Failed"
msgstr "La connexion a échoué"
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:270
#, python-format
msgid "A Password is required to join the room %s. Please type it."
-msgstr "Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
+msgstr ""
+"Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:282
#, python-format
msgid "Maximum number of users for %s has been reached"
msgstr "Le nombre maximal d'utilisateurs pour %s a été atteint"
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:291
#, python-format
msgid "You are banned from group chat %s."
msgstr "Vous êtes banni du salon %s."
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:296
#, python-format
msgid "Group chat %s does not exist."
msgstr "Le salon %s n'existe pas."
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:299
msgid "Group chat creation is restricted."
msgstr "La création de salon est réservée aux administrateurs."
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:302
#, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr "Votre pseudonyme enregistré doit être utilisé dans le salon %s."
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:307
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "Vous n'êtes pas dans la liste des membres du salon %s."
-#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
+#: ../src/gui_interface.py:438 ../src/gui_interface.py:442
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Erreur %(code)s : %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
+#: ../src/gui_interface.py:453 ../src/gui_interface.py:467
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "erreur en envoyant %(message)s ( %(error)s )"
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:494 ../src/notify.py:441
msgid "Subscription request"
msgstr "Requête d'Inscription"
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:519
msgid "Authorization accepted"
msgstr "Autorisation acceptée"
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:520
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Le contact \"%s\" vous a autorisé à voir son état."
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:528
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:529
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -8564,95 +9262,69 @@ msgstr ""
"Vous le/la verrez toujours hors-ligne.\n"
"Voulez vous le/la supprimer de votre liste de contacts ?"
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:550 ../src/notify.py:443
msgid "Unsubscribed"
msgstr "Désinscrit(e)"
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:561
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Le contact avec \"%s\" ne peut être établi"
-#: ../src/gui_interface.py:859
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s a changé le sujet en %(subject)s"
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr "Le salon affiche dorénavant les membres non-disponibles"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "Le salon n'affiche plus les membres non-disponibles"
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Un changement de la configuration du salon relatif à la vie-privée a eu lieu"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "L'enregistrement des conversations du salon est maintenant activé"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Le salon n'est plus anonyme"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Le salon est maintenant sami-anonyme"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Le salon est maintenant totalement anonyme"
-
-#: ../src/gui_interface.py:985
-msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
-msgstr "Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
+#: ../src/gui_interface.py:659
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent "
+"GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:661 ../src/gui_interface.py:669
msgid "You are currently connected without your OpenPGP key."
msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:663
msgid "Your passphrase is incorrect"
msgstr "Votre mot de passe est incorrect"
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:668
msgid "OpenGPG Passphrase Incorrect"
msgstr "Mot de passe OpenGPG est incorrect"
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:691
msgid "GPG key not trusted"
msgstr "la clef GPG n'est pas une clef de confiance"
-#: ../src/gui_interface.py:1019
-msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
-msgstr "La clef GPG utilisé pour chiffrer cette conversation n'est pas une clef de confiance. Voulez-vous vraiment chiffrer ce message ?"
+#: ../src/gui_interface.py:691
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"La clef GPG utilisé pour chiffrer cette conversation n'est pas une clef de "
+"confiance. Voulez-vous vraiment chiffrer ce message ?"
-#: ../src/gui_interface.py:1031
+#: ../src/gui_interface.py:704
#, fuzzy
-msgid "Gnome Keyring is installed but not correctly started (environment variable probably not correctly set)"
-msgstr "Gnome Keyring est installé mais pas \t\t\t\tcorrectement démarré (variable d'environnement probablement \t\t\t\tmal configurée)"
+msgid ""
+"Gnome Keyring is installed but not correctly started "
+"(environment variable probably not correctly set)"
+msgstr ""
+"Gnome Keyring est installé mais pas \t\t\t\tcorrectement démarré (variable "
+"d'environnement probablement \t\t\t\tmal configurée)"
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:811
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Nouveau courriel sur %(gmail_mail_address)s"
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:813
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
msgstr[0] "Vous avez %d nouveau courrier électronique"
msgstr[1] "Vous avez %d nouveaux courriers électroniques"
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:826
#, python-format
msgid ""
"\n"
@@ -8667,200 +9339,215 @@ msgstr ""
"Sujet : %(subject)s\n"
"%(snippet)s"
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:891
#, python-format
msgid "%s wants to send you a file."
msgstr "%s souhaite vous envoyer un fichier."
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:928 ../src/roster_window.py:1896
msgid "Remote contact stopped transfer"
msgstr "Le contact distant à stoppé le transfert"
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:931 ../src/roster_window.py:1898
msgid "Error opening file"
msgstr "Erreur à l'ouverture du fichier"
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:963
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:967
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
+msgstr ""
+"Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
-#: ../src/gui_interface.py:1304
+#: ../src/gui_interface.py:980
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:984
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Impossible de déchiffrer le message de %s\n"
-"Il a peut-être été manipulé."
-
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1059
msgid "Unable to decrypt message"
msgstr "Impossible de déchiffrer le message"
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1071
msgid "Username Conflict"
msgstr "Conflit de nom d'utilisateur"
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1072
msgid "Please type a new username for your local account"
msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping ?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong ! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Erreur."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1087
msgid "Resource Conflict"
msgstr "Conflit de ressource"
-#: ../src/gui_interface.py:1557
-msgid "You are already connected to this account with the same resource. Please type a new one"
-msgstr "Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en entrer une nouvelle"
+#: ../src/gui_interface.py:1088
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
+"entrer une nouvelle"
#. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1133
#, python-format
msgid "%s wants to start a voice chat."
msgstr "%s souhaite vous envoyer un fichier."
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1136
msgid "Voice Chat Request"
msgstr "Requête de transfert de fichier"
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1223
msgid "Error verifying SSL certificate"
msgstr "Erreur durant la vérification du certificat SSL"
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1224
#, 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 ""
-"Une erreur est survenue lors de la vérification du certificat SSL de votre serveur Jabber : %(error)s\n"
+"Une erreur est survenue lors de la vérification du certificat SSL de votre "
+"serveur Jabber : %(error)s\n"
"Voulez-vous toujours vous connecter à ce serveur ?"
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1233
msgid "Ignore this error for this certificate."
msgstr "Ignorer cette erreur pour ce certificat."
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1258
msgid "SSL certificate error"
msgstr "Erreur de certificat SSL"
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1259
#, python-format
msgid ""
-"It seems the SSL certificate of account %(account)s 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 ""
-"Le certificat SSL du compte %(account)s semble avoir changé, ou votre connexion est en train d'être « hackée ».\n"
+"Le certificat SSL du compte %(account)s semble avoir changé, ou votre "
+"connexion est en train d'être « hackée ».\n"
"Ancienne empreinte digitale : %(old)s\n"
"Nouvelle empreinte digitale : %(new)s\n"
"\n"
-"Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du certificat ?"
+"Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
+"certificat ?"
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
+#: ../src/gui_interface.py:1295 ../src/gui_interface.py:1337
+#: ../src/gui_interface.py:1379
msgid "Insecure connection"
msgstr "Connexion non-sécurisée"
-#: ../src/gui_interface.py:1777
-#, fuzzy
-msgid "You are about to connect to the server with an insecure connection. This means all your conversations will be exchanged unencrypted. Are you sure you want to do that?"
-msgstr "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous sûr de vouloir le faire ?"
+#: ../src/gui_interface.py:1296
+#, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. Are you sure you want to do that?"
+msgstr ""
+"Vous êtes sur le point de vous connecter au compte %(account)s (%(server)s) "
+"avec une connexion non-sécurisée. Cela signifie que toutes vos conversations "
+"ne seront pas chiffrées. Êtes vous sûr de vouloir faire cela ?"
-#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
+#: ../src/gui_interface.py:1301 ../src/gui_interface.py:1341
+#: ../src/gui_interface.py:1382
msgid "Yes, I really want to connect insecurely"
msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
-#: ../src/gui_interface.py:1814
-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 "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous sûr de vouloir le faire ?"
+#: ../src/gui_interface.py:1338
+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 ""
+"Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
+"sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
+"sûr de vouloir le faire ?"
-#: ../src/gui_interface.py:1850
-#, fuzzy
-msgid "You are about to send your password unencrypted on an insecure connection. Are you sure you want to do that?"
-msgstr "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-chiffrée. Êtes vous sûr de vouloir le faire ?"
+#: ../src/gui_interface.py:1380
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
+"chiffrée. Êtes vous sûr de vouloir le faire ?"
#. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1887 ../src/gui_interface.py:1910
msgid "Emoticons disabled"
msgstr "Émoticônes désactivées"
-#: ../src/gui_interface.py:2423
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
-msgstr "Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc désactivées."
+#: ../src/gui_interface.py:1888
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc "
+"désactivées."
-#: ../src/gui_interface.py:2446
-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 "Votre thème d'émoticônes n'a pu être chargé. Vous avez peut-être besoin de mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/wiki/Emoticons pour plus de détails."
+#: ../src/gui_interface.py:1911
+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 ""
+"Votre thème d'émoticônes n'a pu être chargé. Vous avez peut-être besoin de "
+"mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/"
+"wiki/Emoticons pour plus de détails."
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:1955 ../src/roster_window.py:3784
msgid "You cannot join a group chat while you are invisible"
-msgstr "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes invisible."
+msgstr ""
+"Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
+"invisible."
#. it is good to notify the user
#. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2871
+#: ../src/gui_interface.py:2342
msgid "Could not save your settings and preferences"
msgstr "Impossible d'enregistrer vos informations de configuration"
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:2889
msgid "Passphrase Required"
msgstr "Mot de Passe Requis"
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:2890
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Entrez votre mot de passe GPG pour la clé %(keyid)s (compte %(account)s)."
+msgstr ""
+"Entrez votre mot de passe GPG pour la clé %(keyid)s (compte %(account)s)."
-#: ../src/gui_interface.py:3426
+#: ../src/gui_interface.py:2904
msgid "GPG key expired"
msgstr "Clef GPG expirée"
-#: ../src/gui_interface.py:3427
-#, fuzzy, python-format
+#: ../src/gui_interface.py:2905
+#, python-format
msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
msgstr "Votre clef GPG a expiré, vous serez connecté(e) à %s sans OpenPGP."
#. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:2914
msgid "Wrong Passphrase"
msgstr "Mot de passe erroné"
-#: ../src/gui_interface.py:3437
+#: ../src/gui_interface.py:2915
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
@@ -8868,75 +9555,96 @@ msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
msgid "_New Group Chat"
msgstr "_Nouveau Salon de Discussion"
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:419
msgid "I would like to add you to my roster"
msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:116
msgid "Cannot find history logs database"
msgstr "Impossible de trouver la base de données de l'historique"
#. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:156
msgid "Contacts"
msgstr "Contacts"
#. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_manager.py:169 ../src/history_manager.py:213
#: ../src/history_window.py:98
msgid "Date"
msgstr "Date"
#. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:176 ../src/history_manager.py:232
msgid "Nickname"
msgstr "Pseudonyme"
#. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_manager.py:185 ../src/history_manager.py:220
#: ../src/history_window.py:106
msgid "Message"
msgstr "Message"
#. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:193 ../src/history_manager.py:226
msgid "Subject"
msgstr "Sujet"
-#: ../src/history_manager.py:241
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST LANCÉ)"
+#: ../src/history_manager.py:252
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
+"LANCÉ)"
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:254
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 ""
-"Normalement la taille allouée a la base de donnée ne sera pas libérée, elle sera simplement ré-utilisable. Si vous voulez vraiment réduire la taille du fichier, choisir OUI, sinon choisir NON.\n"
+"Normalement la taille allouée a la base de donnée ne sera pas libérée, elle "
+"sera simplement ré-utilisable. Si vous voulez vraiment réduire la taille du "
+"fichier, choisir OUI, sinon choisir NON.\n"
"\n"
"Si vous choisissez OUI, patientez..."
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:259
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Erreur de base de données"
+
+#: ../src/history_manager.py:477
msgid "Exporting History Logs..."
msgstr "Exportation de l'historique..."
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:554
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s le %(time)s a dit: %(message)s\n"
-#: ../src/history_manager.py:572
-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] "Voulez vous réellement supprimer l'historique de ce contact ?"
-msgstr[1] "Voulez vous réellement supprimer l'historique de ces contacts ?"
+#: ../src/history_manager.py:592
+#, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Voulez-vous vraiment supprimer les logs de %(jid)s ?"
+
+#: ../src/history_manager.py:596
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Voulez vous réellement supprimer l'historique de ces contacts ?"
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:598 ../src/history_manager.py:637
msgid "This is an irreversible operation."
msgstr "Ceci est une opération irréversible."
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Annuler la confirmation"
+
+#: ../src/history_manager.py:634
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
@@ -8975,14 +9683,18 @@ msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
msgid "Status is now: %(status)s"
msgstr "L'état est maintenant : %(status)s"
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:518 ../src/htmltextview.py:528
msgid "Timeout loading image"
msgstr "Délai du chargement de l'image dépassé"
-#: ../src/htmltextview.py:535
+#: ../src/htmltextview.py:538
msgid "Image is too big"
msgstr "L'image est trop grande"
+#: ../src/htmltextview.py:571
+msgid "Loading"
+msgstr "Chargement"
+
#: ../src/message_window.py:222
msgid "You are going to close several tabs"
msgstr "Vous êtes sur le point de fermer plusieurs onglets"
@@ -8991,19 +9703,19 @@ msgstr "Vous êtes sur le point de fermer plusieurs onglets"
msgid "Do you really want to close them all?"
msgstr "Voulez-vous vraiment tous les fermer ?"
-#: ../src/message_window.py:485
+#: ../src/message_window.py:497
msgid "Chats"
msgstr "Discussions"
-#: ../src/message_window.py:487
+#: ../src/message_window.py:499
msgid "Group Chats"
msgstr "Salons de discussion"
-#: ../src/message_window.py:489
+#: ../src/message_window.py:501
msgid "Private Chats"
msgstr "Conversations privées"
-#: ../src/message_window.py:495
+#: ../src/message_window.py:507
msgid "Messages"
msgstr "Messages"
@@ -9015,346 +9727,430 @@ msgstr "- les messages seront archivés"
msgid "- messages will not be logged"
msgstr "- les messages ne seront pas archivés"
-#: ../src/notify.py:232
+#: ../src/notify.py:167
#, python-format
msgid "%(nick)s Changed Status"
msgstr "%(nick)s a changé d'état"
-#: ../src/notify.py:242
+#: ../src/notify.py:177
#, python-format
msgid "%(nickname)s Signed In"
msgstr "%(nickname)s s'est connecté(e)"
-#: ../src/notify.py:250
+#: ../src/notify.py:185
#, python-format
msgid "%(nickname)s Signed Out"
msgstr "%(nickname)s s'est déconnecté(e)"
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nouveau message simple de %(nickname)s"
+#: ../src/notify.py:482
+msgid "Ignore"
+msgstr "Ignorer"
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nouveau message privé dans le salon %s"
+#: ../src/plugins/gui.py:67
+msgid "Plugin"
+msgstr ""
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s : %(message)s"
+#: ../src/plugins/gui.py:160
+#, fuzzy
+msgid "Plugin failed"
+msgstr "L'inscription a échoué"
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Message de %(nickname)s"
+#: ../src/plugins/gui.py:204
+msgid "Unable to properly remove the plugin"
+msgstr "Impossible de supprimer le plugin proprement"
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nouveau message de %(nickname)s"
+#. members not safe
+#: ../src/plugins/gui.py:212 ../src/plugins/pluginmanager.py:495
+#: ../src/plugins/pluginmanager.py:503
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Le service a envoyé des données mal-formées"
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignorer"
+#: ../src/plugins/gui.py:235 ../src/plugins/gui.py:243
+#: ../src/plugins/pluginmanager.py:511
+msgid "Plugin already exists"
+msgstr "Le plugin existe déjà "
+
+#: ../src/plugins/gui.py:235
+msgid "Overwrite?"
+msgstr "Remplacer ?"
+
+#: ../src/plugins/gui.py:264
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuration du salon de discussion"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:481 ../src/plugins/pluginmanager.py:487
+msgid "Archive corrupted"
+msgstr "Archive corrompue"
+
+#: ../src/plugins/pluginmanager.py:483
+#, fuzzy
+msgid "Archive empty"
+msgstr "Le fichier est vide"
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
msgid "Retrieving profile..."
msgstr "Récupération du profil..."
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:125 ../src/roster_window.py:3141
msgid "File is empty"
msgstr "Le fichier est vide"
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:128 ../src/roster_window.py:3144
msgid "File does not exist"
msgstr "Le fichier n'existe pas"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:142 ../src/profile_window.py:158
+#: ../src/roster_window.py:3146 ../src/roster_window.py:3157
msgid "Could not load image"
msgstr "Impossible de charger l'image"
-#: ../src/profile_window.py:215
-#, fuzzy
+#: ../src/profile_window.py:229
msgid "Wrong date format"
-msgstr "Informations du Contact"
+msgstr "Mauvais format de date"
-#: ../src/profile_window.py:216
-#, fuzzy
+#: ../src/profile_window.py:230
msgid "Format of the date must be YYYY-MM-DD"
msgstr "Format : AAAA-MM-JJ"
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:284
msgid "Information received"
msgstr "Invitation reçue"
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:362
msgid "Without a connection you can not publish your contact information."
msgstr "Vous devez être connecté pour publier vos informations."
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:375
msgid "Sending profile..."
msgstr "Envoi du profil..."
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:394
msgid "Information NOT published"
msgstr "l'information n'a PAS été publiée"
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:401
msgid "vCard publication failed"
msgstr "échec lors de la publication de votre vCard"
-#: ../src/profile_window.py:377
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Une erreur s'est produite lors de la publication de vos informations personnelles, veuillez réessayer plus tard."
+#: ../src/profile_window.py:402
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Une erreur s'est produite lors de la publication de vos informations "
+"personnelles, veuillez réessayer plus tard."
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:240 ../src/roster_window.py:1028
msgid "Merged accounts"
msgstr "Comptes regroupés"
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:1961
msgid "Authorization has been sent"
msgstr "L'Autorisation a été envoyée"
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1962
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Désormais \"%s\" connaîtra votre état."
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:1985
msgid "Subscription request has been sent"
msgstr "La requête d'inscription a été envoyée"
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:1986
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "Si \"%s\" accepte cette requête, vous connaîtrez son état."
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2000
msgid "Authorization has been removed"
msgstr "L'Autorisation a été supprimée"
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2001
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté(e)."
-#: ../src/roster_window.py:2009
+#: ../src/roster_window.py:2028
msgid "GPG is not usable"
msgstr "GPG n'est pas utilisable"
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2029
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Vous serez connecté à %s sans OpenPGP."
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2241 ../src/roster_window.py:3714
msgid "You are participating in one or more group chats"
msgstr "Vous participez à un ou plusieurs salons"
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-vous sûr de vouloir être invisible ?"
+#: ../src/roster_window.py:2242 ../src/roster_window.py:3715
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
+"vous sûr de vouloir être invisible ?"
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2268
msgid "desync'ed"
msgstr "désynchronisé"
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2334
msgid "Really quit Gajim?"
msgstr "Vraiment quitter Gajim ?"
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2335
msgid "Are you sure you want to quit Gajim?"
msgstr "Êtes-vous sûr de vouloir quitter Gajim ?"
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2336
msgid "Always close Gajim"
msgstr "Toujours fermer Gajim"
-#: ../src/roster_window.py:2396
-#, fuzzy
+#: ../src/roster_window.py:2420
msgid "You have running file transfers"
-msgstr "Annule le transfert de fichier"
+msgstr "Vous des transferts de fichiers en cours"
-#: ../src/roster_window.py:2397
-msgid "If you quit now, the file(s) being transferred will be stopped. Do you still want to quit?"
+#: ../src/roster_window.py:2421
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
msgstr ""
+"Si vous quittez maintenant, le transfert de fichier(s) sera arrêté. Voulez-"
+"vous toujours quitter ?"
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2452 ../src/roster_window.py:2860
msgid "You have unread messages"
msgstr "Vous avez des messages non lus"
-#: ../src/roster_window.py:2429
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
-msgstr "Les messages seront disponibles pour une lecture ultérieure si l'archivage de l'historique est actif et si le contact est dans votre liste."
+#: ../src/roster_window.py:2453
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+msgstr ""
+"Les messages seront disponibles pour une lecture ultérieure si l'archivage "
+"de l'historique est actif et si le contact est dans votre liste."
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2861
msgid "You must read them before removing this transport."
msgstr "Vous devez les lire avant de supprimer ce compte."
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2864
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "La passerelle \"%s\" sera enlevée"
-#: ../src/roster_window.py:2724
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette passerelle."
+#: ../src/roster_window.py:2865
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
+"passerelle."
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2868
msgid "Transports will be removed"
msgstr "Les passerelles seront enlevées"
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2873
#, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ces passerelles : %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ces "
+"passerelles : %s"
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2941
msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr "Vous êtes sur le point de bloquer un contact. Êtes-vous sûr de vouloir continuer ?"
+msgstr ""
+"Vous êtes sur le point de bloquer un contact. Êtes-vous sûr de vouloir "
+"continuer ?"
-#: ../src/roster_window.py:2802
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "Ce contact vous verra hors-ligne et vous ne recevrez pas les messages qu'il vous enverra."
+#: ../src/roster_window.py:2943
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+"Ce contact vous verra hors-ligne et vous ne recevrez pas les messages qu'il "
+"vous enverra."
#. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3033
msgid "Rename Contact"
msgstr "Renommer le contact"
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3034
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Entrez un nouveau surnom pour le contact %s."
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3041
msgid "Rename Group"
msgstr "_Renommer le Groupe"
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3042
#, python-format
msgid "Enter a new name for group %s"
msgstr "Entrez un nouveau nom pour le groupe %s."
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3087
msgid "Remove Group"
msgstr "_Supprimer le Groupe"
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3088
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Voulez-vous enlever le groupe %s de la liste de contacts ?"
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3089
msgid "Also remove all contacts in this group from your roster"
-msgstr "Supprimer également de votre roster tous les contacts appartenant à ce groupe"
+msgstr ""
+"Supprimer également de votre roster tous les contacts appartenant à ce groupe"
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3128
msgid "Assign OpenPGP Key"
msgstr "Assigner une clé OpenPGP"
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3129
msgid "Select a key to apply to the contact"
msgstr "Choisissez la clé correspondant au contact"
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3524
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Le contact \"%s\" sera enlevé de la liste de contacts"
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3526
#, python-format
msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr "Vous êtes sur le point de supprimer « %(name)s » (%(jid)s) de votre roster.\n"
+msgstr ""
+"Vous êtes sur le point de supprimer « %(name)s » (%(jid)s) de votre roster.\n"
-#: ../src/roster_window.py:3379
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "En supprimant ce contact, vous enlevez aussi son autorisation. Il/Elle vous verra donc toujours déconnecté(e)."
+#: ../src/roster_window.py:3531
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"En supprimant ce contact, vous enlevez aussi son autorisation. Il/Elle vous "
+"verra donc toujours déconnecté(e)."
#. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3537
msgid "Do you want to continue?"
msgstr "Voulez vous continuer ?"
-#: ../src/roster_window.py:3389
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle vous verra donc toujours déconnecté(e)."
+#: ../src/roster_window.py:3541
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
+"vous verra donc toujours déconnecté(e)."
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3544
msgid "I want this contact to know my status after removal"
msgstr "Autoriser ce contact à connaître mon état après la suppression"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3548
msgid "Contacts will be removed from your roster"
msgstr "Les contacts seront enlevés de la liste de contacts"
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3553
#, python-format
msgid ""
"By removing these contacts:%s\n"
"you also remove authorization resulting in them always seeing you as offline."
msgstr ""
"En supprimant ces contacts : %s\n"
-"vous enlevez aussi leurs autorisations. Ces contacts vous verront donc toujours déconnecté(e)."
+"vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
+"toujours déconnecté(e)."
-#: ../src/roster_window.py:3459
-#, fuzzy
-msgid "You are about to send a custom status. Are you sure you want to continue?"
-msgstr "Vous êtes sur le point d'envoyer un statut personnalisé. Êtes-vous sûr de vouloir continuer ?"
+#: ../src/roster_window.py:3611
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Vous êtes sur le point d'envoyer un statut personnalisé. Êtes-vous sûr de "
+"vouloir continuer ?"
-#: ../src/roster_window.py:3461
-#, fuzzy, python-format
-msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he or she will see your global status."
-msgstr "Ce contact vous vera %(status)s, mais seulement jusqu'Ã ce que vous changiez votre statut. Il verra alors votre statut global."
+#: ../src/roster_window.py:3613
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he or she will see your global status."
+msgstr ""
+"Ce contact vous verra %(status)s, mais seulement jusqu'Ã ce que vous "
+"changiez votre statut. Il verra alors votre statut global."
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3632
msgid "No account available"
msgstr "Aucun compte disponible"
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3633
msgid "You must create an account before you can chat with other contacts."
-msgstr "Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
+msgstr ""
+"Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4280
msgid "Metacontacts storage not supported by your server"
msgstr "Le stockage des métacontacts n'est pas supporté par votre serveur"
-#: ../src/roster_window.py:4097
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "Votre serveur ne supporte pas l'enregistrement des informations de métacontacts. Par conséquent, ces informations ne seront pas enregistrées lors de la prochaine connexion."
+#: ../src/roster_window.py:4282
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Votre serveur ne supporte pas l'enregistrement des informations de "
+"métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
+"lors de la prochaine connexion."
-#: ../src/roster_window.py:4189
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir continuer ?"
+#: ../src/roster_window.py:4374
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
+"continuer ?"
-#: ../src/roster_window.py:4191
-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 "Les métacontacts sont une façon de regrouper plusieurs contacts en un seul. Généralement, cela est utile lorsqu'une même personne possède plusieurs comptes Jabber ou des comptes de transport."
+#: ../src/roster_window.py:4376
+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 ""
+"Les métacontacts sont une façon de regrouper plusieurs contacts en un seul. "
+"Généralement, cela est utile lorsqu'une même personne possède plusieurs "
+"comptes Jabber ou des comptes de transport."
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4497
msgid "Invalid file URI:"
msgstr "Url de fichier invalide :"
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4509
#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
msgstr[0] "Voulez vous envoyer ce fichier à %s :"
msgstr[1] "Voulez vous envoyer ces fichiers à %s :"
-#: ../src/roster_window.py:4433
+#: ../src/roster_window.py:4644
#, python-format
msgid "Send %s to %s"
msgstr "Envoyer %s à %s"
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4655
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Faire de %s et %s des métacontacts"
+
+#: ../src/roster_window.py:4658
#, python-format
msgid "Make %s and %s metacontacts"
msgstr "Faire de %s et %s des métacontacts"
@@ -9364,130 +10160,129 @@ msgstr "Faire de %s et %s des métacontacts"
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
-#: ../src/roster_window.py:4970 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5098 ../src/roster_window.py:5152
+#: ../src/roster_window.py:5161 ../src/statusicon.py:264
+#: ../src/statusicon.py:311 ../src/statusicon.py:317
#, python-format
msgid "using account %s"
msgstr "du compte %s"
#. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5168
#, python-format
msgid "to %s account"
msgstr "au compte %s"
#. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5173
#, python-format
msgid "using %s account"
msgstr "pour le compte %s"
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5212 ../src/statusicon.py:327
msgid "_Manage Bookmarks..."
msgstr "Gérer les marque-pages..."
#. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5232
#, python-format
msgid "of account %s"
msgstr "du compte %s"
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5273
#, python-format
msgid "for account %s"
msgstr "pour le compte %s"
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5333 ../src/roster_window.py:5438
msgid "_Change Status Message"
msgstr "_Changer le message d'état"
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5366
msgid "Publish Tune"
msgstr "Publier ce que j'écoute"
-#: ../src/roster_window.py:5176
-#, fuzzy
+#: ../src/roster_window.py:5368
msgid "Publish Location"
-msgstr "Publier ce que j'écoute"
+msgstr "Publier la localisation"
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5371
msgid "Configure Services..."
msgstr "Configurer les Services..."
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5516
msgid "_Maximize All"
msgstr "Tout _maximiser"
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5526 ../src/roster_window.py:5699
msgid "Send Group M_essage"
msgstr "_Envoyer un message de groupe"
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5534
msgid "To all users"
msgstr "À tous les utilisateurs"
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5538
msgid "To all online users"
msgstr "À tous les utilisateurs connectés"
#. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5719
msgid "_Manage Contacts"
msgstr "_Gérer les Contacts"
#. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5728
msgid "Edit _Groups"
msgstr "Éditer les _groupes"
#. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5783
msgid "Send Single Message"
msgstr "Envoyer un message Simple"
#. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:5830
msgid "Execute Command..."
msgstr "Exécuter une commande..."
#. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5840
msgid "_Manage Transport"
msgstr "_Gérer les Passerelles"
#. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:5849
msgid "_Modify Transport"
msgstr "_Modifier la Passerelle"
#. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:5859
msgid "_Rename"
msgstr "_Renommer"
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5919
msgid "_Maximize"
msgstr "_Maximiser"
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5928
msgid "_Reconnect"
msgstr "_Reconnecter"
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:5935
msgid "_Disconnect"
msgstr "_Déconnecter"
#. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6024
msgid "History Manager"
msgstr "Gestionnaire d'historique"
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6035
msgid "_Join New Group Chat"
msgstr "_Joindre un salon de discussion"
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6254
msgid "Change Status Message..."
msgstr "Changer le message d'état..."
@@ -9504,21 +10299,16 @@ msgstr "Erreur dans la forme des données reçues"
msgid "No result"
msgstr "Aucun résultat."
-#: ../src/session.py:136
+#: ../src/session.py:95
msgid "Disk WriteError"
msgstr "Erreur d'écriture du disque"
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Sujet : %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:431 ../src/session.py:475
msgid "Confirm these session options"
msgstr "Confirmer ces options de session"
-#: ../src/session.py:448
-#, fuzzy, python-format
+#: ../src/session.py:432
+#, python-format
msgid ""
"The remote client wants '\n"
" 'to negotiate an session with these features:\n"
@@ -9533,7 +10323,7 @@ msgstr ""
"\n"
"\tCes options sont-elles acceptables ?"
-#: ../src/session.py:492
+#: ../src/session.py:476
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -9542,22 +10332,21 @@ msgid ""
"\n"
"Continue with the session?"
msgstr ""
-"Le client distant à choisi ces options :\n"
+"Le client distant a choisi ces options :\n"
"\n"
"%s\n"
"\n"
"Continuer la session ?"
-#: ../src/statusicon.py:227
+#: ../src/statusicon.py:228
msgid "_Change Status Message..."
msgstr "_Changer le message d'état..."
-#: ../src/statusicon.py:339
-#, fuzzy
+#: ../src/statusicon.py:342
msgid "Hide _Roster"
-msgstr "dans le _roster"
+msgstr "Cacher la liste de contacts"
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:353
msgid "Hide this menu"
msgstr "Cacher ce menu"
@@ -9614,34 +10403,34 @@ msgid "OpenPGP: "
msgstr "OpenPGPÂ : "
#: ../src/tooltips.py:646
-#, fuzzy, python-format
+#, python-format
msgid "Idle since %s"
-msgstr " depuis %s"
+msgstr "Inactif depuis %s"
#: ../src/tooltips.py:647
-#, fuzzy, python-format
+#, python-format
msgid "Idle for %s"
-msgstr "Console XML pour %s"
+msgstr "Inactif pour %s"
#: ../src/tooltips.py:698
-#, fuzzy, python-format
+#, python-format
msgid "Mood: %s"
-msgstr "Humeur :"
+msgstr "Humeur : %s"
#: ../src/tooltips.py:702
-#, fuzzy, python-format
+#, python-format
msgid "Activity: %s"
-msgstr "Activité :"
+msgstr "Activité : %s"
#: ../src/tooltips.py:706
-#, fuzzy, python-format
+#, python-format
msgid "Tune: %s"
-msgstr "Ton :"
+msgstr "Ton : %s"
#: ../src/tooltips.py:710
-#, fuzzy, python-format
+#, python-format
msgid "Location: %s"
-msgstr "Notification"
+msgstr "Localisation : %s"
#: ../src/tooltips.py:735
msgid "Download"
@@ -9696,65 +10485,260 @@ msgstr ""
"Ce service n'a pas renvoyé d'informations détaillées.\n"
"Il est probablement défectueux ou cassé"
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
msgid "?Client:Unknown"
msgstr "Inconnu"
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
msgid "?OS:Unknown"
msgstr "Inconnu"
-#: ../src/vcard.py:288
+#: ../src/vcard.py:310
msgid "?Time:Unknown"
msgstr "?Date:Inconnue"
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
#, python-format
msgid "since %s"
msgstr "depuis %s"
-#: ../src/vcard.py:345
+#: ../src/vcard.py:367
msgid "?Role in Group Chat:<b>Role:</b>"
msgstr ""
-#: ../src/vcard.py:349
+#: ../src/vcard.py:371
msgid "<b>Affiliation:</b>"
msgstr "<b>Affiliation :</b>"
-#: ../src/vcard.py:357
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Ce contact s'intéresse à votre état mais vous ne vous intéressez pas au sien"
+#: ../src/vcard.py:379
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Ce contact s'intéresse à votre état mais vous ne vous intéressez pas au sien"
-#: ../src/vcard.py:359
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au vôtre"
+#: ../src/vcard.py:381
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
+"vôtre"
-#: ../src/vcard.py:361
+#: ../src/vcard.py:383
msgid "You and the contact are interested in each other's presence information"
msgstr "Vous et ce contact vous intéressez à vos états réciproques"
#. None
-#: ../src/vcard.py:363
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Vous n'êtes pas intéressé par l'état de ce contact et il ne s'intéresse pas au vôtre"
+#: ../src/vcard.py:385
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Vous n'êtes pas intéressé par l'état de ce contact et il ne s'intéresse pas "
+"au vôtre"
-#: ../src/vcard.py:370
+#: ../src/vcard.py:392
msgid "You are waiting contact's answer about your subscription request"
-msgstr "Vous attendez la réponse de ce contact pour votre demande de voir son état"
+msgstr ""
+"Vous attendez la réponse de ce contact pour votre demande de voir son état"
-#: ../src/vcard.py:372
+#: ../src/vcard.py:394
msgid "There is no pending subscription request."
msgstr "Il n'y a aucune requête d'inscription en attente."
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
msgid " resource with priority "
msgstr " ressource avec la priorité "
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "une fenêtre ou un onglet ouvert avec ce contact "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Actions</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Conditions</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Actions avancées"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Éditeur de configuration avancée"
+
+#~ msgid "All statuses"
+#~ msgstr "Tous les états"
+
+#~ msgid "Busy "
+#~ msgstr "Occupé(e) "
+
+#~ msgid "Contact Change Status "
+#~ msgstr "Le contact a changé d'état"
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contact déconnecté"
+
+#~ msgid "Don't have "
+#~ msgstr "N'ai pas"
+
+#~ msgid "File Transfer Finished"
+#~ msgstr "Transfert de fichier terminé"
+
+#~ msgid "File Transfer Request "
+#~ msgstr "Requête de transfert de fichier"
+
+#~ msgid "File Transfer Started "
+#~ msgstr "Transfert de fichier commencé"
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Message d'un salon mis en surbrillance"
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Message reçu dans un salon"
+
+#~ msgid "Have "
+#~ msgstr "Ai"
+
+#~ msgid "Launch a command"
+#~ msgstr "Lancer une commande"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Un ou plusieurs états spéciaux..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "En ligne / Disponible pour discuter"
+
+#~ msgid "Play a sound"
+#~ msgstr "Jouer un son"
+
+#~ msgid "Receive a Message"
+#~ msgstr "Recevoir un message"
+
+#~ msgid "When "
+#~ msgstr "Quand"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Activer l'indice d'urgence du gestionnaire de fenêtres pour faire "
+#~ "clignoter la fenêtre de discussion dans la liste des fenêtres"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Désactiver l'ouverture automatique de fenêtres de conversation"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Désactiver la fenêtre popup existante"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Désactiver le son existant pour cet événement"
+
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Désactiver l'affichage des événements dans la zone de notification"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Désactiver l'affichage des événements dans la liste de contacts"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "M'av_iser avec une fenêtre popup"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Ouvrir une fenêtre de conversation"
+
+#~ msgid "_Show event in notification area"
+#~ msgstr "Afficher les événements dans la zone de notification"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Ne le montrer que dans la _liste"
+
+#~ msgid "and I "
+#~ msgstr "et je "
+
+#~ msgid "contact(s)"
+#~ msgstr "contact(s)"
+
+#~ msgid "everybody"
+#~ msgstr "tout le monde"
+
+#~ msgid "for "
+#~ msgstr "pour "
+
+#~ msgid "group(s)"
+#~ msgstr "groupes"
+
+#~ msgid "when I'm in"
+#~ msgstr "lorsque je suis là "
+
+#~ msgid "Advanced..."
+#~ msgstr "Avancées..."
+
+#~ msgid "all or space separated status"
+#~ msgstr "tous ou par état (séparé par des espaces)"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no' ou 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' ou ''"
+
+#~ msgid "Condition"
+#~ msgstr "Condition"
+
+#~ msgid "when I am "
+#~ msgstr "quand je suis "
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Envoyer un _message simple..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Avatar de l'utilisateur :"
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Nécessite gpg et python-GnuPGInterface."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr ""
+#~ "Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
+#~ "spécifié)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Trop d'arguments.\n"
+#~ "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "L'argument \"%(arg)s\" n'est pas précisé.\n"
+#~ "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Sujet : %s"
+
#~ msgid "@"
#~ msgstr "@"
#~ msgid "_Disable showing event in systray"
-#~ msgstr "_Désactiver l'affichage des événements dans la zone de notification."
+#~ msgstr ""
+#~ "_Désactiver l'affichage des événements dans la zone de notification."
#~ msgid "_Show event in systray"
#~ msgstr "L'afficher dans la zone de notifications"
@@ -9774,32 +10758,25 @@ msgstr " ressource avec la priorité "
#~ msgid "Nickname not allowed: %s"
#~ msgstr "Surnom invalide : %s"
-#~ msgid "Room has been destroyed"
-#~ msgstr "Le salon de discussion a été détruit"
-
-#~ msgid "You can join this room instead: %s"
-#~ msgstr "Vous pouvez rejoindre le salon %s à la place"
-
-#~ msgid "I would like to add you to my roster."
-#~ msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
-
#~ msgid "we are now subscribed to %s"
#~ msgstr "nous sommes maintenant inscrits chez %s"
-#~ msgid "unsubscribe request from %s"
-#~ msgstr "Requête de désinscription de la part de %s"
-
#~ msgid "we are now unsubscribed from %s"
#~ msgstr "nous ne sommes plus dans la liste de %s"
-#~ 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 "L'identifiant Jabber %s ne respecte pas la norme RFC. Il ne sera pas ajouté à votre liste de contacts. Utilisez un outil de gestion de liste de contact tel que http://jru.jabberstudio.org pour le supprimer"
-
#~ msgid "Account Modification"
#~ msgstr "Modification du compte"
-#~ 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 "Si vous cochez cette case, Gajim se connectera sur le port 5223, sur lequel les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le chiffrement TLS par défaut si le serveur annonce qu'il le supporte, et avec cette option vous désactivez le 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 ""
+#~ "Si vous cochez cette case, Gajim se connectera sur le port 5223, sur "
+#~ "lequel les serveurs sont supposés gérer le SSL. Notez que Gajim utilise "
+#~ "le chiffrement TLS par défaut si le serveur annonce qu'il le supporte, et "
+#~ "avec cette option vous désactivez le TLS"
#~ msgid "Edit Personal Information..."
#~ msgstr "_Éditer les informations personnelles..."
@@ -9807,8 +10784,12 @@ msgstr " ressource avec la priorité "
#~ msgid "Hostname: "
#~ msgstr "Serveur :"
-#~ msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-#~ msgstr "Si cette case est cochée, Gajim va stocker le mot de passe dans ~/.gajim/config avec accès en lecture pour vous uniquement"
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Si cette case est cochée, Gajim va stocker le mot de passe dans ~/.gajim/"
+#~ "config avec accès en lecture pour vous uniquement"
#~ msgid "Port: "
#~ msgstr "Port : "
@@ -9971,7 +10952,9 @@ msgstr " ressource avec la priorité "
#~ msgstr "Bannières et liens cliquables"
#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
-#~ msgstr "Possibilité d'avoir des URL cliquables dans les bannières des conversations."
+#~ msgstr ""
+#~ "Possibilité d'avoir des URL cliquables dans les bannières des "
+#~ "conversations."
#~ msgid "Requires python-sexy."
#~ msgstr "Nécessite python-sexy."
@@ -9979,11 +10962,18 @@ msgstr " ressource avec la priorité "
#~ msgid "GTK+ runtime is missing libglade support"
#~ msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
-#~ msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-#~ msgstr "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la dernière version stable à partir de %s"
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
+#~ "dernière version stable à partir de %s"
-#~ msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-#~ msgstr "Vérifiez que GTK+ et PyGTK contiennent le support de glade dans votre système."
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Vérifiez que GTK+ et PyGTK contiennent le support de glade dans votre "
+#~ "système."
#~ msgid "Gajim needs PySQLite2 to run"
#~ msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
@@ -9994,17 +10984,28 @@ msgstr " ressource avec la priorité "
#~ msgid "_Outgoing message:"
#~ msgstr "Message s_ortant :"
-#~ msgid "The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored."
-#~ msgstr "L'hôte %s que vous avez spécifié dans l'option avancée « ft_add_hosts_to_send » est invalide, il a été ignoré."
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "L'hôte %s que vous avez spécifié dans l'option avancée "
+#~ "« ft_add_hosts_to_send » est invalide, il a été ignoré."
#~ msgid "OpenPGP passphrase was not given"
#~ msgstr "Mot de passe OpenPGP non renseigné"
-#~ msgid "To continue sending and receiving messages, you will need to reconnect."
-#~ msgstr "Pour continuer à envoyer et recevoir des messages, vous devez vous reconnecter."
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Pour continuer à envoyer et recevoir des messages, vous devez vous "
+#~ "reconnecter."
-#~ msgid "You are not connected or not visible to others. Your message could not be sent."
-#~ msgstr "Vous n'êtes pas connecté ou vous êtes invisible. Votre message n'a pas pu être envoyé."
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Vous n'êtes pas connecté ou vous êtes invisible. Votre message n'a pas pu "
+#~ "être envoyé."
#~ msgid "[This message is encrypted]"
#~ msgstr "[Ce message est chiffré]"
@@ -10018,8 +11019,12 @@ msgstr " ressource avec la priorité "
#~ msgid "A icon in systemtray reflecting the current presence."
#~ msgstr "Une icône dans le tray indiquant la présence courante."
-#~ msgid "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-#~ msgstr "Nécessite python-gnome2-extras ou une compilation du module trayicon depuis les sources Gajim."
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Nécessite python-gnome2-extras ou une compilation du module trayicon "
+#~ "depuis les sources Gajim."
#~ msgid "Requires PyGTK >= 2.10."
#~ msgstr "Nécessite PyGTK >= 2.10."
@@ -10045,8 +11050,12 @@ msgstr " ressource avec la priorité "
#~ msgid "Usage: /%s, hide the chat buttons."
#~ msgstr "Usage: /%s, cache les boutons de discussion."
-#~ msgid "Usage: /%(command)s <action>, sends action to the current group chat. Use third person. (e.g. /%(command)s explodes.)"
-#~ msgstr "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. Utilise la troisième personne. (ex : /%(command)s explose.)"
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. "
+#~ "Utilise la troisième personne. (ex : /%(command)s explose.)"
#~ msgid "Usage: /%s, sends a ping to the contact"
#~ msgstr "Utilisation : /%s, envoie un ping au contact"
@@ -10067,31 +11076,65 @@ msgstr " ressource avec la priorité "
#~ msgstr "Ce salon de discussion n'a pas de sujet"
#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
-#~ msgstr "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
+#~ msgstr ""
+#~ "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
#~ msgid "Nickname not found"
#~ msgstr "Surnom introuvable : %s"
-#~ 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."
-#~ msgstr "Utilisation : /%s <surnom|identifiant Jabber> [raison], bannit l'identifiant Jabber du salon. Le surnom de l'occupant peut être utilisé s'il ne contient pas de \"@\". Si l'identifiant Jabber est actuellement dans le salon il sera également éjecté. Ne supporte pas les espaces dans le surnom."
+#~ 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."
+#~ msgstr ""
+#~ "Utilisation : /%s <surnom|identifiant Jabber> [raison], bannit "
+#~ "l'identifiant Jabber du salon. Le surnom de l'occupant peut être utilisé "
+#~ "s'il ne contient pas de \"@\". Si l'identifiant Jabber est actuellement "
+#~ "dans le salon il sera également éjecté. Ne supporte pas les espaces dans "
+#~ "le surnom."
-#~ msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-#~ msgstr "Usage : /%s <surnom>, ouvre une fenêtre de conversation privée avec l'occupant(e) spécifié(e)."
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Usage : /%s <surnom>, ouvre une fenêtre de conversation privée avec "
+#~ "l'occupant(e) spécifié(e)."
-#~ msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-#~ msgstr "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courant en affichant la raison si spécifiée."
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courant en "
+#~ "affichant la raison si spécifiée."
-#~ msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-#~ msgstr "Utilisation : /%s <identifiant Jabber> [raison], invite l'identifiant Jabber dans le salon actuel, la raison est optionnelle."
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Utilisation : /%s <identifiant Jabber> [raison], invite l'identifiant "
+#~ "Jabber dans le salon actuel, la raison est optionnelle."
-#~ msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-#~ msgstr "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur en option on peut spécifier le surnom utilisé."
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
+#~ "salon@serveur en option on peut spécifier le surnom utilisé."
-#~ msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason."
-#~ msgstr "Utilisation : /%s <surnom> [raison], éjecte l'occupant portant le surnom spécifié du salon et affiche en option la raison. Le surnom ne doit pas contenir d'espaces !"
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Utilisation : /%s <surnom> [raison], éjecte l'occupant portant le surnom "
+#~ "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
+#~ "contenir d'espaces !"
-#~ msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-#~ msgstr "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et envoie le message à l'occupant(e) spécifié(e) par le surnom."
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
+#~ "envoie le message à l'occupant(e) spécifié(e) par le surnom."
#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
#~ msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
@@ -10099,17 +11142,26 @@ msgstr " ressource avec la priorité "
#~ msgid "Usage: /%s , display the names of group chat occupants."
#~ msgstr "Utilisation : /%s , affiche les noms des occupants du salon."
-#~ msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-#~ msgstr "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
-#~ msgid "Usage: /%s <message>, sends a message without looking for other commands."
-#~ msgstr "Utilisation : /%s <message>, envoie un message sans chercher d'autres commandes."
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Utilisation : /%s <message>, envoie un message sans chercher d'autres "
+#~ "commandes."
-#~ msgid "Usage: /%s <nickname>, allow <nickname> to send you messages and private messages."
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
#~ msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-#~ msgstr "Cliquez pour voir les fonctionnalités du serveur jabber (comme les passerelles MSN, ICQ)"
+#~ msgstr ""
+#~ "Cliquez pour voir les fonctionnalités du serveur jabber (comme les "
+#~ "passerelles MSN, ICQ)"
#~ msgid "Servers Features"
#~ msgstr "Fonctionnalités du Serveur"
@@ -10123,9 +11175,6 @@ msgstr " ressource avec la priorité "
#~ msgid "Name:"
#~ msgstr "Nom :"
-#~ msgid "Show _roster"
-#~ msgstr "Montrer la _liste de contacts"
-
#~ msgid "Select the account with which to synchronise"
#~ msgstr "Sélectionnez le compte avec lequel vous voulez vous synchroniser"
@@ -10160,8 +11209,12 @@ msgstr " ressource avec la priorité "
#~ msgid "gnome-keyring"
#~ msgstr "gnome-keyring"
-#~ msgid "Requires python-gnome2-extras or compilation of gtkspell module from Gajim sources."
-#~ msgstr "Nécessite python-gnome2-extras ou un compilation du module gtkspell depuis les sources Gajim."
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Nécessite python-gnome2-extras ou un compilation du module gtkspell "
+#~ "depuis les sources Gajim."
#~ msgid "Idle"
#~ msgstr "Inactif"
@@ -10185,13 +11238,20 @@ msgstr " ressource avec la priorité "
#~ msgstr "_Serveur :"
#~ msgid "Requires compilation of the idle module from Gajim sources."
-#~ msgstr "Nécessite la compilation du module d'inactivité depuis les sources de Gajim."
+#~ msgstr ""
+#~ "Nécessite la compilation du module d'inactivité depuis les sources de "
+#~ "Gajim."
#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr "Cette commande n'existe pas: /%s (précédez la de /say pour l'envoyer)"
+#~ msgstr ""
+#~ "Cette commande n'existe pas: /%s (précédez la de /say pour l'envoyer)"
-#~ msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-#~ msgstr "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. Utilise la troisième personne. (ex : /%(command)s explose.)"
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. "
+#~ "Utilise la troisième personne. (ex : /%(command)s explose.)"
#~ msgid "Encryption enabled"
#~ msgstr "Chiffrement E2E activé"
@@ -10199,11 +11259,16 @@ msgstr " ressource avec la priorité "
#~ msgid "Encryption disabled"
#~ msgstr "Chiffrement E2E désactivé"
-#~ msgid "If checked, Gajim will sort contacts in roster window and groupchats by their status and not by the shown name"
-#~ msgstr "Si cette case est cochée, Gajim triera les contacts dans la fenêtre principale et dans les salons par statut et non pas par nom"
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "Si cette case est cochée, Gajim triera les contacts dans la fenêtre "
+#~ "principale et dans les salons par statut et non pas par nom"
#~ msgid "The username used to identify the Last.fm account."
-#~ msgstr "Le nom d'utilisateur utilisé comme identifiant pour le compte Last.fm."
+#~ msgstr ""
+#~ "Le nom d'utilisateur utilisé comme identifiant pour le compte Last.fm."
#~ msgid "Thoughtful"
#~ msgstr "Pensif"
@@ -10212,7 +11277,9 @@ msgstr " ressource avec la priorité "
#~ msgstr "Network Manager n'est pas disponible"
#~ msgid "Session Management support not available (missing gnome.ui module)"
-#~ msgstr "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
+#~ msgstr ""
+#~ "Support du gestionnaire de sessions indisponible (module gnome.ui "
+#~ "manquant)"
#~ msgid "General:"
#~ msgstr "Général :"
@@ -10300,29 +11367,48 @@ msgstr " ressource avec la priorité "
#~ msgstr "OK pour continuer ?"
#~ msgid ""
-#~ "You've begun an encrypted session with %s, but it can't be guaranteed that you're talking directly to the person you think you are.\n"
+#~ "You've begun an encrypted session with %s, but it can't be guaranteed "
+#~ "that you're talking directly to the person you think you are.\n"
#~ "\n"
-#~ "You should speak with them directly (in person or on the phone) and confirm that their Short Authentication String is identical to this one: %s\n"
+#~ "You should speak with them directly (in person or on the phone) and "
+#~ "confirm that their Short Authentication String is identical to this one: "
+#~ "%s\n"
#~ "\n"
#~ "Would you like to continue with the encrypted session?"
#~ msgstr ""
-#~ "Vous avez commencé une session chiffrée avec %s, mais il ne peut être garanti que vous êtes en train de discuter avec la personne que vous croyez.\n"
+#~ "Vous avez commencé une session chiffrée avec %s, mais il ne peut être "
+#~ "garanti que vous êtes en train de discuter avec la personne que vous "
+#~ "croyez.\n"
#~ "\n"
-#~ "Vous devriez parler avec elle directement (en personne ou au téléphone) et confirmer que leur Chaîne d'Authentification Courte est identique à celle-ci :%s\n"
+#~ "Vous devriez parler avec elle directement (en personne ou au téléphone) "
+#~ "et confirmer que leur Chaîne d'Authentification Courte est identique à "
+#~ "celle-ci :%s\n"
#~ "\n"
#~ "Voulez-vous continuer la session chiffrée ?"
#~ msgid "Yes, I verified the Short Authentication String"
#~ msgstr "Oui, j'ai vérifié la Chaîne Courte d'Authentification"
-#~ msgid "If checked, Gajim can regularly poll a Last.fm account and sends recently played songs through PEP."
-#~ msgstr "Si activé, Gajim peut régulièrement consulter un compte Last.fm et envoyer les morceaux récemment joués via PEP."
+#~ msgid ""
+#~ "If checked, Gajim can regularly poll a Last.fm account and sends recently "
+#~ "played songs through PEP."
+#~ msgstr ""
+#~ "Si activé, Gajim peut régulièrement consulter un compte Last.fm et "
+#~ "envoyer les morceaux récemment joués via PEP."
-#~ msgid "When negotiating an encrypted session, should Gajim prefer to use public keys for identification?"
-#~ msgstr "Durant la négociation d'une session chiffrée, Gajim doit-il utiliser de préférence une clef publique pour l'identification ?"
+#~ msgid ""
+#~ "When negotiating an encrypted session, should Gajim prefer to use public "
+#~ "keys for identification?"
+#~ msgstr ""
+#~ "Durant la négociation d'une session chiffrée, Gajim doit-il utiliser de "
+#~ "préférence une clef publique pour l'identification ?"
-#~ msgid "To continue, Gajim needs to access your stored secrets. Enter your passphrase"
-#~ msgstr "Pour continuer, Gajim a besoin d'accéder à vos secrets stockés. Veuillez entrer votre mot de passe"
+#~ msgid ""
+#~ "To continue, Gajim needs to access your stored secrets. Enter your "
+#~ "passphrase"
+#~ msgstr ""
+#~ "Pour continuer, Gajim a besoin d'accéder à vos secrets stockés. Veuillez "
+#~ "entrer votre mot de passe"
#~ msgid "Confirm Passphrase"
#~ msgstr "Confirmer le mot de passe"
@@ -10337,7 +11423,9 @@ msgstr " ressource avec la priorité "
#~ msgstr "Les mots de passe ne correspondent pas.\n"
#~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
-#~ msgstr "Gajim a besoin que vous créiez un mot de passe afin de chiffrer les secrets stockés"
+#~ msgstr ""
+#~ "Gajim a besoin que vous créiez un mot de passe afin de chiffrer les "
+#~ "secrets stockés"
#~ msgid "Role:"
#~ msgstr "Fonction :"
diff --git a/po/ja.po b/po/ja.po
index eaa9efa7e1202af2a606bd9f19ab189f1ce7b8cb..ed8e4d64f7892bd8e2c200c6023aef1a0f38c169 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,19 +2,15 @@
# Copyright (C) 2009 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER
# This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
#
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
msgid ""
msgstr ""
-"Project-Id-Version: Gajim 0.13.3\n"
+"Project-Id-Version: Gajim 0.15 ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
-"PO-Revision-Date: 2010-03-10 17:59+0900\n"
-"Last-Translator: Mako N. <mako@pasero.net>\n"
+"POT-Creation-Date: 2011-09-02 18:31+0900\n"
+"PO-Revision-Date: 2011-09-02 19:09+0900\n"
+"Last-Translator: Mako N <mako@pasero.net>\n"
"Language-Team: Japanese\n"
-"Language: \n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -25,11 +21,10 @@ msgid "Join _Group Chat..."
msgstr "グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹ (_G)..."
#: ../data/gui/account_context_menu.ui.h:2
-#, fuzzy
msgid "_Add Contact..."
-msgstr "相手先リストã«è¿½åŠ ã™ã‚‹ (_C)..."
+msgstr "相手先リストã«è¿½åŠ ã™ã‚‹ (_A)..."
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
msgid "_Discover Services"
msgstr "サービスを探索ã™ã‚‹ (_D)"
@@ -119,12 +114,12 @@ msgstr "管ç†..."
#: ../data/gui/account_creation_wizard_window.ui.h:17
#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
+#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703
+#: ../src/config.py:1708 ../src/config.py:2284 ../src/config.py:2363
+#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730
+#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
+#: ../src/dialogs.py:532 ../src/roster_window.py:3092
+#: ../src/roster_window.py:3098 ../src/roster_window.py:3103
msgid "None"
msgstr "ãªã—"
@@ -152,7 +147,7 @@ msgid ""
msgstr "Jabber ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã™ã‚‹ã«ã¯ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå¿…è¦ã§ã™ã€‚"
#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
msgid "_Advanced"
msgstr "æ‹¡å¼µ (_A)"
@@ -165,12 +160,13 @@ msgid "_Hostname:"
msgstr "ホストå (_H):"
#: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
+#: ../data/gui/accounts_window.ui.h:61
msgid "_Jabber ID:"
msgstr "Jabber ID (_J):"
#: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "_Password:"
msgstr "パスワード (_P):"
@@ -179,6 +175,7 @@ msgid "_Port:"
msgstr "ãƒãƒ¼ãƒˆç•ªå· (_P):"
#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/manage_bookmarks_window.ui.h:9
msgid "_Server:"
msgstr "サーãƒãƒ¼ (_S):"
@@ -223,19 +220,23 @@ msgid "Auto-reconnect when connection is lost"
msgstr "切æ–ã—ãŸã‚‰è‡ªå‹•ã§å†æŽ¥ç¶šã™ã‚‹"
#: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
msgid "Browse..."
-msgstr "一覧 (_B)"
+msgstr "å‚ç…§..."
#: ../data/gui/accounts_window.ui.h:12
msgid "C_onnect on Gajim startup"
msgstr "Gajim 起動時ã«æŽ¥ç¶šã™ã‚‹ (_o)"
#: ../data/gui/accounts_window.ui.h:13
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "証明書ã¯æš—å·åŒ–ã•ã‚Œã‚‹ (_e)"
+
+#: ../data/gui/accounts_window.ui.h:14
msgid "Chan_ge Password"
msgstr "パスワードを変更ã™ã‚‹ (_g)"
-#: ../data/gui/accounts_window.ui.h:14
+#: ../data/gui/accounts_window.ui.h:15
msgid ""
"Check this so Gajim will ask you before sending your password over an "
"insecure connection."
@@ -243,11 +244,6 @@ msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€å®‰å…¨ã§ãªã„接続ã®å‰ã«ãƒ‘スワードをèžã„ã¦ãるよã†ã«ãªã‚Šã¾"
"ã™ã€‚"
-#: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "転é€ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž..."
-
#: ../data/gui/accounts_window.ui.h:16
msgid "Choose _Key..."
msgstr "éµã®é¸æŠž (_K)..."
@@ -261,9 +257,8 @@ msgid "Click to request authorization to all contacts of another account"
msgstr "別アカウントã®ã™ã¹ã¦ã®ç›¸æ‰‹å…ˆã«æ‰¿èªã‚’求ã‚ã‚‹ã«ã¯ã‚¯ãƒªãƒƒã‚¯"
#: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
msgid "Client certificate"
-msgstr "自己署å証明書"
+msgstr "クライアントã®è¨¼æ˜Žæ›¸"
#: ../data/gui/accounts_window.ui.h:20
msgid "Co_nnect on Gajim startup"
@@ -285,18 +280,19 @@ msgstr "å:"
#. No configured account
#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
+#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160
+#: ../src/notify.py:311 ../src/notify.py:334 ../src/notify.py:383
+#: ../src/notify.py:399
msgid "Gajim"
msgstr "Gajim"
#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56
+#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124
+#: ../src/roster_window.py:3034 ../src/roster_window.py:5652
msgid "General"
msgstr "全般"
@@ -355,8 +351,8 @@ msgid "Information about you, as stored in the server"
msgstr "サーãƒã«æ ¼ç´ã™ã‚‹ã€ã‚ãªãŸã«é–¢ã™ã‚‹æƒ…å ±ã§ã™"
#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
+#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826
+#: ../src/dialogs.py:837
msgid "Jabber ID:"
msgstr "Jabber ID:"
@@ -369,8 +365,8 @@ msgstr "姓:"
msgid "Mer_ge accounts"
msgstr "アカウントã®çµ±åˆ (_g)"
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
+#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
+#: ../src/config.py:2377
msgid "No key selected"
msgstr "éµãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -397,7 +393,7 @@ msgid "Priority will change automatically according to your status."
msgstr "å„ªå…ˆé †ä½ã¯ã€åœ¨å¸çŠ¶æ³ã«å¿œã˜ã¦è‡ªå‹•çš„ã«å¤‰ã‚ã‚Šã¾ã™ã€‚"
#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602
msgid "Re_name"
msgstr "åå‰ã®å¤‰æ›´ (_n)"
@@ -437,58 +433,54 @@ msgstr "アカウントã®åœ¨å¸çŠ¶æ³ã‚’全体ã®åœ¨å¸çŠ¶æ³ã«åˆã‚ã›ã‚‹ (_
#: ../data/gui/accounts_window.ui.h:52
#: ../data/gui/synchronise_select_account_dialog.ui.h:2
msgid "Synchronise contacts"
-msgstr "相手先ã®åŒæœŸ"
+msgstr "相手先をåˆã‚ã›ã‚‹"
#: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
-
-#: ../data/gui/accounts_window.ui.h:54
msgid "Use G_PG Agent"
msgstr "GPG エージェントを使ㆠ(_P)"
-#: ../data/gui/accounts_window.ui.h:55
+#: ../data/gui/accounts_window.ui.h:54
msgid "Use cust_om hostname/port"
msgstr "別ã®ãƒ›ã‚¹ãƒˆå/ãƒãƒ¼ãƒˆç•ªå·ã‚’使ㆠ(_o)"
-#: ../data/gui/accounts_window.ui.h:56
+#: ../data/gui/accounts_window.ui.h:55
msgid "Use cust_om port:"
msgstr "別ã®ãƒãƒ¼ãƒˆç•ªå·ã‚’使ㆠ(_o):"
-#: ../data/gui/accounts_window.ui.h:57
+#: ../data/gui/accounts_window.ui.h:56
msgid "Use file transfer proxies"
msgstr "ファイル転é€ã®ãƒ—ãƒã‚シを使ã†"
-#: ../data/gui/accounts_window.ui.h:58
+#: ../data/gui/accounts_window.ui.h:57
msgid "_Client Cert File:"
-msgstr ""
+msgstr "クライアントã®è¨¼æ˜Žæ›¸ãƒ•ã‚¡ã‚¤ãƒ« (_C):"
-#: ../data/gui/accounts_window.ui.h:59
+#: ../data/gui/accounts_window.ui.h:58
msgid "_Edit Personal Information..."
msgstr "å€‹äººæƒ…å ±ã‚’ç·¨é›†ã™ã‚‹ (_E)..."
#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
+#: ../data/gui/accounts_window.ui.h:59 ../data/gui/xml_console_window.ui.h:11
msgid "_Enable"
msgstr "有効 (_E)"
-#: ../data/gui/accounts_window.ui.h:61
+#: ../data/gui/accounts_window.ui.h:60
msgid "_Hostname: "
msgstr "ホストå (_H):"
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:62
msgid "_Manage..."
msgstr "ç®¡ç† (_M)..."
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:64
msgid "_Port: "
msgstr "ãƒãƒ¼ãƒˆç•ªå· (_P):"
-#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/accounts_window.ui.h:65
msgid "_Warn before using an insecure connection"
msgstr "安全ã§ãªã„接続ã®å‰ã«ã¯è¦å‘Šã™ã‚‹ (_W)"
-#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/accounts_window.ui.h:66
msgid "_use HTTP__PROXY environment variable"
msgstr "環境変数 HTTP__PROXY を使ㆠ(_u)"
@@ -532,6 +524,7 @@ msgid "_Group:"
msgstr "グループ (_G):"
#: ../data/gui/add_new_contact_window.ui.h:12
+#: ../data/gui/manage_bookmarks_window.ui.h:7
msgid "_Nickname:"
msgstr "ニックãƒãƒ¼ãƒ (_N):"
@@ -544,9 +537,8 @@ msgid "_Register"
msgstr "登録 (_R)"
#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
msgid "_Save subscription message"
-msgstr "在å¸é€šçŸ¥ã®ç”³ã—込㿠(_S)"
+msgstr "在å¸é€šçŸ¥ç”³è¾¼ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ä¿å˜ (_S)"
#: ../data/gui/add_new_contact_window.ui.h:16
msgid "_User ID:"
@@ -573,9 +565,8 @@ msgid "Error description..."
msgstr "エラーã®èª¬æ˜Ž..."
#: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
msgid "F_inish"
-msgstr "完了 (_F)"
+msgstr "完了 (_i)"
#: ../data/gui/adhoc_commands_window.ui.h:7
msgid "Please wait while retrieving command list..."
@@ -620,9 +611,8 @@ msgid "Deletes Message of the Day"
msgstr "今日ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’削除ã—ã¾ã™"
#: ../data/gui/advanced_menuitem_menu.ui.h:3
-#, fuzzy
msgid "Edit Archi_ving Preferences"
-msgstr "è¨å®š (_P)"
+msgstr "書庫ã®è¨å®šã‚’編集 (_v)"
#: ../data/gui/advanced_menuitem_menu.ui.h:4
msgid "Edit _Privacy Lists..."
@@ -660,202 +650,6 @@ msgstr "管ç†äºº (_A)"
msgid "_Send Server Message..."
msgstr "サーãƒãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ (_S)..."
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "ウィンドウ/タブã§é–‹ã "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>æ“作</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-#, fuzzy
-msgid "<b>Conditions</b>"
-msgstr "<b>状æ³</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>耳ã¸ã®é€šçŸ¥</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "詳細ãªæ“作"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "通知ã®åˆ¶å¾¡ã®è©³ç´°"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-#, fuzzy
-msgid "All statuses"
-msgstr "ã™ã¹ã¦ã®çŠ¶æ³"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "離å¸ä¸ã§ã™"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "å–ã‚Šè¾¼ã¿ä¸ã§ã™"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "相手先ãŒåœ¨å¸çŠ¶æ³ã‚’変更"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "相手先ãŒåˆ‡æ–ã—ãŸ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-#, fuzzy
-msgid "Don't have "
-msgstr "æŒã£ã¦ã„ã¾ã›ã‚“ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "ファイルã®è»¢é€"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "ファイル転é€ã®è¦æ±‚"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "ファイルã®è»¢é€ã®ä¸æ–"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "グループãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®å¼·èª¿"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "グループãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ã—ãŸ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-#, fuzzy
-msgid "Have "
-msgstr "æŒã£ã¦ã„ã¾ã™ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "éš ã‚Œã¦ã„ã¾ã™"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-#, fuzzy
-msgid "Launch a command"
-msgstr "コマンドを実行ã™ã‚‹"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "ä¸åœ¨ã§ã™"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-#, fuzzy
-msgid "One or more special statuses..."
-msgstr "特別ãªçŠ¶æ³..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "オンライン / ãƒãƒ£ãƒƒãƒˆã§ãã¾ã™"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "サウンドを演å¥ã™ã‚‹"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "æ–°ç€ã®ç§ä¿¡"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "次ã®å ´åˆ: "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-#, fuzzy
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"タスクãƒãƒ¼ã®ãƒ•ãƒ©ãƒƒã‚·ãƒ¥ã§ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’作るãŸã‚ã«ã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒžãƒãƒ¼ã‚¸ãƒ£"
-"ã® UrgencyHint を有効ã«ã™ã‚‹ (_A)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "自動ã§ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒé–‹ãã®ã‚’ç¦æ¢ã™ã‚‹ (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "æ—¢å˜ã®ãƒãƒƒãƒ—アップウィンドウをç¦æ¢ã™ã‚‹ (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "ã“ã®ã‚¤ãƒ™ãƒ³ãƒˆã®ã‚µã‚¦ãƒ³ãƒ‰ã‚’ç¦æ¢ã™ã‚‹ (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "åç°¿ã¸ã®ã‚¤ãƒ™ãƒ³ãƒˆã®è¡¨ç¤ºã‚’ã‚„ã‚ã‚‹ (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "åç°¿ã¸ã®ã‚¤ãƒ™ãƒ³ãƒˆã®è¡¨ç¤ºã‚’ã‚„ã‚ã‚‹ (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "ãƒãƒƒãƒ—アップウィンドウã§çŸ¥ã‚‰ã›ã‚‹ (_I)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "ユーザーã®ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‹ã (_O)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "イベントをåç°¿ã«è¡¨ç¤ºã™ã‚‹ (_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "イベントをåç°¿ã«è¡¨ç¤ºã™ã‚‹ (_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "ã¨ç§ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "相手先"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-#, fuzzy
-msgid "for "
-msgstr "4"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "グループ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr ""
-
#: ../data/gui/archiving_preferences_window.ui.h:1
msgid "<i>Method Auto</i>"
msgstr ""
@@ -871,29 +665,30 @@ msgstr ""
#: ../data/gui/archiving_preferences_window.ui.h:4
#, fuzzy
msgid "Auto"
-msgstr "自動å‚åŠ "
+msgstr "自動化"
#: ../data/gui/archiving_preferences_window.ui.h:5
msgid "Concede"
-msgstr ""
+msgstr "èªã‚ã‚‹"
#: ../data/gui/archiving_preferences_window.ui.h:6
msgid "Forbid"
-msgstr ""
+msgstr "ç¦æ¢ã™ã‚‹"
+# Auto ã®é¸æŠžè‚¢
#: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
msgid "No"
-msgstr "ãªã—"
+msgstr "ã—ãªã„"
#: ../data/gui/archiving_preferences_window.ui.h:8
#, fuzzy
msgid "Prefer"
-msgstr "è¨å®š"
+msgstr "ãã®éƒ½åº¦é¸ã¶"
+# Auto ã®é¸æŠžè‚¢
#: ../data/gui/archiving_preferences_window.ui.h:9
msgid "Yes"
-msgstr ""
+msgstr "ã™ã‚‹"
#: ../data/gui/atom_entry_window.ui.h:1
msgid "Entry:"
@@ -917,14 +712,14 @@ msgstr "æ–°ã—ã„エントリーをå—ã‘å–ã‚Šã¾ã—ãŸ:"
#: ../data/gui/blocked_contacts_window.ui.h:1
msgid "Blocked Contacts"
-msgstr "æ‹’å¦ã•ã‚Œã¦ã„る相手先"
+msgstr "é®æ–ã—ã¦ã„る相手先"
#: ../data/gui/blocked_contacts_window.ui.h:2
#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5621
+#: ../src/roster_window.py:5748 ../src/roster_window.py:5881
msgid "_Unblock"
-msgstr "æ‹’å¦ã®è§£é™¤ (_U)"
+msgstr "é®æ–ã®è§£é™¤ (_U)"
#: ../data/gui/change_activity_dialog.ui.h:1
msgid "<b>Message:</b> "
@@ -985,7 +780,7 @@ msgstr "グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹ (_G)"
#: ../data/gui/chat_context_menu.ui.h:2
#: ../data/gui/contact_context_menu.ui.h:16
msgid "_Add to Roster..."
-msgstr "åç°¿ã«è¿½åŠ ã™ã‚‹ (_A)..."
+msgstr "åç°¿ã«è¿½åŠ (_A)..."
#: ../data/gui/chat_context_menu.ui.h:3
msgid "_Copy JID/Email Address"
@@ -1009,14 +804,13 @@ msgstr "リンク先をブラウザã§é–‹ã (_O)"
msgid "_Start Chat"
msgstr "ãƒãƒ£ãƒƒãƒˆã®é–‹å§‹ (_S)"
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
+#: ../data/gui/chat_control.ui.h:1
msgid "#"
msgstr "#"
#: ../data/gui/chat_control.ui.h:2
msgid "*"
-msgstr ""
+msgstr "*"
#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
msgid "0"
@@ -1024,43 +818,43 @@ msgstr "0"
#: ../data/gui/chat_control.ui.h:4
msgid "1"
-msgstr ""
+msgstr "1"
#: ../data/gui/chat_control.ui.h:5
msgid "2"
-msgstr ""
+msgstr "2"
#: ../data/gui/chat_control.ui.h:6
msgid "3"
-msgstr ""
+msgstr "3"
#: ../data/gui/chat_control.ui.h:7
msgid "4"
-msgstr ""
+msgstr "4"
#: ../data/gui/chat_control.ui.h:8
msgid "5"
-msgstr ""
+msgstr "5"
#: ../data/gui/chat_control.ui.h:9
msgid "6"
-msgstr ""
+msgstr "6"
#: ../data/gui/chat_control.ui.h:10
msgid "7"
-msgstr ""
+msgstr "7"
#: ../data/gui/chat_control.ui.h:11
msgid "8"
-msgstr ""
+msgstr "8"
#: ../data/gui/chat_control.ui.h:12
msgid "9"
-msgstr ""
+msgstr "9"
#: ../data/gui/chat_control.ui.h:13
msgid "Add this contact to roster (Ctrl+D)"
-msgstr "ã“ã®ç›¸æ‰‹å…ˆã‚’åç°¿ã«è¿½åŠ ã™ã‚‹ (Ctrl+D)"
+msgstr "相手先をåç°¿ã«è¿½åŠ ã™ã‚‹ (Ctrl+D)"
#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
msgid "Browse the chat history (Ctrl+H)"
@@ -1068,42 +862,41 @@ msgstr "ãƒãƒ£ãƒƒãƒˆã®å±¥æ´ã‚’見る (Ctrl+H)"
#: ../data/gui/chat_control.ui.h:15
msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "相手先を招待 (Ctrl+G)"
+msgstr "相手先を会話ã«æ‹›å¾…ã™ã‚‹ (Ctrl+G)"
#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
msgid "Show a list of emoticons (Alt+M)"
-msgstr "顔文å—ã®ä¸€è¦§ã®è¡¨ç¤º (Alt+M)"
+msgstr "感情アイコンã®ä¸€è¦§ã‚’表示ã™ã‚‹ (Alt+M)"
#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
msgid "Show a list of formattings"
-msgstr "書å¼ã®ä¸€è¦§ã®è¡¨ç¤º"
+msgstr "書å¼ã®ä¸€è¦§ã‚’表示ã™ã‚‹"
#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
-#, fuzzy
msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "拡張機能ã®ä¸€è¦§ã‚’表示 (Alt+A)"
+msgstr "拡張機能ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示ã™ã‚‹ (Alt+D)"
#: ../data/gui/chat_control.ui.h:19
msgid "Show the contact's profile (Ctrl+I)"
-msgstr "相手先ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã®è¡¨ç¤º (Ctrl+I)"
+msgstr "相手先ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’表示ã™ã‚‹ (Ctrl+I)"
#: ../data/gui/chat_control.ui.h:20
msgid "Toggle audio session"
-msgstr ""
+msgstr "音声セッションã«ã™ã‚‹/ã—ãªã„"
#: ../data/gui/chat_control.ui.h:21
msgid "Toggle video session"
-msgstr ""
+msgstr "ビデオセッションã«ã™ã‚‹/ã—ãªã„"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:275
msgid "_Send"
msgstr "é€ä¿¡ (_S)"
#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
msgid "label"
-msgstr ""
+msgstr "ラベル"
#: ../data/gui/chat_to_muc_window.ui.h:1
msgid "In_vite"
@@ -1151,8 +944,9 @@ msgstr "グループã®å¤‰æ›´ (_G)..."
#. Invite to
#. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5557
+#: ../src/roster_window.py:5716
msgid "In_vite to"
msgstr "招待 (_v)"
@@ -1161,16 +955,15 @@ msgid "Invite _Contacts"
msgstr "相手先を招待 (_C)"
#: ../data/gui/contact_context_menu.ui.h:8
-#, fuzzy
msgid "Remo_ve"
-msgstr "削除 (_R)"
+msgstr "削除 (_v)"
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5805
msgid "Send Cus_tom Status"
msgstr "個別ã®åœ¨å¸çŠ¶æ³ã®é€ä¿¡ (_t)"
-#: ../data/gui/contact_context_menu.ui.h:10
+#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
msgid "Send Single _Message..."
msgstr "å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®é€ä¿¡ (_M)..."
@@ -1199,10 +992,10 @@ msgid "_Allow him/her to see my status"
msgstr "自分ã®åœ¨å¸çŠ¶æ³ã‚’見られるã“ã¨ã‚’許å¯ã™ã‚‹ (_A)"
#: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5629
+#: ../src/roster_window.py:5754 ../src/roster_window.py:5884
msgid "_Block"
-msgstr "æ‹’å¦ (_B)"
+msgstr "é®æ– (_B)"
#: ../data/gui/contact_context_menu.ui.h:19
msgid "_Forbid him/her to see my status"
@@ -1210,8 +1003,8 @@ msgstr "自分ã®åœ¨å¸çŠ¶æ³ã‚’見られるã“ã¨ã‚’ç¦æ¢ã™ã‚‹ (_F)"
#: ../data/gui/contact_context_menu.ui.h:20
#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5755
+#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
+#: ../src/roster_window.py:5955
msgid "_History"
msgstr "å±¥æ´ (_H)"
@@ -1239,20 +1032,17 @@ msgstr "無視ã—ãªã„ (_U)"
msgid "Fill in the form."
msgstr "次ã®æ¬„を埋ã‚ã¦ãã ã•ã„。"
-# (Mako)Personal Eventing via Pubsub
#: ../data/gui/data_form_window.ui.h:2
-#, fuzzy
msgid "Room Configuration"
-msgstr "PEP サービスã®èª¿æ•´"
+msgstr "談話室ã®æ§‹æˆ"
#: ../data/gui/edit_groups_dialog.ui.h:1
msgid "Edit Groups"
msgstr "グループã®ç·¨é›†"
#: ../data/gui/esession_info_window.ui.h:1
-#, fuzzy
msgid "(<b>ESession</b> info)"
-msgstr "<b>説明</b>"
+msgstr "(<b>æš—å·åŒ–セッション</b> æƒ…å ±)"
#: ../data/gui/esession_info_window.ui.h:2
msgid "_Verify"
@@ -1271,9 +1061,8 @@ msgid "A list of active, completed and stopped file transfers"
msgstr "ファイル転é€ã®è»¢é€ä¸ã€å®Œäº†ã€ä¸æ¢ã®ä¸€è¦§"
#: ../data/gui/filetransfers.ui.h:2
-#, fuzzy
msgid "Cancel file transfer"
-msgstr "é¸æŠžã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®è»¢é€ã‚’ä¸æ¢ã—ã¾ã™"
+msgstr "ファイルã®è»¢é€ã‚’ä¸æ¢ã™ã‚‹"
#: ../data/gui/filetransfers.ui.h:3
msgid "Cancels the selected file transfer"
@@ -1320,7 +1109,7 @@ msgstr ""
msgid "When a file transfer is complete show a popup notification"
msgstr "ファイル転é€ãŒå®Œäº†ã—ãŸã‚‰ã€ãƒãƒƒãƒ—アップã§çŸ¥ã‚‰ã›ã‚‹"
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
+#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
msgid "_Continue"
msgstr "続ã‘ã‚‹ (_C)"
@@ -1330,7 +1119,6 @@ msgstr "ファイル転é€ãŒå®Œäº†ã—ãŸã‚‰çŸ¥ã‚‰ã›ã‚‹ (_N)"
# #(Mako)Containing ã‚’ã©ã†ã™ã‚‹
#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-#, fuzzy
msgid "_Open Containing Folder"
msgstr "フォルダを開ã (_O)"
@@ -1347,26 +1135,24 @@ msgid "<b>Chatstate Tab Colors</b>"
msgstr "<b>ãƒãƒ£ãƒƒãƒˆçŠ¶æ…‹ã®ã‚¿ãƒ–ã®è‰²</b>"
#: ../data/gui/gajim_themes_window.ui.h:2
-#, fuzzy
msgid "Account row"
-msgstr "アカウント"
+msgstr "アカウントã®è¡Œ"
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1030
msgid "Bold"
msgstr "太å—ã«ã™ã‚‹"
#: ../data/gui/gajim_themes_window.ui.h:4
msgid "Chat Banner"
-msgstr ""
+msgstr "ãƒãƒ£ãƒƒãƒˆã®ãƒãƒŠãƒ¼"
#: ../data/gui/gajim_themes_window.ui.h:5
msgid "Composing"
msgstr "入力ä¸"
#: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
msgid "Contact row"
-msgstr "相手先"
+msgstr "相手先ã®è¡Œ"
#: ../data/gui/gajim_themes_window.ui.h:7
msgid "Font style:"
@@ -1378,18 +1164,17 @@ msgstr "Gajim テーマã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º"
#: ../data/gui/gajim_themes_window.ui.h:9
msgid "Gone"
-msgstr "ä¸åœ¨"
+msgstr "終了"
#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
msgid "Group row"
-msgstr "グループ"
+msgstr "グループã®è¡Œ"
#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
msgid "Inactive"
-msgstr "活動åœæ¢ä¸"
+msgstr "åœæ¢ä¸"
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1031
msgid "Italic"
msgstr "イタリック"
@@ -1411,7 +1196,7 @@ msgstr ""
#: ../data/gui/gajim_themes_window.ui.h:17
msgid "Paused"
-msgstr "一時åœæ¢ä¸"
+msgstr "休æ¢ä¸"
#: ../data/gui/gajim_themes_window.ui.h:18
msgid "Text _color:"
@@ -1453,67 +1238,70 @@ msgstr "談話室ã®ç®¡ç† (_M)"
msgid "_Minimize on close"
msgstr "é–‰ã˜ã‚‹ãƒœã‚¿ãƒ³ã§æœ€å°åŒ– (_M)"
-#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+msgid "_Request Voice"
+msgstr "発言権をè¦æ±‚ (_R)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
msgid "Mo_derator"
msgstr "å¸ä¼šè€… (_d)"
-#: ../data/gui/gc_occupants_menu.ui.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:3
msgid "Occupant Actions"
msgstr "在室者ã®æ“作"
-#: ../data/gui/gc_occupants_menu.ui.h:3
+#: ../data/gui/gc_occupants_menu.ui.h:4
msgid "Send _File"
msgstr "ファイルã®é€ä¿¡ (_F)"
-#: ../data/gui/gc_occupants_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:5
msgid "_Add to Roster"
msgstr "åç°¿ã«è¿½åŠ (A)"
-#: ../data/gui/gc_occupants_menu.ui.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:6
msgid "_Admin"
msgstr "管ç†äºº (_A)"
-#: ../data/gui/gc_occupants_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:7
msgid "_Ban"
msgstr "ç· ã‚出㗠(_B)"
-#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:10
msgid "_Kick"
msgstr "蹴り出㗠(_K)"
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:11
msgid "_Member"
msgstr "メンãƒãƒ¼ (_M)"
-#: ../data/gui/gc_occupants_menu.ui.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:12
msgid "_Owner"
msgstr "主宰者 (_O)"
-#: ../data/gui/gc_occupants_menu.ui.h:12
+#: ../data/gui/gc_occupants_menu.ui.h:13
msgid "_Send Private Message"
msgstr "ç§ä¿¡ã‚’é€ã‚‹ (_S)"
# (Mako)moderated room ã§ã®ç™ºè¨€ã™ã‚‹æ¨©åˆ©
-#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:15
msgid "_Voice"
msgstr "発言権 (_V)"
#: ../data/gui/groupchat_control.ui.h:1
msgid "Bookmark this room (Ctrl+B)"
-msgstr "ã“ã®è«‡è©±å®¤ã‚’ブックマーク (Ctrl+B)"
+msgstr "ã“ã®è«‡è©±å®¤ã‚’ブックマークã™ã‚‹ (Ctrl+B)"
#: ../data/gui/groupchat_control.ui.h:3
msgid "Change the room's subject (Alt+T)"
-msgstr "談話室ã®é¡Œã®å¤‰æ›´ (Alt+T)"
+msgstr "談話室ã®é¡Œã‚’変更ã™ã‚‹ (Alt+T)"
#: ../data/gui/groupchat_control.ui.h:4
msgid "Change your nickname (Ctrl+N)"
-msgstr "ニックãƒãƒ¼ãƒ ã®å¤‰æ›´ (Ctrl+N)"
+msgstr "ニックãƒãƒ¼ãƒ を変更ã™ã‚‹ (Ctrl+N)"
#: ../data/gui/groups_post_window.ui.h:1
-#, fuzzy
msgid "Create new post"
-msgstr "æ–°ã—ã„ãƒã‚¹ãƒˆã®ä½œæˆ"
+msgstr "æ–°ã—ã„投稿を作æˆ"
#: ../data/gui/groups_post_window.ui.h:2
#: ../data/gui/single_message_window.ui.h:2
@@ -1539,21 +1327,15 @@ msgstr ""
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
msgstr "<big><b>Gajim å±¥æ´è¨˜éŒ²ãƒžãƒãƒ¼ã‚¸ãƒ£</b></big>"
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "削除"
-
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:4
msgid "Export"
msgstr "書ã出ã—"
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:5
msgid "Gajim History Logs Manager"
msgstr "Gajim å±¥æ´è¨˜éŒ²ãƒžãƒãƒ¼ã‚¸ãƒ£"
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:6
msgid ""
"This log manager is not intended for log viewing. If you are looking for "
"such functionality, use the history window instead.\n"
@@ -1567,28 +1349,25 @@ msgstr ""
"ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã¯è¨˜éŒ²ã®å‰Šé™¤ã‚„書ã出ã—ã®ãŸã‚ã«ãŠä½¿ã„ãã ã•ã„。左ã®ä¸€è¦§ã‹ã‚‰è¨˜éŒ²"
"ã‚’é¸æŠžã—ã€ã¾ãŸä¸‹ã®æ¬„ã§ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’検索ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:9
msgid "_Search Database"
msgstr "データベースã®æ¤œç´¢ (_S)"
#: ../data/gui/history_window.ui.h:1
-#, fuzzy
msgid "All Chat Histories"
-msgstr "ã™ã¹ã¦ã®çŠ¶æ³"
+msgstr "ã™ã¹ã¦ã®ãƒãƒ£ãƒƒãƒˆã®å±¥æ´"
#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
msgid "Conversation History"
msgstr "会話ã®å±¥æ´"
#: ../data/gui/history_window.ui.h:3
-#, fuzzy
msgid "Enter JID or Contact name"
-msgstr "åå‰"
+msgstr "JID ã¾ãŸã¯ç›¸æ‰‹å…ˆã®åå‰ã‚’入力ã—ã¦ãã ã•ã„"
#: ../data/gui/history_window.ui.h:4
-#, fuzzy
msgid "Groupchat Histories"
-msgstr "グループãƒãƒ£ãƒƒãƒˆ"
+msgstr "グループãƒãƒ£ãƒƒãƒˆã®å±¥æ´"
#: ../data/gui/history_window.ui.h:5
msgid "Search:"
@@ -1624,13 +1403,11 @@ msgid "forbid"
msgstr ""
#: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:229
msgid "jid"
msgstr "jid"
#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
@@ -1642,9 +1419,8 @@ msgid "oppose"
msgstr ""
#: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
msgid "otr"
-msgstr "æš‘"
+msgstr ""
#: ../data/gui/item_archiving_preferences_window.ui.h:11
msgid "prefer"
@@ -1663,26 +1439,22 @@ msgid "stream"
msgstr ""
#: ../data/gui/join_groupchat_window.ui.h:2
-#, fuzzy
msgid "Bro_wse Rooms"
-msgstr "一覧 (_B)"
+msgstr "談話室を一覧 (_w)"
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2328
msgid "Join Group Chat"
msgstr "グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ "
#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
msgid "Join this room _automatically when I connect"
-msgstr "接続時ã«è‡ªå‹•çš„ã«ã“ã®è«‡è©±å®¤ã«å‚åŠ ã™ã‚‹"
+msgstr "接続時ã«è‡ªå‹•çš„ã«ã“ã®è«‡è©±å®¤ã«å‚åŠ ã™ã‚‹ (_a)"
#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
msgid "Nickname:"
msgstr "ニックãƒãƒ¼ãƒ :"
#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
msgid "Password:"
msgstr "パスワード:"
@@ -1691,28 +1463,25 @@ msgid "Recently:"
msgstr "最近使ã£ãŸ:"
#: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "Room:"
msgstr "談話室:"
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
msgid "Server:"
msgstr "サーãƒãƒ¼:"
#: ../data/gui/join_groupchat_window.ui.h:10
-#, fuzzy
msgid "_Bookmark this room"
-msgstr "ã“ã®è«‡è©±å®¤ã‚’ブックマーク"
+msgstr "ã“ã®è«‡è©±å®¤ã‚’ブックマーク (_B)"
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
#: ../src/disco.py:1804
msgid "_Join"
msgstr "å‚åŠ (_J)"
#: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "自動å‚åŠ "
+msgid "A_uto join"
+msgstr "自動å‚åŠ (_u)"
#: ../data/gui/manage_bookmarks_window.ui.h:2
msgid "If checked, Gajim will join this group chat on startup"
@@ -1723,20 +1492,23 @@ msgid "Manage Bookmarks"
msgstr "ブックマークã®ç®¡ç†"
#: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "自動å‚åŠ ã—ã¦æœ€å°åŒ–"
+msgid "Minimi_ze on Auto Join"
+msgstr "自動å‚åŠ ã—ã¦æœ€å°åŒ– (_z)"
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
-msgstr "状æ³ã®è¡¨ç¤º:"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "Pr_int status:"
+msgstr "状æ³ã®è¡¨ç¤º (_i):"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "Roo_m:"
+msgstr "談話室 (_m):"
#: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "タイトル:"
+msgid "_Title:"
+msgstr "タイトル (_T):"
# (Mako)Personal Eventing via Pubsub
#: ../data/gui/manage_pep_services_window.ui.h:1
-#, fuzzy
msgid "PEP Service Configuration"
msgstr "PEP サービスã®èª¿æ•´"
@@ -1754,12 +1526,11 @@ msgstr "<b>è¨å®š</b>"
#: ../data/gui/manage_proxies_window.ui.h:3
msgid "BOSH"
-msgstr ""
+msgstr "BOSH"
#: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
msgid "HTTP Connect"
-msgstr "接続ä¸"
+msgstr "HTTP 接続"
#: ../data/gui/manage_proxies_window.ui.h:5
msgid "Manage Proxy Profiles"
@@ -1779,7 +1550,7 @@ msgstr "プãƒã‚ã‚·ã®ãƒãƒ¼ãƒˆ (_P):"
#: ../data/gui/manage_proxies_window.ui.h:9
msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
#: ../data/gui/manage_proxies_window.ui.h:10
msgid "Use HTTP prox_y"
@@ -1791,7 +1562,7 @@ msgstr "プãƒã‚¯ã‚·ã®èªè¨¼ã‚’使用ã™ã‚‹ (_e)"
#: ../data/gui/manage_proxies_window.ui.h:12
msgid "_BOSH URL:"
-msgstr "BOSH URL (_B):"
+msgstr "_BOSH URL:"
#: ../data/gui/manage_proxies_window.ui.h:13
msgid "_Name:"
@@ -1811,82 +1582,67 @@ msgstr "パスフレーズ"
#: ../data/gui/plugins_window.ui.h:1
msgid "<empty>"
-msgstr ""
+msgstr "<空>"
#: ../data/gui/plugins_window.ui.h:2
msgid "<empty>"
-msgstr ""
+msgstr "<空>"
#: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
msgid "Authors:"
-msgstr "承èªã™ã‚‹ (_t)"
+msgstr "作者:"
#: ../data/gui/plugins_window.ui.h:4
-#, fuzzy
-msgid "Available"
-msgstr "åœ¨å¸ (_A)"
+msgid "Configure"
+msgstr "調整"
#: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "調整 (_C)"
+msgid "Description:"
+msgstr "説明: "
#: ../data/gui/plugins_window.ui.h:6
-#, fuzzy
-msgid "Descrition:"
-msgstr "説明: "
+msgid "Homepage:"
+msgstr "ホームページ:"
#: ../data/gui/plugins_window.ui.h:7
-#, fuzzy
-msgid "Homepage:"
-msgstr "<b>ホームページ:</b>"
+msgid "Install from zip"
+msgstr "zip ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
#: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
-msgstr ""
+msgid "Installed"
+msgstr "インストール済"
#: ../data/gui/plugins_window.ui.h:9
-#, fuzzy
-msgid "Installed"
-msgstr "滞ã£ã¦ã„ã¾ã™"
-
-#: ../data/gui/plugins_window.ui.h:10
msgid ""
"Plug-in decription should be displayed here. This text will be erased during "
"PluginsWindow initialization."
msgstr ""
+"プラグインã®èª¬æ˜ŽãŒã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã“ã®æ–‡ã¯ãƒ—ラグインウィンドウã®åˆæœŸåŒ–ã®"
+"éš›ã«æ¶ˆåŽ»ã•ã‚Œã¾ã™ã€‚"
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:10
msgid "Plugins"
-msgstr ""
+msgstr "プラグイン"
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:11
msgid "Uninstall"
-msgstr ""
+msgstr "アンインストール"
-#: ../data/gui/plugins_window.ui.h:13
-#, fuzzy
+#: ../data/gui/plugins_window.ui.h:12
msgid "Version:"
-msgstr "GTK+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³:"
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr ""
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³:"
-#: ../data/gui/plugins_window.ui.h:15
+#: ../data/gui/plugins_window.ui.h:13
msgid "homepage url"
-msgstr ""
+msgstr "ホームページ URL"
#: ../data/gui/popup_notification_window.ui.h:1
-#, fuzzy
msgid "Event Type"
-msgstr "イベント"
+msgstr "イベントã®ç¨®é¡ž"
#: ../data/gui/popup_notification_window.ui.h:2
-#, fuzzy
msgid "Event desc"
-msgstr "イベント"
+msgstr "イベントã®èª¬æ˜Ž"
#: ../data/gui/preferences_window.ui.h:1
msgid "<b>Advanced Configuration Editor</b>"
@@ -1897,9 +1653,8 @@ msgid "<b>Applications</b>"
msgstr "<b>アプリケーション</b>"
#: ../data/gui/preferences_window.ui.h:3
-#, fuzzy
msgid "<b>Audio</b>"
-msgstr "<b>æ“作</b>"
+msgstr "<b>音声</b>"
#: ../data/gui/preferences_window.ui.h:4
msgid "<b>Auto Status</b>"
@@ -1918,13 +1673,11 @@ msgid "<b>Chat state notifications</b>"
msgstr "ãƒãƒ£ãƒƒãƒˆçŠ¶æ…‹ã®é€šçŸ¥"
#: ../data/gui/preferences_window.ui.h:8
-#, fuzzy
msgid "<b>Connection</b>"
-msgstr "<b>状æ³</b>"
+msgstr "<b>接続</b>"
#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
#: ../data/gui/preferences_window.ui.h:10
-#, fuzzy
msgid "<b>Custom</b>"
msgstr "<b>カスタム</b>"
@@ -1948,6 +1701,10 @@ msgstr "<b>プライãƒã‚·ãƒ¼</b>"
msgid "<b>Roster Appearance</b>"
msgstr "<b>åç°¿ã®å¤–観</b>"
+#: ../data/gui/preferences_window.ui.h:17
+msgid "<b>Sounds</b>"
+msgstr "<b>耳ã¸ã®é€šçŸ¥</b>"
+
#: ../data/gui/preferences_window.ui.h:18
msgid "<b>Status Messages</b>"
msgstr "<b>在å¸çŠ¶æ³ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸</b>"
@@ -1957,9 +1714,8 @@ msgid "<b>Themes</b>"
msgstr "<b>テーマ</b>"
#: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
msgid "<b>Video</b>"
-msgstr "<b>Middle:</b>"
+msgstr "<b>ビデオ</b>"
#: ../data/gui/preferences_window.ui.h:21
msgid "<b>Visual Notifications</b>"
@@ -1967,144 +1723,131 @@ msgstr "<b>ç›®ã¸ã®é€šçŸ¥</b>"
#: ../data/gui/preferences_window.ui.h:22
msgid "<i>(example: stunserver.org)</i>"
-msgstr ""
+msgstr "<i>(例: stunserver.org)</i>"
#: ../data/gui/preferences_window.ui.h:23
msgid "Advanced"
msgstr "æ‹¡å¼µ"
#: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "æ‹¡å¼µ..."
-
-#: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
msgid "All chat states"
-msgstr "ã™ã¹ã¦ã®çŠ¶æ³"
+msgstr "ã™ã¹ã¦ã®ãƒãƒ£ãƒƒãƒˆçŠ¶æ…‹"
-#: ../data/gui/preferences_window.ui.h:26
+#: ../data/gui/preferences_window.ui.h:25
msgid "Allow _OS information to be sent"
msgstr "OS æƒ…å ±ã®é€ä¿¡ã‚’許å¯ã™ã‚‹ (_O)"
-#: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:26
msgid "Allow my _idle time to be sent"
-msgstr "OS æƒ…å ±ã®é€ä¿¡ã‚’許å¯ã™ã‚‹ (_O)"
+msgstr "æ“作ã—ãªã„時間ã®é€ä¿¡ã‚’許å¯ã™ã‚‹ (_i)"
-#: ../data/gui/preferences_window.ui.h:28
+#: ../data/gui/preferences_window.ui.h:27
msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
msgstr "離å¸/ä¸åœ¨/å–ã‚Šè¾¼ã¿ä¸/éš ã‚Œä¸ã®ãƒãƒƒãƒ—アップ/通知を許å¯ã™ã‚‹ (_a)"
-#: ../data/gui/preferences_window.ui.h:29
+#: ../data/gui/preferences_window.ui.h:28
msgid "Allow sound when I'm _busy"
msgstr "å–ã‚Šè¾¼ã¿ä¸ã§ã‚‚サウンドを鳴ら㙠(_b)"
-#: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:29
msgid "Always"
-msgstr "離å¸ä¸ã§ã™"
+msgstr "常ã«"
# (Mako)èªžé †ãŒé›£ã—ã„
-#: ../data/gui/preferences_window.ui.h:31
+#: ../data/gui/preferences_window.ui.h:30
msgid "Ask status message when I:"
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’求ã‚ã‚‹ã®ã¯ã€ç§ãŒ "
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
msgid "Audio / Video"
-msgstr ""
+msgstr "音声/ビデオ"
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:32
msgid "Audio input device"
-msgstr "デフォルトã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+msgstr "音声入力デãƒã‚¤ã‚¹"
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:33
msgid "Audio output device"
-msgstr ""
+msgstr "音声出力デãƒã‚¤ã‚¹"
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:34
msgid "Chat message:"
msgstr "ãƒãƒ£ãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸:"
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:35
msgid "Check on startup if Gajim is the _default Jabber client"
msgstr "起動時ã«ã€Gajim ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã® Jabber クライアントã‹ã‚’調ã¹ã‚‹ (_d)"
-#: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:36
msgid "Composing only"
-msgstr "入力ä¸"
+msgstr "入力ä¸ã®ã¿"
-#: ../data/gui/preferences_window.ui.h:38
+#: ../data/gui/preferences_window.ui.h:37
msgid "Configure color and font of the interface"
msgstr "色ã¨ãƒ•ã‚©ãƒ³ãƒˆã®èª¿æ•´"
-#: ../data/gui/preferences_window.ui.h:39
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:38
msgid "Contact's message:"
-msgstr "ãƒãƒ£ãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸:"
+msgstr "相手先ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸:"
-#: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:39
msgid "Contact's nickname:"
-msgstr "åå‰"
+msgstr "相手先ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ :"
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:40
msgid "Custom"
-msgstr "<b>カスタム</b>"
+msgstr "カスタム"
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:41
msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgstr "åç°¿ã¯åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ãƒãƒ£ãƒƒãƒˆã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã¾ã¨ã‚ãŸã‚¦ã‚£ãƒ³ãƒ‰ã‚¦"
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:42
msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgstr "åç°¿ã¯åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ãƒãƒ£ãƒƒãƒˆã¯ç¨®é¡žã§ã¾ã¨ã‚ãŸã‚¦ã‚£ãƒ³ãƒ‰ã‚¦"
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:43
msgid "Detached roster with detached chats"
-msgstr ""
+msgstr "åç°¿ã¯åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ãƒãƒ£ãƒƒãƒˆã¯å€‹ã€…ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦"
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:44
msgid "Detached roster with single chat"
-msgstr ""
+msgstr "åç°¿ã¯åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ãƒãƒ£ãƒƒãƒˆã¯ã²ã¨ã¤ã«ã¾ã¨ã‚ãŸã‚¦ã‚£ãƒ³ãƒ‰ã‚¦"
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
+#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
+#: ../src/config.py:672
msgid "Disabled"
msgstr "無効"
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:46
msgid "Display _activity of contacts in roster"
msgstr "åç°¿ã«ç›¸æ‰‹å…ˆã®å‹•å‘を表示ã™ã‚‹ (_a)"
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:47
msgid "Display _extra email details"
msgstr "メールã®è©³ç´°ã‚’表示ã™ã‚‹ (_e)"
-#: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:48
msgid "Display _location of contacts in roster"
-msgstr "åç°¿ã«ç›¸æ‰‹å…ˆã®æ°—分を表示ã™ã‚‹ (_o)"
+msgstr "åç°¿ã«ç›¸æ‰‹å…ˆã®ä½ç½®ã‚’表示ã™ã‚‹ (_l)"
-#: ../data/gui/preferences_window.ui.h:50
+#: ../data/gui/preferences_window.ui.h:49
msgid "Display _tunes of contacts in roster"
msgstr "åç°¿ã«ç›¸æ‰‹å…ˆã®è´ã„ã¦ã„る楽曲を表示ã™ã‚‹ (_t)"
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:50
msgid "Display a_vatars of contacts in roster"
msgstr "åç°¿ã«ç›¸æ‰‹å…ˆã®ã‚¢ãƒã‚¿ãƒ¼ã‚’表示ã™ã‚‹"
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:51
msgid "Display m_ood of contacts in roster"
msgstr "åç°¿ã«ç›¸æ‰‹å…ˆã®æ°—分を表示ã™ã‚‹ (_o)"
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:52
msgid "Display status _messages of contacts in roster"
msgstr "åç°¿ã«ç›¸æ‰‹å…ˆã®çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹"
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:53
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 "
@@ -2113,7 +1856,7 @@ msgstr ""
"Gajim ã¯ã€ç›¸æ‰‹å…ˆã¨ã®ä¼šè©±ã«é–¢é€£ã™ã‚‹ãƒ¡ã‚¿æƒ…å ±ã®é€å—ä¿¡ãŒã§ãã¾ã™ã€‚ã“ã“ã§ã¯ã€"
"ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¸ã®ãƒãƒ£ãƒƒãƒˆçŠ¶æ…‹ã®è¡¨ç¤ºã«ã¤ã„ã¦æŒ‡å®šã—ã¾ã™ã€‚"
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:54
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 "
@@ -2122,7 +1865,7 @@ msgstr ""
"Gajim ã¯ã€ç›¸æ‰‹å…ˆã¨ã®ä¼šè©±ã«é–¢é€£ã™ã‚‹ãƒ¡ã‚¿æƒ…å ±ã®é€å—ä¿¡ãŒã§ãã¾ã™ã€‚ã“ã“ã§ã¯ã€"
"ãƒãƒ£ãƒƒãƒˆçŠ¶æ…‹ã®ä»–人ã¸ã®é€ä¿¡ã«ã¤ã„ã¦æŒ‡å®šã—ã¾ã™ã€‚"
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:55
msgid ""
"Gajim will notify you via a popup window in the bottom right of the screen "
"about contacts that just signed out"
@@ -2130,30 +1873,30 @@ msgstr ""
"ç”»é¢ã®å³ä¸‹ã®ãƒãƒƒãƒ—アップウィンドウã§ã€ç›¸æ‰‹å…ˆãŒã‚µã‚¤ãƒ³ã‚¢ã‚¦ãƒˆã—ãŸã¨ãã«é€šçŸ¥ã—ã¾"
"ã™"
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:57
msgid "Hide all buttons in chat windows"
msgstr "ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®ã™ã¹ã¦ã®ãƒœã‚¿ãƒ³ã‚’éš ã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:58
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
msgstr "ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯ä½¿ç”¨ä¸ã® OS を知られるã“ã¨ã‚’許å¯ã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:59
msgid ""
"If checked, Gajim will also include information about the sender of the new "
"emails"
msgstr "ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯é›»åメールã®é€ä¿¡è€…ã®æƒ…å ±ã‚’å«ã‚ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:61
+#: ../data/gui/preferences_window.ui.h:60
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯ã‚³ãƒ³ãƒ”ュータãŒä½¿ã‚ã‚Œã¦ã„ãªã„ã¨ãã€åœ¨å¸çŠ¶æ³ã‚’「離"
"å¸ä¸ã€ã«å¤‰æ›´ã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:61
msgid ""
"If checked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
@@ -2161,7 +1904,7 @@ msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯ã‚³ãƒ³ãƒ”ュータãŒé•·ã„間使ã‚ã‚Œã¦ã„ãªã„ã¨ãã€åœ¨å¸çŠ¶æ³"
"を「ä¸åœ¨ã€ã«å¤‰æ›´ã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:62
msgid ""
"If checked, Gajim will display avatars of contacts in roster window and in "
"group chats"
@@ -2169,7 +1912,7 @@ msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯å簿ウィンドウã¨ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«ç›¸æ‰‹å…ˆã®ã‚¢ãƒ"
"ターを表示ã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:63
msgid ""
"If checked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
@@ -2177,30 +1920,30 @@ msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯å簿ウィンドウã¨ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã®ç›¸æ‰‹å…ˆåã®ä¸‹ã«"
"状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:64
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr "ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯å簿ウィンドウã«ç›¸æ‰‹å…ˆã®å‹•å‘を表示ã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:65
msgid ""
"If checked, Gajim will display the location of contacts in the roster window"
-msgstr "ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯å簿ウィンドウã«ç›¸æ‰‹å…ˆã®æ°—分を表示ã—ã¾ã™"
+msgstr ""
+"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯å簿ウィンドウã«ç›¸æ‰‹å…ˆã®ä½ç½®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:66
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr "ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯å簿ウィンドウã«ç›¸æ‰‹å…ˆã®æ°—分を表示ã—ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:67
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯å簿ウィンドウã«ç›¸æ‰‹å…ˆã®è´ã„ã¦ã„る楽曲を表示ã—ã¾"
"ã™"
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:68
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 "
@@ -2211,16 +1954,16 @@ msgstr ""
"ã¦ã„ãªã„å ´åˆã¯ã€ã“ã®ç›¸æ‰‹å…ˆã‚„グループãƒãƒ£ãƒƒãƒˆã«ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®è¨€èªžãŒé©ç”¨ã•ã‚Œã¾"
"ã™ã€‚"
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:69
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 ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯æ‰¿èªã—ã¦ã„ãªã„相手先ã‹ã‚‰ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’無視ã—ã¾ã™ã€‚"
-"åç°¿ã«ãªã„相手先ã‹ã‚‰ã®ã™ã¹ã¦ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ‹’å¦ã—ã¾ã™ã®ã§ã€æ³¨æ„ã—ã¦ãã ã•ã„。"
+"åç°¿ã«ãªã„相手先ã‹ã‚‰ã®ã™ã¹ã¦ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é®æ–ã—ã¾ã™ã®ã§ã€æ³¨æ„ã—ã¦ãã ã•ã„。"
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:70
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 "
@@ -2230,7 +1973,7 @@ msgstr ""
"å·åŒ– (E2EE) ã®å ´åˆã¯ç›¸æ‰‹å…ˆãŒè¨˜éŒ²ã«åŒæ„ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。ãã†ã§ãªã‘ã‚Œ"
"ã°è¨˜éŒ²ã—ãªã„ã§ãã ã•ã„。"
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:71
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
@@ -2238,7 +1981,7 @@ msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim 㯠GMail 経由ã§æ–°ã—ã„メールをå—ã‘å–ã£ãŸã¨ãã€é€šçŸ¥ã—"
"ã¾ã™"
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:72
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, "
@@ -2248,7 +1991,7 @@ msgstr ""
"(例: MSN ã‹ã‚‰ã®ç›¸æ‰‹å…ˆã«ã¯ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã€é›¢å¸ã€å–ã‚Šè¾¼ã¿ä¸...ãªã©ã®å¯¾å¿œã™ã‚‹ MSN ã®"
"アイコンãŒã‚ã‚Šã¾ã™)"
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:73
msgid ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
@@ -2256,7 +1999,7 @@ msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¦æ±‚ã—ã¾ã›ã‚“。ã‹ã‚ã‚Šã«å¯¾å¿œã™ã‚‹ãƒ‡"
"フォルトã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒä½¿ã‚ã‚Œã¾ã™ã€‚"
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:74
msgid ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
"animated or static graphical emoticons"
@@ -2264,6 +2007,11 @@ msgstr ""
"「無効ã€ã§ãªã‘ã‚Œã°ã€Gajim 㯠':)' ã®ã‚ˆã†ãªã‚¹ãƒžã‚¤ãƒªãƒ¼ã‚’対応ã™ã‚‹ç”»åƒã«ç½®ãæ›ãˆ"
"ã¾ã™"
+# 起動時ã«å簿を表示ã™ã‚‹ã‹
+#: ../data/gui/preferences_window.ui.h:75
+msgid "Last state"
+msgstr "以å‰ã®çŠ¶æ…‹"
+
#: ../data/gui/preferences_window.ui.h:76
msgid "Log _encrypted chat session"
msgstr "æš—å·åŒ–ãƒãƒ£ãƒƒãƒˆã‚’記録ã™ã‚‹ (_e)"
@@ -2276,10 +2024,10 @@ msgstr "メッセージウィンドウを簡潔ã«ã™ã‚‹ (_k)"
msgid "Ma_nage..."
msgstr "è¨å®š (_n)..."
+# (Mako)systrayã«è¡¨ç¤º
#: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
msgid "Never"
-msgstr "サーãƒãƒ¼"
+msgstr "ã—ãªã„"
#: ../data/gui/preferences_window.ui.h:80
msgid "Notifications"
@@ -2287,28 +2035,23 @@ msgstr "通知"
#: ../data/gui/preferences_window.ui.h:81
msgid "Notify me about contacts that sign _in"
-msgstr "相手先ã®ãƒã‚°ã‚¤ãƒ³ã‚’通知ã™ã‚‹ (_i)"
+msgstr "相手先ã®ã‚µã‚¤ãƒ³ã‚¤ãƒ³ã‚’通知ã™ã‚‹ (_i)"
#: ../data/gui/preferences_window.ui.h:82
msgid "Notify me about contacts that sign _out"
-msgstr "相手先ã®ãƒã‚°ã‚¢ã‚¦ãƒˆã‚’通知ã™ã‚‹ (_o)"
+msgstr "相手先ã®ã‚µã‚¤ãƒ³ã‚¢ã‚¦ãƒˆã‚’通知ã™ã‚‹ (_o)"
#: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
msgid "Notify me about it"
-msgstr "相手先ã®ãƒã‚°ã‚¢ã‚¦ãƒˆã‚’通知ã™ã‚‹ (_o)"
+msgstr "ãã‚Œã«ã¤ã„ã¦é€šçŸ¥ã™ã‚‹"
#: ../data/gui/preferences_window.ui.h:84
msgid "Notify on new _GMail email"
msgstr "æ–°ã—ã„ GMail メールを通知ã™ã‚‹ (_G)"
#: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
msgid "Only when pending events"
-msgstr ""
-"表示ã—ãªã„\n"
-"ä¿ç•™ã‚¤ãƒ™ãƒ³ãƒˆãŒã‚ã‚‹ã¨ãã ã‘\n"
-"常ã«"
+msgstr "ä¿ç•™ã‚¤ãƒ™ãƒ³ãƒˆãŒã‚ã‚‹ã¨ãã ã‘"
#: ../data/gui/preferences_window.ui.h:86
msgid "Personal Events"
@@ -2320,7 +2063,7 @@ msgstr "サウンドを鳴ら㙠(_s)"
#: ../data/gui/preferences_window.ui.h:88
msgid "Pop it up"
-msgstr ""
+msgstr "ãƒãƒƒãƒ—アップã™ã‚‹"
#: ../data/gui/preferences_window.ui.h:89
msgid "Preferences"
@@ -2331,20 +2074,20 @@ msgid ""
"STUN server hostname. If none given, Gajim will try\n"
"to discover one from server."
msgstr ""
+"STUN サーãƒãƒ¼ã€‚空ãªã‚‰ã€Gajim ã¯ã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰æŽ¢ç´¢\n"
+"ã—よã†ã¨ã—ã¾ã™ã€‚"
#: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
msgid "STUN server:"
-msgstr "サーãƒãƒ¼:"
+msgstr "STUN サーãƒãƒ¼:"
#: ../data/gui/preferences_window.ui.h:93
msgid "Show notification area icon:"
-msgstr ""
+msgstr "通知エリアã®ã‚¢ã‚¤ã‚³ãƒ³ã®è¡¨ç¤º:"
#: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
msgid "Show only in roster"
-msgstr "イベントをåç°¿ã«è¡¨ç¤ºã™ã‚‹ (_S)"
+msgstr "åç°¿ã«ã®ã¿è¡¨ç¤ºã™ã‚‹"
# (Mako)"Ask status message when I:" ã«ç¶šã語
#: ../data/gui/preferences_window.ui.h:95
@@ -2358,7 +2101,7 @@ msgstr "サインアウトã—ãŸã¨ã (_o)"
#: ../data/gui/preferences_window.ui.h:97
msgid "Single window for everything"
-msgstr ""
+msgstr "ã™ã¹ã¦ã‚’ã²ã¨ã¤ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦"
#: ../data/gui/preferences_window.ui.h:98
msgid ""
@@ -2372,7 +2115,7 @@ msgstr ""
msgid "Sort contacts by status"
msgstr "相手先を在å¸çŠ¶æ³é †ã«ä¸¦ã¹ã‚‹"
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
msgid "Status"
msgstr "在å¸çŠ¶æ³"
@@ -2418,7 +2161,7 @@ msgstr "ä¸ç¶™å…ˆã®ã‚¢ã‚¤ã‚³ãƒ³ã‚’使ㆠ(_t)"
#: ../data/gui/preferences_window.ui.h:111
msgid "Use default applications"
-msgstr ""
+msgstr "デフォルトã®ã‚¢ãƒ—リケーションを使ã†"
#: ../data/gui/preferences_window.ui.h:112
msgid "Use system _default"
@@ -2426,34 +2169,31 @@ msgstr "システムã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚’使ㆠ(_d)"
#: ../data/gui/preferences_window.ui.h:113
msgid "Video framerate"
-msgstr ""
+msgstr "ビデオã®ãƒ•ãƒ¬ãƒ¼ãƒ レート"
#: ../data/gui/preferences_window.ui.h:114
-#, fuzzy
msgid "Video input device"
-msgstr "デフォルトã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+msgstr "ビデオ入力デãƒã‚¤ã‚¹"
#: ../data/gui/preferences_window.ui.h:115
msgid "Video output device"
-msgstr ""
+msgstr "ビデオ出力デãƒã‚¤ã‚¹"
#: ../data/gui/preferences_window.ui.h:116
msgid "Video size"
-msgstr ""
+msgstr "ビデオã®å¤§ãã•"
#: ../data/gui/preferences_window.ui.h:117
msgid "When new event is received:"
msgstr "æ–°ã—ã„イベントをå—ä¿¡ã—ãŸã¨ã:"
#: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
msgid "Your message:"
-msgstr "エラーメッセージ: %s"
+msgstr "ã‚ãªãŸã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸:"
#: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
msgid "Your nickname:"
-msgstr "ニックãƒãƒ¼ãƒ :"
+msgstr "ã‚ãªãŸã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ :"
#: ../data/gui/preferences_window.ui.h:120
msgid "_Away after:"
@@ -2512,35 +2252,34 @@ msgid "_Send chat state notifications:"
msgstr "ãƒãƒ£ãƒƒãƒˆçŠ¶æ…‹é€šçŸ¥ã‚’é€ä¿¡ã™ã‚‹ (_S):"
#: ../data/gui/preferences_window.ui.h:134
+msgid "_Show roster on startup:"
+msgstr "自動時ã«å簿を表示ã™ã‚‹ (_S):"
+
+#: ../data/gui/preferences_window.ui.h:135
msgid "_Status message:"
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ (_S):"
# (Mako)ã‚ãˆã¦ã‚«ãƒƒã‚³æ›¸ã
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:136
msgid "_URL highlight:"
msgstr "URL 強調表示 (_U):"
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:137
msgid "_Window behavior:"
msgstr "ウィンドウã®é…ç½® (_W):"
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:138
msgid "in _group chats"
msgstr "グループãƒãƒ£ãƒƒãƒˆã§ (_g)"
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:139
msgid "in _roster"
-msgstr "åç°¿ã«ã‚ã‚Šã¾ã›ã‚“"
+msgstr "å簿㧠(_r)"
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:140
msgid "minutes"
msgstr "分後"
-#: ../data/gui/privacy_lists_window.ui.h:1
-msgid "Privacy Lists:"
-msgstr "個人リスト:"
-
#: ../data/gui/privacy_list_window.ui.h:1
msgid "<b>Add / Edit a rule</b>"
msgstr "<b>è¦å‰‡ã®è¿½åŠ /編集</b>"
@@ -2555,12 +2294,11 @@ msgstr "<i>プライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆ</i>"
#: ../data/gui/privacy_list_window.ui.h:4
msgid "Active for this session"
-msgstr ""
+msgstr "ã“ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã§æœ‰åŠ¹"
#: ../data/gui/privacy_list_window.ui.h:5
-#, fuzzy
msgid "Active on each startup"
-msgstr "Gajim 起動時ã«æŽ¥ç¶šã™ã‚‹ (_o)"
+msgstr "èµ·å‹•ã”ã¨ã«æœ‰åŠ¹"
#: ../data/gui/privacy_list_window.ui.h:6
msgid "All"
@@ -2583,65 +2321,58 @@ msgid "JabberID"
msgstr "JabberID"
#: ../data/gui/privacy_list_window.ui.h:11
-#, fuzzy
msgid "Order:"
msgstr "é †ä½:"
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3966
msgid "Privacy List"
msgstr "プライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆ"
#: ../data/gui/privacy_list_window.ui.h:13
-#, fuzzy
msgid "all by subscription"
-msgstr "在å¸é€šçŸ¥ã®ã™ã¹ã¦"
+msgstr "在å¸é€šçŸ¥ã®çŠ¶æ…‹ãŒ"
#: ../data/gui/privacy_list_window.ui.h:14
-#, fuzzy
msgid "all in the group"
-msgstr "グループã®ã™ã¹ã¦"
+msgstr "グループãŒ"
#: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
msgid "both"
msgstr "相互ã«æ‰¿èª"
-# #(Mako)helpers.pyã¯ã€
-# 相手先ã®æƒ…å ±ã§ã€subscriptionã®æœ‰ç„¡ãªã®ã§ã€ã€Œã“ã¡ã‚‰ãŒæ‰¿èªã€ã¨ã—ãŸã„
+# (Mako)相手先ã®æƒ…å ±ã§ã€subscriptionã®æœ‰ç„¡ãªã®ã§ã€ã€Œã“ã¡ã‚‰ãŒæ‰¿èªã€ã¨ã—ãŸã„
#: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
msgid "from"
msgstr "ã“ã¡ã‚‰ãŒæ‰¿èª"
#: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
msgid "none"
-msgstr "1"
+msgstr "ãªã—"
+# (Mako)相手先ã®æƒ…å ±ã§ã€subscriptionã®æœ‰ç„¡ãªã®ã§ã€ã€Œç›¸æ‰‹å…ˆãŒæ‰¿èªã€ã¨ã—ãŸã„
#: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
msgid "to"
-msgstr "2"
+msgstr "相手先ãŒæ‰¿èª"
#: ../data/gui/privacy_list_window.ui.h:19
-#, fuzzy
msgid "to send me messages"
-msgstr "メッセージをç§ã«é€ä¿¡ã™ã‚‹"
+msgstr "メッセージをç§ã«é€ä¿¡ã™ã‚‹ã“ã¨"
#: ../data/gui/privacy_list_window.ui.h:20
-#, fuzzy
msgid "to send me queries"
-msgstr "クエリーをç§ã«é€ä¿¡ã™ã‚‹"
+msgstr "クエリーをç§ã«é€ä¿¡ã™ã‚‹ã“ã¨"
#: ../data/gui/privacy_list_window.ui.h:21
-#, fuzzy
msgid "to send me status"
-msgstr "状æ³ã‚’ç§ã«é€ä¿¡ã™ã‚‹"
+msgstr "状æ³ã‚’ç§ã«é€ä¿¡ã™ã‚‹ã“ã¨"
#: ../data/gui/privacy_list_window.ui.h:22
-#, fuzzy
msgid "to view my status"
-msgstr "ç§ã®çŠ¶æ³ã‚’見ã›ã‚‹"
+msgstr "ç§ã®çŠ¶æ³ã‚’見るã“ã¨"
+
+#: ../data/gui/privacy_lists_window.ui.h:1
+msgid "Privacy Lists:"
+msgstr "プライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆ:"
#: ../data/gui/profile_window.ui.h:1
#: ../data/gui/vcard_information_window.ui.h:1
@@ -2668,110 +2399,109 @@ msgid "<b>Company:</b>"
msgstr "<b>会社:</b>"
#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:10
msgid "<b>Country:</b>"
msgstr "<b>国:</b>"
#: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/vcard_information_window.ui.h:11
msgid "<b>Department:</b>"
msgstr "<b>部署:</b>"
#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:12
msgid "<b>E-Mail:</b>"
msgstr "<b>メールアドレス:</b>"
#: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:13
msgid "<b>Extra Address:</b>"
msgstr "<b>建物åãªã©:</b>"
#. Family Name
#: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:15
msgid "<b>Family:</b>"
msgstr "<b>姓:</b>"
#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:16
msgid "<b>Full Name</b>"
msgstr "<b>åå‰(フルãƒãƒ¼ãƒ )</b>"
#. Given Name
#: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:18
msgid "<b>Given:</b>"
msgstr "<b>å:</b>"
#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:19
msgid "<b>Homepage:</b>"
msgstr "<b>ホームページ:</b>"
#. Middle Name
#: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:22
msgid "<b>Middle:</b>"
msgstr "<b>Middle:</b>"
#: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:23
msgid "<b>Name:</b>"
msgstr "<b>åå‰:</b>"
#: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:24
msgid "<b>Nickname:</b>"
msgstr "<b>ニックãƒãƒ¼ãƒ :</b>"
#: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:25
msgid "<b>Phone No.:</b>"
msgstr "<b>電話番å·:</b>"
#: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:26
msgid "<b>Position:</b>"
msgstr "<b>å½¹è·:</b>"
#: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:27
msgid "<b>Postal Code:</b>"
msgstr "<b>郵便番å·:</b>"
#. Prefix in Name
#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:29
msgid "<b>Prefix:</b>"
msgstr "<b>Prefix:</b>"
-# (Mako)å€‹äººæƒ…å ±ã§ã¯ã€Œå½¹ã€(劇ã®å½¹ã®ã‚ˆã†ãªæ„味ã§)ã€
-# vcard ã§ã¯ã€Œè·ç¨®ã€ãŒé©åˆ‡ã¨æ€ã‚れる。
+# (Mako)vcard ã§ã¯ã€Œè·ç¨®ã€ãŒé©åˆ‡
#: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:31
msgid "<b>Role:</b>"
-msgstr "<b>å½¹/è·ç¨®:</b>"
+msgstr "<b>è·ç¨®:</b>"
#: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:32
msgid "<b>State:</b>"
msgstr "<b>州(県):</b>"
#: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:34
msgid "<b>Street:</b>"
msgstr "<b>町ä¸å・番地:</b>"
#. Suffix in Name
#: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:38
msgid "<b>Suffix:</b>"
msgstr "<b>Suffix:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:42
msgid "About"
msgstr "概略"
@@ -2780,12 +2510,12 @@ msgid "Click to set your avatar"
msgstr "ã‚¢ãƒã‚¿ãƒ¼ã®è¨å®š"
#: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:45
+#: ../data/gui/vcard_information_window.ui.h:46
msgid "Format: YYYY-MM-DD"
msgstr "書å¼: YYYY-MM-DD"
#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:48
msgid "Personal Info"
msgstr "å€‹äººæƒ…å ±"
@@ -2799,7 +2529,6 @@ msgid "<b>What do you want to do?</b>"
msgstr "<b>ã‚ãªãŸãŒã‚„ã‚ŠãŸã„ã“ã¨ã¯ ?</b>"
#: ../data/gui/remove_account_window.ui.h:2
-#, fuzzy
msgid "Remove account _only from Gajim"
msgstr "アカウントを Gajim ã‹ã‚‰ã®ã¿å‰Šé™¤ (_o)"
@@ -2809,13 +2538,12 @@ msgstr "アカウントを Gajim ã¨ã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰ã‚‚削除 (_s)"
#. Remove group
#. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5639
+#: ../src/roster_window.py:5764 ../src/roster_window.py:5894
msgid "_Remove"
msgstr "削除 (_R)"
#: ../data/gui/roster_item_exchange_window.ui.h:1
-#, fuzzy
msgid ""
"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
"your roster."
@@ -2825,10 +2553,9 @@ msgstr ""
#: ../data/gui/roster_item_exchange_window.ui.h:2
msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "メッセージ本文 <ç¾åœ¨ä½¿ã‚ã‚Œã¦ã„ãªã„ãŸã‚ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“>"
#: ../data/gui/roster_item_exchange_window.ui.h:3
-#, fuzzy
msgid "Roster Item Exchange"
msgstr "åç°¿ã®é …ç›®ã®äº¤æ›"
@@ -2860,58 +2587,54 @@ msgstr "ヘルプ(オンライン)"
#: ../data/gui/roster_window.ui.h:8
msgid "P_lugins"
-msgstr ""
+msgstr "プラグイン (_l)"
#: ../data/gui/roster_window.ui.h:9
msgid "Profile, A_vatar"
msgstr "プãƒãƒ•ã‚£ãƒ¼ãƒ«ã¨ã‚¢ãƒã‚¿ãƒ¼"
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
msgid "Show Only _Active Contacts"
msgstr "アクティブãªç›¸æ‰‹å…ˆã®ã¿è¡¨ç¤º (_A)"
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
msgid "Show Trans_ports"
msgstr "ä¸ç¶™å…ˆã‚’表示 (_p)"
-#: ../data/gui/roster_window.ui.h:12
+#: ../data/gui/roster_window.ui.h:13
msgid "Show _Offline Contacts"
msgstr "オフラインã®ç›¸æ‰‹å…ˆã‚’表示 (_O)"
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
msgid "Show _Roster"
-msgstr "åç°¿ã®è¡¨ç¤º (_R)"
+msgstr "å簿を表示 (_R)"
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
msgid "_Accounts"
msgstr "アカウント (_A)"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/roster_window.ui.h:16
#: ../data/gui/subscription_request_window.ui.h:6
msgid "_Actions"
msgstr "æ“作 (_A)"
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:18
msgid "_Contents"
msgstr "目次 (_C)"
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
+#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
msgid "_Edit"
msgstr "編集 (_E)"
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
msgid "_FAQ"
msgstr "_FAQ"
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:22
msgid "_Help"
msgstr "ヘルプ (_H)"
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã™ã‚‹ (_S)..."
-
#: ../data/gui/roster_window.ui.h:25
msgid "_View"
msgstr "表示 (_V)"
@@ -2925,16 +2648,15 @@ msgid "Search"
msgstr "検索"
#: ../data/gui/search_window.ui.h:3
-#, fuzzy
msgid "_Add contact"
-msgstr "相手先リストã«è¿½åŠ ã™ã‚‹ (_A)..."
+msgstr "相手先リストã«è¿½åŠ (_A)"
#. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5906
msgid "_Information"
msgstr "æƒ…å ± (_I)"
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
msgid "_Search"
msgstr "検索 (_S)"
@@ -2947,9 +2669,8 @@ msgid "_Address:"
msgstr "アドレス (_A):"
#: ../data/gui/service_registration_window.ui.h:1
-#, fuzzy
msgid "Register to"
-msgstr "登録"
+msgstr "登録 "
#: ../data/gui/service_registration_window.ui.h:2
msgid "_Cancel"
@@ -3015,9 +2736,8 @@ msgid "Select the contacts you want to synchronise"
msgstr "åˆã‚ã›ãŸã„相手先をé¸æŠžã—ã¦ãã ã•ã„"
#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-#, fuzzy
msgid "Synchronise : select contacts"
-msgstr "åŒæœŸ: 相手先ã®é¸æŠž"
+msgstr "åŒèª¿: 相手先ã®é¸æŠž"
#: ../data/gui/systray_context_menu.ui.h:1
msgid "Mute Sounds"
@@ -3050,65 +2770,62 @@ msgid "<b>Client:</b>"
msgstr "<b>クライアント:</b>"
#: ../data/gui/vcard_information_window.ui.h:8
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>è¨å®šã—ãŸã‚¢ãƒã‚¿ãƒ¼:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
msgid "<b>Contact time:</b>"
msgstr "<b>通話時間:</b>"
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:20
msgid "<b>Jabber ID:</b>"
msgstr "<b>Jabber ID:</b>"
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:30
msgid "<b>Resource:</b>"
msgstr "<b>リソース:</b>"
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:33
msgid "<b>Status:</b>"
msgstr "<b>在å¸çŠ¶æ³:</b>"
#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:36
msgid "<b>Subscription:</b>"
msgstr "<b>在å¸é€šçŸ¥:</b>"
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:39
msgid "<b>System:</b>"
msgstr "<b>システム:</b>"
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>User avatar:</b>"
+msgstr "<b>ユーザーã®ã‚¢ãƒã‚¿ãƒ¼:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:43
msgid "Comments"
msgstr "備考"
-#: ../data/gui/vcard_information_window.ui.h:42
-#, fuzzy
-msgid "Configured avatar:"
-msgstr "è¨å®šã—ãŸã‚¢ãƒã‚¿ãƒ¼:"
-
-#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/vcard_information_window.ui.h:44
#: ../data/gui/zeroconf_information_window.ui.h:1
msgid "Contact"
msgstr "相手先"
-#: ../data/gui/vcard_information_window.ui.h:44
+#: ../data/gui/vcard_information_window.ui.h:45
msgid "Contact Information"
msgstr "相手先ã®æƒ…å ±"
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:47
msgid "More"
msgstr "ãã®ä»–ã®æƒ…å ±"
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "ユーザーã®ã‚¢ãƒã‚¿ãƒ¼:"
-
#: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
msgid "<b>Filter</b>"
-msgstr "<b>フォント</b>"
+msgstr "<b>フィルタ</b>"
#: ../data/gui/xml_console_window.ui.h:2
-#, fuzzy
msgid "<b>Jabber Traffic</b>"
-msgstr "<b>Jabber 通信</b>"
+msgstr "<b>Jabber トラヒック</b>"
#: ../data/gui/xml_console_window.ui.h:3
msgid "<b>XML Input</b>"
@@ -3116,23 +2833,23 @@ msgstr "<b>XML 入力</b>"
#: ../data/gui/xml_console_window.ui.h:4
msgid "Hide IN stanzas"
-msgstr ""
+msgstr "IN スタンザを表示ã—ãªã„"
#: ../data/gui/xml_console_window.ui.h:5
msgid "Hide IQ stanzas"
-msgstr ""
+msgstr "IQ スタンザを表示ã—ãªã„"
#: ../data/gui/xml_console_window.ui.h:6
msgid "Hide Message stanzas"
-msgstr ""
+msgstr "Message スタンザを表示ã—ãªã„"
#: ../data/gui/xml_console_window.ui.h:7
msgid "Hide OUT stanzas"
-msgstr ""
+msgstr "OUT スタンザを表示ã—ãªã„"
#: ../data/gui/xml_console_window.ui.h:8
msgid "Hide Presence stanzas"
-msgstr ""
+msgstr "Presence スタンザを表示ã—ãªã„"
#: ../data/gui/xml_console_window.ui.h:9
msgid "Info/Query"
@@ -3195,28 +2912,25 @@ msgid ""
msgstr "コマンドã®å®Ÿè¡Œä¸ã§ã™ã€‚本当ã«ä¸æ¢ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
#: ../src/adhoc_commands.py:370
-#, fuzzy
msgid "Invalid Form"
-msgstr "談話室åãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
+msgstr "フォームãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
#: ../src/adhoc_commands.py:371
-#, fuzzy
msgid "The form is not filled correctly."
-msgstr "ニックãƒãƒ¼ãƒ ã«ä½¿ç”¨ã§ããªã„æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
+msgstr "フォームãŒæ£ã—ã入力ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
msgid "Service sent malformed data"
-msgstr ""
+msgstr "サービスã¯ä¸æ£ãªãƒ‡ãƒ¼ã‚¿ã‚’é€ä¿¡ã—ã¾ã—ãŸ"
#: ../src/adhoc_commands.py:399
msgid "Service changed the session identifier."
-msgstr ""
+msgstr "サービスã¯ã‚»ãƒƒã‚·ãƒ§ãƒ³ ID を変更ã—ã¾ã—ãŸã€‚"
#. when stanza doesn't have error description
#: ../src/adhoc_commands.py:513
-#, fuzzy
msgid "Service returned an error."
-msgstr "エラーを返ã—ã¦ãã¾ã—ãŸã€‚"
+msgstr "サービスã¯ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸã€‚"
#. For i18n
#: ../src/advanced_configuration_window.py:91
@@ -3239,7 +2953,7 @@ msgstr "æ•´æ•°åž‹"
msgid "Text"
msgstr "æ–‡å—列型"
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1050
msgid "Color"
msgstr "色"
@@ -3261,203 +2975,218 @@ msgid "(None)"
msgstr "(ãªã—)"
#: ../src/advanced_configuration_window.py:259
-#, fuzzy
msgid "Hidden"
-msgstr "éš ã—"
+msgstr "(éžè¡¨ç¤º)"
#: ../src/atom_window.py:123
-#, fuzzy, python-format
+#, python-format
msgid "You have received new entries (and %d not displayed):"
msgid_plural "You have received new entries (and %d not displayed):"
-msgstr[0] "æ–°ã—ã„エントリーをå—ã‘å–ã‚Šã¾ã—㟠(%(count)d ãŒè¡¨ç¤ºã•ã‚Œã¾ã›ã‚“):"
-msgstr[1] "æ–°ã—ã„エントリーをå—ã‘å–ã‚Šã¾ã—㟠(%(count)d ãŒè¡¨ç¤ºã•ã‚Œã¾ã›ã‚“):"
+msgstr[0] "æ–°ã—ã„エントリーをå—ã‘å–ã‚Šã¾ã—㟠(%d 件ãŒè¡¨ç¤ºã•ã‚Œã¾ã›ã‚“):"
+msgstr[1] "æ–°ã—ã„エントリーをå—ã‘å–ã‚Šã¾ã—㟠(%d 件ãŒè¡¨ç¤ºã•ã‚Œã¾ã›ã‚“):"
#. the next script, executed in the "po" directory,
#. generates the following list.
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "English"
msgstr "英語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Belarusian"
msgstr "ベラルーシ語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Bulgarian"
msgstr "ブルガリア語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Breton"
msgstr "ブルトン語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Czech"
msgstr "ãƒã‚§ã‚³èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "German"
msgstr "ドイツ語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Greek"
msgstr "ギリシア語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "British"
msgstr "英語 (イギリス)"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Esperanto"
msgstr "エスペラント"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Spanish"
msgstr "スペイン語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Basque"
msgstr "ãƒã‚¹ã‚¯èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "French"
msgstr "フランス語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Croatian"
msgstr "クãƒã‚¢ãƒã‚¢èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Italian"
msgstr "イタリア語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Norwegian (b)"
msgstr "ノルウェー語 (b)"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Dutch"
msgstr "オランダ語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Norwegian"
msgstr "ノルウェー語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Polish"
msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Portuguese"
msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Brazilian Portuguese"
msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž (ブラジル)"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Russian"
msgstr "ãƒã‚·ã‚¢èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Serbian"
msgstr "セルビア語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Slovak"
msgstr "スãƒãƒã‚ア語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Swedish"
msgstr "スウェーデン語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Chinese (Ch)"
msgstr "ä¸å›½èªž (Ch)"
-#: ../src/chat_control.py:496
+#: ../src/chat_control.py:227
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/chat_control.py:232
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s)"
+
+#: ../src/chat_control.py:237
+msgid "Error."
+msgstr "エラー"
+
+#: ../src/chat_control.py:562
msgid "Spelling language"
msgstr "スペルãƒã‚§ãƒƒã‚¯ã®è¨€èªž"
#. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:594 ../src/chat_control.py:810
msgid "A connection is not available"
msgstr "接続ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:595 ../src/chat_control.py:811
msgid "Your message can not be sent until you are connected."
msgstr "接続ã™ã‚‹ã¾ã§ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯é€ä¿¡ã•ã‚Œã¾ã›ã‚“。"
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1032
msgid "Underline"
msgstr "下線"
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1033
msgid "Strike"
msgstr "抹消線"
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1056
msgid "Font"
msgstr "フォント"
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1065
msgid "Clear formating"
msgstr "書å¼ã®ã‚¯ãƒªã‚¢"
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1142
msgid "Really send file?"
msgstr "ファイルをé€ä¿¡ã—ã¾ã™ã‹ ?"
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1143
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr ""
"ファイルを %s ã«é€ä¿¡ã™ã‚‹ã¨ã€ãã®ç›¸æ‰‹ã¯ã‚ãªãŸã®æœ¬å½“ã® Jabber ID を知るã“ã¨ã«ãª"
"ã‚Šã¾ã™ã€‚"
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
-#, fuzzy
+#: ../src/chat_control.py:1623 ../src/chat_control.py:2135
msgid "GPG encryption enabled"
msgstr "GPG æš—å·åŒ–ã¯æœ‰åŠ¹"
+#: ../src/chat_control.py:1644 ../src/chat_control.py:1647
+msgid "Requires python-farsight."
+msgstr "python-farsight ãŒå¿…è¦ã§ã™ã€‚"
+
#. Add to roster
-#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
-#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
-#: ../src/roster_window.py:3382
+#: ../src/chat_control.py:1673 ../src/common/contacts.py:149
+#: ../src/common/contacts.py:270 ../src/common/helpers.py:60
+#: ../src/common/helpers.py:254 ../src/dialogs.py:1099 ../src/dialogs.py:2222
+#: ../src/dialogs.py:2251 ../src/gui_interface.py:467
+#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:404
+#: ../src/roster_window.py:1644 ../src/roster_window.py:1646
+#: ../src/roster_window.py:1979 ../src/roster_window.py:3507
+#: ../src/roster_window.py:3534
msgid "Not in Roster"
msgstr "åç°¿ã«ã‚ã‚Šã¾ã›ã‚“"
-#: ../src/chat_control.py:1575
+#: ../src/chat_control.py:1704
msgid "This contact does not support file transfer."
msgstr "ã“ã®ç›¸æ‰‹å…ˆã¯ãƒ•ã‚¡ã‚¤ãƒ«è»¢é€ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。"
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1707
msgid "You need to know the real JID of the contact to send him or her a file."
msgstr "ファイル転é€ã‚’è¡Œãªã†ã«ã¯ã€æœ¬å½“ã® JID を知ã£ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1814
#, python-format
msgid "%(type)s state : %(state)s, reason: %(reason)s"
-msgstr ""
+msgstr "%(type)s ã®çŠ¶æ…‹: %(state)s ç†ç”±: %(reason)s"
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2005
#, 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:1990 ../src/dialogs.py:5278
+#: ../src/chat_control.py:2115 ../src/dialogs.py:5027
msgid "No GPG key assigned"
msgstr "GPG éµãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã›ã‚“"
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2116
msgid ""
"No GPG key is assigned to this contact. So you cannot encrypt messages with "
"GPG."
@@ -3465,52 +3194,52 @@ msgstr ""
"ã“ã®ç›¸æ‰‹å…ˆã« GPG éµãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ãªã„ãŸã‚ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ GPG ã§æš—å·åŒ–ã™ã‚‹"
"ã“ã¨ãŒã§ãã¾ã›ã‚“。"
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2125
msgid "GPG encryption disabled"
msgstr "GPG æš—å·åŒ–ã¯ç„¡åŠ¹"
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2151
msgid "Session WILL be logged"
msgstr "セッションã¯è¨˜éŒ²ã•ã‚Œã¾ã™"
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2153
msgid "Session WILL NOT be logged"
msgstr "セッションã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“"
# (Mako)æš—å·åŒ–ã¯æœ‰åŠ¹ %sã€
#. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2170
msgid "is"
msgstr "ã§"
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2170
msgid "is NOT"
msgstr "ã§ãªã"
# #. ãƒãƒ£ãƒƒãƒˆã¯è¨˜éŒ² %s。
#. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2172
msgid "will"
msgstr "記録ã•ã‚Œã¾ã™"
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2172
msgid "will NOT"
msgstr "記録ã•ã‚Œã¾ã›ã‚“"
#. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2176
msgid "and authenticated"
msgstr "èªè¨¼ã•ã‚Œã¦ã„ã¾ã™"
#. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2180
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:2062
+#: ../src/chat_control.py:2187
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3519,32 +3248,31 @@ msgstr ""
"%(type)s ã®æš—å·åŒ–ã¯æœ‰åŠ¹%(status)sã€%(authenticated)s。\n"
"ãƒãƒ£ãƒƒãƒˆã¯%(logged)s。"
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2331
msgid "Session negotiation cancelled"
-msgstr ""
+msgstr "セッションã®ç¢ºçŽ‡ã‚’ä¸æ¢ã—ã¾ã—ãŸ"
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2341
msgid "This session WILL be archived on server"
-msgstr ""
+msgstr "セッションã¯ã‚µãƒ¼ãƒãƒ¼ã«è¨˜éŒ²ã•ã‚Œã¾ã™"
-#: ../src/chat_control.py:2217
-#, fuzzy
+#: ../src/chat_control.py:2343
msgid "This session WILL NOT be archived on server"
-msgstr "セッションã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“"
+msgstr "セッションã¯ã‚µãƒ¼ãƒãƒ¼ã«è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“"
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2352
msgid "This session is encrypted"
msgstr "ã“ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã¯æš—å·åŒ–ã•ã‚Œã¦ã„ã¾ã™"
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2355
msgid " and WILL be logged"
msgstr " ã‹ã¤ã€è¨˜éŒ²ã•ã‚Œã¾ã™"
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2357
msgid " and WILL NOT be logged"
msgstr " ã‹ã¤ã€è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“"
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2362
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
@@ -3552,38 +3280,41 @@ msgstr ""
"é ãã®ç›¸æ‰‹å…ˆã®åŒä¸€æ€§ã¯æ¤œè¨¼ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚詳ã—ãã¯ç›¾ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ã"
"ã ã•ã„。"
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2364
msgid "E2E encryption disabled"
msgstr "終端間暗å·åŒ– (E2EE) ã¯ç„¡åŠ¹"
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2408 ../src/chat_control.py:2421
msgid "The following message was NOT encrypted"
-msgstr "次ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯æš—å·åŒ–ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ:"
+msgstr "次ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯æš—å·åŒ–ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2414
msgid "The following message was encrypted"
-msgstr "次ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯æš—å·åŒ–ã•ã‚Œã¾ã—ãŸ:"
+msgstr "次ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯æš—å·åŒ–ã•ã‚Œã¾ã—ãŸ"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2685
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "\"%s\" ã•ã‚“ã‹ã‚‰æ–°ã—ã„メッセージをå—ä¿¡ã—ã¾ã—ãŸ"
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2686
msgid ""
"If you close this tab and you have history disabled, this message will be "
"lost."
msgstr ""
"ã“ã®ã‚¿ãƒ–ã‚’é–‰ã˜ã‚‹ã¨ã€è¨˜éŒ²ã‚’残ã•ãªã„è¨å®šã®å ´åˆã€ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯å¤±ã‚ã‚Œã¾ã™ã€‚"
-#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
-#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
-#: ../src/gajim.py:159 ../src/session.py:138
+#: ../src/chat_control.py:2853 ../src/common/connection.py:451
+#: ../src/common/connection_handlers.py:945
+#: ../src/common/connection_handlers.py:1055
+#: ../src/common/connection_handlers.py:1712
+#: ../src/common/connection_handlers_events.py:864
+#: ../src/common/logger.py:1126 ../src/gajim.py:203 ../src/session.py:97
msgid "Database Error"
msgstr "データベースã®ã‚¨ãƒ©ãƒ¼"
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2854
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3592,42 +3323,50 @@ msgstr ""
"データベースファイル (%s) ã‚’èªã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“。修復ã™ã‚‹ã‹ã€ã¾ãŸã¯å‰Šé™¤(ã™ã¹"
"ã¦ã®å±¥æ´ã¯å¤±ã‚ã‚Œã¾ã™)ã—ã¦ãã ã•ã„。"
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3090 ../src/gui_interface.py:1032
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"%s ã•ã‚“ã‹ã‚‰ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’復å·ã§ãã¾ã›ã‚“\n"
+"改竄ã®å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚"
+
+#: ../src/chat_control.py:3123
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s ã•ã‚“ã¯ç¾åœ¨ã€%(status)s"
-#: ../src/common/check_paths.py:37
+#: ../src/common/check_paths.py:38
msgid "creating logs database"
msgstr "記録データベースを作ã£ã¦ã„ã¾ã™"
-#: ../src/common/check_paths.py:85
-#, fuzzy
+#: ../src/common/check_paths.py:86
msgid "creating cache database"
-msgstr "記録データベースを作ã£ã¦ã„ã¾ã™"
+msgstr "ã‚ャッシュデータベースを作りã¾ã™"
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
+#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
+#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
#, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚ディレクトリã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
msgid "Gajim will now exit"
msgstr "Gajim ã¯çµ‚了ã—ã¾ã™"
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
#, python-format
msgid "%s is a directory but should be a file"
msgstr "%s ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚ファイルã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:352
#, python-format
msgid "creating %s directory"
msgstr "ディレクトリ %s を作りã¾ã™"
@@ -3652,6 +3391,11 @@ msgstr "ãƒãƒ£ãƒƒãƒˆã§ãã¾ã™"
msgid "Online"
msgstr "オンライン"
+#: ../src/common/commands.py:106 ../src/common/helpers.py:242
+#: ../src/tooltips.py:193
+msgid "Away"
+msgstr "離å¸ä¸"
+
#: ../src/common/commands.py:107
msgid "Extended away"
msgstr "長時間ä¸åœ¨ã§ã™"
@@ -3677,7 +3421,7 @@ msgid "Leave Groupchats"
msgstr "グループãƒãƒ£ãƒƒãƒˆã‹ã‚‰é€€å‡º"
#: ../src/common/commands.py:197
-#, fuzzy, python-format
+#, python-format
msgid "%(nickname)s on %(room_jid)s"
msgstr "%(room_jid)s ã® %(nickname)s ã•ã‚“"
@@ -3690,10 +3434,10 @@ msgid "Choose the groupchats you want to leave"
msgstr "退出ã—ãŸã„グループãƒãƒ£ãƒƒãƒˆã‚’é¸æŠžã—ã¦ãã ã•ã„"
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:212 ../src/common/contacts.py:128
+#: ../src/common/helpers.py:60 ../src/roster_window.py:817
+#: ../src/roster_window.py:1648 ../src/roster_window.py:1650
+#: ../src/roster_window.py:2512 ../src/roster_window.py:5524
msgid "Groupchats"
msgstr "グループãƒãƒ£ãƒƒãƒˆ"
@@ -3710,111 +3454,115 @@ msgid "All unread messages have been forwarded."
msgstr "ã™ã¹ã¦ã®æœªèªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒè»¢é€ã•ã‚Œã¾ã—ãŸã€‚"
#: ../src/common/commands.py:295
-#, fuzzy
msgid "Forward unread message then disconnect"
-msgstr "未èªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®è»¢é€"
+msgstr "未èªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’転é€ã—ã¦ã‹ã‚‰åˆ‡æ–"
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
msgid "Play sound when user is busy"
msgstr "å–ã‚Šè¾¼ã¿ä¸ã§ã‚‚サウンドを鳴らã™"
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
msgid "Use D-Bus and Notification-Daemon to show notifications"
msgstr "通知を表示ã™ã‚‹ãŸã‚ã« D-Bus 㨠Notification-Daemon を使ã„ã¾ã™"
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
msgid "Show only online and free for chat contacts in roster."
msgstr "「オンラインã€ã¨ã€Œãƒãƒ£ãƒƒãƒˆã§ãã¾ã™ã€ã®ç›¸æ‰‹å…ˆã®ã¿ã‚’åç°¿ã«è¡¨ç¤ºã—ã¾ã™ã€‚"
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
msgid "Time in minutes, after which your status changes to away."
msgstr "在å¸çŠ¶æ³ãŒã€Œé›¢å¸ä¸ã€ã«å¤‰ã‚ã‚‹ã¾ã§ã®æ™‚é–“(å˜ä½ã¯åˆ†)。"
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
msgid "$S (Away as a result of being idle more than $T min)"
msgstr "$S (æ“作ã®ãªã„状態㌠$T 分以上ã«ãªã£ãŸçµæžœã¨ã—ã¦ã®é›¢å¸)"
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
msgid "$S will be replaced by current status message, $T by autoaway time."
msgstr "$S ã¯ç¾åœ¨ã®çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«ç½®ãæ›ãˆã‚‰ã‚Œã¾ã™ã€‚$T ã¯è‡ªå‹•é›¢å¸ã®æ™‚é–“ã§ã™ã€‚"
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
msgid "Time in minutes, after which your status changes to not available."
msgstr "在å¸çŠ¶æ³ãŒã€Œä¸åœ¨ã€ã«å¤‰ã‚ã‚‹ã¾ã§ã®æ™‚é–“(å˜ä½ã¯åˆ†)。"
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
msgid "$S (Not available as a result of being idle more than $T min)"
msgstr "$S (æ“作ã®ãªã„状態㌠$T 分以上ã«ãªã£ãŸçµæžœã¨ã—ã¦ã®ä¸åœ¨)"
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
msgid "$S will be replaced by current status message, $T by autoxa time."
msgstr "$S ã¯ç¾åœ¨ã®çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«ç½®ãæ›ãˆã‚‰ã‚Œã¾ã™ã€‚$T ã¯è‡ªå‹•ä¸åœ¨ã®æ™‚é–“ã§ã™ã€‚"
-#: ../src/common/config.py:88
-#, fuzzy
+#: ../src/common/config.py:89
msgid ""
"When to show notification area icon. Can be 'never', 'on_event', 'always'."
msgstr ""
-"ã„ã¤ã‚·ã‚¹ãƒ†ãƒ トレイアイコンを表示ã™ã‚‹ã‹ã€‚'never'(表示ã—ãªã„), 'on_event'(ä¿ç•™"
-"イベントãŒã‚ã‚‹ã¨ãã ã‘), 'always'(常ã«)ã®ã„ãšã‚Œã‹ã€‚"
+"ã„ã¤é€šçŸ¥ã‚¨ãƒªã‚¢ã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã™ã‚‹ã‹ã€‚'never'(表示ã—ãªã„)ã€'on_event'(ä¿ç•™ã‚¤"
+"ベントãŒã‚ã‚‹ã¨ãã ã‘)ã€'always'(常ã«)ã®ã„ãšã‚Œã‹ã€‚"
+
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+"トレイアイコンãŒè¡¨ç¤ºã•ã‚Œã¦ã„ãªã„状態ã§ã‚‚å簿ウィンドウを閉ã˜ã‚‹ã“ã¨ã‚’許ã—ã¾"
+"ã™ã€‚"
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
msgid "Incoming nickname color."
msgstr "å—ä¿¡ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã®è‰²ã€‚"
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
msgid "Outgoing nickname color."
msgstr "é€ä¿¡ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã®è‰²ã€‚"
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
msgid "Incoming text color."
msgstr "å—ä¿¡ã®æ–‡ã®è‰²ã€‚"
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
msgid "Outgoing text color."
msgstr "é€ä¿¡ã®æ–‡ã®è‰²ã€‚"
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
msgid "Status message text color."
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸æ–‡ã®è‰²ã€‚"
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
msgid "Incoming nickname font."
msgstr "å—ä¿¡ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã®ãƒ•ã‚©ãƒ³ãƒˆã€‚"
-#: ../src/common/config.py:101
+#: ../src/common/config.py:103
msgid "Outgoing nickname font."
msgstr "é€ä¿¡ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã®ãƒ•ã‚©ãƒ³ãƒˆã€‚"
-#: ../src/common/config.py:102
+#: ../src/common/config.py:104
msgid "Incoming text font."
msgstr "å—ä¿¡ã®æ–‡ã®ãƒ•ã‚©ãƒ³ãƒˆã€‚"
-#: ../src/common/config.py:103
+#: ../src/common/config.py:105
msgid "Outgoing text font."
msgstr "é€ä¿¡ã®æ–‡ã®ãƒ•ã‚©ãƒ³ãƒˆã€‚"
-#: ../src/common/config.py:104
+#: ../src/common/config.py:106
msgid "Status message text font."
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®æ–‡ã®ãƒ•ã‚©ãƒ³ãƒˆã€‚"
-#: ../src/common/config.py:105
+#: ../src/common/config.py:107
msgid ""
"List (space separated) of rows (accounts and groups) that are collapsed."
msgstr "折り畳む(アカウントやグループãƒãƒ£ãƒƒãƒˆã®)è¡Œã®ä¸€è¦§(空白ã§åŒºåˆ‡ã‚‹)。"
#. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:108 ../src/common/config.py:496
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:492
+#: ../src/common/optparser.py:526 ../src/gui_interface.py:2634
msgid "default"
msgstr "デフォルト"
-#: ../src/common/config.py:112
+#: ../src/common/config.py:114
msgid "Language used by speller"
msgstr "スペルãƒã‚§ãƒƒã‚¯ã®ãŸã‚ã®è¨€èªž"
-#: ../src/common/config.py:113
+#: ../src/common/config.py:115
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3825,7 +3573,7 @@ msgstr ""
"ã™ã€‚\n"
"'never'(ãªã—) - 時刻をå°ã•ãªã„。"
-#: ../src/common/config.py:114
+#: ../src/common/config.py:116
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. "
@@ -3835,25 +3583,30 @@ msgstr ""
"ã‚ã„ã¾ã„時計を使ã„ã¾ã›ã‚“。1 ãŒæœ€ã‚‚æ£ç¢ºãªæ™‚計ã§ã€4 ãŒæœ€ã‚‚æ£ç¢ºã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
"print_time ㌠'sometimes'(時々) ã®å ´åˆã®ã¿ä½¿ã‚ã‚Œã¾ã™ã€‚"
-#: ../src/common/config.py:117
+#: ../src/common/config.py:119
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "* / _ ã®çµ„ã‚’ã€æ›¸å¼æŒ‡å®šã®æ–‡å—ã¨ã—ã¦æ‰±ã†ã€‚"
-#: ../src/common/config.py:118
+#: ../src/common/config.py:120
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
"真ãªã‚‰ã€*/_ を除去ã—ã¾ã›ã‚“. ãŸã¨ãˆã° *abc* ã¯å¤ªå—ã«ãªã‚Šã¾ã™ãŒ * * ã¯é™¤ã‹ã‚Œã¾"
"ã›ã‚“。"
-#: ../src/common/config.py:121
+#: ../src/common/config.py:123
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 ""
+"HTML ã‚’é€ä¿¡ã™ã‚‹ãŸã‚ã«æ§‹é€ 化テã‚スト(ReStructured text markup)を使ã†(é¸æŠžã™ã‚Œ"
+"ã°ã‚¢ã‚¹ã‚ーフォーマットも)。文法㯠http://docutils.sourceforge.net/docs/ref/"
+"rst/\"\n"
+"\"restructuredtext.html ã‚’å‚ç…§ã—ã¦ãã ã•ã„ (ã“れを使ã†ã«ã¯ docutils をインス"
+"トールãŒå¿…è¦ã§ã™)。"
-#: ../src/common/config.py:130
+#: ../src/common/config.py:132
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -3861,7 +3614,7 @@ msgstr ""
"グループãƒãƒ£ãƒƒãƒˆã§ã€ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ 補完(タブ)を使ã†ã¨ãã€ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã®å¾Œã‚ã«ã¤"
"ã‘åŠ ãˆã‚‰ã‚Œã‚‹æ–‡å—。"
-#: ../src/common/config.py:131
+#: ../src/common/config.py:133
msgid ""
"Character to propose to add after desired nickname when desired nickname is "
"used by someone else in group chat."
@@ -3869,7 +3622,15 @@ msgstr ""
"グループãƒãƒ£ãƒƒãƒˆã§ã€å¸Œæœ›ã—ãŸãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ãŒä»–ã®èª°ã‹ã«ä½¿ã‚ã‚Œã¦ã„ãŸå ´åˆã€å¸Œæœ›ã—"
"ãŸãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã®å¾Œã‚ã«ã¤ã‘åŠ ãˆã‚‰ã‚Œã‚‹æ–‡å—。"
-#: ../src/common/config.py:159
+#: ../src/common/config.py:151
+msgid ""
+"If true, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+"真ãªã‚‰ã€Gajim ã¯åç°¿ã‚’é–‰ã˜ã‚‹éš›ã«ãã®ä½ç½®ã‚’ä¿å˜ã—ã€é–‹ãéš›ã«ã¯ãã®ä½ç½®ã«æˆ»ã—ã¾"
+"ã™ã€‚"
+
+#: ../src/common/config.py:162
msgid ""
"This option let you customize timestamp that is printed in conversation. For "
"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3879,42 +3640,48 @@ msgstr ""
"%M] \" 㯠\"[hour:minute] \" ã¨ãªã‚Šã¾ã™ã€‚詳ã—ã㯠python ã® strftime ã«é–¢ã™ã‚‹"
"文書をã”覧ãã ã•ã„: http://docs.python.org/lib/module-time.html"
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
msgid "Characters that are printed before the nickname in conversations"
msgstr "会話ã®ä¸ã§ã€ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã®å‰ã«è¡¨ç¤ºã•ã‚Œã‚‹æ–‡å—列"
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
msgid "Characters that are printed after the nickname in conversations"
msgstr "会話ã®ä¸ã§ã€ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã®å¾Œã«è¡¨ç¤ºã•ã‚Œã‚‹æ–‡å—列"
-#: ../src/common/config.py:164
+#: ../src/common/config.py:167
msgid ""
"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
-msgstr ""
+msgstr "æ–°ãŸã«ãƒ¡ãƒ¼ãƒ«ãŒå±Šã„ãŸéš›ã«èµ·å‹•ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã€‚例: /usr/bin/getmail -q"
-#: ../src/common/config.py:166
+#: ../src/common/config.py:169
msgid "Add * and [n] in roster title?"
msgstr "* 㨠[n] ã‚’åç°¿ã®é¡Œã«è¿½åŠ ã™ã‚‹ã‹ã©ã†ã‹ã€‚"
-#: ../src/common/config.py:167
+#: ../src/common/config.py:170
msgid ""
"How many lines to remember from previous conversation when a chat tab/window "
"is reopened."
msgstr "ãƒãƒ£ãƒƒãƒˆã®ã‚¿ãƒ–ã¾ãŸã¯ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’å†ã³é–‹ã„ãŸã¨ãã€è¦šãˆã¦ã„る行数。"
-#: ../src/common/config.py:168
+#: ../src/common/config.py:171
msgid "How many minutes should last lines from previous conversation last."
msgstr "å‰ã®ä¼šè©±ã®æœ€å¾Œã‹ã‚‰æŒç¶šã—ã¦ãŠã時間(å˜ä½ã¯åˆ†)。"
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
-msgstr "グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹ã¨ãã€ã‚µãƒ¼ãƒãƒ¼ã«è¦æ±‚ã™ã‚‹è¡Œæ•°ã€‚"
+#: ../src/common/config.py:172
+msgid ""
+"How many lines to request to server when entering a groupchat. -1 means no "
+"limit"
+msgstr ""
+"グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹ã¨ãã€ã‚µãƒ¼ãƒãƒ¼ã«è¦æ±‚ã™ã‚‹è¡Œæ•°ã€‚-1 ã¯åˆ¶é™ãªã—。"
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹ã¨ãã€è¨˜éŒ²ã‚’é¡ã‚‹æ™‚é–“(å˜ä½ã¯åˆ†)。"
+#: ../src/common/config.py:173
+msgid ""
+"How many minutes back to request logs when a entering a groupchat. -1 means "
+"no limit"
+msgstr ""
+"グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹ã¨ãã€è¨˜éŒ²ã‚’é¡ã‚‹æ™‚é–“(å˜ä½ã¯åˆ†)。-1 ã¯åˆ¶é™ãªã—。"
-#: ../src/common/config.py:171
+#: ../src/common/config.py:174
msgid ""
"How many seconds to wait before trying to autorejoin to a conference you are "
"being disconnected from. Set to 0 to disable autorejoining."
@@ -3922,7 +3689,12 @@ msgstr ""
"切æ–ã•ã‚Œã¦ã‹ã‚‰ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«è‡ªå‹•ã§å†å‚åŠ ã‚’è©¦ã¿ã‚‹ã¾ã§ã®å¾…機時間(å˜ä½ã¯"
"秒)。"
-#: ../src/common/config.py:173
+#: ../src/common/config.py:175
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr "談話室ã‹ã‚‰è¹´ã‚Šå‡ºã•ã‚ŒãŸå ´åˆã€è‡ªå‹•ã§å†å‚åŠ ã™ã‚‹ã‹ã€‚"
+
+#: ../src/common/config.py:176
msgid ""
"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
"Client default behaviour)."
@@ -3930,11 +3702,11 @@ msgstr ""
"Ctrl+Enter をメッセージé€ä¿¡ã¨ã—ã¦ã€Enter を改行ã¨ã—ã¾ã™ (Mirabilis ICQ クライ"
"アントã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ™å‹•)。"
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "Ctrl+KeyUP ã§é¡ã‚‹ã“ã¨ã®ã§ãる行数。"
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
#, python-format
msgid ""
"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3943,12 +3715,11 @@ msgstr ""
"独自ã®è¾žæ›¸ã® URL (%s ã‚’å«ã‚ã¾ã™ã€‚ã“ã“㧠%s ã¯èªž/フレーズã§ã™)。ã¾ãŸã¯ã€"
"WIKTIONARY を使ã†å ´åˆã¯å˜ã« 'WIKTIONARY' ã¨ã—ã¦ãã ã•ã„。"
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr "ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã‚’ gajim-remote を使ã£ã¦é éš”æ“作ã§ãã¾ã™ã€‚"
-#: ../src/common/config.py:182
-#, fuzzy
+#: ../src/common/config.py:185
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 "
@@ -3957,25 +3728,25 @@ msgid ""
msgstr ""
"真ãªã‚‰ã€NetworkManager ã‹ã‚‰ã® D-Bus ä¿¡å·ã‚’監視ã—ã¦ã€ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã®çŠ¶æ…‹ã‚’"
"ã‚‚ã¨ã«ã€ç›¸æ‰‹å…ˆã®åœ¨å¸çŠ¶æ³ã‚’æ›´æ–°ã—ã¾ã™(相手先㌠listen_to_network_manager ã‚’"
-"「å½ã€ã«ã—ã¦ãŠã‚‰ãšã€å…¨ä½“ã®åœ¨å¸çŠ¶æ³ã«åŒæœŸã•ã›ã¦ã„ã‚‹å ´åˆ)。"
+"「å½ã€ã«ã—ã¦ãŠã‚‰ãšã€å…¨ä½“ã®åœ¨å¸çŠ¶æ³ã«åŒèª¿ã•ã›ã¦ã„ã‚‹å ´åˆ)。"
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
msgid ""
"Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr ""
-"ãƒãƒ£ãƒƒãƒˆçŠ¶æ…‹é€šçŸ¥ã®é€ä¿¡ã€‚「ã™ã¹ã¦ã®çŠ¶æ…‹ã€ã€Œå…¥åŠ›ä¸ã®ã¿ã€ã€Œé€šçŸ¥ã—ãªã„ã€ã®ã„ãšã‚Œ"
-"ã‹ã€‚"
+"ãƒãƒ£ãƒƒãƒˆçŠ¶æ…‹é€šçŸ¥ã®é€ä¿¡ã€‚all (ã™ã¹ã¦ã®çŠ¶æ…‹)ã€composing_only (入力ä¸ã®ã¿)ã€"
+"disabled (通知ã—ãªã„) ã®ã„ãšã‚Œã‹ã€‚"
# (Mako)ã“ã®å ´åˆ Disabled ã¯ã€Œè¡¨ç¤ºã—ãªã„ã€ã¨ã™ã‚‹ã¹ãã‹
-#: ../src/common/config.py:184
+#: ../src/common/config.py:187
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
+#: ../src/common/config.py:189
msgid ""
"When not printing time for every message (print_time==sometimes), print it "
"every x minutes."
@@ -3983,11 +3754,11 @@ msgstr ""
"個々ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«æ™‚刻をå°ã™ã®ã§ã¯ãªã„å ´åˆ(print_time==sometimes (時々))ã€æ™‚"
"刻をå°ã™æ™‚é–“é–“éš” (å˜ä½:分)。"
-#: ../src/common/config.py:187
+#: ../src/common/config.py:190
msgid "Ask before closing a group chat tab/window."
msgstr "グループãƒãƒ£ãƒƒãƒˆã®ã‚¿ãƒ–ã¾ãŸã¯ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã‚‹å‰ã«ç¢ºèªã‚’求ã‚ã¾ã™ã€‚"
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
msgid ""
"Always ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3995,15 +3766,15 @@ msgstr ""
"グループãƒãƒ£ãƒƒãƒˆ JID ã®ä¸€è¦§(空白ã§åŒºåˆ‡ã‚‹)ã«ã‚るグループãƒãƒ£ãƒƒãƒˆã®ã‚¿ãƒ–ã¾ãŸã¯"
"ウィンドウを閉ã˜ã‚‹å‰ã«ã¯ã€å¿…ãšç¢ºèªã‚’求ã‚ã¾ã™ã€‚"
-#: ../src/common/config.py:189
+#: ../src/common/config.py:192
msgid ""
"Never ask before closing group chat tab/window in this space separated list "
"of group chat jids."
msgstr ""
-"グループãƒãƒ£ãƒƒãƒˆ JID ã®ä¸€è¦§(空白ã§åŒºåˆ‡ã‚‹)ã«ã‚るグループãƒãƒ£ãƒƒãƒˆã® タブã¾ãŸã¯"
+"グループãƒãƒ£ãƒƒãƒˆ JID ã®ä¸€è¦§(空白ã§åŒºåˆ‡ã‚‹)ã«ã‚るグループãƒãƒ£ãƒƒãƒˆã®ã‚¿ãƒ–ã¾ãŸã¯"
"ウィンドウを閉ã˜ã‚‹å‰ã«ã¯ã€æ±ºã—ã¦ç¢ºèªã‚’求ã‚ã¾ã›ã‚“。"
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
msgid ""
"Ask before closing tabbed chat window if there are control that can loose "
"data (chat, private chat, groupchat that will not be minimized)"
@@ -4011,34 +3782,35 @@ msgstr ""
"タブã®ã‚ã‚‹ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã‚‹å‰ã«ã€ãã‚ŒãŒãƒ‡ãƒ¼ã‚¿ã‚’失ã†æ“作ã§ã‚ã‚‹ã“ã¨ã®"
"確èªã‚’求ã‚ã¾ã™"
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
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 ""
+"ãƒãƒ¼ã‚«ãƒ«ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã«åŠ ãˆã¦ã€ã‚¢ãƒ‰ãƒ¬ã‚¹å¤‰æ› / ãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã®å ´"
+"åˆã«ãƒ•ã‚¡ã‚¤ãƒ«è»¢é€ã«ç”¨ã„るホストã®ä¸€è¦§(コンマ区切り)。"
-#: ../src/common/config.py:195
+#: ../src/common/config.py:198
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "IEC 標準è¦æ ¼ã§ã€KiB 㯠1024 ãƒã‚¤ãƒˆã€KB 㯠1000 ãƒã‚¤ãƒˆã€‚"
-#: ../src/common/config.py:197
-#, fuzzy
+#: ../src/common/config.py:200
msgid "Notify of events in the notification area."
-msgstr "システムã®ãƒˆãƒ¬ã‚¤ã‚¢ã‚¤ã‚³ãƒ³ã§ã‚¤ãƒ™ãƒ³ãƒˆã‚’通知ã—ã¾ã™ã€‚"
+msgstr "システムã®é€šçŸ¥ã‚¨ãƒªã‚¢ã§ã‚¤ãƒ™ãƒ³ãƒˆã‚’通知ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:203
+#: ../src/common/config.py:206
msgid "Show tab when only one conversation?"
msgstr "ã²ã¨ã¤ã ã‘ã®ä¼šè©±ã®ã¨ãもタブを表示ã™ã‚‹ã‹ã©ã†ã‹ã€‚"
-#: ../src/common/config.py:204
+#: ../src/common/config.py:207
msgid "Show tabbed notebook border in chat windows?"
msgstr "ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã‚¿ãƒ–ã¤ã帳é¢ã®ç¸ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã€‚"
-#: ../src/common/config.py:205
+#: ../src/common/config.py:208
msgid "Show close button in tab?"
msgstr "é–‰ã˜ã‚‹ãƒœã‚¿ãƒ³ã‚’タブã«è¡¨ç¤ºã™ã‚‹ã‹ã©ã†ã‹ã€‚"
-#: ../src/common/config.py:206
+#: ../src/common/config.py:209
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 "
@@ -4050,32 +3822,31 @@ msgstr ""
"ã§ã™ã€‚大ããªæ•°å€¤ã»ã©å®‰å…¨ã§ã™ãŒã€ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’始ã‚ã‚‹éš›ã«è¨ˆç®—ã«æ™‚é–“ãŒã‹ã‹ã‚Šã¾"
"ã™ã€‚"
-#: ../src/common/config.py:215
+#: ../src/common/config.py:218
msgid "Preview new messages in notification popup?"
msgstr "æ–°ç€ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ãƒãƒƒãƒ—アップ通知ã«è¡¨ç¤ºã™ã‚‹ã‹ã©ã†ã‹ã€‚"
-#: ../src/common/config.py:220
+#: ../src/common/config.py:223
msgid ""
"A semicolon-separated list of words that will be highlighted in group chats."
msgstr "グループãƒãƒ£ãƒƒãƒˆã§å¼·èª¿è¡¨ç¤ºã™ã‚‹èªžã®ä¸€è¦§(セミコãƒãƒ³ã§åŒºåˆ‡ã‚‹)。A"
-#: ../src/common/config.py:221
-#, fuzzy
+#: ../src/common/config.py:224
msgid ""
"If True, quits Gajim when X button of Window Manager is clicked. This "
"setting is taken into account only if notification icon is used."
msgstr ""
"真ãªã‚‰ã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒžãƒãƒ¼ã‚¸ãƒ£ã®Ã—ボタンãŒã‚¯ãƒªãƒƒã‚¯ã•ã‚ŒãŸå ´åˆã« Gajim を終了ã—ã¾"
-"ã™ã€‚ã“ã®è¨å®šã¯ãƒˆãƒ¬ã‚¤ã‚¢ã‚¤ã‚³ãƒ³ãŒä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹ã¨ãã®ã¿é©ç”¨ã•ã‚Œã¾ã™ã€‚"
+"ã™ã€‚ã“ã®è¨å®šã¯é€šçŸ¥ã‚¢ã‚¤ã‚³ãƒ³ãŒä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹ã¨ãã®ã¿é©ç”¨ã•ã‚Œã¾ã™ã€‚"
-#: ../src/common/config.py:222
+#: ../src/common/config.py:225
msgid ""
"If True, Gajim will check if it's the default jabber client on each startup."
msgstr ""
"真ãªã‚‰ã€Gajim ã¯èµ·å‹•ã™ã‚‹ãŸã³ã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã® jabber クライアントã§ã‚ã‚‹ã‹ã‚’調ã¹"
"ã¾ã™ã€‚"
-#: ../src/common/config.py:223
+#: ../src/common/config.py:226
msgid ""
"If True, Gajim will display an icon on each tab containing unread messages. "
"Depending on the theme, this icon may be animated."
@@ -4083,7 +3854,7 @@ msgstr ""
"真ãªã‚‰ã€Gajim ã¯æœªèªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚るタブã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã—ã¾ã™ã€‚テーマã«ä¾å˜"
"ã—ã€ã‚¢ã‚¤ã‚³ãƒ³ãŒå‹•ç”»ã®ã‚‚ã®ã‚‚ã‚ã‚Šã¾ã™ã€‚"
-#: ../src/common/config.py:224
+#: ../src/common/config.py:227
msgid ""
"If True, Gajim will display the status message, if not empty, for every "
"contact under the contact name in roster window."
@@ -4091,11 +3862,11 @@ msgstr ""
"真ãªã‚‰ã€Gajim ã¯å簿ウィンドウã®ç›¸æ‰‹å…ˆã®åå‰ã®ä¸‹ã«åœ¨å¸çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’(ãã‚ŒãŒ"
"空ã§ãªã‘ã‚Œã°)表示ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:230
+#: ../src/common/config.py:233
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr "åç°¿ã§ã®ã‚¢ãƒã‚¿ãƒ¼ã®è¡¨ç¤ºä½ç½®ã€‚left(å·¦)ã¾ãŸã¯right(å³)"
-#: ../src/common/config.py:231
+#: ../src/common/config.py:234
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."
@@ -4103,7 +3874,7 @@ msgstr ""
"真ãªã‚‰ã€å‰å›žã‚¢ãƒã‚¿ãƒ¼ã®ãªã„相手先ã¾ãŸã¯å—ã‘å–ã£ã¦ã‹ã‚‰æ™‚é–“ã®çµŒã¡éŽãŽã¦ã„る相手"
"å…ˆã«å¯¾ã—ã¦ã€ Gajim ã¯ã‚¢ãƒã‚¿ãƒ¼ã‚’è¦æ±‚ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:232
+#: ../src/common/config.py:235
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."
@@ -4111,7 +3882,7 @@ msgstr ""
"å½ãªã‚‰ã€ç›¸æ‰‹å…ˆãŒåœ¨å¸çŠ¶æ³ã‚„状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’変更ã—ã¦ã‚‚ã€Gajim ã¯ãƒãƒ£ãƒƒãƒˆã«åœ¨å¸"
"状æ³ã‚’表示ã—ã¾ã›ã‚“。"
-#: ../src/common/config.py:233
+#: ../src/common/config.py:236
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 "
@@ -4126,30 +3897,34 @@ msgstr ""
"\"in_and_out\"(入退室ã®ã¿)ãªã‚‰ã€Gajim ã¯ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã¸ã®å‚åŠ /退出ã®ã¿ã‚’表"
"示ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:235
+#: ../src/common/config.py:238
+msgid "Log XHTML messages instead of plain text messages."
+msgstr "プレーンテã‚ストã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã§ã¯ãªã XHTML ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’記録ã™ã‚‹ã€‚"
+
+#: ../src/common/config.py:239
msgid "Background color of contacts when they just signed in."
msgstr "相手先ãŒã¡ã‚‡ã†ã©ã‚µã‚¤ãƒ³ã‚¤ãƒ³ã—ãŸã¨ãã®èƒŒæ™¯è‰²ã€‚"
-#: ../src/common/config.py:236
+#: ../src/common/config.py:240
msgid "Background color of contacts when they just signed out."
msgstr "相手先ãŒã¡ã‚‡ã†ã©ã‚µã‚¤ãƒ³ã‚¢ã‚¦ãƒˆã—ãŸã¨ãã®èƒŒæ™¯è‰²ã€‚"
-#: ../src/common/config.py:238
+#: ../src/common/config.py:242
msgid ""
"If True, restored messages will use a smaller font than the default one."
msgstr ""
"真ãªã‚‰ã€å¾©å…ƒã•ã‚ŒãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ•ã‚©ãƒ³ãƒˆã‚ˆã‚Šå°ã•ã„フォントを使ã„ã¾"
"ã™ã€‚"
-#: ../src/common/config.py:239
+#: ../src/common/config.py:243
msgid "Don't show avatar for the transport itself."
msgstr "ä¸ç¶™å…ˆãã®ã‚‚ã®ã®ã‚¢ãƒã‚¿ãƒ¼ã‚’表示ã—ã¾ã›ã‚“。"
-#: ../src/common/config.py:240
+#: ../src/common/config.py:244
msgid "Don't show roster in the system taskbar."
msgstr "システムã®ã‚¿ã‚¹ã‚¯ãƒãƒ¼ã«å簿を表示ã—ã¾ã›ã‚“。"
-#: ../src/common/config.py:241
+#: ../src/common/config.py:245
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 "
@@ -4159,20 +3934,19 @@ msgstr ""
"トãŒã‚ã‚‹å ´åˆã«ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’フラッシュã•ã›ã¾ã™ (ãŸã„ã¦ã„ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒžãƒãƒ¼ã‚¸ãƒ£"
"ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã™)。"
-#: ../src/common/config.py:243
-#, fuzzy
+# (Mako) sha ãŒã‚ˆãã‚ã‹ã‚‰ãªã„。ã¨ã‚Šã‚ãˆãšãã®ã¾ã¾ã§ã€‚presence ã¯ã¨ã‚Šã‚ãˆãšã€Œç›¸æ‰‹å…ˆã€
+#: ../src/common/config.py:247
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 ã¯ã€ãƒ‘スワードã§ä¿è·ã•ã‚ŒãŸã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«èª°ã‹ãŒå‚åŠ ã™ã‚‹éš›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."
+"Jabberd1.4 ã¯ã€ãƒ‘スワードã§ä¿è·ã•ã‚ŒãŸã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«èª°ã‹ãŒå‚åŠ ã™ã‚‹éš› sha "
+"ã®ã‚ˆã†ãªæƒ…å ±ã‚’å¥½ã¿ã¾ã›ã‚“。ã“ã®ã‚ªãƒ—ションをå½ã«ã™ã‚‹ã¨ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã®ç›¸æ‰‹"
+"先㫠sha ã‚’é€ã‚‹ã®ã‚’ã‚„ã‚ã¾ã™ã€‚"
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
-#, fuzzy
+#: ../src/common/config.py:250
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
@@ -4184,40 +3958,53 @@ msgid ""
"specific window."
msgstr ""
"æ–°ç€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ç½®ãウィンドウã®åˆ¶å¾¡ã€‚\n"
-"'always'(常ã«) - ã™ã¹ã¦ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯å˜ç‹¬ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã€‚\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."
+"'always'(常ã«) - ã™ã¹ã¦ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ã²ã¨ã¤ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã€‚\n"
+"'always_with_roster'(åç°¿ã¤ã) - 'always'(常ã«) ã«ä¼¼ã¦ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯åç°¿ã¤ã"
+"ã®ã²ã¨ã¤ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã€‚\n"
+"'never'(ãªã—) - ã™ã¹ã¦ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ãã‚Œãžã‚Œã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã€‚\n"
+"'peracct'(アカウントã”ã¨) - ãã‚Œãžã‚Œã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¸ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ãã‚Œãžã‚Œã®"
+"ウィンドウã«ã€‚\n"
+"'pertype'(種類ã”ã¨) - メッセージã®ç¨®é¡ž(ãŸã¨ãˆã°ãƒãƒ£ãƒƒãƒˆã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆ)ã”"
+"ã¨ã«ãã‚Œãžã‚Œã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã€‚"
-#: ../src/common/config.py:247
+#: ../src/common/config.py:251
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+"起動時ã«å簿を表示ã™ã‚‹ã‹ã€‚\n"
+"'always'(常ã«) - 常ã«å簿を表示ã™ã‚‹ã€‚\n"
+"'never'(ãªã—) - å簿を表示ã—ãªã„。\n"
+"'last_state'(以å‰ã®çŠ¶æ…‹) - å‰ã®åç°¿ã®è¡¨ç¤ºçŠ¶æ…‹ã®é€šã‚Šã«ã™ã‚‹ã€‚"
+
+#: ../src/common/config.py:252
msgid "If False, you will no longer see the avatar in the chat window."
msgstr "å½ãªã‚‰ã€ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã‚¢ãƒã‚¿ãƒ¼ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。"
-#: ../src/common/config.py:248
+#: ../src/common/config.py:253
msgid "If True, pressing the escape key closes a tab/window."
msgstr "真ãªã‚‰ã€ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—ã‚ーを押ã™ã“ã¨ã§ã‚¿ãƒ–ã¾ãŸã¯ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¾ã™ã€‚"
-#: ../src/common/config.py:249
+#: ../src/common/config.py:254
msgid "Hides the buttons in chat windows."
msgstr "ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®ãƒœã‚¿ãƒ³ã‚’表示ã—ã¾ã›ã‚“。"
-#: ../src/common/config.py:250
+#: ../src/common/config.py:255
msgid "Hides the banner in a group chat window"
msgstr "グループãƒãƒ£ãƒƒãƒˆã®ãƒãƒŠãƒ¼ã‚’表示ã—ã¾ã›ã‚“"
-#: ../src/common/config.py:251
+#: ../src/common/config.py:256
msgid "Hides the banner in two persons chat window"
msgstr "一対一ãƒãƒ£ãƒƒãƒˆã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®ãƒãƒŠãƒ¼ã‚’表示ã—ã¾ã›ã‚“"
-#: ../src/common/config.py:252
+#: ../src/common/config.py:257
msgid "Hides the group chat occupants list in group chat window."
msgstr "グループãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§ã€åœ¨å®¤è€…一覧を表示ã—ã¾ã›ã‚“。"
# (Mako)chat 㯠group chat ã®ã“ã¨ã‹?
-#: ../src/common/config.py:253
+#: ../src/common/config.py:258
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."
@@ -4225,42 +4012,41 @@ msgstr ""
"ãƒãƒ£ãƒƒãƒˆã§ã€å‰ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¨åˆ¥ã®äººã®å ´åˆã®ã¿ã€è¡Œã®å…ˆé ã«ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ を表示ã—"
"ã¾ã™ã€‚"
-#: ../src/common/config.py:254
+#: ../src/common/config.py:259
msgid "Indentation when using merge consecutive nickname."
msgstr "連続ã™ã‚‹ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã‚’çµ±åˆã™ã‚‹éš›ã®å—下ã’幅。"
-#: ../src/common/config.py:255
+#: ../src/common/config.py:260
msgid "Smooth scroll message in conversation window"
msgstr "会話ウィンドウã®ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã‚’ãªã‚らã‹ã«ã—ã¾ã™"
-#: ../src/common/config.py:256
+#: ../src/common/config.py:261
msgid ""
"List of colors, separated by \":\", that will be used to color nicknames in "
"group chats."
msgstr "グループãƒãƒ£ãƒƒãƒˆã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã«ä½¿ã‚れる色。\":\"ã§åŒºåˆ‡ã£ã¦ãã ã•ã„。"
-#: ../src/common/config.py:257
+#: ../src/common/config.py:262
msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
+msgstr "未èªã®ã‚‚ã®ãŒãªã„å ´åˆã€Ctrl-Tab ã§æ¬¡ã®å…¥åŠ›ã‚¿ãƒ–ã«ç§»å‹•ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:258
-#, fuzzy
+#: ../src/common/config.py:263
msgid ""
"Should we show the confirm metacontacts creation dialog or not? Empty string "
"means we never show the dialog."
msgstr ""
-"metacontact 作æˆã®ç¢ºèªã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã€‚空文å—ãªã‚‰ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’"
+"メタ相手先ã®ä½œæˆã®ç¢ºèªã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã€‚空文å—ãªã‚‰ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’"
"表示ã—ã¾ã›ã‚“。"
-#: ../src/common/config.py:259
+#: ../src/common/config.py:264
msgid ""
"Should we show the confirm block contact dialog or not? Empty string means "
"we never show the dialog."
msgstr ""
-"相手先ã®æ‹’å¦ã®ç¢ºèªã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã€‚空文å—ãªã‚‰ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示"
+"相手先ã®é®æ–ã®ç¢ºèªã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã€‚空文å—ãªã‚‰ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示"
"ã—ã¾ã›ã‚“。"
-#: ../src/common/config.py:260
+#: ../src/common/config.py:265
msgid ""
"Should we show the confirm custom status dialog or not? Empty string means "
"we never show the dialog."
@@ -4268,7 +4054,7 @@ msgstr ""
"個別ã®åœ¨å¸çŠ¶æ³ã®ç¢ºèªã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã€‚空文å—ãªã‚‰ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表"
"示ã—ã¾ã›ã‚“。"
-#: ../src/common/config.py:261
+#: ../src/common/config.py:266
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 "
@@ -4278,7 +4064,7 @@ msgstr ""
"ã™ã€‚ã€æ³¨æ„ã€‘è² ã®å„ªå…ˆé †ä½ã®ã¾ã¾ãƒã‚°ã‚¤ãƒ³ã™ã‚‹ã¨ã€ã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰ã©ã‚“ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚‚"
"å—ä¿¡ã—ã¾ã›ã‚“。"
-#: ../src/common/config.py:262
+#: ../src/common/config.py:267
msgid ""
"If True, Gajim will use Gnome Keyring (if available) to store account "
"passwords."
@@ -4286,7 +4072,7 @@ msgstr ""
"真ãªã‚‰ã€Gajim ã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ‘スワードをä¿å˜ã™ã‚‹éš›ã« Gnome Keyring (ã‚‚ã—ã‚ã‚Œ"
"ã°) を使ã„ã¾ã™ã€‚"
-#: ../src/common/config.py:263
+#: ../src/common/config.py:268
msgid ""
"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
"account passwords."
@@ -4294,7 +4080,7 @@ msgstr ""
"真ãªã‚‰ Gajim ã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ‘スワードをä¿æŒã™ã‚‹éš›ã« KDE Wallet (ã‚‚ã— "
"kwalletcli ãŒã‚ã‚Œã°) を使ã„ã¾ã™ã€‚"
-#: ../src/common/config.py:264
+#: ../src/common/config.py:269
msgid ""
"If True, Gajim will show number of online and total contacts in account and "
"group rows."
@@ -4302,16 +4088,15 @@ msgstr ""
"真ãªã‚‰ã€Gajim ã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®è¡Œã«ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã¨ç·è¨ˆã®ç›¸æ‰‹å…ˆã®æ•°ã‚’表示"
"ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:265
-#, fuzzy
+#: ../src/common/config.py:270
msgid ""
"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
"as if they were of this type"
msgstr ""
-"空白ã€'chat'(ãƒãƒ£ãƒƒãƒˆ)ã€'normal'(普通)ã®ã„ãšã‚Œã‹ã€‚ã‚‚ã—空ãªã‚‰ã€ã™ã¹ã¦ã®å—ä¿¡"
-"メッセージをã“ã®ã‚¿ã‚¤ãƒ—ã¨ã—ã¦æ‰±ã„ã¾ã™"
+"空白ã€'chat'(ãƒãƒ£ãƒƒãƒˆ)ã€'normal'(普通) ã®ã„ãšã‚Œã‹ã€‚ã‚‚ã—空ã§ãªã‘ã‚Œã°ã€ã™ã¹ã¦ã®"
+"å—信メッセージをã“ã®ã‚¿ã‚¤ãƒ—ã¨ã—ã¦æ‰±ã„ã¾ã™"
-#: ../src/common/config.py:266
+#: ../src/common/config.py:271
msgid ""
"If True, Gajim will scroll and select the contact who sent you the last "
"message, if chat window is not already opened."
@@ -4319,7 +4104,7 @@ msgstr ""
"真ãªã‚‰ã€ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒé–‹ã„ã¦ã„ãªã„å ´åˆã«ã€æœ€æ–°ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ã‚ãªãŸã«"
"é€ã£ãŸç›¸æ‰‹å…ˆã‚’スクãƒãƒ¼ãƒ«ã—ã¦é¸æŠžã—ã¾ã™ã€‚"
-#: ../src/common/config.py:267
+#: ../src/common/config.py:272
msgid ""
"If True, Gajim will convert string between $$ and $$ to an image using dvips "
"and convert before insterting it in chat window."
@@ -4327,37 +4112,34 @@ msgstr ""
"真ãªã‚‰ã€Gajim 㯠$$ 㨠$$ ã®é–“ã®æ–‡å—列を dvips を用ã„ã¦ç”»åƒã«å¤‰æ›ã—ã¾ã™ã€‚"
"ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«æŒ¿å…¥ã™ã‚‹å‰ã«å¤‰æ›ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:268
-#, fuzzy
+#: ../src/common/config.py:273
msgid "Time of inactivity needed before the change status window closes down."
-msgstr "Time of 活動åœæ¢ä¸ needed before the change status window closes down."
+msgstr "在ç±æƒ…æ³å¤‰æ›´ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã‚‹ã¾ã§ã®æ´»å‹•åœæ¢ã®æ™‚間。"
-#: ../src/common/config.py:269
+#: ../src/common/config.py:274
msgid ""
"Maximum number of lines that are printed in conversations. Oldest lines are "
"cleared."
msgstr "表示ã•ã‚ŒãŸä¼šè©±ã®æœ€å¤§è¡Œæ•°ã€‚å¤ã„ã»ã†ã‹ã‚‰å‰Šé™¤ã•ã‚Œã¾ã™ã€‚"
-#: ../src/common/config.py:270
-#, fuzzy
+#: ../src/common/config.py:275
msgid ""
"If True, notification windows from notification-daemon will be attached to "
"notification icon."
msgstr ""
-"真ãªã‚‰ã€notification-daemon ã‹ã‚‰ã®é€šçŸ¥ã¯ã‚·ã‚¹ãƒ†ãƒ トレイアイコンã«ä»˜ã‘られã¾"
-"ã™ã€‚"
+"真ãªã‚‰ã€notification-daemon ã‹ã‚‰ã®é€šçŸ¥ã¯é€šçŸ¥ã‚¢ã‚¤ã‚³ãƒ³ã®è„‡ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
-#: ../src/common/config.py:271
+#: ../src/common/config.py:276
msgid "Choose interval between 2 checks of idleness."
-msgstr ""
+msgstr "æ“作ã—ãªã„状態をãƒã‚§ãƒƒã‚¯ã™ã‚‹æ™‚間間隔。"
-#: ../src/common/config.py:272
+#: ../src/common/config.py:277
msgid ""
"Change the value to change the size of latex formulas displayed. The higher "
"is larger."
msgstr "LaTeX ã®æ•°å¼è¡¨ç¤ºã®ã‚µã‚¤ã‚ºã€‚高ã„値ã»ã©å¤§ãããªã‚Šã¾ã™ã€‚"
-#: ../src/common/config.py:273
+#: ../src/common/config.py:278
msgid ""
"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
"uri. (mailto and xmpp are handled separately)"
@@ -4365,7 +4147,7 @@ msgstr ""
"æ£å½“㪠URI スã‚ーム。ã“ã®ä¸€è¦§ã«ã‚るスã‚ームã ã‘ãŒâ€å®Ÿéš›ã®â€URIã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™"
"(mailto 㨠xmpp ã¯åˆ¥ã€…ã«æ‰±ã„ã¾ã™)。"
-#: ../src/common/config.py:274
+#: ../src/common/config.py:279
msgid ""
"Ask offline status message to all offline contacts when connection to an "
"accoutn is established. WARNING: This causes a lot of requests to be sent!"
@@ -4374,11 +4156,11 @@ msgstr ""
"メッセージを求ã‚ã¾ã™ã€‚注æ„: 大é‡ã®é€ä¿¡ã™ã¹ãリクエストを発生ã•ã›ã‚‹ã“ã¨ãŒã‚ã‚Š"
"ã¾ã™!"
-#: ../src/common/config.py:275
+#: ../src/common/config.py:280
msgid "If True, completion in groupchats will be like a shell auto-completion"
msgstr "真ãªã‚‰ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã§ã®è£œå®Œã‚’シェルã®è‡ªå‹•è£œå®Œã®ã‚ˆã†ã«ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:276
+#: ../src/common/config.py:281
msgid ""
"When is self contact row displayed. Can be \"always\", \"when_other_resource"
"\" or \"never\""
@@ -4387,31 +4169,37 @@ msgstr ""
"ã«)ã€\"when_other_resource\"(リソースãŒç•°ãªã‚‹å ´åˆ)ã€\"never\"(表示ã—ãªã„)ã®ã„"
"ãšã‚Œã‹ã€‚"
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
msgstr ""
+"jingle ã®å‡ºåŠ›ã®ãƒ“デオã®ãƒ•ãƒ¬ãƒ¼ãƒ レート (オプション)。例: 10/1 ã¾ãŸã¯ 25/2"
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
msgid "Optionally resize jingle output video. Example: 320x240"
-msgstr ""
+msgstr "jingle ã®å‡ºåŠ›ã®ãƒ“デオã®å¤§ãã• (オプション). 例: 320x240"
-#: ../src/common/config.py:285
+#: ../src/common/config.py:290
msgid ""
"If True, Gajim will try to use a STUN server when using jingle. The one in "
"\"stun_server\" option, or the one given by the jabber server."
msgstr ""
+"真ãªã‚‰ã€Gajim 㯠jingle を使ã†éš›ã« STUN サーãƒãƒ¼ã‚’利用ã—よã†ã¨ã—ã¾ã™ã€‚サー"
+"ãƒãƒ¼ã¯ \"stun_server\" オプションã‹ã€ã¾ãŸã¯ jabber サーãƒãƒ¼ã«ã‚ˆã£ã¦ä¸Žãˆã‚‰ã‚Œã¾"
+"ã™ã€‚"
-#: ../src/common/config.py:286
+#: ../src/common/config.py:291
msgid "STUN server to use when using jingle"
-msgstr ""
+msgstr "jingle を使ã†éš›ã«åˆ©ç”¨ã™ã‚‹ STUN サーãƒãƒ¼"
-#: ../src/common/config.py:287
+#: ../src/common/config.py:292
msgid ""
"If True, Gajim will show affiliation of groupchat occupants by adding a "
"colored square to the status icon"
msgstr ""
+"真ãªã‚‰ã€Gajim ã¯ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã®å‚åŠ è€…ã®åˆ†æŽŒã‚’ステータスアイコンã«è‰²ä»˜ãå››"
+"角をã¤ã‘ã¦è¡¨ç¤ºã—ã¾ã™ã€‚"
-#: ../src/common/config.py:300
+#: ../src/common/config.py:306
msgid ""
"Priority will change automatically according to your status. Priorities are "
"defined in autopriority_* options."
@@ -4419,93 +4207,92 @@ msgstr ""
"在å¸çŠ¶æ³ã«å¿œã˜ã¦å„ªå…ˆé †ä½ã‚’自動的ã«å¤‰æ›´ã—ã¾ã™ã€‚å„ªå…ˆé †ä½ã¯ autopriority_* オプ"
"ションã§å®šç¾©ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:308
+#: ../src/common/config.py:314
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 ""
-"自動接続ã®éš›ã«ä½¿ã‚れる在å¸çŠ¶æ³ã€‚online(オンライン), chat(ãƒãƒ£ãƒƒãƒˆå¯), away(離"
-"å¸ä¸), xa(ä¸åœ¨), dnd(å–ã‚Šè¾¼ã¿ä¸), invisible(éš ã‚Œä¸)ã®ã„ãšã‚Œã‹ã€‚注æ„: ã“ã®ã‚ªãƒ—"
-"ション㯠restore_last_status ãŒç„¡åŠ¹ã®ã¨ãã®ã¿ä½¿ã‚ã‚Œã¾ã™"
+"自動接続ã®éš›ã«ä½¿ã‚れる在å¸çŠ¶æ³ã€‚online (オンライン)ã€chat (ãƒãƒ£ãƒƒãƒˆå¯)ã€away "
+"(離å¸ä¸)ã€xa (ä¸åœ¨)ã€dnd (å–ã‚Šè¾¼ã¿ä¸)ã€invisible (éš ã‚Œä¸) ã®ã„ãšã‚Œã‹ã€‚注æ„: "
+"ã“ã®ã‚ªãƒ—ション㯠restore_last_status ãŒç„¡åŠ¹ã®ã¨ãã®ã¿ä½¿ã‚ã‚Œã¾ã™"
# (Mako) If enabled 㯠If True ã§ã‚ã‚‹ã¹ãã ã‚ã†
-#: ../src/common/config.py:309
+#: ../src/common/config.py:315
msgid "If enabled, restore the last status that was used."
msgstr "真ãªã‚‰ã€æœ€å¾Œã«ä½¿ã‚ã‚ŒãŸåœ¨å¸çŠ¶æ³ã‚’復元ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:311
+#: ../src/common/config.py:317
msgid ""
"If True, Contacts requesting authorization will be automatically accepted."
msgstr "真ãªã‚‰ã€ç›¸æ‰‹å…ˆã®æ‰¿èªã®è¦æ±‚ã¯è‡ªå‹•çš„ã«äº†æ‰¿ã•ã‚Œã¾ã™ã€‚"
-#: ../src/common/config.py:312
+#: ../src/common/config.py:318
msgid ""
"If False, this account will be disabled and will not appear in roster window."
msgstr ""
"å½ãªã‚‰ã€ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’無効ã«ã—ã¦ã€ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã‚¢ãƒã‚¿ãƒ¼ã‚’表示ã—ã¾ã›"
"ん。"
-#: ../src/common/config.py:315
+#: ../src/common/config.py:321
msgid ""
"If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr ""
+msgstr "å½ãªã‚‰ã€ãŸã¨ãˆ GPG ãŒè¨å®šã•ã‚Œã¦ã„ã¦ã‚‚ã€GPG éµã«ã‚ˆã‚‹ç½²åã‚’è¡Œã„ã¾ã›ã‚“。"
-#: ../src/common/config.py:317
+#: ../src/common/config.py:323
msgid "Enable ESessions encryption for this account."
-msgstr ""
+msgstr "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æš—å·åŒ–セッションを有効ã«ã™ã‚‹"
-#: ../src/common/config.py:318
+#: ../src/common/config.py:324
msgid "Should Gajim automatically start an encrypted session when possible?"
msgstr "Gajim ã¯(å¯èƒ½ãªã‚‰)自動的ã«æš—å·åŒ–セッションを始ã‚ã‚‹ã¹ãã‹ã©ã†ã‹ã€‚"
-#: ../src/common/config.py:319
+#: ../src/common/config.py:325
msgid ""
"Ordered list (space separated) of connection type to try. Can contain tls, "
"ssl or plain"
msgstr "試ã¿ã‚‹æŽ¥ç¶šã®ç¨®é¡žã®é †ç•ª(空白ã§åŒºåˆ‡ã‚‹)。「tlsã€ã€Œsslã€ã¾ãŸã¯ã€Œplainã€"
-#: ../src/common/config.py:320
+#: ../src/common/config.py:326
msgid ""
"Show a warning dialog before sending password on an plaintext connection."
msgstr ""
"æš—å·åŒ–ã•ã‚Œãªã„接続ã®å ´åˆã€ãƒ‘スワードをé€ã‚‹å‰ã«è¦å‘Šã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:321
+#: ../src/common/config.py:327
msgid "Show a warning dialog before using standard SSL library."
msgstr "標準㮠SSL ライブラリを使ã†å‰ã«è¦å‘Šã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:322
-#, fuzzy
+#: ../src/common/config.py:328
msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
msgstr ""
-"æš—å·åŒ–ã•ã‚Œãªã„接続ã®å ´åˆã€ãƒ‘スワードをé€ã‚‹å‰ã«è¦å‘Šã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã—ã¾ã™ã€‚"
+"æš—å·åŒ–ã•ã‚Œãªã„接続ã§å¹³æ–‡ã§ãƒ‘スワードをé€ã‚‹å‰ã«ã€è¦å‘Šã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã—ã¾"
+"ã™ã€‚"
-#: ../src/common/config.py:324
+#: ../src/common/config.py:330
msgid "Space separated list of ssl errors to ignore."
msgstr "無視ã™ã¹ã SSL ã®ã‚¨ãƒ©ãƒ¼ã®ä¸€è¦§(空白ã§åŒºåˆ‡ã£ã¦)。"
-#: ../src/common/config.py:333
-#, fuzzy
+#: ../src/common/config.py:339
msgid "Whitespace sent after inactivity"
-msgstr "活動åœæ¢çŠ¶æ…‹ã®å¾Œã«ç©ºç™½ã‚’é€ã‚Šã¾ã™"
+msgstr "活動åœæ¢çŠ¶æ…‹ã®å¾Œã«é€ã‚‰ã‚Œã‚‹ç©ºç™½"
-#: ../src/common/config.py:334
+#: ../src/common/config.py:340
msgid "XMPP ping sent after inactivity"
msgstr "活動åœæ¢çŠ¶æ…‹ã®å¾Œã« XMPP ping ã‚’é€ã‚Šã¾ã™"
-#: ../src/common/config.py:338
+#: ../src/common/config.py:344
msgid ""
"How many seconds to wait for the answer of ping alive packet before we try "
"to reconnect."
msgstr "生å˜ãƒ‘ケットをé€ã£ã¦ã‹ã‚‰å†æŽ¥ç¶šã‚’試ã¿ã‚‹ã¾ã§å¾…æ©Ÿã™ã‚‹æ™‚é–“(å˜ä½ã¯ç§’)。"
#. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:348
msgid "Jabberd2 workaround"
msgstr "Jabberd2 対ç–"
-#: ../src/common/config.py:345
+#: ../src/common/config.py:351
msgid ""
"If checked, Gajim will use your IP and proxies defined in "
"file_transfer_proxies option for file transfer."
@@ -4513,15 +4300,24 @@ msgstr ""
"ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯ã‚ãªãŸã® IP ã¨ãƒ—ãƒã‚シを使ã„ã¾ã™ã€‚プãƒã‚ã‚·ã¯ãƒ•ã‚¡"
"イル転é€ã®ãŸã‚ã« file_transfer_proxies オプションã§å®šç¾©ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:359
+#: ../src/common/config.py:365
msgid "Answer to receipt requests"
-msgstr ""
+msgstr "å—é ˜ç¢ºèªã«å¿œã˜ã‚‹"
-#: ../src/common/config.py:360
+#: ../src/common/config.py:366
msgid "Sent receipt requests"
-msgstr ""
+msgstr "å—é ˜ç¢ºèªã‚’求ã‚ã‚‹"
+
+#: ../src/common/config.py:375
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Gajim ãŒä½¿ç”¨ä¸ã® OS を通知ã™ã‚‹ã“ã¨ã‚’許å¯ã—ã¾ã™ã€‚"
+
+#: ../src/common/config.py:376
+msgid "Allow Gajim to send your local time."
+msgstr "Gajim ãŒã‚ãªãŸã®ç¾åœ°æ™‚間を通知ã™ã‚‹ã“ã¨ã‚’許å¯ã—ã¾ã™ã€‚"
-#: ../src/common/config.py:370
+#: ../src/common/config.py:377
msgid ""
"When negotiating an encrypted session, should Gajim assume you want your "
"messages to be logged?"
@@ -4529,20 +4325,19 @@ msgstr ""
"æš—å·åŒ–セッションを確立ã—よã†ã¨ã™ã‚‹éš›ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®è¨˜éŒ²ã‚’ã¨ã‚ŠãŸã„ã¨ä»®å®šã™ã‚‹ã‹"
"ã©ã†ã‹"
-#: ../src/common/config.py:373
-#, fuzzy
+#: ../src/common/config.py:380
msgid "Message that is sent to contacts you want to add"
-msgstr "è¿½åŠ ã—ãŸã„相手先ã®æƒ…å ±ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„"
+msgstr "è¿½åŠ ã—ãŸã„相手先ã«é€ã‚‰ã‚Œã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: ../src/common/config.py:374
+#: ../src/common/config.py:381
msgid "Last time we syncronized with logs from server."
-msgstr ""
+msgstr "サーãƒãƒ¼ã®å±¥æ´ã«åŒæœŸã—ãŸæœ€å¾Œã®æ™‚刻"
-#: ../src/common/config.py:436
+#: ../src/common/config.py:443
msgid "Is OpenPGP enabled for this contact?"
msgstr "ã“ã®ç›¸æ‰‹å…ˆã« OpenPGP を使ãˆã‚‹ã‹ã©ã†ã‹"
-#: ../src/common/config.py:437
+#: ../src/common/config.py:444
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
@@ -4550,108 +4345,97 @@ msgstr ""
"Gajim ã¯ã“ã®ç›¸æ‰‹å…ˆã«ã¤ã„ã¦è‡ªå‹•çš„ã«(å¯èƒ½ãªã‚‰)æš—å·åŒ–セッションを始ã‚ã‚‹ã¹ãã‹ã©"
"ã†ã‹"
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:445 ../src/common/config.py:448
msgid "Language for which we want to check misspelled words"
msgstr "スペル間é•ã„を調ã¹ãŸã„言語"
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "all(ã™ã¹ã¦)ã€çŠ¶æ³ã‚’空白ã§åŒºåˆ‡ã£ã¦"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes'(ã¯ã„)ã€'no'(ã„ã„ãˆ)ã€'both'(両方)ã®ã„ãšã‚Œã‹"
-
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'yes'(ã¯ã„)ã€'no'(ã„ã„ãˆ)ã€''(空白)ã®ã„ãšã‚Œã‹"
-
-#: ../src/common/config.py:460
+#: ../src/common/config.py:451
msgid ""
"State whether plugins should be activated on exit (this is saved on Gajim "
"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
"instead."
msgstr ""
+"終了時ã«ãƒ—ラグインãŒæœ‰åŠ¹åŒ–ã•ã‚Œã‚‹ã‹ã©ã†ã‹ (ã“れ㯠Gajim ã®çµ‚了時ã«ä¿å˜ã•ã‚Œã¾"
+"ã™)。ã“ã®ã‚ªãƒ—ションをプラグインã®æœ‰åŠ¹åŒ–/無効化ã®ãŸã‚ã«ä½¿ç”¨ã—ã¦ã¯ã„ã‘ã¾ã›ã‚“。"
+"代ã‚ã‚Šã« GUI を使用ã—ã¦ãã ã•ã„。"
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:456 ../src/common/pep.py:157
msgid "Sleeping"
msgstr "ç¡çœ ä¸"
-#: ../src/common/config.py:466
+#: ../src/common/config.py:457
msgid "Back soon"
msgstr "ã™ãã«æˆ»ã‚Šã¾ã™"
-#: ../src/common/config.py:466
+#: ../src/common/config.py:457
msgid "Back in some minutes."
msgstr "数分後ã«æˆ»ã‚Šã¾ã™ã€‚"
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:458 ../src/common/pep.py:127
msgid "Eating"
msgstr "食事"
-#: ../src/common/config.py:467
+#: ../src/common/config.py:458
msgid "I'm eating, so leave me a message."
msgstr "食事ã®ãŸã‚ã€ã—ã°ã‚‰ã離れã¾ã™ã€‚"
-#: ../src/common/config.py:468
+#: ../src/common/config.py:459
msgid "Movie"
msgstr "æ˜ ç”»"
-#: ../src/common/config.py:468
+#: ../src/common/config.py:459
msgid "I'm watching a movie."
msgstr "ãŸã ã„ã¾æ˜ 画鑑賞ä¸ã§ã™ã€‚"
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:460 ../src/common/pep.py:186
msgid "Working"
msgstr "仕事ä¸"
-#: ../src/common/config.py:469
+#: ../src/common/config.py:460
msgid "I'm working."
msgstr "仕事ä¸ã§ã™ã€‚"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:461
msgid "Phone"
msgstr "電話ä¸"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:461
msgid "I'm on the phone."
msgstr "電話ä¸ã§ã™ã€‚"
-#: ../src/common/config.py:471
+#: ../src/common/config.py:462
msgid "Out"
msgstr "外出ä¸"
-#: ../src/common/config.py:471
+#: ../src/common/config.py:462
msgid "I'm out enjoying life."
msgstr "出ã‹ã‘ã¦ã„ã¾ã™ã€‚"
-#: ../src/common/config.py:482
+#: ../src/common/config.py:473
msgid "I'm available."
msgstr "在å¸ã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/common/config.py:483
+#: ../src/common/config.py:474
msgid "I'm free for chat."
msgstr "ãƒãƒ£ãƒƒãƒˆã§ãã¾ã™ã€‚"
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:475 ../src/config.py:1609
msgid "Be right back."
msgstr "ã™ã戻りã¾ã™ã€‚"
-#: ../src/common/config.py:485
+#: ../src/common/config.py:476
msgid "I'm not available."
msgstr "ä¸åœ¨ã§ã™ã€‚"
-#: ../src/common/config.py:486
+#: ../src/common/config.py:477
msgid "Do not disturb."
msgstr "邪é”ã—ãªã„ã§ãã ã•ã„。"
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:478 ../src/common/config.py:479
msgid "Bye!"
msgstr "ãƒã‚¤ãƒã‚¤ !"
-#: ../src/common/config.py:498
+#: ../src/common/config.py:489
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."
@@ -4659,94 +4443,26 @@ msgstr ""
"グループãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«ã€muc_highlight_words ã§è¨å®šã—ãŸèªžã€ã¾ãŸã¯ã‚ãª"
"ãŸã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ãŒå«ã¾ã‚Œã‚‹å ´åˆã«ã‚µã‚¦ãƒ³ãƒ‰ã‚’鳴らã—ã¾ã™ã€‚"
-#: ../src/common/config.py:499
+#: ../src/common/config.py:490
msgid "Sound to play when any MUC message arrives."
msgstr "グループãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒã‚ã£ãŸéš›ã«ã‚µã‚¦ãƒ³ãƒ‰ã‚’鳴らã—ã¾ã™ã€‚"
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:499 ../src/common/optparser.py:310
msgid "green"
msgstr "green"
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:503 ../src/common/optparser.py:296
msgid "grocery"
msgstr "grocery"
-#: ../src/common/config.py:516
+#: ../src/common/config.py:507
msgid "human"
msgstr "human"
-#: ../src/common/config.py:520
+#: ../src/common/config.py:511
msgid "marine"
msgstr "marine"
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:127
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "ä¸ç¶™å…ˆ %s ã®ç™»éŒ²æƒ…å ±ãŒä¸€å®šæ™‚間内ã«åˆ°é”ã—ã¾ã›ã‚“ã§ã—ãŸ"
-
-#: ../src/common/connection_handlers.py:134
-msgid "Registration succeeded"
-msgstr "登録ãŒå®Œäº†ã—ã¾ã—ãŸ"
-
-#: ../src/common/connection_handlers.py:135
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "エージェント %s ã®ç™»éŒ²ã¯æˆåŠŸã—ã¾ã—ãŸ"
-
-#: ../src/common/connection_handlers.py:143
-msgid "Registration failed"
-msgstr "登録ãŒå¤±æ•—ã—ã¾ã—ãŸ"
-
-#: ../src/common/connection_handlers.py:143
-#, python-format
-msgid ""
-"Registration 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:466
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "ディスクã®æ›¸ãè¾¼ã¿ã‚¨ãƒ©ãƒ¼"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
-#, fuzzy
-msgid "Invisibility not supported"
-msgstr "ã€Œéš ã‚Œã¦ã„ã¾ã™ã€ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
-
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
-#, fuzzy, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "アカウント %s ã¯ã€Œéš ã‚Œã¦ã„ã¾ã™ã€ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。"
-
-#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
-#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
-#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
-msgid "Invalid Jabber ID"
-msgstr "Jabber ID ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-
-#: ../src/common/connection_handlers.py:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "æ£ã—ããªã„ JID ã‹ã‚‰ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå±Šãã¾ã—ãŸã€‚無視ã—ã¾ã™ã€‚"
-
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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 ã‚’å‚ç…§ã®ã“ã¨) ã‹ã€ã¾ãŸã¯å‰Šé™¤ã—㦠(ã™ã¹ã¦ã®å±¥æ´"
-"ã¯å¤±ã‚ã‚Œã¾ã™) ãã ã•ã„。"
-
#: ../src/common/connection.py:68
msgid "Unable to get issuer certificate"
msgstr "発行者ã®è¨¼æ˜Žæ›¸ã‚’å–å¾—ã§ãã¾ã›ã‚“"
@@ -4873,31 +4589,38 @@ msgid "Key usage does not include certificate signing"
msgstr "証明書署åã«éµã®ä½¿ã„æ–¹ãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“"
#: ../src/common/connection.py:99
-#, fuzzy
msgid "Application verification failure"
-msgstr "検証ã«å¤±æ•—ã—ã¾ã—ãŸ"
+msgstr "アプリケーションã®æ¤œè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:259
+#: ../src/common/connection_handlers_events.py:967 ../src/config.py:2106
+#: ../src/config.py:2115 ../src/config.py:2183 ../src/config.py:3619
+#: ../src/dataforms_widget.py:623 ../src/dialogs.py:3079
+msgid "Invalid Jabber ID"
+msgstr "Jabber ID ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
+
+#: ../src/common/connection.py:260 ../src/dialogs.py:3080
#, 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:278
+# (Mako) ã“ã“ã§ã¯ presence を「相手先ã€ã¨è¨³ã™
+#: ../src/common/connection.py:282
msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
+msgstr "相手先ãŒç½²åã—ã¦ã„ãªã„ã‹ã€éµãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:285
#, 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:333
+#: ../src/common/connection.py:337
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ *æš—å·åŒ–ã•ã‚Œã¦ã„ã¾ã™* (å‚考 :XEP:`27`]"
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:435
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -4906,77 +4629,97 @@ msgstr ""
"件å: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:448 ../src/common/connection_handlers.py:339
+#: ../src/common/connection_handlers.py:943
+#: ../src/common/connection_handlers.py:1053
+#: ../src/common/connection_handlers.py:1710
+#: ../src/common/connection_handlers_events.py:861
+#: ../src/common/logger.py:1124 ../src/gajim.py:385
+msgid "Disk Write Error"
+msgstr "ディスクã®æ›¸ãè¾¼ã¿ã‚¨ãƒ©ãƒ¼"
+
+#: ../src/common/connection.py:452 ../src/common/connection_handlers.py:946
+#: ../src/common/connection_handlers.py:1056
+#: ../src/common/connection_handlers.py:1713
+#: ../src/common/connection_handlers_events.py:865
+#: ../src/common/logger.py:1127 ../src/gajim.py:204 ../src/session.py:98
+#, 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 ã‚’å‚ç…§ã®ã“ã¨) ã‹ã€ã¾ãŸã¯å‰Šé™¤ã—㦠(ã™ã¹ã¦ã®å±¥æ´"
+"ã¯å¤±ã‚ã‚Œã¾ã™) ãã ã•ã„。"
+
+#: ../src/common/connection.py:845
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "アカウント \"%s\" ã§ã®æŽ¥ç¶šãŒåˆ‡ã‚Œã¾ã—ãŸ"
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:846
msgid "Reconnect manually."
msgstr "手動ã§å†æŽ¥ç¶šã—ã¦ãã ã•ã„。"
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:857
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr ""
+msgstr "サーãƒãƒ¼ %(name)s ã¯ç™»éŒ²è¦æ±‚ã«å¯¾ã—ã¦ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %(error)s"
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:899
#, python-format
msgid "Server %s provided a different registration form"
-msgstr ""
-
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "未知㮠SSL エラー: %d"
+msgstr "サーãƒãƒ¼ %s ã¯ç•°ãªã‚‹ç™»éŒ²ãƒ•ã‚©ãƒ¼ãƒ ã‚’æä¾›ã—ã¦ã„ã¾ã™"
#. wrong answer
-#: ../src/common/connection.py:884
-#, fuzzy
+#: ../src/common/connection.py:915
msgid "Invalid answer"
-msgstr "回ç”ãŒé–“é•ã£ã¦ã„ã¾ã™"
+msgstr "å¿œç”ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:916
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr ""
+msgstr "ä¸ç¶™å…ˆ %(name)s ã¯ç™»éŒ²è¦æ±‚ã«å¯¾ã—ã¦ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %(error)s"
-#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
-#: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/connection.py:1224 ../src/common/connection.py:1358
+#: ../src/common/connection.py:1972
+#: ../src/common/zeroconf/connection_zeroconf.py:204
#, python-format
msgid "Could not connect to \"%s\""
msgstr "%s ã«æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1225 ../src/gui_interface.py:524
msgid "Check your connection or try again later."
msgstr "è¨å®šã‚’確èªã™ã‚‹ã‹ã€æ™‚é–“ã‚’ãŠã„ã¦è©¦ã—ã¦ãã ã•ã„。"
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1230
#, python-format
msgid "Server replied: %s"
msgstr "サーãƒã®å¿œç”: %s"
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1243
msgid "Connection to proxy failed"
msgstr "プãƒã‚ã‚·ã¸ã®æŽ¥ç¶šã«å¤±æ•—"
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1275 ../src/common/connection.py:1337
#, python-format
msgid "Could not connect to account %s"
msgstr "アカウント %s ã«æŽ¥ç¶šã§ãã¾ã›ã‚“"
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1276 ../src/common/connection.py:1338
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr "アカウント %s ã§ã®æŽ¥ç¶šãŒåˆ‡ã‚Œã¾ã—ãŸã€‚å†æŽ¥ç¶šã‚’試ã¿ã¾ã™ã€‚"
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1301
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "%s ã®è¨¼æ˜Žæ›¸ã®çœŸæ£æ€§ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1304
#, python-format
msgid ""
"\n"
@@ -4985,7 +4728,7 @@ msgstr ""
"\n"
"SSL エラー: <b>%s</b>"
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1306
#, python-format
msgid ""
"\n"
@@ -4994,25 +4737,25 @@ msgstr ""
"\n"
"未知㮠SSL エラー: %d"
-#: ../src/common/connection.py:1297
+#: ../src/common/connection.py:1359
msgid "Check your connection or try again later"
msgstr "接続を確èªã™ã‚‹ã‹ã€ã¾ãŸã¯å¾Œã§å†åº¦è©¦ã—ã¦ãã ã•ã„"
# (Mako) %s ã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‹
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1393
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "\"%s\" ã®èªè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1395
msgid "Please check your login and password for correctness."
msgstr "æ•´åˆæ€§ã®ãŸã‚ã«ã€ãƒã‚°ã‚¤ãƒ³ã¨ãƒ‘スワードを確èªã—ã¦ãã ã•ã„。"
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1468
msgid "Error while removing privacy list"
msgstr "プライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆã‚’削除ã™ã‚‹éš›ã®ã‚¨ãƒ©ãƒ¼"
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1469
#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5021,58 +4764,218 @@ msgstr ""
"プライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆ %s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚ç¾åœ¨ã®æŽ¥ç¶šã«ä½¿ç”¨ã•ã‚Œã¦ã„るよã†"
"ã§ã™ã€‚使用をやã‚ã¦ã‹ã‚‰å†ã³è©¦ã—ã¦ãã ã•ã„。"
-#: ../src/common/connection.py:1658
-#, fuzzy, python-format
+#: ../src/common/connection.py:1546 ../src/common/connection_handlers.py:573
+msgid "Invisibility not supported"
+msgstr "ã€Œéš ã‚Œã¦ã„ã¾ã™ã€ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#: ../src/common/connection.py:1547 ../src/common/connection_handlers.py:574
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr "アカウント %s ã¯ã€Œéš ã‚Œã¦ã„ã¾ã™ã€ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。"
+
+#: ../src/common/connection.py:1839
+#, python-format
msgid "Sent contact: \"%s\" (%s)"
-msgstr "é€ã£ãŸç›¸æ‰‹å…ˆ: %s (%s)"
+msgstr "é€ã£ãŸç›¸æ‰‹å…ˆ: \"%s\" (%s)"
-#: ../src/common/connection.py:1661
-#, fuzzy
+#: ../src/common/connection.py:1842
msgid "Sent contacts:"
msgstr "é€ã£ãŸç›¸æ‰‹å…ˆ:"
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:1989 ../src/common/connection.py:2012
msgid "Not fetched because of invisible status"
-msgstr ""
+msgstr "ã€Œéš ã‚Œä¸ã€ã®ãŸã‚å–å¾—ã§ãã¾ã›ã‚“"
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2542
msgid "Unregister failed"
msgstr "登録解除ã«å¤±æ•—"
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2543
#, python-format
msgid "Unregistration with server %(server)s failed: %(error)s"
msgstr "サーãƒãƒ¼ %(server)s ã§ã®ç™»éŒ²è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸ: %(error)s"
+# (Mako) idle ã‚’ã©ã†ã™ã‚‹
+#: ../src/common/connection_handlers.py:95
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
+msgid "Unable to load idle module"
+msgstr "アイドルモジュールをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
+
+#: ../src/common/connection_handlers.py:128
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "ä¸ç¶™å…ˆ %s ã®ç™»éŒ²æƒ…å ±ãŒä¸€å®šæ™‚間内ã«åˆ°é”ã—ã¾ã›ã‚“ã§ã—ãŸ"
+
+#: ../src/common/connection_handlers.py:135
+msgid "Registration succeeded"
+msgstr "登録ãŒå®Œäº†ã—ã¾ã—ãŸ"
+
+#: ../src/common/connection_handlers.py:136
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "エージェント %s ã®ç™»éŒ²ã¯æˆåŠŸã—ã¾ã—ãŸ"
+
+#: ../src/common/connection_handlers.py:144
+msgid "Registration failed"
+msgstr "登録ãŒå¤±æ•—ã—ã¾ã—ãŸ"
+
+#: ../src/common/connection_handlers.py:144
+#, python-format
+msgid ""
+"Registration 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:1755
+msgid "I would like to add you to my roster."
+msgstr "ã‚ãªãŸã‚’ç§ã®åç°¿ã«è¿½åŠ ã—ãŸã„ã¨æ€ã£ã¦ã„ã¾ã™ã€‚"
+
+#: ../src/common/connection_handlers_events.py:345
+#, 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/ ã®ã‚ˆã†ãªå簿管ç†ãƒ„ールを使ã£ã¦ãã ã•ã„。"
+
+# (Mako) 実際ã«ä½¿ã‚ã‚Œã¦ã„ã‚‹å ´æ‰€ã‚’ç¢ºèªã—ã¦ã„ãªã„ãŒã€å¼·å¼•ã«è¨³ã™
+#: ../src/common/connection_handlers_events.py:776
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "%s ã‹ã‚‰ç¶™èªä¸æ¢ã®è¦æ±‚"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:886
+msgid "Room has been destroyed"
+msgstr "談話室ã¯é–‰éŽ–ã•ã‚Œã¾ã—ãŸ"
+
+#: ../src/common/connection_handlers_events.py:894
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "代ã‚ã‚Šã«æ¬¡ã®è«‡è©±å®¤ã«å‚åŠ ã—ã¾ã™: %s"
+
+#: ../src/common/connection_handlers_events.py:968
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "æ£ã—ããªã„ JID ã‹ã‚‰ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå±Šãã¾ã—ãŸã€‚無視ã—ã¾ã™ã€‚"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1005
+#: ../src/gui_interface.py:415 ../src/gui_interface.py:429
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "%(message)s ã‚’é€ä¿¡ã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1422
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "未知㮠SSL エラー: %d"
+
+#: ../src/common/connection_handlers_events.py:1950 ../src/dialogs.py:2771
+#: ../src/notify.py:260
+msgid "New Single Message"
+msgstr "æ–°ç€ã®å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+
+#: ../src/common/connection_handlers_events.py:1952
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "%(nickname)s ã‹ã‚‰ã®æ–°ã—ã„å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+
+#: ../src/common/connection_handlers_events.py:1956 ../src/dialogs.py:2772
+#: ../src/notify.py:261
+msgid "New Private Message"
+msgstr "æ–°ç€ã®ç§ä¿¡"
+
+#: ../src/common/connection_handlers_events.py:1958
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "グループãƒãƒ£ãƒƒãƒˆ %s ã‹ã‚‰ã®æ–°ç€ã®ç§ä¿¡"
+
+#: ../src/common/connection_handlers_events.py:1961
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s ã•ã‚“: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:1964
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "%(nickname)s ã•ã‚“ã‹ã‚‰ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+
+#: ../src/common/connection_handlers_events.py:1968 ../src/dialogs.py:2771
+#: ../src/notify.py:260
+msgid "New Message"
+msgstr "æ–°ç€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+
+#: ../src/common/connection_handlers_events.py:1970
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "%(nickname)s ã•ã‚“ã‹ã‚‰ã®æ–°ç€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+
+#: ../src/common/connection_handlers_events.py:2099
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s ã•ã‚“ã®åœ¨å¸çŠ¶æ³ãŒå¤‰ã‚ã‚Šã¾ã—ãŸ"
+
+#: ../src/common/connection_handlers_events.py:2101
+#: ../src/groupchat_control.py:202 ../src/groupchat_control.py:1755
+#: ../src/history_window.py:447
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s ã•ã‚“ã¯ç¾åœ¨ %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2106 ../src/dialogs.py:2783
+#: ../src/notify.py:274
+msgid "Contact Changed Status"
+msgstr "相手先ãŒåœ¨å¸çŠ¶æ³ã‚’変更"
+
+#: ../src/common/connection_handlers_events.py:2108
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s ã•ã‚“ãŒã‚µã‚¤ãƒ³ã‚¤ãƒ³ã—ã¾ã—ãŸ"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2113 ../src/dialogs.py:2767
+#: ../src/notify.py:256
+msgid "Contact Signed In"
+msgstr "相手先ãŒã‚µã‚¤ãƒ³ã‚¤ãƒ³ã—ã¾ã—ãŸ"
+
+#: ../src/common/connection_handlers_events.py:2115
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s ã•ã‚“ãŒã‚µã‚¤ãƒ³ã‚¢ã‚¦ãƒˆã—ã¾ã—ãŸ"
+
+#: ../src/common/connection_handlers_events.py:2120 ../src/dialogs.py:2769
+#: ../src/notify.py:258
+msgid "Contact Signed Out"
+msgstr "相手先ãŒã‚µã‚¤ãƒ³ã‚¢ã‚¦ãƒˆã—ã¾ã—ãŸ"
+
# (Mako)承èªãªã—ã«åç°¿ã«ã‚る状態
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/contacts.py:126 ../src/common/helpers.py:60
+#: ../src/gui_interface.py:467
msgid "Observers"
msgstr "オブザーãƒ"
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:854
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#: ../src/common/contacts.py:130 ../src/common/contacts.py:358
+#: ../src/common/helpers.py:60 ../src/disco.py:120 ../src/disco.py:121
+#: ../src/disco.py:1517 ../src/roster_window.py:856
+#: ../src/roster_window.py:1552 ../src/roster_window.py:1640
+#: ../src/roster_window.py:1642 ../src/roster_window.py:1804
+#: ../src/roster_window.py:2480
msgid "Transports"
msgstr "ä¸ç¶™å…ˆ"
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:366
msgid "Not in roster"
msgstr "åç°¿ã«ã‚ã‚Šã¾ã›ã‚“"
#. only say that to non Windows users
#: ../src/common/dbus_support.py:40
-#, fuzzy
msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python bindings are missing in this computer"
+msgstr "ã“ã®ã‚³ãƒ³ãƒ”ュータã«ã¯ D-Bus python çµåˆãŒã‚ã‚Šã¾ã›ã‚“"
#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
-#, fuzzy
msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajim ã® D-Bus ã«é–¢ã™ã‚‹æ€§èƒ½ã‚’使用ã§ãã¾ã›ã‚“。"
#. only say that to non Windows users
#: ../src/common/dbus_support.py:51
@@ -5080,14 +4983,15 @@ msgid "D-Bus does not run correctly on this machine"
msgstr "ã“ã®ã‚³ãƒ³ãƒ”ュータã§ã¯ D-Bus ãŒæ£ã—ã機能ã—ã¦ã„ã¾ã›ã‚“"
#: ../src/common/dbus_support.py:54
-#, fuzzy
msgid "D-Bus does not run correctly on this machine: system bus not present"
-msgstr "ã“ã®ã‚³ãƒ³ãƒ”ュータã§ã¯ D-Bus ãŒæ£ã—ã機能ã—ã¦ã„ã¾ã›ã‚“"
+msgstr ""
+"ã“ã®ã‚³ãƒ³ãƒ”ュータã§ã¯ D-Bus ãŒæ£ã—ã機能ã—ã¦ã„ã¾ã›ã‚“: システムãƒã‚¹ãŒã‚ã‚Šã¾ã›ã‚“"
#: ../src/common/dbus_support.py:57
-#, fuzzy
msgid "D-Bus does not run correctly on this machine: session bus not present"
-msgstr "ã“ã®ã‚³ãƒ³ãƒ”ュータã§ã¯ D-Bus ãŒæ£ã—ã機能ã—ã¦ã„ã¾ã›ã‚“"
+msgstr ""
+"ã“ã®ã‚³ãƒ³ãƒ”ュータã§ã¯ D-Bus ãŒæ£ã—ã機能ã—ã¦ã„ã¾ã›ã‚“: セッションãƒã‚¹ãŒã‚ã‚Šã¾ã›"
+"ã‚“"
#: ../src/common/exceptions.py:45
msgid "Database cannot be read."
@@ -5099,10 +5003,10 @@ msgstr ""
"サービスãŒã‚ã‚Šã¾ã›ã‚“: Gajim ãŒèµ·å‹•ã—ã¦ã„ãªã„ã‹ã€ã‚ã‚‹ã„㯠remote_control ãŒ"
"「å½ã€ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™"
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
msgid "D-Bus is not present on this machine or python module is missing"
msgstr ""
-"ã“ã®ã‚³ãƒ³ãƒ”ュータ㫠D-Bus ãŒãªã„ã‹ã€ã‚ã‚‹ã„㯠present ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“"
+"ã“ã®ã‚³ãƒ³ãƒ”ュータ㫠D-Bus ãŒãªã„ã‹ã€ã‚ã‚‹ã„㯠python ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“"
#: ../src/common/exceptions.py:78
#, python-format
@@ -5110,6 +5014,8 @@ msgid ""
"Session bus is not available.\n"
"Try reading %(url)s"
msgstr ""
+"セッションãƒã‚¹ãŒæœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
+"%(url)s ã‚’ã”覧ãã ã•ã„"
#: ../src/common/exceptions.py:90
#, python-format
@@ -5283,272 +5189,278 @@ msgstr "週ã®çµ‚ã‚ã‚Š"
msgid "Weekend!"
msgstr "週末 !"
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:151
msgid "Username must be between 1 and 1023 chars"
-msgstr ""
+msgstr "ユーザーåã¯1æ–‡å—以上1023æ–‡å—以下ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:156
msgid "Invalid character in username."
msgstr "ユーザーåã«ä¸æ£ãªæ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
msgid "Server must be between 1 and 1023 chars"
-msgstr ""
+msgstr "サーãƒãƒ¼åã¯1æ–‡å—以上1023æ–‡å—以下ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:167
msgid "Invalid character in hostname."
msgstr "ホストåã«ä¸æ£ãªæ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
msgid "Server address required."
msgstr "サーãƒãƒ¼ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
msgid "Resource must be between 1 and 1023 chars"
-msgstr ""
+msgstr "リソースã¯1æ–‡å—以上1023æ–‡å—以下ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:178
msgid "Invalid character in resource."
msgstr "リソースã«ä¸æ£ãªæ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
msgid "_Busy"
msgstr "å–ã‚Šè¾¼ã¿ä¸ (_B)"
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:220 ../src/tooltips.py:195
msgid "Busy"
-msgstr "å–ã‚Šè¾¼ã¿ä¸ã§ã™"
+msgstr "å–ã‚Šè¾¼ã¿ä¸"
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
msgid "_Not Available"
msgstr "ä¸åœ¨ (_N)"
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+msgid "Not Available"
+msgstr "ä¸åœ¨"
+
+#: ../src/common/helpers.py:228
msgid "_Free for Chat"
msgstr "ãƒãƒ£ãƒƒãƒˆå¯ (_F)"
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:230 ../src/tooltips.py:191
msgid "Free for Chat"
-msgstr "ãƒãƒ£ãƒƒãƒˆã§ãã¾ã™"
+msgstr "ãƒãƒ£ãƒƒãƒˆå¯"
-#: ../src/common/helpers.py:230
-#, fuzzy
+#: ../src/common/helpers.py:233
msgid "?user status:_Available"
-msgstr "一時åœæ¢ã—ã¾ã—ãŸ"
+msgstr "åœ¨å¸ (_A)"
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
-#, fuzzy
+#: ../src/common/helpers.py:235 ../src/tooltips.py:189
msgid "?user status:Available"
-msgstr "一時åœæ¢ã—ã¾ã—ãŸ"
+msgstr "在å¸"
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
msgid "Connecting"
msgstr "接続ä¸ã§ã™"
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
msgid "A_way"
msgstr "離å¸ä¸ (_w)"
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:245
msgid "_Offline"
msgstr "オフライン (_O)"
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:247 ../src/tooltips.py:199
msgid "Offline"
-msgstr "オフラインã§ã™"
+msgstr "オフライン"
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:250
msgid "_Invisible"
msgstr "éš ã‚Œä¸ (_I)"
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:252
+msgid "Invisible"
+msgstr "éš ã‚Œä¸"
+
+#: ../src/common/helpers.py:256
msgid "?contact has status:Unknown"
msgstr "ä¸æ˜Ž"
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:258
msgid "?contact has status:Has errors"
msgstr "エラーãŒèµ·ã“ã£ã¦ã„ã¾ã™"
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:263
msgid "?Subscription we already have:None"
msgstr "ãªã—"
# (Mako)subscription
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:265
msgid "To"
msgstr "相手先ãŒæ‰¿èª"
-# #(Mako)helpers.pyã¯ã€
+# (Mako)groups_post_window.ui ã¯ã€ãƒ¡ãƒ¼ãƒ«ã®ã€Œå·®å‡ºäººã€ã«ç›¸å½“
+# helpers.pyã¯ã€
# 相手先ã®æƒ…å ±ã§ã€subscriptionã®æœ‰ç„¡ãªã®ã§ã€ã€Œã“ã¡ã‚‰ãŒæ‰¿èªã€ã¨ã—ãŸã„
-#: ../src/common/helpers.py:264
-#, fuzzy
+#: ../src/common/helpers.py:267
msgid "From"
msgstr "ã“ã¡ã‚‰ãŒæ‰¿èª"
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
msgid "Both"
msgstr "相互ã«æ‰¿èª"
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:277
msgid "?Ask (for Subscription):None"
msgstr "ãªã—"
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:279
msgid "Subscribe"
msgstr "申ã—è¾¼ã¿"
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
msgid "?Group Chat Contact Role:None"
msgstr "ãªã—"
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
msgid "Moderators"
msgstr "å¸ä¼šè€…"
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
msgid "Moderator"
msgstr "å¸ä¼šè€…"
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:296
msgid "Participants"
msgstr "å‚åŠ è€…"
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:298
msgid "Participant"
msgstr "å‚åŠ è€…"
# (Mako)moderated room ã§ã€ç™ºè¨€æ¨©(voice)ã‚’æŒãŸãªã„者
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:301
msgid "Visitors"
msgstr "å‚è´è€…"
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:303
msgid "Visitor"
msgstr "å‚è´è€…"
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:309 ../src/tooltips.py:210
msgid "?Group Chat Contact Affiliation:None"
msgstr "ãªã—"
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:311 ../src/tooltips.py:216
msgid "Owner"
msgstr "主宰者"
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:313 ../src/tooltips.py:214
msgid "Administrator"
msgstr "管ç†äºº"
# (Mako)「会員ã€ã§ã¯æŽ’ä»–çš„ãªãƒ‹ãƒ¥ã‚¢ãƒ³ã‚¹ãŒå¼·ã„ã®ã§ã—ã‹ãŸãªãカタカナ語ã§
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:315 ../src/tooltips.py:212
msgid "Member"
msgstr "メンãƒãƒ¼"
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:354
msgid "is paying attention to the conversation"
msgstr "ã•ã‚“ã¯ã“ã®ä¼šè©±ã«ç›®ã‚’å‘ã‘ã¦ã„ã¾ã™"
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:356
msgid "is doing something else"
msgstr "ã•ã‚“ã¯ä½•ã‹ã»ã‹ã®ã“ã¨ã‚’ã—ã¦ã„ã¾ã™"
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
msgid "is composing a message..."
msgstr "ã•ã‚“ãŒãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’書ã„ã¦ã„ã¾ã™..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:361
msgid "paused composing a message"
msgstr "ã•ã‚“ã¯æ›¸ã手をã¡ã‚‡ã£ã¨æ¢ã‚ã¦ã„ã¾ã™"
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:363
msgid "has closed the chat window or tab"
msgstr "ã•ã‚“ã¯ä¼šè©±ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¾ã—ãŸ"
#. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:628
#, python-format
msgid "%s GiB"
msgstr "%s GiB"
#. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:631
#, python-format
msgid "%s GB"
msgstr "%s GB"
#. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:635
#, python-format
msgid "%s MiB"
msgstr "%s MiB"
#. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:638
#, python-format
msgid "%s MB"
msgstr "%s MB"
#. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:642
#, python-format
msgid "%s KiB"
msgstr "%s KiB"
#. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:645
#, python-format
msgid "%s KB"
msgstr "%s KB"
#. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:648
#, python-format
msgid "%s B"
msgstr "%s B"
# (Mako)ã“ã‚Œã¨ã€æ¬¡ã® "from room %s" ã¯é€£ç¶šã—ã¦è¡¨ç¤ºã•ã‚Œã‚‹
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
msgstr[0] "ä¿ç•™ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ %d 件"
msgstr[1] "ä¿ç•™ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ %d 件"
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1112
#, python-format
msgid " from room %s"
msgstr " - 談話室 \"%s\""
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
#, python-format
msgid " from user %s"
msgstr " - ユーザー %s"
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1117
#, python-format
msgid " from %s"
msgstr "- %s"
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
msgstr[0] "ä¿ç•™ã‚¤ãƒ™ãƒ³ãƒˆ %d 件"
msgstr[1] "ä¿ç•™ã‚¤ãƒ™ãƒ³ãƒˆ %d 件"
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1162
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
#: ../src/common/helpers.py:1341
msgid "Hello, I am $name."
-msgstr ""
+msgstr "ã“ã‚“ã«ã¡ã¯ã€‚ç§ã¯ $name ã§ã™ã€‚"
#: ../src/common/jingle_rtp.py:107
-#, fuzzy, python-format
+#, python-format
msgid "%s configuration error"
-msgstr "談話室ã®æ§‹æˆ"
+msgstr "%s è¨å®šã‚¨ãƒ©ãƒ¼"
#: ../src/common/jingle_rtp.py:108
#, python-format
@@ -5561,33 +5473,42 @@ msgid ""
"Error was:\n"
"%s"
msgstr ""
+"%s を使用ã§ãã¾ã›ã‚“。è¨å®šã‚’見直ã—ã¦ãã ã•ã„。\n"
+"\n"
+"パイプライン:\n"
+"%s\n"
+"\n"
+"エラー:\n"
+"%s"
#: ../src/common/jingle_rtp.py:205
msgid "GStreamer error"
-msgstr ""
+msgstr "GStreamer エラー"
#: ../src/common/jingle_rtp.py:206
-#, fuzzy, python-format
+#, python-format
msgid ""
"Error: %s\n"
"Debug: %s"
-msgstr "エラーメッセージ: %s"
+msgstr ""
+"エラー: %s\n"
+"デãƒãƒƒã‚°: %s"
#: ../src/common/jingle_rtp.py:335
msgid "audio input"
-msgstr ""
+msgstr "音声入力"
#: ../src/common/jingle_rtp.py:338
msgid "audio output"
-msgstr ""
+msgstr "音声出力"
#: ../src/common/jingle_rtp.py:381
msgid "video input"
-msgstr ""
+msgstr "ビデオ入力"
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:390
msgid "video output"
-msgstr ""
+msgstr "ビデオ出力"
#: ../src/common/latex.py:109
#, python-format
@@ -5595,66 +5516,72 @@ msgid "Error executing \"%(command)s\": %(error)s"
msgstr "\"%(command)s\" ã®å®Ÿè¡Œä¸ã«ã‚¨ãƒ©ãƒ¼: %(error)s"
#: ../src/common/logging_helpers.py:33
-#, fuzzy, python-format
+#, python-format
msgid "%s is not a valid loglevel"
msgstr "%s ã¯æ£ã—ã„ãƒã‚°ãƒ¬ãƒ™ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../src/common/multimedia_helpers.py:37
-#, fuzzy
+#: ../src/common/multimedia_helpers.py:39
msgid " Default device"
-msgstr "デフォルトã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+msgstr " デフォルトã®ãƒ‡ãƒã‚¤ã‚¹"
#. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:60
msgid "Audio test"
-msgstr ""
+msgstr "音声テスト"
#. Auto src
#. Auto sink
#. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:63
+#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:111
msgid "Autodetect"
-msgstr ""
+msgstr "自動検出"
#. Alsa src
#. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
-#, fuzzy, python-format
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:81
+#, python-format
msgid "ALSA: %s"
-msgstr "サイズ: %s"
+msgstr "ALSA: %s"
+
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:83
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Pulse: %s"
#. Fake sink
#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:105
msgid "Fake audio output"
-msgstr ""
+msgstr "å½ã®éŸ³å£°å‡ºåŠ›"
#. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:90
msgid "Video test"
-msgstr ""
+msgstr "ビデオã®ãƒ†ã‚¹ãƒˆ"
#. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:95
#, python-format
msgid "V4L2: %s"
-msgstr ""
+msgstr "V4L2: %s"
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:108
#, python-format
msgid "X Window System (X11/XShm/Xv): %s"
-msgstr ""
+msgstr "X ウィンドウシステム(X11/XShm/Xv): %s"
#. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:110
msgid "X Window System (without Xv)"
-msgstr ""
+msgstr "X ウィンドウシステム(without Xv)"
#. we talk about a file
#: ../src/common/optparser.py:53
@@ -5662,13 +5589,14 @@ msgstr ""
msgid "error: cannot open %s for reading"
msgstr "エラー: èªã¿è¾¼ã¿ãƒ¢ãƒ¼ãƒ‰ã§ %s ã‚’é–‹ã‘ã¾ã›ã‚“"
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
msgid "cyan"
msgstr "cyan"
-#: ../src/common/optparser.py:383
+# (Mako) create index ã®ã“ã¨
+#: ../src/common/optparser.py:385
msgid "migrating logs database to indices"
-msgstr ""
+msgstr "記録データベースã‹ã‚‰ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’作æˆã—ã¾ã™"
#: ../src/common/passwords.py:123
#, python-format
@@ -6303,19 +6231,19 @@ msgstr "勉強ä¸"
msgid "Writing"
msgstr "執ç†ä¸"
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:339
msgid "Unknown Artist"
msgstr "ä¸æ˜Ž"
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:342
msgid "Unknown Title"
msgstr "ä¸æ˜Ž"
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:345
msgid "Unknown Source"
msgstr "ä¸æ˜Ž"
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:348
#, python-format
msgid ""
"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6337,7 +6265,7 @@ msgid ""
msgstr "別㮠Gajim ãŒèµ·å‹•ã—ã¦ã„るよã†ã§ã™ã€‚ファイル転é€ã¯ä¸æ¢ã•ã‚Œã¾ã—ãŸã€‚"
#. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:424
msgid ""
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
@@ -6345,11 +6273,11 @@ msgstr ""
"[æš—å·åŒ–セッションã®é€”ä¸ã§ã™ã€‚ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’見ã¦ã„ã‚‹ã¨ã„ã†ã“ã¨ã¯ã€ä½•ã‹å¤±æ•—ã—"
"ã¦ã„ã¾ã™ã€‚]"
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:192
msgid "Avahi error"
msgstr "Avahi エラー"
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
#, python-format
msgid ""
"%s\n"
@@ -6358,72 +6286,73 @@ msgstr ""
"%s\n"
"ãƒãƒ¼ã‚«ãƒ«ã®ä¼é€ãŒã†ã¾ãåƒã„ã¦ã„ãªã„よã†ã§ã™ã€‚"
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:205
msgid "Please check if Avahi or Bonjour is installed."
msgstr "Avahi ã‹ Bonjour ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ãã ã•ã„。"
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:219
msgid "Could not start local service"
msgstr "ãƒãƒ¼ã‚«ãƒ«ã®ã‚µãƒ¼ãƒ“スを起動ã§ãã¾ã›ã‚“"
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:216
#, python-format
msgid "Unable to bind to port %d."
msgstr "ãƒãƒ¼ãƒˆ %d ã‚’é–‹ã‘ã¾ã›ã‚“。"
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../src/common/zeroconf/connection_zeroconf.py:220
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
msgid "Please check if avahi-daemon is running."
msgstr "avahi-daemon ãŒèµ·å‹•ã—ã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ãã ã•ã„。"
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:303
+#: ../src/common/zeroconf/connection_zeroconf.py:316
+#: ../src/common/zeroconf/connection_zeroconf.py:332
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "アカウント \"%s\" ã®åœ¨å¸çŠ¶æ³ã‚’変更ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:351
+#: ../src/common/zeroconf/connection_zeroconf.py:390
msgid "Your message could not be sent."
msgstr "メッセージをé€ä¿¡ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:404
msgid "Contact is offline. Your message could not be sent."
msgstr "相手先ã¯ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã§ã™ã€‚メッセージをé€ä¿¡ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:431
msgid ""
"Connection to host could not be established: Timeout while sending data."
msgstr "ホストã¸ã®æŽ¥ç¶šã‚’確立ã§ãã¾ã›ã‚“ã§ã—ãŸ: データé€ä¿¡ä¸ã®æ™‚間切れã§ã™ã€‚"
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_avahi.py:193
#: ../src/common/zeroconf/zeroconf_bonjour.py:191
#, python-format
msgid "Error while adding service. %s"
msgstr "サービスã®è¿½åŠ ä¸ã®ã‚¨ãƒ©ãƒ¼ã§ã™ã€‚%s"
-#: ../src/config.py:397
+#: ../src/config.py:406
msgid "Default Message"
msgstr "デフォルトã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: ../src/config.py:406
+#: ../src/config.py:415
msgid "Enabled"
msgstr "有効"
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3115
msgid "Default"
msgstr "デフォルト"
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:746 ../src/dialogs.py:1493
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "言語 %s ã®è¾žæ›¸ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../src/config.py:734
+#: ../src/config.py:747
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -6432,214 +6361,213 @@ msgstr ""
"スペルãƒã‚§ãƒƒã‚¯ã‚’è¡Œãªã†ã«ã¯ %s ã®è¾žæ›¸ã‚’インストールã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。ã‚ã‚‹"
"ã„ã¯ã€speller_language オプションã§åˆ¥ã®è¨€èªžã‚’é¸æŠžã—ã¦ãã ã•ã„。"
-#: ../src/config.py:1214
+#: ../src/config.py:1223
msgid "status message title"
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚¿ã‚¤ãƒˆãƒ«"
-#: ../src/config.py:1214
+#: ../src/config.py:1223
msgid "status message text"
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®æ–‡"
#. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
-#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py:1523 ../src/dialogs.py:2528 ../src/dialogs.py:2595
+#: ../src/dialogs.py:3382 ../src/disco.py:886 ../src/disco.py:1744
+#: ../src/disco.py:2046 ../src/history_window.py:90
msgid "Name"
msgstr "åå‰"
-#: ../src/config.py:1609
+#: ../src/config.py:1618
msgid "Relogin now?"
msgstr "今ã™ãå†ãƒã‚°ã‚¤ãƒ³ã—ã¾ã™ã‹ ?"
-#: ../src/config.py:1610
+#: ../src/config.py:1619
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr "ã™ã¹ã¦ã®å¤‰æ›´ã‚’ç›´ã¡ã«æœ‰åŠ¹ã«ã™ã‚‹ã«ã¯ã€å†ãƒã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。"
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1773 ../src/config.py:1906
msgid "OpenPGP is not usable on this computer"
msgstr "OpenPGP ã¯ã“ã®ã‚³ãƒ³ãƒ”ュータã§ã¯ä½¿ãˆã¾ã›ã‚“。"
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1946 ../src/config.py:1993
msgid "Unread events"
msgstr "未èªã®ã‚¤ãƒ™ãƒ³ãƒˆ"
-#: ../src/config.py:1934
+#: ../src/config.py:1947
msgid "Read all pending events before removing this account."
msgstr "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’削除ã™ã‚‹å‰ã«ã™ã¹ã¦ã®ä¿ç•™ã‚¤ãƒ™ãƒ³ãƒˆã‚’èªã¿ã¾ã™ã€‚"
-#: ../src/config.py:1963
+#: ../src/config.py:1976
#, python-format
msgid "You have opened chat in account %s"
msgstr "アカウント %s ã§ãƒãƒ£ãƒƒãƒˆä¸ã§ã™"
-#: ../src/config.py:1964
+#: ../src/config.py:1977
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr ""
"ã™ã¹ã¦ã®ãƒãƒ£ãƒƒãƒˆã¨ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¾ã™ã€‚続ã‘ã¦ã‚‚ã„ã„ã§ã™"
"ã‹ ?"
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:1989 ../src/config.py:2531 ../src/config.py:2567
msgid "You are currently connected to the server"
msgstr "ç¾åœ¨ã‚µãƒ¼ãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„る状態ã§ã™"
-#: ../src/config.py:1977
+#: ../src/config.py:1990
msgid "To change the account name, you must be disconnected."
msgstr "アカウントåを変更ã™ã‚‹ã«ã¯ã€æŽ¥ç¶šã‚’切らãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/config.py:1981
+#: ../src/config.py:1994
msgid "To change the account name, you must read all pending events."
msgstr ""
"アカウントåを変更ã™ã‚‹ã«ã¯ã€ä¿ç•™ã•ã‚Œã¦ã„ã‚‹ã™ã¹ã¦ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’èªã¾ãªã‘ã‚Œã°ãªã‚Š"
"ã¾ã›ã‚“。"
-#: ../src/config.py:1987
+#: ../src/config.py:2000
msgid "Account Name Already Used"
msgstr "アカウンåã¯æ—¢ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™"
-#: ../src/config.py:1988
+#: ../src/config.py:2001
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
msgstr "ã“ã®åå‰ã¯åˆ¥ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§æ—¢ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™ã€‚別ã®åå‰ã«ã—ã¦ãã ã•ã„。"
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2005 ../src/config.py:2009
msgid "Invalid account name"
msgstr "アカウントåãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/config.py:1993
+#: ../src/config.py:2006
msgid "Account name cannot be empty."
msgstr "アカウントåã¯ç©ºç™½ã«ã§ãã¾ã›ã‚“。"
-#: ../src/config.py:1997
+#: ../src/config.py:2010
msgid "Account name cannot contain spaces."
msgstr "アカウントåã«ã‚¹ãƒšãƒ¼ã‚¹ã‚’å«ã‚ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/config.py:2074
+#: ../src/config.py:2087
msgid "Rename Account"
msgstr "アカウントã®å¤‰æ›´"
-#: ../src/config.py:2075
+#: ../src/config.py:2088
#, python-format
msgid "Enter a new name for account %s"
msgstr "%s ã•ã‚“ã®æ–°ã—ã„åå‰ã‚’入力ã—ã¦ãã ã•ã„"
-#: ../src/config.py:2103
+#: ../src/config.py:2116
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Jabber ID 㯠\"user@サーãƒãƒ¼å\" ã®å½¢ã‚’ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2339 ../src/config.py:3665
msgid "Invalid entry"
msgstr "入力内容ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2340 ../src/config.py:3666
msgid "Custom port must be a port number."
msgstr "ãƒãƒ¼ãƒˆã¯ç•ªå·ã§æŒ‡å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/config.py:2342
+#: ../src/config.py:2361
msgid "Failed to get secret keys"
msgstr "秘密éµãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/config.py:2343
+#: ../src/config.py:2362
msgid "There is no OpenPGP secret key available."
msgstr "利用ã§ãã‚‹ OpenPGP ã®ç§˜å¯†éµãŒã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/config.py:2377
+#: ../src/config.py:2396
msgid "OpenPGP Key Selection"
msgstr "OpenPGP ã‚ーã®é¸æŠž"
-#: ../src/config.py:2378
+#: ../src/config.py:2397
msgid "Choose your OpenPGP key"
msgstr "OpenPGP ã®éµã‚’é¸æŠžã—ã¦ãã ã•ã„"
-#: ../src/config.py:2385
+#: ../src/config.py:2404
msgid "No such account available"
msgstr "ãã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ç„¡åŠ¹ã§ã™"
-#: ../src/config.py:2386
+#: ../src/config.py:2405
msgid "You must create your account before editing your personal information."
msgstr "å€‹äººæƒ…å ±ã‚’ç·¨é›†ã™ã‚‹ã«ã¯ã€ãã®å‰ã«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’作æˆã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2412 ../src/dialogs.py:2281 ../src/dialogs.py:2517
+#: ../src/dialogs.py:2705 ../src/disco.py:515 ../src/profile_window.py:361
msgid "You are not connected to the server"
msgstr "サーãƒã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“"
-#: ../src/config.py:2394
+#: ../src/config.py:2413
msgid "Without a connection, you can not edit your personal information."
msgstr "接続ã—ã¦ã„ãªã„状態ã§ã¯å€‹äººæƒ…å ±ã®ç·¨é›†ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/config.py:2398
+#: ../src/config.py:2417
msgid "Your server doesn't support Vcard"
msgstr "ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¯ Vcard をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
-#: ../src/config.py:2399
+#: ../src/config.py:2418
msgid "Your server can't save your personal information."
msgstr "ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¯å€‹äººæƒ…å ±ã‚’ä¿æŒã§ãã¾ã›ã‚“。"
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2532 ../src/config.py:2568
msgid "To disable the account, you must be disconnected."
-msgstr "アカウントã®ç„¡åŠ¹ã«ã™ã‚‹ã«ã¯ã€æŽ¥ç¶šã‚’切らãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
+msgstr "アカウントを無効ã«ã™ã‚‹ã«ã¯ã€æŽ¥ç¶šã‚’切らãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/config.py:2517
+#: ../src/config.py:2537
msgid "Account Local already exists."
msgstr "アカウント Local ã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/config.py:2518
-#, fuzzy
+#: ../src/config.py:2538
msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Please rename or remove it before enabling link-local messaging."
+msgstr "ãƒãƒ¼ã‚«ãƒ«ã®ä¼é€ã‚’有効ã«ã™ã‚‹ã«ã¯ã€åå‰ã®å¤‰æ›´ã¾ãŸã¯å‰Šé™¤ã‚’è¡Œã£ã¦ãã ã•ã„。"
-#: ../src/config.py:2675
+#: ../src/config.py:2695
#, python-format
msgid "Edit %s"
msgstr "%s を編集"
-#: ../src/config.py:2677
+#: ../src/config.py:2697
#, python-format
msgid "Register to %s"
msgstr "%s を登録"
#. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2733
msgid "Ban List"
msgstr "追放者ã®ä¸€è¦§"
-#: ../src/config.py:2714
+#: ../src/config.py:2734
msgid "Member List"
msgstr "メンãƒãƒ¼ã®ä¸€è¦§"
-#: ../src/config.py:2714
+#: ../src/config.py:2734
msgid "Owner List"
msgstr "主宰者ã®ä¸€è¦§"
-#: ../src/config.py:2715
+#: ../src/config.py:2735
msgid "Administrator List"
msgstr "管ç†äººã®ä¸€è¦§"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2799 ../src/disco.py:893 ../src/history_manager.py:207
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2789
+#: ../src/config.py:2809
msgid "Reason"
msgstr "ç†ç”±"
-#: ../src/config.py:2796
+#: ../src/config.py:2816
msgid "Nick"
msgstr "ニックãƒãƒ¼ãƒ "
-#: ../src/config.py:2802
+#: ../src/config.py:2822
msgid "Role"
msgstr "å½¹"
-#: ../src/config.py:2829
+#: ../src/config.py:2849
msgid "Banning..."
msgstr "ç· ã‚出ã—ä¸..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2851
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -6647,11 +6575,11 @@ msgstr ""
"<b>èª°ã‚’ç· ã‚出ã—ãŸã„ã§ã™ã‹ ?</b>\n"
"\n"
-#: ../src/config.py:2833
+#: ../src/config.py:2853
msgid "Adding Member..."
msgstr "メンãƒãƒ¼ã‚’è¿½åŠ ..."
-#: ../src/config.py:2834
+#: ../src/config.py:2854
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -6659,11 +6587,11 @@ msgstr ""
"<b>誰をメンãƒãƒ¼ã«ã—ãŸã„ã§ã™ã‹ ?</b>\n"
"\n"
-#: ../src/config.py:2836
+#: ../src/config.py:2856
msgid "Adding Owner..."
msgstr "ä¸»å®°è€…ã‚’è¿½åŠ ..."
-#: ../src/config.py:2837
+#: ../src/config.py:2857
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -6671,11 +6599,11 @@ msgstr ""
"<b>誰を主宰者ã«ã—ãŸã„ã§ã™ã‹ ?</b>\n"
"\n"
-#: ../src/config.py:2839
+#: ../src/config.py:2859
msgid "Adding Administrator..."
msgstr "管ç†äººã‚’è¿½åŠ ..."
-#: ../src/config.py:2840
+#: ../src/config.py:2860
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -6683,7 +6611,7 @@ msgstr ""
"<b>誰を管ç†äººã«ã—ãŸã„ã§ã™ã‹ ?</b>\n"
"\n"
-#: ../src/config.py:2841
+#: ../src/config.py:2861
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -6699,110 +6627,110 @@ msgstr ""
"4. ドメイン (ドメインã®åˆè‡´ã€‚ã©ã‚“㪠user@domain ã‚„ domain/resource ã‚„\n"
"サブドメインをå«ã‚“ã§ã‚‚å¯)"
-#: ../src/config.py:2943
+#: ../src/config.py:2962
#, python-format
msgid "Removing %s account"
msgstr "アカウント %s を削除ã—ã¾ã™"
-#: ../src/config.py:2958
-#, fuzzy
+#: ../src/config.py:2977
msgid "Account is disabled"
-msgstr "感情アイコンã¯ç„¡åŠ¹"
+msgstr "アカウントã¯ç„¡åŠ¹ã§ã™"
-#: ../src/config.py:2959
+#: ../src/config.py:2978
msgid "To unregister from a server, account must be enabled."
msgstr ""
+"サーãƒãƒ¼ã‹ã‚‰ç™»éŒ²ã‚’解除ã™ã‚‹ã«ã¯ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’有効ã«ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:2991 ../src/gui_interface.py:278
+#: ../src/gui_interface.py:696
msgid "Password Required"
msgstr "パスワードãŒå¿…è¦ã§ã™"
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:2992 ../src/gui_interface.py:676
#, python-format
msgid "Enter your password for account %s"
msgstr "%s ã®ãƒ‘スワードを入力ã—ã¦ãã ã•ã„"
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:2993 ../src/gui_interface.py:696
msgid "Save password"
msgstr "パスワードをä¿å˜ã™ã‚‹"
-#: ../src/config.py:2984
+#: ../src/config.py:3003
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "アカウント \"%s\" ã¯ã‚µãƒ¼ãƒã«æŽ¥ç¶šã—ã¦ã„ã¾ã™"
-#: ../src/config.py:2985
+#: ../src/config.py:3004
msgid "If you remove it, the connection will be lost."
msgstr "削除ã™ã‚‹ã¨ã€æŽ¥ç¶šãŒå¤±ã‚ã‚Œã¾ã™ã€‚"
-#: ../src/config.py:2999
-#, fuzzy, python-format
+#: ../src/config.py:3018
+#, python-format
msgid "Connection to server %s failed"
-msgstr "プãƒã‚ã‚·ã¸ã®æŽ¥ç¶šã«å¤±æ•—"
+msgstr "サーãƒãƒ¼ %s ã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/config.py:3000
-#, fuzzy
+#: ../src/config.py:3019
msgid "What would you like to do?"
msgstr "何をã—ãŸã„ã§ã™ã‹ ?"
-#: ../src/config.py:3001
-#, fuzzy
+#: ../src/config.py:3020
msgid "Remove only from Gajim"
-msgstr "アカウントを Gajim ã‹ã‚‰ã®ã¿å‰Šé™¤ (_o)"
+msgstr "アカウントを Gajim ã‹ã‚‰ã®ã¿å‰Šé™¤"
-#: ../src/config.py:3002
+#: ../src/config.py:3021
msgid "Don't remove anything. I'll try again later"
-msgstr ""
+msgstr "何も削除ã§ãã¾ã›ã‚“。ã‚ã¨ã§å†ã³è©¦ã¿ã¾ã™"
-#: ../src/config.py:3095
+#: ../src/config.py:3115
msgid "?print_status:All"
msgstr "ã™ã¹ã¦"
-#: ../src/config.py:3096
+#: ../src/config.py:3116
msgid "Enter and leave only"
msgstr "入退室ã®ã¿"
-#: ../src/config.py:3097
+#: ../src/config.py:3117
msgid "?print_status:None"
msgstr "ãªã—"
-#: ../src/config.py:3167
+#: ../src/config.py:3189
msgid "New Group Chat"
msgstr "æ–°ã—ã„グループãƒãƒ£ãƒƒãƒˆ"
-#: ../src/config.py:3200
+#: ../src/config.py:3222
msgid "This bookmark has invalid data"
msgstr "ã“ã®ãƒ–ックマークã¯ä¸æ£ãªãƒ‡ãƒ¼ã‚¿ã‚’å«ã‚“ã§ã„ã¾ã™"
-#: ../src/config.py:3201
+#: ../src/config.py:3223
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr ""
"サーãƒãƒ¼ã¨è«‡è©±å®¤ã®æ¬„ã‚’æ£ã—ã入力ã™ã‚‹ã‹ã€ã“ã®ãƒ–ックマークを削除ã—ã¦ãã ã•ã„。"
#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
+#: ../src/config.py:3348 ../src/dialogs.py:2070
msgid "Invalid nickname"
msgstr "ニックãƒãƒ¼ãƒ ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3349 ../src/config.py:3360 ../src/config.py:3369
+#: ../src/config.py:3380 ../src/config.py:3388
msgid "Character not allowed"
msgstr "使ãˆãªã„æ–‡å—ã§ã™"
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3360 ../src/config.py:3368 ../src/config.py:3380
+#: ../src/config.py:3641
msgid "Invalid server"
msgstr "サーãƒãƒ¼åãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/config.py:3347
+#: ../src/config.py:3387
msgid "Invalid room"
msgstr "談話室åãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/config.py:3515
+#: ../src/config.py:3557
msgid "Account has been added successfully"
msgstr "アカウントã¯ç„¡äº‹ã«è¿½åŠ ã•ã‚Œã¾ã—ãŸ"
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3558 ../src/config.py:3564
msgid ""
"You can set advanced account options by pressing the Advanced button, or "
"later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6811,32 +6739,32 @@ msgstr ""
"「拡張ã€ãƒœã‚¿ãƒ³ã§ã€è©³ç´°ãªã‚ªãƒ—ションã®è¨å®šãŒã§ãã¾ã™ã€‚ã¾ãŸå¾Œã§ã€ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ãƒ³ãƒ‰"
"ウã®ã€Œç·¨é›†ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®ã€Œã‚¢ã‚«ã‚¦ãƒ³ãƒˆã€ã‚’é¸æŠžã—ã¦è¨å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: ../src/config.py:3521
+#: ../src/config.py:3563
msgid "Your new account has been created successfully"
msgstr "æ–°ã—ã„アカウントã¯ç„¡äº‹ã«ä½œã‚‰ã‚Œã¾ã—ãŸ"
-#: ../src/config.py:3560
+#: ../src/config.py:3602
msgid "Invalid username"
msgstr "ユーザーåãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/config.py:3562
+#: ../src/config.py:3604
msgid "You must provide a username to configure this account."
msgstr "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’編集ã™ã‚‹ã«ã¯ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼åを指定ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/config.py:3600
+#: ../src/config.py:3642
msgid "Please provide a server on which you want to register."
msgstr "登録ã—ãŸã„サーãƒãƒ¼ã‚’指定ã—ã¦ãã ã•ã„。"
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3698 ../src/gui_interface.py:1174
msgid "Certificate Already in File"
msgstr "証明書ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ã‚Šã¾ã™"
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3699 ../src/gui_interface.py:1175
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "ã“ã®è¨¼æ˜Žæ›¸ã¯æ—¢ã«ãƒ•ã‚¡ã‚¤ãƒ« %s ã«ã‚ã‚Šã¾ã™ã€‚å†ã³è¿½åŠ ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/config.py:3734
+#: ../src/config.py:3788
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6851,7 +6779,7 @@ msgstr ""
"SSL エラー: %(error)s\n"
"ãã‚Œã§ã‚‚ã“ã®ã‚µãƒ¼ãƒãƒ¼ã«æŽ¥ç¶šã—ã¾ã™ã‹ ?"
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3794 ../src/gui_interface.py:1203
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6862,73 +6790,77 @@ msgstr ""
"ã“ã®è¨¼æ˜Žæ›¸ã® SHA1 指紋:\n"
"%s"
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3826 ../src/config.py:3860
msgid "An error occurred during account creation"
msgstr "アカウント作æˆæ™‚ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—ãŸ"
-#: ../src/config.py:3871
+#: ../src/config.py:3925
msgid "Account name is in use"
msgstr "アカウントåã¯ä½¿ã‚ã‚Œã¦ã„ã¾ã™"
-#: ../src/config.py:3872
+#: ../src/config.py:3926
msgid "You already have an account using this name."
msgstr "ã“ã®åå‰ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/config.py:3991
-#, fuzzy
+#: ../src/config.py:4056
msgid "PEP node was not removed"
-msgstr "PEP node was not removed"
+msgstr "PEP ノードã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/config.py:3992
-#, fuzzy, python-format
+#: ../src/config.py:4057
+#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP ノード %(node)s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ: %(message)s"
+
+#: ../src/config.py:4085
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "%s を調整"
-#: ../src/config.py:4036
+#: ../src/config.py:4101 ../src/plugins/gui.py:73
msgid "Active"
msgstr "有効"
-#: ../src/config.py:4044
+#: ../src/config.py:4109
msgid "Event"
msgstr "イベント"
-#: ../src/config.py:4079
+#: ../src/config.py:4144
msgid "First Message Received"
msgstr "最åˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ã—ãŸ"
-#: ../src/config.py:4080
+#: ../src/config.py:4145
msgid "Next Message Received Focused"
msgstr "é–‹ã„ã¦ã„ã‚‹ãƒãƒ£ãƒƒãƒˆã§ã€ãã®æ¬¡ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ã—ãŸ"
-#: ../src/config.py:4082
+#: ../src/config.py:4147
msgid "Next Message Received Unfocused"
msgstr "é–‹ã„ã¦ã„ãªã„ãƒãƒ£ãƒƒãƒˆã§ã€ãã®æ¬¡ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ã—ãŸ"
-#: ../src/config.py:4083
+#: ../src/config.py:4148
msgid "Contact Connected"
msgstr "相手先ãŒæŽ¥ç¶šã—ãŸ"
-#: ../src/config.py:4084
+#: ../src/config.py:4149
msgid "Contact Disconnected"
msgstr "相手先ãŒåˆ‡æ–ã—ãŸ"
-#: ../src/config.py:4085
+#: ../src/config.py:4150
msgid "Message Sent"
msgstr "メッセージをé€ä¿¡ã—ãŸ"
-#: ../src/config.py:4086
+#: ../src/config.py:4151
msgid "Group Chat Message Highlight"
msgstr "グループãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®å¼·èª¿"
-#: ../src/config.py:4087
+#: ../src/config.py:4152
msgid "Group Chat Message Received"
msgstr "グループãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ã—ãŸ"
-#: ../src/config.py:4088
+#: ../src/config.py:4153
msgid "GMail Email Received"
msgstr "GMail メールをå—ä¿¡ã—ãŸ"
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:603
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
@@ -6938,7 +6870,7 @@ msgstr ""
"示ã™ã‚‚ã®ã§ã™ã€‚ã‚‚ã—長時間表示ã•ã‚ŒãŸã¾ã¾ãªã‚‰ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯\n"
"失ã‚ã‚ŒãŸã¨è€ƒãˆã‚‰ã‚Œã¾ã™ã€‚"
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:622
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
@@ -6946,239 +6878,236 @@ msgstr ""
"ã“ã®ç·šã‚ˆã‚Šä¸‹ã®æ–‡ã¯ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã‚’\n"
"最後ã«èªã‚“ã ã¨ã以é™ã«ç™ºç”Ÿã—ãŸã‚‚ã®ã§ã™"
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:742
msgid "_Quote"
msgstr "引用 (_Q)"
-#: ../src/conversation_textview.py:747
-#, fuzzy, python-format
+#: ../src/conversation_textview.py:749
+#, python-format
msgid "_Actions for \"%s\""
-msgstr "%s ã«å¯¾ã™ã‚‹æ“作 (_A)"
+msgstr "\"%s\" ã«å¯¾ã™ã‚‹æ“作 (_A)"
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
msgid "Read _Wikipedia Article"
msgstr "_Wikipedia ã®é …ã‚’èªã‚€"
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:767
msgid "Look it up in _Dictionary"
msgstr "辞書を引ã (_D)"
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:784
#, 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:795
+#: ../src/conversation_textview.py:797
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "Web 検索㮠URL ã« \"%s\" ãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“"
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:800
msgid "Web _Search for it"
msgstr "Web ã§æ¤œç´¢ã™ã‚‹ (_S)"
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:806
msgid "Open as _Link"
msgstr "リンクã¨ã—ã¦é–‹ã (_L)"
#. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
-#, fuzzy, python-format
+#: ../src/conversation_textview.py:1310
+#, python-format
msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
msgstr[0] "昨日"
-msgstr[1] "昨日"
+msgstr[1] "%(nb_days)iæ—¥å‰"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1359 ../src/history_window.py:480
#, python-format
msgid "Subject: %s\n"
msgstr "件å: %s\n"
-#: ../src/dataforms_widget.py:545
-#, fuzzy
+#: ../src/dataforms_widget.py:565
msgid "Unable to load image"
-msgstr "メッセージを復å·ã§ãã¾ã›ã‚“"
+msgstr "ç”»åƒã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
-#: ../src/dataforms_widget.py:547
-#, fuzzy, python-format
+#: ../src/dataforms_widget.py:567
+#, python-format
msgid "Media type not supported: %s"
-msgstr "ã€Œéš ã‚Œã¦ã„ã¾ã™ã€ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
+msgstr "メディアタイプã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“: %s"
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:582
msgid "This field is required"
-msgstr ""
+msgstr "ã“ã®æ¬„ã¯å¿…é ˆé …ç›®ã§ã™"
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:627
msgid "Jabber ID already in list"
msgstr "Jabber ID ã¯ä¸€è¦§ã«ã‚ã‚Šã¾ã™"
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:628
msgid "The Jabber ID you entered is already in the list. Choose another one."
msgstr ""
"入力ã•ã‚ŒãŸ Jabber ID ã¯æ—¢ã«ä¸€è¦§ã«è¼‰ã£ã¦ã„ã¾ã™ã€‚別㮠Jabber ID ã‚’é¸æŠžã—ã¦ãã "
"ã•ã„。"
#. Default jid
-#: ../src/dataforms_widget.py:619
-#, fuzzy
+#: ../src/dataforms_widget.py:639
msgid "new@jabber.id"
msgstr "new@jabber.id"
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
-#, fuzzy, python-format
+#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
+#, python-format
msgid "new%d@jabber.id"
msgstr "new%d@jabber.id"
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:81
#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "相手先å: <i>%s</i>"
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:83
#, python-format
msgid "Jabber ID: <i>%s</i>"
msgstr "Jabber ID: <i>%s</i>"
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:197
msgid "Group"
msgstr "グループ"
-#: ../src/dialogs.py:202
-#, fuzzy
+#: ../src/dialogs.py:204
msgid "In the group"
msgstr "グループ内"
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:295
msgid "KeyID"
msgstr "éµ ID"
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:300
msgid "Contact name"
msgstr "åå‰"
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:475
msgid "Set Mood"
msgstr "気分ã®è¨å®š"
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:595
#, python-format
msgid "%s Status Message"
msgstr "%s ã®çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:609
msgid "Status Message"
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:800
msgid "Overwrite Status Message?"
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’上書ãã—ã¾ã™ã‹ ?"
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:801
msgid ""
"This name is already used. Do you want to overwrite this status message?"
msgstr "ã“ã®åå‰ã¯æ—¢ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™ã€‚ã“ã®çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’上書ãã—ã¾ã™ã‹ ?"
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:809
msgid "Save as Preset Status Message"
msgstr "用æ„ã—ã¦ãŠã状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¨ã—ã¦ä¿å˜"
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:810
msgid "Please type a name for this status message"
msgstr "ã“ã®çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®åå‰ã‚’入力ã—ã¦ãã ã•ã„"
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:838
msgid "AIM Address:"
msgstr "AIM アドレス:"
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:839
msgid "GG Number:"
msgstr "GG 番å·:"
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:840
msgid "ICQ Number:"
msgstr "ICQ 番å·:"
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:841
msgid "MSN Address:"
msgstr "MSN アドレス:"
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:842
msgid "Yahoo! Address:"
msgstr "Yahoo! アドレス:"
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:879
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr "アカウント %s ã«è¿½åŠ ã—ãŸã„相手先ã®æƒ…å ±ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„"
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:882
msgid "Please fill in the data of the contact you want to add"
msgstr "è¿½åŠ ã—ãŸã„相手先ã®æƒ…å ±ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„"
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
+#: ../src/dialogs.py:3615
msgid "Invalid User ID"
msgstr "ユーザー ID ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1081
msgid "The user ID must not contain a resource."
msgstr "ユーザー ID ã«ã¯ãƒªã‚½ãƒ¼ã‚¹ã‚’å«ã‚ã¾ã›ã‚“。"
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1086
msgid "You cannot add yourself to your roster."
msgstr "ã‚ãªãŸè‡ªèº«ã‚’åç°¿ã«è¿½åŠ ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1100
msgid "Contact already in roster"
msgstr "相手先ã¯æ—¢ã«åç°¿ã«ã‚ã‚Šã¾ã™"
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1101
msgid "This contact is already listed in your roster."
msgstr "ã“ã®ç›¸æ‰‹å…ˆã¯æ—¢ã«åç°¿ã«ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
msgid "User ID:"
msgstr "ユーザー ID:"
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "A GTK+ jabber client"
+#: ../src/dialogs.py:1273
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Jabber/XMPP クライアント"
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1274
msgid "GTK+ Version:"
msgstr "GTK+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³:"
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1275
msgid "PyGTK Version:"
-msgstr "PyGTK+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³:"
+msgstr "PyGTK ãƒãƒ¼ã‚¸ãƒ§ãƒ³:"
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1285
msgid "Current Developers:"
msgstr "ç¾åœ¨ã®é–‹ç™ºè€…:"
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1287
msgid "Past Developers:"
msgstr "éŽåŽ»ã®é–‹ç™ºè€…:"
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1293
msgid "THANKS:"
msgstr "è¬æ„:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1299
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:1227
+#: ../src/dialogs.py:1311
msgid "translator-credits"
msgstr "Mako (mako AT pasero.net)"
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1494
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -7191,461 +7120,428 @@ msgstr ""
"\n"
"スペル間é•ã„ã®å¼·èª¿è¡¨ç¤ºã¯ä½¿ã‚ã‚Œã¾ã›ã‚“"
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1872
+msgid "_Resume"
+msgstr "残㙠(_R)"
+
+#: ../src/dialogs.py:1880
+msgid "Re_place"
+msgstr "ç½®æ›ã™ã‚‹ (_p)"
+
+#: ../src/dialogs.py:2071 ../src/dialogs.py:2470
msgid "The nickname has not allowed characters."
msgstr "ニックãƒãƒ¼ãƒ ã«ä½¿ç”¨ã§ããªã„æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2189
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "アカウント %(account)s ã«å¯¾ã—ã¦ã€%(jid)s ã•ã‚“ã‹ã‚‰ã®åœ¨å¸é€šçŸ¥ã®ç”³ã—è¾¼ã¿"
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2192
#, python-format
msgid "Subscription request from %s"
msgstr "%s ã•ã‚“ã‹ã‚‰åœ¨å¸é€šçŸ¥ã®ç”³ã—è¾¼ã¿"
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2276 ../src/gui_interface.py:1925
#, python-format
msgid "You are already in group chat %s"
msgstr "æ—¢ã«ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆ %s ã«å‚åŠ ã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2282
msgid "You can not join a group chat unless you are connected."
msgstr "接続ã—ãªã„ã¨ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã§ãã¾ã›ã‚“。"
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2326
#, python-format
msgid "Join Group Chat with account %s"
msgstr "アカウント %s ã§ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«å‚åŠ "
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2457
msgid "Invalid Account"
msgstr "アカウントãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2458
msgid ""
"You have to choose an account from which you want to join the groupchat."
msgstr "グループãƒãƒ£ãƒƒãƒˆå‚åŠ ã«ä½¿ç”¨ã™ã‚‹ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’é¸æŠžã—ã¦ãã ã•ã„。"
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2469
msgid "Invalid Nickname"
msgstr "ニックãƒãƒ¼ãƒ ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2474 ../src/dialogs.py:2480
+#: ../src/groupchat_control.py:2079
msgid "Invalid group chat Jabber ID"
msgstr "グループãƒãƒ£ãƒƒãƒˆã® JID ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/dialogs.py:2343
-#, fuzzy
+#: ../src/dialogs.py:2475
msgid "Please enter the group chat Jabber ID as room@server."
-msgstr "グループãƒãƒ£ãƒƒãƒˆã® JID ã«ä½¿ãˆãªã„æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
+msgstr "グループãƒãƒ£ãƒƒãƒˆã® JID ã‚’ã€room@server ã®ã‚ˆã†ã«ã€å…¥åŠ›ã—ã¦ãã ã•ã„。"
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
+#: ../src/dialogs.py:2481 ../src/groupchat_control.py:2080
msgid "The group chat Jabber ID has not allowed characters."
msgstr "グループãƒãƒ£ãƒƒãƒˆã® JID ã«ä½¿ãˆãªã„æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2485 ../src/gui_interface.py:1907
msgid "This is not a group chat"
msgstr "グループãƒãƒ£ãƒƒãƒˆã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2486 ../src/gui_interface.py:1908
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆåã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/dialogs.py:2388
-#, fuzzy
+#: ../src/dialogs.py:2518
msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Without a connection, you can not synchronise your contacts."
+msgstr "接続ã—ã¦ã„ãªã„ã¨ã€ç›¸æ‰‹å…ˆã‚’åˆã‚ã›ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2531
msgid "Server"
msgstr "サーãƒãƒ¼"
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2567
msgid "This account is not connected to the server"
msgstr "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ã‚µãƒ¼ãƒã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“"
-#: ../src/dialogs.py:2438
-#, fuzzy
+#: ../src/dialogs.py:2568
msgid "You cannot synchronize with an account unless it is connected."
-msgstr "You cannot synchronise with an account unless it is connected."
+msgstr "接続ã—ã¦ã„ãªã„ã¨ã€ç›¸æ‰‹å…ˆã«åˆã‚ã›ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/dialogs.py:2462
-#, fuzzy
+#: ../src/dialogs.py:2593
msgid "Synchronise"
-msgstr "Synchronise"
+msgstr "åŒèª¿"
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2654
#, python-format
msgid "Start Chat with account %s"
msgstr "アカウント %s ã§ãƒãƒ£ãƒƒãƒˆã‚’開始ã™ã‚‹"
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2656
msgid "Start Chat"
msgstr "ãƒãƒ£ãƒƒãƒˆã‚’開始ã™ã‚‹"
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2657
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
msgstr "ãƒãƒ£ãƒƒãƒˆã—ãŸã„相手先ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã‹ Jabber ID を入力ã—ã¦ãã ã•ã„:"
#. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2684 ../src/dialogs.py:3065 ../src/dialogs.py:3295
msgid "Connection not available"
msgstr "接続ã—ã¦ã„ã¾ã›ã‚“"
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
-#, fuzzy, python-format
+#: ../src/dialogs.py:2685 ../src/dialogs.py:3066 ../src/dialogs.py:3296
+#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "\"%s\" ã«æŽ¥ç¶šã—ã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。"
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2694 ../src/dialogs.py:2697
msgid "Invalid JID"
msgstr "JID ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/dialogs.py:2565
-#, fuzzy, python-format
+#: ../src/dialogs.py:2697
+#, python-format
msgid "Unable to parse \"%s\"."
-msgstr "\"%s\" ã•ã‚“ã‚’è¿½åŠ ã§ãã¾ã›ã‚“"
+msgstr "\"%s\" を解æžã§ãã¾ã›ã‚“。"
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2706
msgid "Without a connection, you can not change your password."
msgstr "接続ã—ãªã„ã¨ã€ãƒ‘スワードã¯å¤‰æ›´ã§ãã¾ã›ã‚“。"
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2725
msgid "Invalid password"
msgstr "パスワードãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2725
msgid "You must enter a password."
msgstr "パスワードを入力ã—ã¦ãã ã•ã„。"
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2729
msgid "Passwords do not match"
msgstr "パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“"
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2730
msgid "The passwords typed in both fields must be identical."
msgstr "ãµãŸã¤ã®æ¬„ã®ãƒ‘スワードã¯åŒä¸€ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "相手先ãŒã‚µã‚¤ãƒ³ã‚¤ãƒ³ã—ã¾ã—ãŸ"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "相手先ãŒã‚µã‚¤ãƒ³ã‚¢ã‚¦ãƒˆã—ã¾ã—ãŸ"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "æ–°ç€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "æ–°ç€ã®å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "æ–°ç€ã®ç§ä¿¡"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2772 ../src/gui_interface.py:813 ../src/notify.py:270
msgid "New E-mail"
msgstr "æ–°ç€ãƒ¡ãƒ¼ãƒ«"
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2774 ../src/gui_interface.py:868 ../src/notify.py:263
msgid "File Transfer Request"
msgstr "ファイル転é€ã®è¦æ±‚"
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2776 ../src/gui_interface.py:775
+#: ../src/gui_interface.py:839 ../src/notify.py:265
msgid "File Transfer Error"
msgstr "ファイル転é€ã®ã‚¨ãƒ©ãƒ¼"
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2778 ../src/gui_interface.py:914
+#: ../src/gui_interface.py:937 ../src/gui_interface.py:954
+#: ../src/notify.py:267
msgid "File Transfer Completed"
msgstr "ファイルã®è»¢é€ã®å®Œäº†"
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2779 ../src/gui_interface.py:917 ../src/notify.py:268
msgid "File Transfer Stopped"
msgstr "ファイルã®è»¢é€ã®ä¸æ–"
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
+#: ../src/dialogs.py:2781 ../src/gui_interface.py:609 ../src/notify.py:272
msgid "Groupchat Invitation"
msgstr "グループãƒãƒ£ãƒƒãƒˆã¸ã®æ‹›å¾…"
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "相手先ãŒåœ¨å¸çŠ¶æ³ã‚’変更"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:2984
#, python-format
msgid "Single Message using account %s"
msgstr "account %s ã§å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:2986
#, python-format
msgid "Single Message in account %s"
msgstr "アカウント %s ã§ã®å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:2988
msgid "Single Message"
msgstr "å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
#. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:2991
#, python-format
msgid "Send %s"
msgstr "%s ã‚’é€ä¿¡ã™ã‚‹"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3014
#, python-format
msgid "Received %s"
msgstr "%s ã‚’å—ä¿¡"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2905
-#, fuzzy, python-format
+#: ../src/dialogs.py:3037
+#, python-format
msgid "Form %s"
-msgstr "差出人"
+msgstr "フォーム%s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3116
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3117
#, python-format
msgid "%s wrote:\n"
msgstr "%s wrote:\n"
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3176
#, python-format
msgid "XML Console for %s"
msgstr "%s 㮠XML コンソール"
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3178
msgid "XML Console"
msgstr "XML コンソール"
#. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
-#, fuzzy
+#: ../src/dialogs.py:3325
msgid "add"
-msgstr "悲"
+msgstr "è¿½åŠ "
-#: ../src/dialogs.py:3175
-#, fuzzy
+#: ../src/dialogs.py:3325
msgid "modify"
-msgstr "変更ã™ã‚‹"
+msgstr "変更"
-#: ../src/dialogs.py:3176
-#, fuzzy
+#: ../src/dialogs.py:3326
msgid "remove"
-msgstr "削除 (_v)"
+msgstr "削除"
-#: ../src/dialogs.py:3204
-#, fuzzy, python-format
+#: ../src/dialogs.py:3355
+#, python-format
msgid ""
"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
"roster."
-msgstr "ç§ã¯ã‚ãªãŸã‚’ç§ã®é€£çµ¡å…ˆãƒªã‚¹ãƒˆã«è¿½åŠ ã—よã†ã¨æ€ã„ã¾ã™ã€‚"
+msgstr ""
+"<b>%(jid)s</b> ã•ã‚“ã¯ã€ã‚ãªãŸã®åç°¿ã«ã‚ã‚‹ã„ãã¤ã‹ã®ç›¸æ‰‹å…ˆã« <b>%(action)s</"
+"b> ã‚’è¡Œã†ã‚ˆã†ã€æ±‚ã‚ã¦ã„ã¾ã™ã€‚"
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
+#: ../src/dialogs.py:3371 ../src/dialogs.py:3417
msgid "Add"
-msgstr "è¿½åŠ ã™ã‚‹"
+msgstr "è¿½åŠ "
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3373 ../src/dialogs.py:3448
msgid "Modify"
-msgstr "変更ã™ã‚‹"
+msgstr "変更"
+
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3375 ../src/dialogs.py:3472
+msgid "Delete"
+msgstr "削除"
-#: ../src/dialogs.py:3228
+#: ../src/dialogs.py:3379
msgid "Jabber ID"
msgstr "Jabber ID"
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3385
msgid "Groups"
msgstr "グループ"
#. it is selected
#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
-#, fuzzy, python-format
+#: ../src/dialogs.py:3493
+#, python-format
msgid "%s suggested me to add you in my roster."
-msgstr "å½¼ã‚’è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ"
+msgstr "ã‚ãªãŸã‚’åç°¿ã«è¿½åŠ ã™ã‚‹ã‚ˆã†ã€%s ã•ã‚“ã¯ç§ã«å‹§ã‚ã¾ã—ãŸã€‚"
-#: ../src/dialogs.py:3356
-#, fuzzy, python-format
+#: ../src/dialogs.py:3507
+#, python-format
msgid "Added %s contacts"
-msgstr "相手先リストã«è¿½åŠ (_A)"
+msgstr "%s ã®ç›¸æ‰‹å…ˆã‚’è¿½åŠ ã—ã¾ã—ãŸ"
-#: ../src/dialogs.py:3393
-#, fuzzy, python-format
+#: ../src/dialogs.py:3544
+#, python-format
msgid "Removed %s contacts"
-msgstr "相手先をåç°¿ã‹ã‚‰å‰Šé™¤ã—ã¾ã™"
+msgstr "%s ã®ç›¸æ‰‹å…ˆã‚’削除ã—ã¾ã—ãŸ"
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3584 ../src/dialogs.py:3761
#, python-format
msgid "Archiving Preferences for %s"
-msgstr ""
+msgstr "%s ã®æ›¸åº«ã®è¨å®š"
-#: ../src/dialogs.py:3473
-#, fuzzy
+#: ../src/dialogs.py:3624
msgid "Invalid expire value"
-msgstr "サーãƒãƒ¼åãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
+msgstr "期é™ã®å€¤ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3625
msgid "Expire must be a valid positive integer."
-msgstr ""
+msgstr "期é™ã¯æ£ã®æ•´æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3672
msgid "There is an error with the form"
-msgstr ""
+msgstr "書å¼ã«èª¤ã‚ŠãŒã‚ã‚Šã¾ã™"
-#: ../src/dialogs.py:3732
-#, fuzzy
+#: ../src/dialogs.py:3892
msgid "There is an error"
-msgstr "エラーを返ã—ã¦ãã¾ã—ãŸã€‚"
+msgstr "誤りãŒã‚ã‚Šã¾ã™"
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:3960
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "プライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆ <b><i>%s</i></b>"
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:3964
#, python-format
msgid "Privacy List for %s"
msgstr "%s ã®ãƒ—ライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆ"
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4031
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr "é †ä½: %(order)s, æ“作: %(action)s, åž‹: %(type)s, 値: %(value)s"
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4036
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "é †ä½: %(order)s, æ“作: %(action)s"
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4087
msgid "<b>Edit a rule</b>"
msgstr "<b>è¦å‰‡ã®ç·¨é›†</b>"
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4198
msgid "<b>Add a rule</b>"
msgstr "<b>è¦å‰‡ã®è¿½åŠ </b>"
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4297
#, python-format
msgid "Privacy Lists for %s"
msgstr "%s ã®ãƒ—ライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆ"
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4299
msgid "Privacy Lists"
msgstr "プライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆ"
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4388
msgid "Invalid List Name"
msgstr "リストåãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4389
msgid "You must enter a name to create a privacy list."
msgstr "プライãƒã‚·ãƒ¼ãƒªã‚¹ãƒˆã‚’作æˆã™ã‚‹ã«ã¯ã€åå‰ã‚’入力ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4421
msgid "You are invited to a groupchat"
msgstr "グループãƒãƒ£ãƒƒãƒˆã¸ã®æ‹›å¾…ã‚’å—ã‘ã¾ã—ãŸ"
-#: ../src/dialogs.py:4224
-#, fuzzy
+#: ../src/dialogs.py:4424
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact ã•ã‚“ãŒã‚ãªãŸã‚’è°è«–ã«å‚åŠ ã™ã‚‹ã‚ˆã†æ‹›å¾…ã—ã¦ã„ã¾ã™"
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4426
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact ã•ã‚“ãŒã‚ãªãŸã‚’グループãƒãƒ£ãƒƒãƒˆ %(room_jid)s ã¸æ‹›å¾…ã—ã¦ã„ã¾ã™"
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4434
#, python-format
msgid "Comment: %s"
msgstr "コメント: %s"
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4436
msgid "Do you want to accept the invitation?"
msgstr "招待ã«å¿œã˜ã¾ã™ã‹ ?"
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4498
msgid "Choose Client Cert #PCKS12"
-msgstr ""
+msgstr "#PCKS12 å½¢å¼ã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆè¨¼æ˜Žæ›¸ã®é¸æŠž"
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4508 ../src/dialogs.py:4550 ../src/dialogs.py:4606
+#: ../src/dialogs.py:4694
msgid "All files"
msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«"
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4513
msgid "PKCS12 Files"
-msgstr ""
+msgstr "PKCS12 å½¢å¼ã®ãƒ•ã‚¡ã‚¤ãƒ«"
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4540
msgid "Choose Sound"
msgstr "サウンドã®é¸æŠž"
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4555
msgid "Wav Sounds"
msgstr "WAV サウンド"
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4593
msgid "Choose Image"
msgstr "ç”»åƒã®é¸æŠž"
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4611
msgid "Images"
msgstr "ç”»åƒ"
-#: ../src/dialogs.py:4482
-#, fuzzy
+#: ../src/dialogs.py:4681
msgid "Choose Archive"
-msgstr "ç”»åƒã®é¸æŠž"
+msgstr "書庫ã®é¸æŠž"
-#: ../src/dialogs.py:4500
-#, fuzzy
+#: ../src/dialogs.py:4699
msgid "Zip files"
-msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«"
+msgstr "Zip ファイル"
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4725
#, python-format
msgid "When %s becomes:"
msgstr "%s ãŒæ¬¡ã®ã‚ˆã†ã«ãªã£ãŸã¨ã:"
-#: ../src/dialogs.py:4527
-#, fuzzy, python-format
+#: ../src/dialogs.py:4727
+#, python-format
msgid "Adding Special Notification for %s"
msgstr "%s ã®ç‰¹åˆ¥é€šçŸ¥ã®è¿½åŠ "
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "状態"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr ""
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:4947
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7656,19 +7552,19 @@ msgstr ""
"\n"
"ã“ã®ãƒãƒ£ãƒƒãƒˆã®èªè¨¼æ–‡å—列 (SAS)㯠<b>%(sas)s</b> ã§ã™ã€‚"
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:4950
msgid "You have already verified this contact's identity."
msgstr "相手先ã®åŒä¸€æ€§ã‚’æ—¢ã«ç¢ºèªã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:4956 ../src/dialogs.py:5040
msgid "Contact's identity verified"
msgstr "相手先ã®åŒä¸€æ€§ã‚’確èªã—ã¾ã—ãŸ"
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:4962
msgid "Verify again..."
msgstr "å†æ¤œè¨¼ä¸..."
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:4967
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 "
@@ -7678,19 +7574,19 @@ msgstr ""
"ã‚’é€ã‚‹ã“ã¨ãŒã§ãã‚‹ã“ã¨ã‚’確実ã«ã™ã‚‹ãŸã‚ã€ãã®äººãŒæœ¬äººã§ã‚ã‚‹ã“ã¨ã‚’検証ã™ã‚‹å¿…è¦"
"ãŒã‚ã‚Šã¾ã™ã€‚次ã®ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。"
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:4970 ../src/dialogs.py:5021 ../src/dialogs.py:5034
msgid "Contact's identity NOT verified"
msgstr "相手先ã®åŒä¸€æ€§ã‚’確èªã—ã¦ã„ã¾ã›ã‚“"
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:4975
msgid "Verify..."
msgstr "検証ä¸..."
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:4986
msgid "Have you verified the contact's identity?"
msgstr "相手先ã®åŒä¸€æ€§ã‚’確èªã—ã¾ã—ãŸã‹ ?"
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:4987
#, python-format
msgid ""
"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7704,23 +7600,23 @@ msgstr ""
"\n"
"ã“ã®æŽ¥ç¶šã®èªè¨¼æ–‡å—列㯠<b>%(sas)s</b> ã§ã™ã€‚"
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:4988
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "é ãã®ç›¸æ‰‹å…ˆã¨è©±ã—ã¦ã€èªè¨¼æ–‡å—列(SAS)を確èªã—ã¾ã—ãŸã‹ ?"
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5022
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
msgstr ""
"ã“ã®ç›¸æ‰‹å…ˆã®éµ (%s) ã¯ã€Gajim ã§å‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸéµã¨ <b>一致ã—ã¾ã›ã‚“</b>。"
-#: ../src/dialogs.py:5279
+#: ../src/dialogs.py:5028
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr ""
"ã“ã®ç›¸æ‰‹å…ˆã«å¯¾ã—㦠GPG éµã¯å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã›ã‚“。ãã®ãŸã‚ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯æš—å·"
"化ã•ã‚Œã¾ã›ã‚“。 "
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5035
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."
@@ -7729,7 +7625,7 @@ msgstr ""
"ã„ã¾ã›ã‚“</b>。メッセージã¯æš—å·åŒ–<b>ã•ã‚Œã¾ã›ã‚“</b>。éµã«ä¿¡é ¼ã‚’与ãˆã‚‹ã«ã¯ GPG "
"クライアントを使ã£ã¦ãã ã•ã„。"
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5041
msgid ""
"GPG Key is assigned to this contact, and you trust his key, so messages will "
"be encrypted."
@@ -7737,24 +7633,74 @@ msgstr ""
"ã“ã®ç›¸æ‰‹å…ˆã«å¯¾ã—㦠GPG éµãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚ãã®éµã‚’ä¿¡é ¼ã—ã¦ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
"ã¯æš—å·åŒ–ã•ã‚Œã¾ã™ã€‚"
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5106
msgid "an audio and video"
-msgstr ""
+msgstr "音声ã¨ãƒ“デオ"
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5108
msgid "an audio"
-msgstr ""
+msgstr "音声"
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5110
msgid "a video"
-msgstr ""
+msgstr "ビデオ"
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5114
#, python-format
msgid ""
"%(contact)s wants to start %(type)s session with you. Do you want to answer "
"the call?"
msgstr ""
+"%(contact)s ã•ã‚“ã¯ã€%(type)s ã§ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’始ã‚よã†ã¨ã—ã¦ã„ã¾ã™ã€‚呼ã³å‡ºã—ã«å¿œ"
+"ãˆã¾ã™ã‹ ?"
+
+#: ../src/dialogs.py:5182
+#, python-format
+msgid "Certificate for account %s"
+msgstr "アカウント %s ã®è¨¼æ˜Žæ›¸"
+
+#: ../src/dialogs.py:5182
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+"<b>発行先:</b>\n"
+"共通å (CN): %(scn)s\n"
+"組織 (O): %(sorg)s\n"
+"部門 (OU): %(sou)s\n"
+"シリアル番å·: %(sn)s\n"
+"\n"
+"<b>発行者:</b>\n"
+"共通å (CN): %(icn)s\n"
+"組織 (O): %(iorg)s\n"
+"部門 (OU): %(iou)s\n"
+"\n"
+"<b>妥当性:</b>\n"
+"発行日: %(io)s\n"
+"有効期é™: %(eo)s\n"
+"\n"
+"<b>指紋</b>\n"
+"SHA1 指紋: %(sha1)s"
+
+#: ../src/dialogs.py:5216 ../src/dialogs.py:5233
+msgid "View cert..."
+msgstr "証明書を表示..."
#: ../src/disco.py:119
msgid "Others"
@@ -7765,24 +7711,24 @@ msgstr "ãã®ä»–"
msgid "Conference"
msgstr "会è°å®¤(グループãƒãƒ£ãƒƒãƒˆ)"
-#: ../src/disco.py:513
+#: ../src/disco.py:516
msgid "Without a connection, you can not browse available services"
msgstr "接続ã—ãªã„ã¨ã€ã‚µãƒ¼ãƒ“スを見るã“ã¨ã¯ã§ãã¾ã›ã‚“"
-#: ../src/disco.py:600
+#: ../src/disco.py:602
#, python-format
msgid "Service Discovery using account %s"
msgstr "アカウント %s ã§ã‚µãƒ¼ãƒ“ス探索"
-#: ../src/disco.py:602
+#: ../src/disco.py:604
msgid "Service Discovery"
msgstr "サービス探索"
-#: ../src/disco.py:758
+#: ../src/disco.py:760
msgid "The service could not be found"
msgstr "サービスãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/disco.py:759
+#: ../src/disco.py:761
msgid ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
@@ -7790,36 +7736,36 @@ msgstr ""
"ã‚ãªãŸãŒå…¥åŠ›ã—ãŸã‚¢ãƒ‰ãƒ¬ã‚¹ã«ã‚µãƒ¼ãƒ“スãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ã€ã¾ãŸã¯å¿œç”ãŒã‚ã‚Šã¾ã›ã‚“。"
"アドレスを確èªã—ã€ã‚‚ã†ã„ã¡ã©ãŠè©¦ã—ãã ã•ã„。"
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:765 ../src/disco.py:1102
msgid "The service is not browsable"
msgstr "ã“ã®ã‚µãƒ¼ãƒ“スを見るã“ã¨ã¯ã§ãã¾ã›ã‚“"
-#: ../src/disco.py:764
+#: ../src/disco.py:766
msgid "This type of service does not contain any items to browse."
msgstr "This type of service does not contain any items to browse."
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:806 ../src/disco.py:816
msgid "Invalid Server Name"
msgstr "サーãƒãƒ¼åãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/disco.py:868
+#: ../src/disco.py:870
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "アカウント %(account)s 㧠%(address)s を眺ã‚ã‚‹"
-#: ../src/disco.py:912
+#: ../src/disco.py:914
msgid "_Browse"
msgstr "一覧 (_B)"
-#: ../src/disco.py:1101
+#: ../src/disco.py:1103
msgid "This service does not contain any items to browse."
msgstr "ã“ã®ã‚µãƒ¼ãƒ“スã«ã¯è¡¨ç¤ºã™ã¹ãé …ç›®ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/disco.py:1341
+#: ../src/disco.py:1343
msgid "_Execute Command"
msgstr "コマンド実行 (_E)"
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1353 ../src/disco.py:1522
msgid "Re_gister"
msgstr "登録 (_g)"
@@ -7843,182 +7789,185 @@ msgstr "説明"
msgid "Id"
msgstr "Id"
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1835 ../src/gui_interface.py:2443
msgid "Bookmark already set"
msgstr "æ—¢ã«ãƒ–ックマーク"
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1836 ../src/gui_interface.py:2444
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "グループãƒãƒ£ãƒƒãƒˆ \"%s\" ã¯æ—¢ã«ãƒ–ックマークã«ã‚ã‚Šã¾ã™ã€‚"
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1845 ../src/gui_interface.py:2458
msgid "Bookmark has been added successfully"
msgstr "ブックマークãŒè¿½åŠ ã•ã‚Œã¾ã—ãŸ"
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1846 ../src/gui_interface.py:2459
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "ブックマークã¯ã€åç°¿ã®ã€Œã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰ç®¡ç†ã§ãã¾ã™ã€‚"
-#: ../src/disco.py:2057
-#, fuzzy
+#: ../src/disco.py:2055
msgid "Subscribed"
msgstr "継èªä¸"
-#: ../src/disco.py:2065
-#, fuzzy
+#: ../src/disco.py:2063
msgid "Node"
msgstr "ノード"
# (Mako)pubsubã®ã¨ã“ã‚
-#: ../src/disco.py:2129
+#: ../src/disco.py:2127
msgid "New post"
msgstr "æ–°ã—ã„投稿"
-#: ../src/disco.py:2135
+#: ../src/disco.py:2133
msgid "_Subscribe"
msgstr "ç¶™èª (_S)"
-#: ../src/disco.py:2141
+#: ../src/disco.py:2139
msgid "_Unsubscribe"
msgstr "継èªã®å–り消㗠(_U)"
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
msgstr "SSL 証明書ã®æ¤œè¨¼"
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
msgid ""
"A library used to validate server certificates to ensure a secure connection."
msgstr ""
"安全ãªæŽ¥ç¶šã‚’確実ã«ã™ã‚‹ãŸã‚ã«ã€ã‚µãƒ¼ãƒãƒ¼è¨¼æ˜Žæ›¸ã®æ¤œè¨¼ã«ä½¿ã‚れるライブラリ。"
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:52 ../src/features_window.py:53
msgid "Requires python-pyopenssl."
msgstr "python-pyopenssl ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
msgid "Bonjour / Zeroconf"
msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
msgid "Serverless chatting with autodetected clients in a local network."
msgstr ""
"ãƒãƒ¼ã‚«ãƒ«ãªãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§è‡ªå‹•æ¤œå‡ºã•ã‚ŒãŸã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã¨ã‚µãƒ¼ãƒãƒ¼ãªã—ã®ãƒãƒ£ãƒƒãƒˆã§"
"ãã¾ã™ã€‚"
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
msgid "Requires python-avahi."
msgstr "python-avahi ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:56
+#: ../src/features_window.py:57
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:57
+#: ../src/features_window.py:58
msgid "Command line"
msgstr "コマンド行"
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
msgid "A script to control Gajim via commandline."
msgstr "コマンド行ã‹ã‚‰ Gajim を制御ã™ã‚‹ã‚¹ã‚¯ãƒªãƒ—トã§ã™ã€‚"
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
msgid "Requires python-dbus."
msgstr "python-dbus ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:85 ../src/features_window.py:89
+#: ../src/features_window.py:109 ../src/features_window.py:113
msgid "Feature not available under Windows."
msgstr "Windows ã§ã¯ã“ã®æ©Ÿèƒ½ã¯ç„¡åŠ¹ã§ã™ã€‚"
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
msgid "OpenGPG message encryption"
msgstr "OpenGPG メッセージ暗å·åŒ–"
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
msgid "Encrypting chat messages with gpg keys."
msgstr "ãƒãƒ£ãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ gpg éµã§æš—å·åŒ–ã—ã¾ã™ã€‚"
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "gpg ã¨python-GnuPGInterface ãŒå¿…è¦ã§ã™ã€‚"
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
+"gpg 㨠python-gnupg (http://code.google.com/p/python-gnupg/) ãŒå¿…è¦ã§ã™ã€‚"
#: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr "gpg.exe ㌠PATH ã«å¿…è¦ã§ã™ã€‚"
+
+#: ../src/features_window.py:66
msgid "Network-manager"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒžãƒãƒ¼ã‚¸ãƒ£"
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
msgid "Autodetection of network status."
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®çŠ¶æ…‹ã‚’自動検出ã—ã¾ã™ã€‚"
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
msgid "Requires gnome-network-manager and python-dbus."
msgstr "gnome-network-manager 㨠python-dbus ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
msgid "Session Management"
msgstr "セッション管ç†"
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
msgid "Gajim session is stored on logout and restored on login."
msgstr "Gajim ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’ã€ãƒã‚°ã‚¢ã‚¦ãƒˆæ™‚ã«ä¿å˜ã—ã€ãƒã‚°ã‚¤ãƒ³æ™‚ã«å¾©æ´»ã•ã›ã¾ã™ã€‚"
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
msgid "Requires python-gnome2."
msgstr "python-gnome2 ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
msgid "Password encryption"
msgstr "パスワード暗å·åŒ–"
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
msgid "Passwords can be stored securely and not just in plaintext."
msgstr "パスワードを平文ã§ã¯ãªã„よã†ã«ã—ã¦ã€å®‰å…¨ã«ä¿å˜ã§ãã¾ã™ã€‚"
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
msgstr "gnome-keyring 㨠python-gnome2-desktopã€ã¾ãŸã¯ kwalletcli ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
msgid "SRV"
msgstr "SRV"
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
msgid "Ability to connect to servers which are using SRV records."
msgstr "SRV レコードを使ã†ã‚µãƒ¼ãƒãƒ¼ã¨ã®æŽ¥ç¶šã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚"
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
msgid "Requires dnsutils."
msgstr "dnsutils ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
msgid "Requires nslookup to use SRV records."
msgstr "SRV レコードを使ã†ãŸã‚ã« nslookup ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
msgid "Spell Checker"
msgstr "スペルãƒã‚§ãƒƒã‚«"
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
msgid "Spellchecking of composed messages."
msgstr "入力ã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚¹ãƒšãƒ«ãƒã‚§ãƒƒã‚¯ã‚’ã—ã¾ã™ã€‚"
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
msgid "Requires libgtkspell."
msgstr "libgtkspell ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
msgid "Notification"
msgstr "通知"
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
msgid "Passive popups notifying for new events."
msgstr "イベントをãƒãƒƒãƒ—アップ通知ã«æ¸¡ã—ã¾ã™ã€‚"
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
msgid ""
"Requires python-notify or instead python-dbus in conjunction with "
"notification-daemon."
@@ -8026,65 +7975,64 @@ msgstr ""
"python-notify , ã¾ãŸã¯ notification-daemon ã¨çµ„ã¿åˆã‚ã›ãŸ python-dbus ãŒå¿…è¦"
"ã§ã™ã€‚"
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
msgid "Automatic status"
msgstr "在å¸çŠ¶æ³ã®è‡ªå‹•å¤‰æ›´"
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
msgid "Ability to measure idle time, in order to set auto status."
msgstr "在å¸çŠ¶æ³ã‚’自動的ã«å¤‰æ›´ã™ã‚‹ãŸã‚ã€æ“作ã®ãªã„時間を計測ã—ã¾ã™ã€‚"
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
msgid "Requires libxss library."
msgstr "libxss ライブラリãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
msgid "Requires python2.5."
msgstr "python2.5 ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
msgid "LaTeX"
msgstr "LaTeX"
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
msgid "Transform LaTeX expressions between $$ $$."
msgstr "$$ $$ ã§å›²ã¾ã‚ŒãŸ LaTeX 表ç¾ã‚’変æ›ã—ã¾ã™ã€‚"
-#: ../src/features_window.py:95
-#, fuzzy
+#: ../src/features_window.py:96
msgid ""
"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
"'use_latex' to True in the Advanced Configuration Editor."
msgstr ""
-"texlive-latex-base 㨠dvipng ãŒå¿…è¦ã§ã™ã€‚詳細è¨å®šã‚¨ãƒ‡ã‚£ã‚¿ 'use_latex' ã‚’"
-"「真ã€ã«è¨å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
+"texlive-latex-base (ãれ㫠dvipng 㨠ImageMagick) ãŒå¿…è¦ã§ã™ã€‚詳細è¨å®šã‚¨ãƒ‡ã‚£"
+"ã‚¿ 'use_latex' を「真ã€ã«è¨å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/features_window.py:96
-#, fuzzy
+#: ../src/features_window.py:97
msgid ""
"Requires texlive-latex-base and (dvipng or ImageMagick) (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' を「真ã€ã«è¨å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
+"texlive-latex-base (ãれ㫠dvipng 㨠ImageMagick) ãŒå¿…è¦ã§ã™ (ã©ã¡ã‚‰ã‚‚ "
+"MikTeX ã«å«ã¾ã‚Œã¦ã„ã¾ã™)。 詳細è¨å®šã‚¨ãƒ‡ã‚£ã‚¿ 'use_latex' を「真ã€ã«è¨å®šã—ãªã‘"
+"ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
msgid "End to End message encryption"
msgstr "全線暗å·åŒ–"
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
msgid "Encrypting chat messages."
msgstr "ãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’終端間ã§æš—å·åŒ–ã—ã¾ã™(E2EE)。"
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:100 ../src/features_window.py:101
msgid "Requires python-crypto."
msgstr "python-crypto ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
msgid "RST Generator"
msgstr "RST 生æˆå™¨"
-#: ../src/features_window.py:102
+#: ../src/features_window.py:103
msgid ""
"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
@@ -8092,28 +8040,36 @@ msgstr ""
"RST コードã‹ã‚‰ XHTML 出力を生æˆã—ã¾ã™ (http://docutils.sourceforge.net/docs/"
"ref/rst/restructuredtext.html ã‚’å‚ç…§ã—ã¦ãã ã•ã„)。"
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:104 ../src/features_window.py:105
msgid "Requires python-docutils."
msgstr "python-docutils ãŒå¿…è¦ã§ã™ã€‚"
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
msgid "Ability to start audio and video chat."
-msgstr ""
+msgstr "音声・ビデオãƒãƒ£ãƒƒãƒˆã®å¯èƒ½æ€§ã€‚"
-#: ../src/features_window.py:107
-#, fuzzy
-msgid "Requires python-farsight."
-msgstr "python-avahi ãŒå¿…è¦ã§ã™ã€‚"
+#: ../src/features_window.py:108
+msgid "Requires python-farsight and gstreamer-plugins-bad."
+msgstr "python-farsight 㨠gstreamer-plugins-bad ãŒå¿…è¦ã§ã™ã€‚"
-# (Mako)features_window.py (機能è¨å®šç”»é¢ã®ãƒ©ãƒ™ãƒ«) ã§ã¯
-# 「有効/無効ã€ãªã©ã¨ã—ãŸã»ã†ãŒãŒã„ã„。
-# 在å¸çŠ¶æ³ã§ã¯ã€Œåœ¨å¸ã—ã¦ã„ã¾ã™ã€
-#: ../src/features_window.py:115
+#: ../src/features_window.py:110
+msgid "UPnP-IGD"
+msgstr "UPnP-IGD"
+
+#: ../src/features_window.py:111
#, fuzzy
+msgid "Ability to request your router to forward port for file transfer."
+msgstr "ファイル転é€ã®ãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‰ãƒãƒ¼ãƒˆã®ãŸã‚ã®ãƒ«ãƒ¼ã‚¿ãƒ¼ã®è¦æ±‚ã®å¯èƒ½æ€§ã€‚"
+
+#: ../src/features_window.py:112
+msgid "Requires python-gupnp-igd."
+msgstr "python-gupnp-igd ãŒå¿…è¦ã§ã™ã€‚"
+
+#: ../src/features_window.py:120
msgid "?features:Available"
-msgstr "在å¸ã—ã¦ã„ã¾ã™"
+msgstr "有効"
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
msgid "Feature"
msgstr "機能"
@@ -8134,7 +8090,7 @@ msgstr "進æ—"
msgid "Filename: %s"
msgstr "ファイルå: %s"
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
#, python-format
msgid "Size: %s"
msgstr "サイズ: %s"
@@ -8142,7 +8098,7 @@ msgstr "サイズ: %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/history_manager.py:541
msgid "You"
msgstr "ã‚ãªãŸ"
@@ -8151,7 +8107,7 @@ msgstr "ã‚ãªãŸ"
msgid "Sender: %s"
msgstr "é€ä¿¡è€…: %s"
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
#: ../src/tooltips.py:742
msgid "Recipient: "
msgstr "å—å–人: "
@@ -8170,12 +8126,12 @@ msgid "File transfer cancelled"
msgstr "ファイルã®è»¢é€ãŒä¸æ¢ã•ã‚Œã¾ã—ãŸ"
#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-#, fuzzy
msgid "Connection with peer cannot be established."
-msgstr "Connection with peer cannot be established."
+msgstr "ピア接続ã¯ç¢ºç«‹ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+# (Mako) ã¨ã‚Šã‚ãˆãšã€Œå—å–人ã€ã§
#: ../src/filetransfers_window.py:235
-#, fuzzy, python-format
+#, python-format
msgid "Recipient: %s"
msgstr "å—å–人: %s"
@@ -8188,80 +8144,80 @@ msgstr "エラーメッセージ: %s"
msgid "File transfer stopped"
msgstr "ファイルã®è»¢é€ãŒä¸æ–ã—ã¾ã—ãŸ"
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:266
msgid "Choose File to Send..."
msgstr "転é€ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž..."
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
msgid "Description: "
msgstr "説明: "
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:295
msgid "Gajim cannot access this file"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“"
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:296
msgid "This file is being used by another process."
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯åˆ¥ã®ãƒ—ãƒã‚°ãƒ©ãƒ ãŒä½¿ç”¨ä¸ã§ã™ã€‚"
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:330
#, python-format
msgid "File: %s"
msgstr "ファイル: %s"
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:336
#, python-format
msgid "Type: %s"
msgstr "種類: %s"
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:338
#, python-format
msgid "Description: %s"
msgstr "説明: %s"
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:339
#, python-format
msgid "%s wants to send you a file:"
msgstr "%s ã•ã‚“ãŒãƒ•ã‚¡ã‚¤ãƒ«ã‚’転é€ã—ãŸãŒã£ã¦ã„ã¾ã™:"
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã«ä¸Šæ›¸ãã§ããªã„"
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
msgid ""
"A file with this name already exists and you do not have permission to "
"overwrite it."
msgstr "ã“ã®åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å˜åœ¨ã—ã€ã‹ã¤ä¸Šæ›¸ãã®æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
msgid "This file already exists"
msgstr "ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™"
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
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:369 ../src/gtkgui_helpers.py:918
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:862
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "ディレクトリ \"%s\" ã«æ›¸ã込む権é™ãŒã‚ã‚Šã¾ã›ã‚“"
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
msgid "You do not have permission to create files in this directory."
msgstr "ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:389
msgid "Save File as..."
msgstr "ファイルã®ä¿å˜..."
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
#. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:459
#, python-format
msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8269,123 +8225,63 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
#. This should make the string Kb/s,
#. where 'Kb' part is taken from %s.
#. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:552
#, python-format
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/秒)"
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
msgid "Invalid File"
msgstr "ファイルãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:595
msgid "File: "
msgstr "ファイル: "
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:599
msgid "It is not possible to send empty files"
msgstr "空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’転é€ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
msgid "Name: "
msgstr "åå‰: "
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
msgid "Sender: "
msgstr "é€ä¿¡è€…: "
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:787
msgid "Pause"
msgstr "一時åœæ¢"
-#: ../src/gajim.py:142
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim ã«ã¯ X server ãŒå¿…è¦ã§ã™ã€‚終了ã—ã¾ã™..."
-
-#: ../src/gajim.py:144
-#, python-format
-msgid "importing PyGTK failed: %s"
-msgstr "PyGTK ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-
-#: ../src/gajim.py:186
-#, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim ã«ã¯ PyGTK 2.12 以上ãŒå¿…è¦ã§ã™"
-
-#: ../src/gajim.py:187
-#, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim ã«ã¯ PyGTK 2.12 ã¾ãŸã¯ãれ以上ãŒå¿…è¦ã§ã™ã€‚終了ã—ã¾ã™..."
-
-#: ../src/gajim.py:189
-#, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim ã«ã¯ GTK 2.12 以上ãŒå¿…è¦ã§ã™"
-
-#: ../src/gajim.py:190
-#, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim ã«ã¯ GTK 2.12 ã¾ãŸã¯ãれ以上ãŒå¿…è¦ã§ã™ã€‚終了ã—ã¾ã™..."
-
-#: ../src/gajim.py:199
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim ã«ã¯ pywin32 ãŒå¿…è¦ã§ã™"
-
-#: ../src/gajim.py:200
-#, python-format
-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:316
-msgid "Gajim is already running"
-msgstr "Gajim ã¯æ—¢ã«èµ·å‹•ã—ã¦ã„ã¾ã™"
-
-#: ../src/gajim.py:317
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr "別㮠Gajim ãŒæ—¢ã«èµ·å‹•ã—ã¦ã„るよã†ã§ã™ãã‚Œã§ã‚‚èµ·å‹•ã—ã¾ã™ã‹ ?"
-
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:77
msgid "Shows a help on specific command"
msgstr "指定ã®ã‚³ãƒžãƒ³ãƒ‰ã«å¯¾ã™ã‚‹ãƒ˜ãƒ«ãƒ—を表示ã—ã¾ã™"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:80
msgid "command"
msgstr "コマンド"
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:81
msgid "show help on command"
msgstr "コマンドã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:85
msgid "Shows or hides the roster window"
msgstr "å簿ウィンドウã®è¡¨ç¤º/éžè¡¨ç¤º"
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:89
msgid "Pops up a window with the next pending event"
msgstr "次ã®ä¿ç•™ã‚¤ãƒ™ãƒ³ãƒˆã‚’ãƒãƒƒãƒ—アップウィンドウã«è¡¨ç¤ºã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:93
msgid ""
"Prints a list of all contacts in the roster. Each contact appears on a "
"separate line"
msgstr ""
"åç°¿ã«ã‚る相手先をã™ã¹ã¦è¡¨ç¤ºã—ã¾ã™ã€‚ãã‚Œãžã‚Œã®ç›¸æ‰‹å…ˆã¯ç©ºè¡Œã§åŒºåˆ‡ã‚‰ã‚Œã¾ã™"
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8397,35 +8293,38 @@ msgstr ""
msgid "account"
msgstr "アカウント"
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:96
msgid "show only contacts of the given account"
msgstr "指定ã•ã‚ŒãŸã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ç›¸æ‰‹å…ˆã®ã¿è¡¨ç¤ºã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:102
msgid "Prints a list of registered accounts"
msgstr "登録アカウントã®ä¸€è¦§ã®è¡¨ç¤ºã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:106
msgid "Changes the status of account or accounts"
msgstr "アカウントã®åœ¨å¸çŠ¶æ³ã®å¤‰æ›´ã—ã¾ã™"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:109
msgid "status"
msgstr "在å¸çŠ¶æ³"
-#: ../src/gajim-remote-plugin.py:106
-#, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#: ../src/gajim-remote.py:109
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
msgstr ""
-"次ã®ã„ãšã‚Œã‹: offline (オフライン)ã€online (オンライン)ã€chat (ãƒãƒ£ãƒƒãƒˆå¯)ã€"
-"away (離å¸ä¸)ã€xa (ä¸åœ¨)ã€dnd (邪é”ã—ãªã„ã§)ã€invisible (éš ã‚Œä¸)"
+"次ã®ã„ãšã‚Œã‹: offline (オフライン)ã€online (オンライン)ã€chat (ãƒãƒ£ãƒƒãƒˆ"
+"å¯)ã€\n"
+"away (離å¸ä¸)ã€xa (ä¸åœ¨)ã€dnd (邪é”ã—ãªã„ã§)ã€invisible (éš ã‚Œä¸)。\n"
+"è¨å®šã•ã‚Œãªã‘ã‚Œã°ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ä»¥å‰ã®çŠ¶æ³ãŒä½¿ã‚ã‚Œã¾ã™"
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:110
msgid "status message"
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:111
msgid ""
"change status of account \"account\". If not specified, try to change status "
"of all accounts that have \"sync with global status\" option set"
@@ -8434,20 +8333,45 @@ msgstr ""
"åˆã€\"sync with global status\" オプションãŒè¨å®šã•ã‚Œã¦ã„るアカウントã™ã¹ã¦ã®"
"在å¸çŠ¶æ³ã‚’変更ã—ã¾ã™ã€‚"
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "アカウントã®å„ªå…ˆé †ä½ã‚’変更ã—ã¾ã™"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "å„ªå…ˆé †ä½"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "アカウントã«è¨å®šã—ãŸã„å„ªå…ˆé †ä½"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"アカウントã®å„ªå…ˆé †ä½ã‚’変更ã—ã¾ã™ã€‚アカウントãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€\"sync with "
+"global status\" オプションã®è¨å®šã•ã‚ŒãŸã‚¢ã‚«ã‚¦ãƒ³ãƒˆã™ã¹ã¦ã®å„ªå…ˆé †ä½ã‚’変更ã—ã¾ã™"
+
+#: ../src/gajim-remote.py:127
msgid "Shows the chat dialog so that you can send messages to a contact"
msgstr "ãƒãƒ£ãƒƒãƒˆã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示ã—ã€ç›¸æ‰‹å…ˆã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã§ãã¾ã™"
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:129
msgid "JID of the contact that you want to chat with"
msgstr "ãƒãƒ£ãƒƒãƒˆã—ãŸã„相手先㮠JID"
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
msgid "if specified, contact is taken from the contact list of this account"
msgstr "指定ã—ãŸå ´åˆã€ç›¸æ‰‹å…ˆã¯ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ç›¸æ‰‹å…ˆä¸€è¦§ã‹ã‚‰é¸æŠžã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+"メッセージã®å†…容。アカウントを指定ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。ãã†ã§ãªã„å ´åˆã¯"
+"\"\"ã¨ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+#: ../src/gajim-remote.py:139
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 "
@@ -8457,34 +8381,29 @@ msgstr ""
"らもãªãã¦ã‚‚ã‹ã¾ã„ã¾ã›ã‚“。 'アカウント' ã ã‘ã‚’è¨å®šã—㦠'OpenPGP éµ' ã‚’è¨å®šã—"
"ãŸããªã„å ´åˆã€'OpenPGP éµ' 㯠'' ã¨ã—ã¦ãã ã•ã„。"
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
msgid "JID of the contact that will receive the message"
msgstr "メッセージをå—ã‘å–ã‚ŠãŸã„相手先㮠JID"
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
msgid "message contents"
msgstr "メッセージã®å†…容"
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "pgp key"
msgstr "pgp éµ"
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "if specified, the message will be encrypted using this public key"
msgstr "指定ã—ãŸå ´åˆã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ã“ã®å…¬é–‹éµã§æš—å·åŒ–ã•ã‚Œã¾ã™"
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
msgid "if specified, the message will be sent using this account"
msgstr "指定ã—ãŸå ´åˆã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’使ã£ã¦é€ã‚‰ã‚Œã¾ã™"
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:152
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 "
@@ -8494,138 +8413,135 @@ msgstr ""
"ã—ãªãã¦ã‚‚ã‹ã¾ã„ã¾ã›ã‚“。アカウント(account)ã ã‘を指定ã—ã¦'OpenPGP éµ'を指定ã—"
"ãŸããªã„å ´åˆã¯ã€'OpenPGP éµ'ã¯å˜ã« '' ã¨ã—ã¦ãã ã•ã„。"
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
msgid "subject"
msgstr "件å"
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
msgid "message subject"
msgstr "メッセージã®ä»¶å"
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:166
msgid "Sends new message to a groupchat you've joined."
msgstr "å‚åŠ ã—ã¦ã„るグループãƒãƒ£ãƒƒãƒˆã«æ–°ã—ã„メッセージをé€ä¿¡ã—ã¾ã™ã€‚"
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:168
msgid "JID of the room that will receive the message"
msgstr "メッセージをå—ã‘å–る談話室ãã®ã‚‚ã®ã® JID"
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:175
msgid "Gets detailed info on a contact"
msgstr "相手先ã®è©³ç´°æƒ…å ±ã‚’å–å¾—ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
msgid "JID of the contact"
msgstr "相手先㮠JID"
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:181
msgid "Gets detailed info on a account"
msgstr "アカウントã®è©³ç´°æƒ…å ±ã‚’å–å¾—ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:183
msgid "Name of the account"
msgstr "アカウントå"
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:187
msgid "Sends file to a contact"
msgstr "相手先ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’転é€ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
msgid "file"
msgstr "ファイル"
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
msgid "File path"
msgstr "ファイルã®å ´æ‰€"
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:191
msgid "if specified, file will be sent using this account"
msgstr "指定ã—ãŸå ´åˆã€ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’使ã£ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’転é€ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:196
msgid "Lists all preferences and their values"
msgstr "ã™ã¹ã¦ã®è¨å®šé …ç›®ã¨ãã®å€¤ã®ä¸€è¦§ã‚’表示ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:200
msgid "Sets value of 'key' to 'value'."
msgstr "é …ç›® 'key' ã®å€¤ã« 'value' ã‚’è¨å®šã—ã¾ã™ã€‚"
# (Mako)訳ã•ãšã«ãã®ã¾ã¾ã«ã—よã†
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
msgid "key=value"
msgstr "key=value"
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
msgid "'key' is the name of the preference, 'value' is the value to set it to"
msgstr "'key' ã¯è¨å®šé …ç›®ã®åå‰ã€'value' ã¯ãã‚Œã«è¨å®šã—ãŸã„値"
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:207
msgid "Deletes a preference item"
msgstr "è¨å®šé …目を削除ã—ã¾ã™"
# (Mako)訳ã•ãšã«ãã®ã¾ã¾ã«ã—よã†
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
msgid "key"
msgstr "key"
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
msgid "name of the preference to be deleted"
msgstr "削除ã™ã‚‹è¨å®šé …ç›®ã®åå‰"
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:213
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "Gajim ã®è¨å®šã®ç¾åœ¨ã®çŠ¶æ…‹ã‚’ .config ファイルã«æ›¸ã出ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:218
msgid "Removes contact from roster"
msgstr "相手先をåç°¿ã‹ã‚‰å‰Šé™¤ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:227
msgid "Adds contact to roster"
msgstr "相手先をåç°¿ã«è¿½åŠ ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:230
msgid "Adds new contact to this account"
msgstr "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«æ–°ã—ã„ç›¸æ‰‹å…ˆã‚’è¿½åŠ ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:235
msgid "Returns current status (the global one unless account is specified)"
msgstr ""
"ç¾åœ¨ã®åœ¨å¸çŠ¶æ³ã‚’è¿”ã—ã¾ã™ (ã‚‚ã—アカウントãŒæŒ‡å®šã•ã‚Œãªã‘ã‚Œã°ã€å…¨ä½“ã®åœ¨å¸çŠ¶æ³ã‚’"
"è¿”ã—ã¾ã™)"
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:242
msgid ""
-"Returns current status message(the global one unless account is specified)"
+"Returns current status message (the global one unless account is specified)"
msgstr ""
"ç¾åœ¨ã®çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¿”ã—ã¾ã™ (ã‚‚ã—アカウントãŒæŒ‡å®šã•ã‚Œãªã‘ã‚Œã°ã€å…¨ä½“ã®çŠ¶æ³"
"メッセージを返ã—ã¾ã™)"
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:249
msgid "Returns number of unread messages"
msgstr "未èªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸æ•°ã‚’è¿”ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:253
msgid "Opens 'Start Chat' dialog"
msgstr "'ãƒãƒ£ãƒƒãƒˆã‚’開始ã™ã‚‹' ã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’é–‹ãã¾ã™"
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:255
msgid "Starts chat, using this account"
msgstr "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ãƒãƒ£ãƒƒãƒˆã‚’開始ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:259
msgid "Sends custom XML"
msgstr "独自㮠XML ã‚’é€ä¿¡ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:261
msgid "XML to send"
msgstr "é€ä¿¡ã™ã‚‹ XML"
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:262
msgid ""
"Account in which the xml will be sent; if not specified, xml will be sent to "
"all accounts"
@@ -8633,44 +8549,87 @@ msgstr ""
"XML ãŒé€ä¿¡ã•ã‚Œã‚‹ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã€‚指定ã•ã‚Œãªã„å ´åˆã€XML ã¯ã™ã¹ã¦ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«é€ä¿¡"
"ã•ã‚Œã¾ã™"
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:268
+msgid "Change the avatar"
+msgstr "ã‚¢ãƒã‚¿ãƒ¼ã‚’変更ã™ã‚‹"
+
+#: ../src/gajim-remote.py:270
+msgid "Picture to use"
+msgstr "使ã„ãŸã„ç”»åƒ"
+
+#: ../src/gajim-remote.py:271
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"ã‚¢ãƒã‚¿ãƒ¼ã‚’è¨å®šã™ã‚‹ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã€‚指定ã•ã‚Œãªã„å ´åˆã€ã‚¢ãƒã‚¿ãƒ¼ã¯ã™ã¹ã¦ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+"ã«è¨å®šã•ã‚Œã¾ã™"
+
+#: ../src/gajim-remote.py:277
msgid "Handle a xmpp:/ uri"
msgstr "xmpp:/ ã® URI ã‚’å–り扱ã„ã¾ã™"
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:279
msgid "uri"
msgstr "uri"
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "å–り扱ㆠURI"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "URI ã‚’å–り扱ã†ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "メッセージã®å†…容"
+
+#: ../src/gajim-remote.py:286
msgid "Join a MUC room"
msgstr "談話室ã«å‚åŠ ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:288
msgid "room"
msgstr "談話室"
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "談話室JID"
+
+#: ../src/gajim-remote.py:289
msgid "nick"
msgstr "ニックãƒãƒ¼ãƒ "
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "使ã„ãŸã„ニックãƒãƒ¼ãƒ "
+
+#: ../src/gajim-remote.py:290
msgid "password"
msgstr "パスワード"
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "談話室ã®ãƒ‘スワード"
+
+#: ../src/gajim-remote.py:291
+msgid "Account from which you want to enter the room"
+msgstr "談話室ã®å‚åŠ ã«ä½¿ã†ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+
+#: ../src/gajim-remote.py:296
msgid "Check if Gajim is running"
msgstr "Gajim ãŒèµ·å‹•ã—ã¦ã„ã‚‹ã‹ãƒã‚§ãƒƒã‚¯ã—ã¾ã™"
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
#: ../src/gajim-remote.py:300
msgid "Shows or hides the ipython window"
msgstr "ipython ウィンドウã®è¡¨ç¤º/éžè¡¨ç¤º"
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:327
msgid "Missing argument \"contact_jid\""
msgstr "引数 \"contact_jid\" ãŒã‚ã‚Šã¾ã›ã‚“"
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:349
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -8679,31 +8638,33 @@ msgstr ""
"'%s' ã¯åç°¿ã«ã‚ã‚Šã¾ã›ã‚“。\n"
"メッセージをé€ã‚‹ãŸã‚ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’指定ã—ã¦ãã ã•ã„。"
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:352
msgid "You have no active account"
msgstr "有効ã«ãªã£ã¦ã„るアカウントãŒã‚ã‚Šã¾ã›ã‚“"
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:405
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr "Gajim ãŒèµ·å‹•ã—ã¦ã„ãªã„よã†ã§ã™ã€‚ãã®ãŸã‚ gajim-remote ã¯ä½¿ãˆã¾ã›ã‚“。"
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:432
#, python-format
msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
msgstr ""
+"使ã„æ–¹: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:436
msgid "Arguments:"
msgstr "引数:"
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:440
#, python-format
msgid "%s not found"
msgstr "%s ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#: ../src/gajim-remote.py:446
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -8712,147 +8673,80 @@ msgstr ""
"使ã„æ–¹: %s コマンド [引数]\n"
"コマンドã¯æ¬¡ã®ã„ãšã‚Œã‹:\n"
-#: ../src/gajim-remote-plugin.py:496
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:515
+#, python-format
msgid ""
"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
+"Type \"%(basename)s help %(command)s\" for more info"
msgstr ""
"引数ãŒå¤šã™ãŽã¾ã™ã€‚\n"
"詳ã—ã㯠\"%(basename)s help %(command)s\" ã¨å…¥åŠ›ã—ã¦ãã ã•ã„"
-#: ../src/gajim-remote-plugin.py:500
-#, fuzzy, python-format
+#: ../src/gajim-remote.py:520
+#, python-format
msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
msgstr ""
"引数 \"%(arg)s\" ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
"詳ã—ã㯠\"%(basename)s help %(command)s\" ã¨å…¥åŠ›ã—ã¦ãã ã•ã„"
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+#: ../src/gajim-remote.py:539
+msgid "No uri given"
+msgstr "uri ãŒã‚ã‚Šã¾ã›ã‚“"
+
+#: ../src/gajim-remote.py:541
msgid "Wrong uri"
msgstr "uri ãŒé–“é•ã£ã¦ã„ã¾ã™"
-#: ../src/gajim-remote.py:109
-#, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"account's previous status"
-msgstr ""
-"次ã®ã„ãšã‚Œã‹: offline (オフライン)ã€online (オンライン)ã€chat (ãƒãƒ£ãƒƒãƒˆå¯)ã€"
-"away (離å¸ä¸)ã€xa (ä¸åœ¨)ã€dnd (邪é”ã—ãªã„ã§)ã€invisible (éš ã‚Œä¸)"
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "アカウントã®å„ªå…ˆé †ä½ã‚’変更ã—ã¾ã™"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "å„ªå…ˆé †ä½"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "アカウントã«è¨å®šã—ãŸã„å„ªå…ˆé †ä½"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"アカウントã®å„ªå…ˆé †ä½ã‚’変更ã—ã¾ã™ã€‚アカウントãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€\"sync with "
-"global status\" オプションã®è¨å®šã•ã‚ŒãŸã‚¢ã‚«ã‚¦ãƒ³ãƒˆã™ã¹ã¦ã®å„ªå…ˆé †ä½ã‚’変更ã—ã¾ã™"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-"メッセージã®å†…容。アカウントを指定ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。ãã†ã§ãªã„å ´åˆã¯"
-"\"\"ã¨ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"ç¾åœ¨ã®çŠ¶æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¿”ã—ã¾ã™ (ã‚‚ã—アカウントãŒæŒ‡å®šã•ã‚Œãªã‘ã‚Œã°ã€å…¨ä½“ã®çŠ¶æ³"
-"メッセージを返ã—ã¾ã™)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "在å¸çŠ¶æ³ã‚’変更ã™ã‚‹"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "使ã„ãŸã„ニックãƒãƒ¼ãƒ "
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"XML ãŒé€ä¿¡ã•ã‚Œã‚‹ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã€‚指定ã•ã‚Œãªã„å ´åˆã€XML ã¯ã™ã¹ã¦ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«é€ä¿¡"
-"ã•ã‚Œã¾ã™"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "å–り扱ㆠURI"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "URI ã‚’å–り扱ã†ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "メッセージã®å†…容"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "談話室JID"
+#: ../src/gajim.py:186
+msgid "Gajim needs X server to run. Quiting..."
+msgstr "Gajim ã«ã¯ X server ãŒå¿…è¦ã§ã™ã€‚終了ã—ã¾ã™..."
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "使ã„ãŸã„ニックãƒãƒ¼ãƒ "
+#: ../src/gajim.py:188
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr "PyGTK ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "談話室ã®ãƒ‘スワード"
+#: ../src/gajim.py:230
+msgid "Gajim needs PyGTK 2.16 or above"
+msgstr "Gajim ã«ã¯ PyGTK 2.16 以上ãŒå¿…è¦ã§ã™"
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "談話室ã®å‚åŠ ã«ä½¿ã†ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+#: ../src/gajim.py:231
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgstr "Gajim ã«ã¯ PyGTK 2.16 ã¾ãŸã¯ãれ以上ãŒå¿…è¦ã§ã™ã€‚終了ã—ã¾ã™..."
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"使ã„æ–¹: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+#: ../src/gajim.py:233
+msgid "Gajim needs GTK 2.16 or above"
+msgstr "Gajim ã«ã¯ GTK 2.16 以上ãŒå¿…è¦ã§ã™"
-#: ../src/gajim-remote.py:514
-#, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%(basename)s help %(command)s\" for more info"
-msgstr ""
-"引数ãŒå¤šã™ãŽã¾ã™ã€‚\n"
-"詳ã—ã㯠\"%(basename)s help %(command)s\" ã¨å…¥åŠ›ã—ã¦ãã ã•ã„"
+#: ../src/gajim.py:234
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgstr "Gajim ã«ã¯ GTK 2.16 ã¾ãŸã¯ãれ以上ãŒå¿…è¦ã§ã™ã€‚終了ã—ã¾ã™..."
-#: ../src/gajim-remote.py:519
-#, python-format
-msgid ""
-"Argument \"%(arg)s\" is not specified. \n"
-"Type \"%(basename)s help %(command)s\" for more info"
-msgstr ""
-"引数 \"%(arg)s\" ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
-"詳ã—ã㯠\"%(basename)s help %(command)s\" ã¨å…¥åŠ›ã—ã¦ãã ã•ã„"
+#: ../src/gajim.py:243
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim ã«ã¯ pywin32 ãŒå¿…è¦ã§ã™"
-#: ../src/gajim-remote.py:538
-msgid "No uri given"
+#: ../src/gajim.py:244
+#, python-format
+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:360
+msgid "Gajim is already running"
+msgstr "Gajim ã¯æ—¢ã«èµ·å‹•ã—ã¦ã„ã¾ã™"
+
+#: ../src/gajim.py:361
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr "別㮠Gajim ãŒæ—¢ã«èµ·å‹•ã—ã¦ã„るよã†ã§ã™ãã‚Œã§ã‚‚èµ·å‹•ã—ã¾ã™ã‹ ?"
#: ../src/gajim_themes_window.py:59
msgid "Theme"
@@ -8879,183 +8773,213 @@ msgstr "ç¾åœ¨ã®ãƒ†ãƒ¼ãƒžã‚’削除ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
msgid "Please first choose another for your current theme."
msgstr "ã¾ãšã€ç¾åœ¨ã®ãƒ†ãƒ¼ãƒžã¨ã—ã¦åˆ¥ã®ã‚‚ã®ã‚’é¸ã‚“ã§ãã ã•ã„。"
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1557
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s ã•ã‚“ã¯ç¾åœ¨ %(new_nick)s ã•ã‚“ã¨èªè˜ã•ã‚Œã¾ã—ãŸ"
+
+#: ../src/groupchat_control.py:230
msgid "Sending private message failed"
msgstr "ç§ä¿¡ã®é€ä¿¡ã«å¤±æ•—ã—ã¾ã—ãŸ"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:232
#, 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:455
+#: ../src/groupchat_control.py:560
msgid "Insert Nickname"
msgstr "ニックãƒãƒ¼ãƒ ã®æŒ¿å…¥"
-#: ../src/groupchat_control.py:636
-#, fuzzy
+# (Mako) èªžé †ãŒå•é¡Œã€‚コãƒãƒ³ã§ã”ã¾ã‹ã—ã¦ã¿ã‚‹
+#: ../src/groupchat_control.py:743
msgid "Conversation with "
-msgstr "会話"
+msgstr "会話ä¸: "
-#: ../src/groupchat_control.py:638
-#, fuzzy
+#: ../src/groupchat_control.py:745
msgid "Continued conversation"
-msgstr "続ã„ã¦ã„る会話"
+msgstr "会話ä¸"
+
+#: ../src/groupchat_control.py:1222
+#, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s ã•ã‚“ã¯é¡Œã‚’ %(subject)s ã«è¨å®šã—ã¾ã—ãŸ"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1240 ../src/groupchat_control.py:1499
msgid "Any occupant is allowed to see your full JID"
-msgstr "入室者ã®èª°ã‚‚ãŒã‚ãªãŸã®ãƒ•ãƒ«JID を知るã“ã¨ãŒã§ãã¾ã™"
+msgstr "在室者ã®èª°ã‚‚ãŒã‚ãªãŸã®ãƒ•ãƒ«JID を知るã“ã¨ãŒã§ãã¾ã™"
+
+#: ../src/groupchat_control.py:1243
+msgid "Room now shows unavailable member"
+msgstr "談話室ã¯ãƒ¡ãƒ³ãƒãƒ¼ä»¥å¤–ã«ã‚‚見ãˆã¾ã™"
+
+#: ../src/groupchat_control.py:1245
+msgid "room now does not show unavailable members"
+msgstr "談話室ã¯ãƒ¡ãƒ³ãƒãƒ¼ä»¥å¤–ã«ã¯è¦‹ãˆã¾ã›ã‚“"
+
+#: ../src/groupchat_control.py:1247
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "談話室ã®æ§‹æˆã®å¤‰æ›´(プライãƒã‚·ãƒ¼é–¢é€£ã§ã¯ãªã„)ãŒã‚ã‚Šã¾ã—ãŸ"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1251
+msgid "Room logging is now enabled"
+msgstr "談話室ã®è¨˜éŒ²ã‚’å–ã‚Šã¯ã˜ã‚ã¾ã™"
+
+#: ../src/groupchat_control.py:1253
+msgid "Room logging is now disabled"
+msgstr "談話室ã®è¨˜éŒ²ã‚’æ¢ã‚ã¾ã™"
+
+#: ../src/groupchat_control.py:1255
+msgid "Room is now non-anonymous"
+msgstr "談話室ã¯éžåŒ¿åã§ã™"
+
+#: ../src/groupchat_control.py:1258
+msgid "Room is now semi-anonymous"
+msgstr "談話室ã¯åŠåŒ¿åã§ã™"
+
+#: ../src/groupchat_control.py:1261
+msgid "Room is now fully-anonymous"
+msgstr "談話室ã¯å®Œå…¨åŒ¿åã§ã™"
#. Can be a message (see handle_event_gc_config_change in
#. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1504
msgid "Room logging is enabled"
-msgstr "談話室ã®è¨˜éŒ²ã¯ã¨ã‚‰ã‚Œã¾ã™"
+msgstr "談話室ã®ä¼šè©±ã¯è¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã™"
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1506
msgid "A new room has been created"
msgstr "æ–°ã—ã„談話室ãŒä½œæˆã•ã‚Œã¾ã—ãŸ"
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1509
msgid "The server has assigned or modified your roomnick"
msgstr "サーãƒãƒ¼ã¯ã‚ãªãŸã®è«‡è©±å®¤ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ を割り当ã¦(ã¾ãŸã¯å¤‰æ›´ã—)ã¾ã—ãŸ"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1515
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s ã¯è¹´ã‚Šå‡ºã•ã‚Œã¾ã—ãŸ: %(reason)s"
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1518
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s 㯠%(who)s ã«ã‚ˆã£ã¦è¹´ã‚Šå‡ºã•ã‚Œã¾ã—ãŸ: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1527
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s ã¯ç· ã‚出ã•ã‚Œã¾ã—ãŸ: %(reason)s"
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1530
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s 㯠%(who)s: ã«ã‚ˆã£ã¦ç· ã‚出ã•ã‚Œã¾ã—ãŸ: %(reason)s"
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1541 ../src/groupchat_control.py:1645
#, python-format
msgid "You are now known as %s"
msgstr "ã‚ãªãŸã¯ %s ã¨èªè˜ã•ã‚Œã¾ã—ãŸ"
-#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s ã•ã‚“ã¯ç¾åœ¨ %(new_nick)s ã•ã‚“ã¨èªè˜ã•ã‚Œã¾ã—ãŸ"
-
-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1599 ../src/groupchat_control.py:1604
+#: ../src/groupchat_control.py:1610
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s ã¯é€€å‡ºã—ã¾ã—㟠(%(reason)s)"
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1601
msgid "affiliation changed"
msgstr "分掌を変更ã—ã¾ã—ãŸ"
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1606
msgid "room configuration changed to members-only"
msgstr "談話室ã¯ãƒ¡ãƒ³ãƒãƒ¼åˆ¶ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1612
msgid "system shutdown"
msgstr "システムã®ã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³"
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1695
#, 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:1481
+#: ../src/groupchat_control.py:1699
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr "** %(nick)s ã•ã‚“ã®åˆ†æŽŒã¯ %(affiliation)s ã«è¨å®šã•ã‚Œã¾ã—ãŸ"
# (Mako)ã“ã“ã§ã® role ã¯ã€Œå½¹ã€
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1714
#, 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:1500
+#: ../src/groupchat_control.py:1718
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
msgstr "** %(nick)s ã•ã‚“ã®å½¹ã¯ %(role)s ã«è¨å®šã•ã‚Œã¾ã—ãŸ"
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1748
#, python-format
msgid "%s has left"
msgstr "%s ã•ã‚“ãŒé€€å‡ºã—ã¾ã—ãŸ"
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1753
#, python-format
msgid "%s has joined the group chat"
msgstr "%s ã•ã‚“ãŒå‚åŠ ã—ã¾ã—ãŸ"
-#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s ã•ã‚“ã¯ç¾åœ¨ %(status)s"
-
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:2006
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "本当ã«ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆ \"%s\" ã‹ã‚‰é€€å‡ºã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2008
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã‚‹ã¨ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã‹ã‚‰åˆ‡æ–ã•ã‚Œã¾ã™ã€‚"
-#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
-#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
-#: ../src/gui_interface.py:1853 ../src/message_window.py:224
-#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
-#: ../src/roster_window.py:4195
-#, fuzzy
+#: ../src/groupchat_control.py:2012 ../src/gui_interface.py:668
+#: ../src/gui_interface.py:1277 ../src/gui_interface.py:1317
+#: ../src/gui_interface.py:1358 ../src/message_window.py:224
+#: ../src/roster_window.py:2942 ../src/roster_window.py:3617
+#: ../src/roster_window.py:4386
msgid "_Do not ask me again"
-msgstr "次回ã‹ã‚‰è³ªå•ã—ãªã„ (_n)"
+msgstr "次回ã‹ã‚‰è³ªå•ã—ãªã„ (_D)"
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:2046
msgid "Changing Subject"
msgstr "é¡Œã®å¤‰æ›´"
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2047
msgid "Please specify the new subject:"
msgstr "æ–°ã—ã„題を入力ã—ã¦ãã ã•ã„:"
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2054
msgid "Changing Nickname"
msgstr "ニックãƒãƒ¼ãƒ ã®å¤‰æ›´"
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2055
msgid "Please specify the new nickname you want to use:"
msgstr "使ã„ãŸã„æ–°ã—ã„ニックãƒãƒ¼ãƒ を入力ã—ã¦ãã ã•ã„:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2086
#, python-format
msgid "Destroying %s"
msgstr "%s ã®é–‰éŽ–"
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2087
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
@@ -9063,22 +8987,22 @@ msgstr ""
"ã“ã®è«‡è©±å®¤ã‚’閉鎖ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚\n"
"下ã«ç†ç”±ã‚’入力ã§ãã¾ã™:"
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2089
msgid "You may also enter an alternate venue:"
msgstr "ã¾ãŸã€ä»£æ›¿ã®è«‡è©±å®¤ã‚’入力ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™:"
#. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2284
#, python-format
msgid "Kicking %s"
msgstr "%s を蹴り出ã—"
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2285 ../src/groupchat_control.py:2617
msgid "You may specify a reason below:"
msgstr "下ã«ç†ç”±ã‚’書ãã“ã¨ãŒã§ãã¾ã™:"
#. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2616
#, python-format
msgid "Banning %s"
msgstr "%s ã‚’ç· ã‚出ã—"
@@ -9107,61 +9031,59 @@ msgstr "詳細"
msgid "Error: cannot open %s for reading"
msgstr "エラー: èªã¿è¾¼ã¿ãƒ¢ãƒ¼ãƒ‰ã§ %s ã‚’é–‹ã‘ã¾ã›ã‚“"
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:348
msgid "Error reading file:"
msgstr "ファイルèªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼:"
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:351
msgid "Error parsing file:"
msgstr "ファイル解æžã‚¨ãƒ©ãƒ¼:"
#. do not traceback (could be a permission problem)
#. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:392
#, python-format
msgid "Could not write to %s. Session Management support will not work"
-msgstr ""
+msgstr "%s ã«æ›¸ã込むã“ã¨ãŒã§ãã¾ã›ã‚“。セッション管ç†ã‚µãƒãƒ¼ãƒˆã¯æ©Ÿèƒ½ã—ã¾ã›ã‚“"
#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
+#: ../src/gtkgui_helpers.py:766
msgid "Gajim is not the default Jabber client"
msgstr "Gajim ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã® Jabber クライアントã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:767
msgid "Would you like to make Gajim the default Jabber client?"
msgstr "Gajim をデフォルト㮠Jabber クライアントã«ã—ã¾ã™ã‹ ?"
-#: ../src/gtkgui_helpers.py:824
-#, fuzzy
+#: ../src/gtkgui_helpers.py:768
msgid "Always check to see if Gajim is the default Jabber client on startup"
msgstr "起動時ã«ã€Gajim ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã® Jabber クライアントã‹ã‚’常ã«ãƒã‚§ãƒƒã‚¯"
-#: ../src/gtkgui_helpers.py:891
-#, fuzzy
+#: ../src/gtkgui_helpers.py:835
msgid "Extension not supported"
msgstr "æ‹¡å¼µã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:836
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
msgstr ""
"ç”»åƒã‚’ %(type)s å½¢å¼ã§ä¿å˜ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。%(new_filename)s ã¨ã—ã¦ä¿å˜ã—"
"ã¾ã™ã‹ ?"
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:872
msgid "Save Image as..."
msgstr "ç”»åƒã®ä¿å˜..."
#. we are banned
#. group chat does not exist
-#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
-#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
-#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
-#: ../src/gui_interface.py:348
+#: ../src/gui_interface.py:126 ../src/gui_interface.py:290
+#: ../src/gui_interface.py:299 ../src/gui_interface.py:305
+#: ../src/gui_interface.py:308 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:316
msgid "Unable to join group chat"
msgstr "グループã«å‚åŠ ã§ãã¾ã›ã‚“"
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:127
#, python-format
msgid ""
"Your desired nickname in group chat %s is in use or registered by another "
@@ -9172,92 +9094,86 @@ msgstr ""
"ã™ã€‚\n"
"別ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ を下ã«å…¥åŠ›ã—ã¦ãã ã•ã„:"
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:130
msgid "Always use this nickname when there is a conflict"
msgstr "è¡çªãŒç”Ÿã˜ãŸã¨ãã¯ã„ã¤ã‚‚ã“ã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ を使ã†"
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:147
msgid "Do you accept this request?"
msgstr "ã“ã®ç”³ã—è¾¼ã¿ã‚’承èªã—ã¾ã™ã‹ ?"
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:149
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "アカウント %s ã¸ã®ç”³ã—è¾¼ã¿ã‚’承èªã—ã¾ã™ã‹ ?"
-#: ../src/gui_interface.py:163
-#, fuzzy, python-format
+#: ../src/gui_interface.py:152
+#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "%(url)s ã«å¯¾ã™ã‚‹ HTTP (%(method)s) ã®æ‰¿èª (id: %(id)s)"
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:195 ../src/notify.py:276
msgid "Connection Failed"
msgstr "接続ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:279
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "談話室 %s ã«å‚åŠ ã™ã‚‹ã«ã¯ãƒ‘スワードãŒå¿…è¦ã§ã™ã€‚入力ã—ã¦ãã ã•ã„。"
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:291
#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "%s ã®äººæ•°åˆ¶é™ã«é”ã—ã¦ã„ã¾ã™"
+msgid "Maximum number of users for <b>%s</b> has been reached"
+msgstr "<b>%s</b> ã®äººæ•°ã®ä¸Šé™ã«é”ã—ã¦ã„ã¾ã™"
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:300
#, python-format
-msgid "You are banned from group chat %s."
-msgstr "グループãƒãƒ£ãƒƒãƒˆ %s ã•ã‚“ã«ç· ã‚出ã•ã‚Œã¦ã„ã¾ã™ã€‚"
+msgid "You are banned from group chat <b>%s</b>."
+msgstr "グループãƒãƒ£ãƒƒãƒˆ <b>%s</b> ã‹ã‚‰ç· ã‚出ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:306
#, python-format
-msgid "Group chat %s does not exist."
-msgstr "グループãƒãƒ£ãƒƒãƒˆ %s ã¯å˜åœ¨ã—ã¾ã›ã‚“。"
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "グループãƒãƒ£ãƒƒãƒˆ <b>%s</b> ã¯å˜åœ¨ã—ã¾ã›ã‚“。"
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:309
msgid "Group chat creation is restricted."
msgstr "グループãƒãƒ£ãƒƒãƒˆã®ä½œæˆã¯åˆ¶é™ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:312
#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "登録ã—ãŸãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆ %s ã§ä½¿ã‚ã‚Œã¾ã™ã€‚"
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
+msgstr "登録ã—ãŸãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆ <b>%s</b> ã§ä½¿ã‚ã‚Œã¾ã™ã€‚"
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:317
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "ã‚ãªãŸã¯ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆ %s ã®ãƒ¡ãƒ³ãƒãƒ¼ä¸€è¦§ã«ã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
+#: ../src/gui_interface.py:400 ../src/gui_interface.py:404
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "エラー %(code)s: %(msg)s"
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "%(message)s ã‚’é€ä¿¡ã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ ( %(error)s )"
-
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:456 ../src/notify.py:278
msgid "Subscription request"
msgstr "在å¸é€šçŸ¥ç”³è¾¼"
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:481
msgid "Authorization accepted"
msgstr "承èªãŒå¾—られã¾ã—ãŸ"
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:482
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "相手先 %s ã•ã‚“ã¯ã€ã‚ãªãŸãŒåœ¨å¸çŠ¶æ³ã‚’見るã“ã¨ã‚’承èªã—ã¾ã—ãŸã€‚"
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:490
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "相手先 \"%s\" ã•ã‚“ã¯ã€ã‚ãªãŸã‹ã‚‰ã®ç”³ã—è¾¼ã¿ã‚’å´ä¸‹ã—ã¾ã—ãŸã€‚"
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:491
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -9265,54 +9181,16 @@ msgstr ""
"ã“ã®ç›¸æ‰‹å…ˆã‚’常ã«ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã¨ã—ã¦è¦‹ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚\n"
"相手先一覧ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ ?"
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:512 ../src/notify.py:280
msgid "Unsubscribed"
msgstr "在å¸é€šçŸ¥ã®å–り消ã—"
-#: ../src/gui_interface.py:631
-#, fuzzy, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Contact with \"%s\" cannot be established"
-
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:523
#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s ã•ã‚“ã¯é¡Œã‚’ %(subject)s ã«è¨å®šã—ã¾ã—ãŸ"
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "談話室ã®è¨˜éŒ²ã‚’å–ã‚Šã¾ã™ã€‚"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "談話室ã®è¨˜éŒ²ã‚’æ¢ã‚ã¾ã™"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "談話室ã¯éžåŒ¿åã§ã™"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "談話室ã¯åŠåŒ¿åã§ã™"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "談話室ã¯å®Œå…¨åŒ¿åã§ã™"
+msgid "Contact with \"%s\" cannot be established"
+msgstr "\"%s\" ã¨ã®æŽ¥ç¶šã¯ç¢ºç«‹ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:621
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
@@ -9320,23 +9198,32 @@ msgstr ""
"Gajim 㯠GPG エージェントを使用ã™ã‚‹ã‚ˆã†è¨å®šã•ã‚Œã¾ã—ãŸã€‚ã—ã‹ã—ã€GPG エージェン"
"トãŒèµ·å‹•ã—ã¦ã„ãªã„ã‹ã€ã‚ã‚‹ã„ã¯ãƒ‘スフレーズãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚\n"
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:623 ../src/gui_interface.py:631
msgid "You are currently connected without your OpenPGP key."
msgstr "ç¾åœ¨ã€OpenPGP éµã‚’使ã‚ãšã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:625
msgid "Your passphrase is incorrect"
msgstr "パスフレーズãŒé•ã„ã¾ã™"
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:630
msgid "OpenGPG Passphrase Incorrect"
msgstr "OpenGPG ã®ãƒ‘スフレーズãŒé•ã„ã¾ã™"
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:643
+msgid "Certificate Passphrase Required"
+msgstr "証明書ã®ãƒ‘スフレーズãŒå¿…è¦ã§ã™"
+
+#: ../src/gui_interface.py:644
+#, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "アカウント %s ã®è¨¼æ˜Žæ›¸ã®ãƒ‘スフレーズを入力ã—ã¦ãã ã•ã„。"
+
+#: ../src/gui_interface.py:666
msgid "GPG key not trusted"
msgstr "GPG éµã«ä¿¡ç”¨ãŒã‚ã‚Šã¾ã›ã‚“"
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:666
msgid ""
"The GPG key used to encrypt this chat is not trusted. Do you really want to "
"encrypt this message?"
@@ -9344,29 +9231,28 @@ msgstr ""
"ã“ã®ãƒãƒ£ãƒƒãƒˆã®æš—å·åŒ–ã«ä½¿ã£ãŸ GPG éµã«ã¯ä¿¡ç”¨ãŒã‚ã‚Šã¾ã›ã‚“。ã»ã‚“ã¨ã†ã«ã“ã®ãƒ¡ãƒƒ"
"セージを暗å·åŒ–ã—ãŸã„ã§ã™ã‹ ?"
-#: ../src/gui_interface.py:1031
-#, fuzzy
+#: ../src/gui_interface.py:679
msgid ""
-"Gnome Keyring is installed but not correctly started "
-"(environment variable probably not correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
msgstr ""
-"Gnome Keyring ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚ã—ã‹ã—ã€\t\t\t\tæ£ã—ãèµ·å‹•ã§ãã¾ã›"
-"ã‚“ (環境変数ãŒæ£ã—ãè¨å®šã•ã‚Œã¦ã„ãªã„よ\t\t\t\tã†ã§ã™)。"
+"Gnome Keyring ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚ã—ã‹ã—ã€æ£ã—ãèµ·å‹•ã§ãã¾ã›ã‚“(環境変"
+"æ•°ãŒæ£ã—ãè¨å®šã•ã‚Œã¦ã„ãªã„よã†ã§ã™)。"
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:786
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "%(gmail_mail_address)s ã«æ–°ç€ãƒ¡ãƒ¼ãƒ«"
-#: ../src/gui_interface.py:1133
-#, fuzzy, python-format
+#: ../src/gui_interface.py:788
+#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
msgstr[0] "æ–°ç€ãƒ¡ãƒ¼ãƒ«ãŒ %d 件ã‚ã‚Šã¾ã™"
msgstr[1] "æ–°ç€ãƒ¡ãƒ¼ãƒ«ãŒ %d 件ã‚ã‚Šã¾ã™"
-#: ../src/gui_interface.py:1146
-#, fuzzy, python-format
+#: ../src/gui_interface.py:801
+#, python-format
msgid ""
"\n"
"\n"
@@ -9380,81 +9266,58 @@ msgstr ""
"件å: %(subject)s\n"
"%(snippet)s"
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:866
#, python-format
msgid "%s wants to send you a file."
msgstr "%s ã•ã‚“ãŒãƒ•ã‚¡ã‚¤ãƒ«ã‚’転é€ã—ãŸãŒã£ã¦ã„ã¾ã™ã€‚"
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-#, fuzzy
+#: ../src/gui_interface.py:903 ../src/roster_window.py:1891
msgid "Remote contact stopped transfer"
msgstr "é ãã®ç›¸æ‰‹å…ˆãŒè»¢é€ã‚’ä¸æ¢ã—ã¾ã—ãŸ"
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:906 ../src/roster_window.py:1893
msgid "Error opening file"
msgstr "ファイルを開ãéš›ã®ã‚¨ãƒ©ãƒ¼"
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:938
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "%(name)s ã•ã‚“ã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ« %(filename)s ã‚’å—ã‘å–ã‚Šã¾ã—ãŸã€‚"
#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:942
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "%(name)s ã•ã‚“ã‹ã‚‰ã®ãƒ•ã‚¡ã‚¤ãƒ« %(filename)s ã®è»¢é€ã‚’ä¸æ–ã—ã¾ã—ãŸã€‚"
-#: ../src/gui_interface.py:1304
+#: ../src/gui_interface.py:955
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "%(name)s ã•ã‚“ã¸ãƒ•ã‚¡ã‚¤ãƒ« %(filename)s ã‚’é€ã‚Šã¾ã—ãŸã€‚"
#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:959
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "%(name)s ã•ã‚“ã¸ã®ãƒ•ã‚¡ã‚¤ãƒ« %(filename)s ã®è»¢é€ã‚’ä¸æ–ã—ã¾ã—ãŸã€‚"
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"%s ã•ã‚“ã‹ã‚‰ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’復å·ã§ãã¾ã›ã‚“\n"
-"改竄ã®å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚"
-
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1034
msgid "Unable to decrypt message"
msgstr "メッセージを復å·ã§ãã¾ã›ã‚“"
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1046
msgid "Username Conflict"
msgstr "ユーザーåã®é‡è¤‡"
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1047
msgid "Please type a new username for your local account"
msgstr "ãƒãƒ¼ã‚«ãƒ«ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æ–°ã—ã„ユーザーåを入力ã—ã¦ãã ã•ã„"
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "エラー"
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1062
msgid "Resource Conflict"
msgstr "リソースã®è¡çª"
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1063
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
@@ -9463,21 +9326,20 @@ msgstr ""
"ã¦ãã ã•ã„"
#. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
-#, fuzzy, python-format
+#: ../src/gui_interface.py:1108
+#, python-format
msgid "%s wants to start a voice chat."
-msgstr "%s ã•ã‚“ãŒãƒ•ã‚¡ã‚¤ãƒ«ã‚’転é€ã—ãŸãŒã£ã¦ã„ã¾ã™ã€‚"
+msgstr "%s ã•ã‚“ãŒãƒ•ã‚¡ã‚¤ãƒ«ã‚’音声ãƒãƒ£ãƒƒãƒˆã‚’始ã‚ãŸãŒã£ã¦ã„ã¾ã™ã€‚"
-#: ../src/gui_interface.py:1607
-#, fuzzy
+#: ../src/gui_interface.py:1111
msgid "Voice Chat Request"
-msgstr "ファイル転é€ã®è¦æ±‚"
+msgstr "音声ãƒãƒ£ãƒƒãƒˆã®è¦æ±‚"
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1198
msgid "Error verifying SSL certificate"
msgstr "SSL 証明書ã®æ¤œè¨¼ã‚¨ãƒ©ãƒ¼"
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1199
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: "
@@ -9487,15 +9349,15 @@ msgstr ""
"jabber サーãƒãƒ¼ã® SSL 証明書ã®æ¤œè¨¼ã«ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™: %(error)s\n"
"ãã‚Œã§ã‚‚ã“ã®ã‚µãƒ¼ãƒãƒ¼ã«æŽ¥ç¶šã—ã¾ã™ã‹ ?"
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1208
msgid "Ignore this error for this certificate."
msgstr "ã“ã®è¨¼æ˜Žæ›¸ã®ã“ã®ã‚¨ãƒ©ãƒ¼ã‚’無視ã—ã¾ã™ã€‚"
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1233
msgid "SSL certificate error"
msgstr "SSL 証明書エラー"
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1234
#, python-format
msgid ""
"It seems the SSL certificate of account %(account)s has changed or your "
@@ -9512,27 +9374,28 @@ msgstr ""
"\n"
"ãã‚Œã§ã‚‚接続ã—ã¦ã€è¨¼æ˜Žæ›¸ã®æŒ‡ç´‹ã‚’æ›´æ–°ã—ã¾ã™ã‹ ?"
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
+#: ../src/gui_interface.py:1270 ../src/gui_interface.py:1312
+#: ../src/gui_interface.py:1354
msgid "Insecure connection"
msgstr "安全ã§ãªã„接続"
-#: ../src/gui_interface.py:1777
-#, fuzzy
+#: ../src/gui_interface.py:1271
+#, python-format
msgid ""
-"You are about to connect to the server with an insecure connection. This "
-"means all your conversations will be exchanged unencrypted. Are you sure you "
-"want to do that?"
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. Are you sure you want to do that?"
msgstr ""
-"安全ã§ãªã„接続ã§ãƒ‘スワードをé€ã‚ã†ã¨ã—ã¦ã„ã¾ã™ã€‚ãれをé¿ã‘ã‚‹ã«ã¯ PyOpenSSL ã‚’"
-"インストールã™ã¹ãã§ã™ã€‚ã‚ãªãŸãŒã‚„ã‚ŠãŸã„ã“ã¨ã§ã™ã‹ ?"
+"安全ã§ãªã„接続ã§ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ %(account)s (サーãƒãƒ¼ %(server)s) ã«æŽ¥ç¶šã—よã†ã¨ã—"
+"ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯ã€ã™ã¹ã¦ã®ä¼šè©±ãŒæš—å·åŒ–ã•ã‚Œãšã«äº¤ã‚ã•ã‚Œã‚‹ã“ã¨æ„味ã—ã¾ã™ã€‚ã‚ãª"
+"ãŸãŒã‚„ã‚ŠãŸã„ã“ã¨ã§ã™ã‹ ?"
-#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
+#: ../src/gui_interface.py:1276 ../src/gui_interface.py:1316
+#: ../src/gui_interface.py:1357
msgid "Yes, I really want to connect insecurely"
msgstr "ã¯ã„。安全ã§ãªã„ã¾ã¾æŽ¥ç¶šã—ãŸã„ã§ã™"
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1313
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?"
@@ -9540,21 +9403,20 @@ msgstr ""
"安全ã§ãªã„接続ã§ãƒ‘スワードをé€ã‚ã†ã¨ã—ã¦ã„ã¾ã™ã€‚ãれをé¿ã‘ã‚‹ã«ã¯ PyOpenSSL ã‚’"
"インストールã™ã¹ãã§ã™ã€‚ã‚ãªãŸãŒã‚„ã‚ŠãŸã„ã“ã¨ã§ã™ã‹ ?"
-#: ../src/gui_interface.py:1850
-#, fuzzy
+#: ../src/gui_interface.py:1355
msgid ""
"You are about to send your password unencrypted on an insecure connection. "
"Are you sure you want to do that?"
msgstr ""
-"æš—å·åŒ–ã•ã‚Œã¦ã„ãªã„接続ã§ãƒ‘スワードをé€ã‚ã†ã¨ã—ã¦ã„ã¾ã™ã€‚ã‚ãªãŸãŒã‚„ã‚ŠãŸã„ã“ã¨"
-"ã§ã™ã‹ ?"
+"安全ã§ãªã„接続ã§æš—å·åŒ–ã•ã‚Œã¦ã„ãªã„パスワードをé€ã‚ã†ã¨ã—ã¦ã„ã¾ã™ã€‚ã‚ãªãŸãŒã‚„"
+"ã‚ŠãŸã„ã“ã¨ã§ã™ã‹ ?"
#. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1864 ../src/gui_interface.py:1887
msgid "Emoticons disabled"
msgstr "感情アイコンã¯ç„¡åŠ¹"
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1865
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
@@ -9562,7 +9424,7 @@ msgstr ""
"指定ã•ã‚ŒãŸæ„Ÿæƒ…アイコンã®ãƒ†ãƒ¼ãƒžã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。ãã®ãŸã‚ã€æ„Ÿæƒ…アイコンã¯ç„¡åŠ¹"
"ã§ã™ã€‚"
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:1888
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 "
@@ -9572,42 +9434,42 @@ msgstr ""
"ルã®æ›¸å¼ã‚’æ›´æ–°ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚知れã¾ã›ã‚“。詳ã—ã㯠http://trac.gajim.org/"
"wiki/Emoticons ã‚’ã”覧ãã ã•ã„。"
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:1932 ../src/roster_window.py:3784
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/gui_interface.py:2871
+#: ../src/gui_interface.py:2319
msgid "Could not save your settings and preferences"
msgstr "è¨å®šã‚’ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:2866
msgid "Passphrase Required"
msgstr "パスフレーズãŒå¿…è¦ã§ã™"
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:2867
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr ""
"éµID %(keyid)s (アカウント %(account)s) ã® GPG éµã®ãƒ‘スフレーズを入力ã—ã¦ãã "
"ã•ã„。"
-#: ../src/gui_interface.py:3426
+#: ../src/gui_interface.py:2881
msgid "GPG key expired"
-msgstr "GPG éµã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™"
+msgstr "GPG éµã¯æœŸé™åˆ‡ã‚Œã§ã™"
-#: ../src/gui_interface.py:3427
-#, fuzzy, python-format
+#: ../src/gui_interface.py:2882
+#, python-format
msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
-msgstr "GPG éµã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚OpenPGP ãªã—ã« %s ã•ã‚“ã«æŽ¥ç¶šã—ã¾ã™ã€‚"
+msgstr "GPG éµã¯æœ‰åŠ¹æœŸé™ãŒåˆ‡ã‚Œã¦ã„ã¾ã™ã€‚OpenPGP ãªã—ã« %s ã«æŽ¥ç¶šã—ã¾ã™ã€‚"
#. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:2891
msgid "Wrong Passphrase"
msgstr "パスフレーズãŒé–“é•ã£ã¦ã„ã¾ã™"
-#: ../src/gui_interface.py:3437
+#: ../src/gui_interface.py:2892
msgid "Please retype your GPG passphrase or press Cancel."
msgstr ""
"GPG ã®ãƒ‘スフレーズをもã†ã„ã¡ã©å…¥åŠ›ã™ã‚‹ã‹ã€ã¾ãŸã¯ã€Œä¸æ¢ã€ã‚’押ã—ã¦ãã ã•ã„。"
@@ -9616,42 +9478,42 @@ msgstr ""
msgid "_New Group Chat"
msgstr "æ–°ã—ã„グループãƒãƒ£ãƒƒãƒˆ (_N)"
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:419
msgid "I would like to add you to my roster"
msgstr "ç§ã¯ã‚ãªãŸã‚’åç°¿ã«è¿½åŠ ã—ãŸã„ã¨æ€ã£ã¦ã„ã¾ã™"
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:116
msgid "Cannot find history logs database"
msgstr "å±¥æ´è¨˜éŒ²ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:156
msgid "Contacts"
msgstr "相手先"
#. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_manager.py:169 ../src/history_manager.py:213
#: ../src/history_window.py:98
msgid "Date"
msgstr "日付"
#. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:176 ../src/history_manager.py:232
msgid "Nickname"
msgstr "ニックãƒãƒ¼ãƒ "
#. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_manager.py:185 ../src/history_manager.py:220
#: ../src/history_window.py:106
msgid "Message"
msgstr "メッセージ"
#. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:193 ../src/history_manager.py:226
msgid "Subject"
msgstr "題"
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:252
msgid ""
"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
"RUNNING)"
@@ -9659,7 +9521,7 @@ msgstr ""
"データベースを消去ã—ã¾ã™ã‹ ? (Gajim ãŒèµ·å‹•ã—ã¦ã„ã‚‹å ´åˆã€ã¾ã£ãŸããŠå‹§ã‚ã§ãã¾"
"ã›ã‚“)"
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:254
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 "
@@ -9667,27 +9529,44 @@ msgid ""
"\n"
"In case you click YES, please wait..."
msgstr ""
+"通常ã€ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹é ˜åŸŸãŒç©ºã«ãªã‚‹ã‚ã‘ã§ã¯ãªãã€å†ä½¿ç”¨å¯èƒ½ã«ãªã‚‹ã ã‘ã§ã™ã€‚ã‚‚ã—"
+"ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹é ˜åŸŸã‚’æœ¬å½“ã«æ¶ˆåŽ»ã—ãŸã„å ´åˆã¯ YES ã‚’ã€ãã†ã§ãªã‘れ㰠NO をクリック"
+"ã—ã¦ãã ã•ã„。\n"
+"\n"
+"YES をクリックã—ãŸå ´åˆã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„..."
+
+#: ../src/history_manager.py:259
+msgid "Database Cleanup"
+msgstr "データベースã®æŽƒé™¤"
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:477
msgid "Exporting History Logs..."
msgstr "å±¥æ´è¨˜éŒ²ã‚’書ã出ã—ã¦ã„ã¾ã™..."
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:554
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(time)s ã€%(who)s ã•ã‚“ã¯è¨€ã„ã¾ã—ãŸ: %(message)s\n"
-#: ../src/history_manager.py:572
-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] "本当ã«ã€é¸æŠžã—ãŸç›¸æ‰‹å…ˆã®è¨˜éŒ²ã‚’削除ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
+#: ../src/history_manager.py:592
+#, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "本当ã«ã€%(jid)s ã®è¨˜éŒ²ã‚’削除ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
+
+#: ../src/history_manager.py:596
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "本当ã«ã€é¸æŠžã—ãŸç›¸æ‰‹å…ˆã®è¨˜éŒ²ã‚’削除ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:598 ../src/history_manager.py:637
msgid "This is an irreversible operation."
-msgstr ""
+msgstr "ã“ã‚Œã¯ä¸å¯é€†çš„ãªæ“作ã§ã™ã€‚"
+
+#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "ä¸æ¢ã®ç¢ºèª"
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:634
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "本当ã«ã€é¸æŠžã—ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’削除ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
@@ -9726,14 +9605,19 @@ msgstr "ç¾åœ¨ã®çŠ¶æ³: %(status)s: %(status_msg)s"
msgid "Status is now: %(status)s"
msgstr "ç¾åœ¨ã®çŠ¶æ³: %(status)s"
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523 ../src/htmltextview.py:533
msgid "Timeout loading image"
msgstr "ç”»åƒã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/htmltextview.py:535
+#: ../src/htmltextview.py:543
msgid "Image is too big"
msgstr "ç”»åƒãŒå¤§ãã™ãŽã¾ã™"
+#: ../src/htmltextview.py:576
+#, fuzzy
+msgid "Loading"
+msgstr "èªã¿è¾¼ã¿ä¸"
+
#: ../src/message_window.py:222
msgid "You are going to close several tabs"
msgstr "タブを閉ã˜ã‚ˆã†ã¨ã—ã¦ã„ã¾ã™"
@@ -9742,19 +9626,19 @@ msgstr "タブを閉ã˜ã‚ˆã†ã¨ã—ã¦ã„ã¾ã™"
msgid "Do you really want to close them all?"
msgstr "本当ã«ãれらをã™ã¹ã¦é–‰ã˜ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
-#: ../src/message_window.py:485
+#: ../src/message_window.py:497
msgid "Chats"
msgstr "ãƒãƒ£ãƒƒãƒˆ"
-#: ../src/message_window.py:487
+#: ../src/message_window.py:499
msgid "Group Chats"
msgstr "グループãƒãƒ£ãƒƒãƒˆ"
-#: ../src/message_window.py:489
+#: ../src/message_window.py:501
msgid "Private Chats"
msgstr "個人ãƒãƒ£ãƒƒãƒˆ"
-#: ../src/message_window.py:495
+#: ../src/message_window.py:507
msgid "Messages"
msgstr "メッセージ"
@@ -9766,153 +9650,151 @@ msgstr "- メッセージã¯è¨˜éŒ²ã•ã‚Œã¾ã™"
msgid "- messages will not be logged"
msgstr "- メッセージã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“"
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s ã•ã‚“ã®åœ¨å¸çŠ¶æ³ãŒå¤‰ã‚ã‚Šã¾ã—ãŸ"
+#: ../src/notify.py:319
+msgid "Ignore"
+msgstr "無視ã™ã‚‹"
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s ã•ã‚“ãŒã‚µã‚¤ãƒ³ã‚¤ãƒ³ã—ã¾ã—ãŸ"
+#: ../src/plugins/gui.py:67
+msgid "Plugin"
+msgstr "プラグイン"
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s ã•ã‚“ãŒã‚µã‚¤ãƒ³ã‚¢ã‚¦ãƒˆã—ã¾ã—ãŸ"
+#: ../src/plugins/gui.py:161
+msgid "Plugin failed"
+msgstr "プラグインã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "%(nickname)s ã‹ã‚‰ã®æ–°ã—ã„å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+#: ../src/plugins/gui.py:205
+msgid "Unable to properly remove the plugin"
+msgstr "プラグインをæ£ã—ã削除ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "グループãƒãƒ£ãƒƒãƒˆ %s ã‹ã‚‰ã®æ–°ç€ã®ç§ä¿¡"
+#. members not safe
+#: ../src/plugins/gui.py:213 ../src/plugins/pluginmanager.py:499
+#: ../src/plugins/pluginmanager.py:507
+msgid "Archive is malformed"
+msgstr ""
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s ã•ã‚“: %(message)s"
+#: ../src/plugins/gui.py:236 ../src/plugins/gui.py:244
+#: ../src/plugins/pluginmanager.py:515
+msgid "Plugin already exists"
+msgstr "プラグインã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™"
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "%(nickname)s ã•ã‚“ã‹ã‚‰ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+#: ../src/plugins/gui.py:236
+msgid "Overwrite?"
+msgstr "上書ãã—ã¾ã™ã‹ ?"
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "%(nickname)s ã•ã‚“ã‹ã‚‰ã®æ–°ç€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
+#: ../src/plugins/gui.py:265
+msgid "Configuration"
+msgstr "調整"
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "無視ã™ã‚‹"
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:485 ../src/plugins/pluginmanager.py:491
+msgid "Archive corrupted"
+msgstr "書庫ãŒå£Šã‚Œã¦ã„ã¾ã™"
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:487
+msgid "Archive empty"
+msgstr "書庫ãŒç©ºã§ã™"
+
+#: ../src/profile_window.py:60
msgid "Retrieving profile..."
msgstr "プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’å–å¾—ä¸..."
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:125 ../src/roster_window.py:3137
msgid "File is empty"
msgstr "ファイルãŒç©ºã§ã™"
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:128 ../src/roster_window.py:3140
msgid "File does not exist"
msgstr "ファイルãŒã‚ã‚Šã¾ã›ã‚“"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:142 ../src/profile_window.py:158
+#: ../src/roster_window.py:3142 ../src/roster_window.py:3153
msgid "Could not load image"
msgstr "ç”»åƒã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/profile_window.py:215
-#, fuzzy
+#: ../src/profile_window.py:229
msgid "Wrong date format"
-msgstr "相手先ã®æƒ…å ±"
+msgstr "日付ã®æ›¸å¼ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: ../src/profile_window.py:216
-#, fuzzy
+#: ../src/profile_window.py:230
msgid "Format of the date must be YYYY-MM-DD"
-msgstr "書å¼: YYYY-MM-DD"
+msgstr "日付ã®æ›¸å¼ã¯ YYYY-MM-DD ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:284
msgid "Information received"
msgstr "æƒ…å ±ã‚’å—ä¿¡ã—ã¾ã—ãŸ"
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:362
msgid "Without a connection you can not publish your contact information."
msgstr "接続ã—ãªã„ã¨ã€æƒ…å ±ã‚’å…¬é–‹ã§ãã¾ã›ã‚“。"
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:375
msgid "Sending profile..."
msgstr "プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¦ã„ã¾ã™..."
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:394
msgid "Information NOT published"
msgstr "æƒ…å ±ã¯å…¬é–‹ã•ã‚Œã¾ã›ã‚“"
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:401
msgid "vCard publication failed"
msgstr "vCard ã®å…¬é–‹ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:402
msgid ""
"There was an error while publishing your personal information, try again "
"later."
msgstr ""
"å€‹äººæƒ…å ±ã®å…¬é–‹ã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚時間をãŠã„ã¦å†åº¦è©¦ã¿ã¦ãã ã•ã„。"
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
-#, fuzzy
+#: ../src/roster_window.py:240 ../src/roster_window.py:1028
msgid "Merged accounts"
msgstr "çµ±åˆã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:1956
msgid "Authorization has been sent"
msgstr "承èªãŒé€ä¿¡ã•ã‚Œã¾ã—ãŸ"
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1957
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "ç¾åœ¨ \"%s\" ã•ã‚“ã¯ã‚ãªãŸã®åœ¨å¸çŠ¶æ³ã‚’知るã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:1980
msgid "Subscription request has been sent"
msgstr "在å¸é€šçŸ¥ã®ç”³ã—è¾¼ã¿ã‚’é€ä¿¡ã—ã¾ã—ãŸ"
-#: ../src/roster_window.py:1967
-#, fuzzy, python-format
+#: ../src/roster_window.py:1981
+#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr ""
"\"%s\" ã•ã‚“ãŒã“ã®ç”³ã—è¾¼ã¿ã‚’承èªã—ãŸã‚‰ã€ç›¸æ‰‹å…ˆã®åœ¨å¸çŠ¶æ³ã‚’知るã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:1995
msgid "Authorization has been removed"
msgstr "承èªãŒå–り消ã•ã‚Œã¾ã—ãŸ"
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:1996
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "\"%s\" ã•ã‚“ã¯å¸¸ã«ã‚ãªãŸã‚’オフラインã¨ã—ã¦è¦‹ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚"
-#: ../src/roster_window.py:2009
+#: ../src/roster_window.py:2023
msgid "GPG is not usable"
msgstr "GPG ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“"
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2024
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "OpenPGP ãªã—ã«ã€%s ã•ã‚“ã«æŽ¥ç¶šã—ã¾ã™ã€‚"
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2231 ../src/roster_window.py:3714
msgid "You are participating in one or more group chats"
msgstr "一ã¤ä»¥ä¸Šã®ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«å‚åŠ ä¸ã§ã™ã€‚"
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2232 ../src/roster_window.py:3715
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -9920,39 +9802,37 @@ msgstr ""
"在å¸çŠ¶æ³ã‚’ã€Œéš ã‚Œä¸ã€ã«ã™ã‚‹ã¨ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã‹ã‚‰é€€å‡ºã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ã»"
"ã‚“ã¨ã†ã«ã€Œéš ã‚Œä¸ã€ã«ã—ã¾ã™ã‹ ?"
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2258
msgid "desync'ed"
msgstr "ä¸æƒã„"
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2324
msgid "Really quit Gajim?"
msgstr "本当㫠Gajim を終了ã—ã¾ã™ã‹ ?"
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2325
msgid "Are you sure you want to quit Gajim?"
msgstr "本当㫠Gajim を終了ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2326
msgid "Always close Gajim"
msgstr "常㫠Gajim を終了ã™ã‚‹"
-#: ../src/roster_window.py:2396
-#, fuzzy
+#: ../src/roster_window.py:2410
msgid "You have running file transfers"
-msgstr "ファイルã®è»¢é€ã‚’ä¸æ¢ã™ã‚‹"
+msgstr "ファイルã®è»¢é€ã‚’実行ä¸ã§ã™"
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2411
msgid ""
"If you quit now, the file(s) being transferred will be stopped. Do you still "
"want to quit?"
-msgstr ""
+msgstr "ã„ã¾çµ‚了ã™ã‚‹ã¨ã€è»¢é€ä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚ãã‚Œã§ã‚‚終了ã—ã¾ã™ã‹?"
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2442 ../src/roster_window.py:2856
msgid "You have unread messages"
msgstr "未èªã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒã‚ã‚Šã¾ã™"
-#: ../src/roster_window.py:2429
-#, fuzzy
+#: ../src/roster_window.py:2443
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
@@ -9960,37 +9840,37 @@ msgstr ""
"å±¥æ´ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã¦ã€ã‹ã¤ç›¸æ‰‹å…ˆãŒåç°¿ã«ã‚ã‚Œã°ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯å¾Œã§èªã‚€ã“ã¨ãŒ"
"ã§ãã¾ã™ã€‚"
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2857
msgid "You must read them before removing this transport."
msgstr "ã“ã®ä¸ç¶™å…ˆã‚’削除ã™ã‚‹å‰ã«ã€ãれらをèªã¾ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2860
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "ä¸ç¶™å…ˆ \"%s\" を削除ã—ã¾ã™"
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2861
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
msgstr "ã“ã®ä¸ç¶™å…ˆã‚’ã¨ãŠã—ã¦ç›¸æ‰‹å…ˆã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€å—ä¿¡ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2864
msgid "Transports will be removed"
msgstr "ä¸ç¶™å…ˆã¯å‰Šé™¤ã•ã‚Œã¾ã™"
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2869
#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
"these transports: %s"
msgstr "ã‚‚ã†ã“れらã®ä¸ç¶™å…ˆ %s ã‹ã‚‰ç›¸æ‰‹å…ˆã¨ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®é€å—ä¿¡ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2937
msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr "相手先を拒å¦ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚続行ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
+msgstr "相手先をé®æ–ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚続行ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:2939
msgid ""
"This contact will see you offline and you will not receive messages he will "
"send you."
@@ -9999,56 +9879,56 @@ msgstr ""
"ん。"
#. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3029
msgid "Rename Contact"
msgstr "相手先ã®åå‰ã‚’変更"
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3030
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "相手先 %s ã•ã‚“ã®æ–°ã—ã„ニックãƒãƒ¼ãƒ を入力ã—ã¦ãã ã•ã„"
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3037
msgid "Rename Group"
msgstr "グループã®åå‰å¤‰æ›´"
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3038
#, python-format
msgid "Enter a new name for group %s"
msgstr "グループ %s ã®æ–°ã—ã„åå‰ã‚’入力ã—ã¦ãã ã•ã„"
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3083
msgid "Remove Group"
msgstr "グループã®å‰Šé™¤"
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3084
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "åç°¿ã‹ã‚‰ã‚°ãƒ«ãƒ¼ãƒ— %s を削除ã—ã¾ã™ã‹ ?"
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3085
msgid "Also remove all contacts in this group from your roster"
msgstr "åç°¿ã®ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ã™ã¹ã¦ã®ç›¸æ‰‹å…ˆã‚‚削除ã—ã¾ã™"
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3124
msgid "Assign OpenPGP Key"
msgstr "OpenPGP éµã®å‰²ã‚Šå½“ã¦"
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3125
msgid "Select a key to apply to the contact"
msgstr "相手先ã«é©ç”¨ã™ã‚‹éµã‚’é¸æŠžã—ã¦ãã ã•ã„"
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3524
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "相手先 \"%s\" ã•ã‚“ã‚’åç°¿ã‹ã‚‰å‰Šé™¤ã—ã¾ã™"
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3526
#, python-format
msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
msgstr "\"%(name)s\" (%(jid)s) ã•ã‚“ã‚’åç°¿ã‹ã‚‰å‰Šé™¤ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚\n"
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3531
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -10057,11 +9937,11 @@ msgstr ""
"を常ã«ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã¨ã—ã¦è¦‹ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚"
#. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3537
msgid "Do you want to continue?"
msgstr "続ã‘ã¾ã™ã‹ ?"
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3541
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -10069,16 +9949,16 @@ msgstr ""
"ã“ã®ç›¸æ‰‹å…ˆã‚’åç°¿ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã¨ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§åœ¨å¸é€šçŸ¥ã®æ‰¿èªã‚‚å–り消ã—ã¾ã™ã€‚相"
"手先ã¯ã‚ãªãŸã‚’常ã«ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã¨ã—ã¦è¦‹ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚"
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3544
msgid "I want this contact to know my status after removal"
msgstr "削除後もã€ã“ã®ç›¸æ‰‹å…ˆã«è‡ªåˆ†ã®åœ¨å¸çŠ¶æ³ã‚’知らã›ã‚‹"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3548
msgid "Contacts will be removed from your roster"
msgstr "相手先ã¯åç°¿ã‹ã‚‰å‰Šé™¤ã•ã‚Œã¾ã—ãŸ"
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3553
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -10088,14 +9968,13 @@ msgstr ""
"ã‚’åç°¿ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã¨ã€åœ¨å¸é€šçŸ¥ã®æ‰¿èªã‚‚å–り消ã—ã¾ã™ã€‚相手先ã¯ã‚ãªãŸã‚’常ã«ã‚ªãƒ•"
"ラインã¨ã—ã¦è¦‹ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚"
-#: ../src/roster_window.py:3459
-#, fuzzy
+#: ../src/roster_window.py:3611
msgid ""
"You are about to send a custom status. Are you sure you want to continue?"
msgstr "独自ã®åœ¨å¸çŠ¶æ³ã‚’é€ä¿¡ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚続行ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
-#: ../src/roster_window.py:3461
-#, fuzzy, python-format
+#: ../src/roster_window.py:3613
+#, python-format
msgid ""
"This contact will temporarily see you as %(status)s, but only until you "
"change your status. Then he or she will see your global status."
@@ -10104,189 +9983,198 @@ msgstr ""
"ãŒåœ¨å¸çŠ¶æ³ã‚’変更ã™ã‚‹ã¾ã§ã®é–“ã§ã™ã€‚ãã®å¾Œã¯ã‚ãªãŸã®å…¨ä½“ã®åœ¨å¸çŠ¶æ³ã‚’見るã“ã¨ã«"
"ãªã‚Šã¾ã™ã€‚"
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3632
msgid "No account available"
msgstr "アカウントãŒã‚ã‚Šã¾ã›ã‚“"
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3633
msgid "You must create an account before you can chat with other contacts."
msgstr "相手先ã¨ãƒãƒ£ãƒƒãƒˆã‚’開始ã™ã‚‹å‰ã«ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’作æˆã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4286
msgid "Metacontacts storage not supported by your server"
-msgstr ""
+msgstr "サーãƒãƒ¼ã¯ãƒ¡ã‚¿ç›¸æ‰‹å…ˆã®ä¿å˜ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4288
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
msgstr ""
+"サーãƒãƒ¼ã¯ãƒ¡ã‚¿ç›¸æ‰‹å…ˆã®æƒ…å ±ã®ä¿å˜ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。ã—ãŸãŒã£ã¦ãã®æƒ…å ±ã¯"
+"次ã®æŽ¥ç¶šã®éš›ã«ã¯å¤±ã‚ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../src/roster_window.py:4189
-#, fuzzy
+#: ../src/roster_window.py:4380
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "metacontact を作æˆã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚続行ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
+msgstr "メタ相手先を作æˆã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚続行ã—ã¦ã‚‚ã„ã„ã§ã™ã‹ ?"
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4382
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:4306
+#: ../src/roster_window.py:4503
msgid "Invalid file URI:"
msgstr "ファイル㮠URI ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“:"
-#: ../src/roster_window.py:4318
-#, fuzzy, python-format
+#: ../src/roster_window.py:4515
+#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
-msgstr[0] "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ %s ã•ã‚“ã«è»¢é€ã—ã¾ã™ã‹"
-msgstr[1] "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ %s ã•ã‚“ã«è»¢é€ã—ã¾ã™ã‹"
+msgstr[0] "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ %s ã•ã‚“ã«è»¢é€ã—ã¾ã™ã‹:"
+msgstr[1] "ã“れらã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ %s ã•ã‚“ã«è»¢é€ã—ã¾ã™ã‹:"
-#: ../src/roster_window.py:4433
-#, fuzzy, python-format
+#: ../src/roster_window.py:4650
+#, python-format
msgid "Send %s to %s"
-msgstr "é€ä¿¡ã™ã‚‹"
+msgstr "%s ã‚’ %s ã«é€ä¿¡"
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4661
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "%s を優先ã®ç›¸æ‰‹å…ˆã¨ã™ã‚‹"
+
+# (Mako) よãã‚ã‹ã‚‰ãªã„。Make [c_source.get_shown_name()] and [c_dest.get_shown_name()] metacontacts
+#: ../src/roster_window.py:4664
#, python-format
msgid "Make %s and %s metacontacts"
-msgstr ""
+msgstr "%s 㨠%s をメタ相手先ã¨ã™ã‚‹"
#. new chat
#. single message
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
-#: ../src/roster_window.py:4970 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5104 ../src/roster_window.py:5158
+#: ../src/roster_window.py:5167 ../src/statusicon.py:264
+#: ../src/statusicon.py:311 ../src/statusicon.py:317
#, python-format
msgid "using account %s"
msgstr "アカウント %s ã§"
#. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5174
#, python-format
msgid "to %s account"
msgstr "アカウント %s ã«å¯¾ã—ã¦"
#. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5179
#, python-format
msgid "using %s account"
msgstr "アカウント %s ã§"
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5218 ../src/statusicon.py:327
msgid "_Manage Bookmarks..."
msgstr "ブックマークã®ç®¡ç† (_M)..."
#. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5238
#, python-format
msgid "of account %s"
msgstr "アカウント %s ã®"
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5279
#, python-format
msgid "for account %s"
msgstr "アカウント %s ã«ã¤ã„ã¦"
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5339 ../src/roster_window.py:5447
msgid "_Change Status Message"
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®å¤‰æ›´ (_C)"
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5372
msgid "Publish Tune"
msgstr "è´ã„ã¦ã„る楽曲åを公開"
-#: ../src/roster_window.py:5176
-#, fuzzy
+#: ../src/roster_window.py:5374
msgid "Publish Location"
-msgstr "è´ã„ã¦ã„る楽曲åを公開"
+msgstr "ä½ç½®æƒ…å ±ã‚’å…¬é–‹"
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5377
msgid "Configure Services..."
-msgstr "サービスã®æ§‹æˆ"
+msgstr "サービスã®èª¿æ•´..."
# (Mako)ã“ã“ã§ã¯ã€Œå¾©å…ƒã€ã®æ„味ã‹
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5525
msgid "_Maximize All"
msgstr "ウィンドウをã™ã¹ã¦å¾©å…ƒ (_M)"
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5535 ../src/roster_window.py:5708
msgid "Send Group M_essage"
msgstr "メッセージã®ä¸€æ–‰é€ä¿¡ (_e)"
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5543
msgid "To all users"
msgstr "ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«"
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5547
msgid "To all online users"
msgstr "オンラインã®ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«"
#. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5728
msgid "_Manage Contacts"
msgstr "相手先ã®ç®¡ç† (_M)"
#. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5737
msgid "Edit _Groups"
msgstr "グループã®ç·¨é›† (_G)"
#. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5792
msgid "Send Single Message"
msgstr "å˜ç™ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®é€ä¿¡"
#. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:5839
msgid "Execute Command..."
msgstr "コマンドを実行ã™ã‚‹..."
#. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5849
msgid "_Manage Transport"
msgstr "ä¸ç¶™å…ˆã®ç®¡ç† (_M)"
#. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:5858
msgid "_Modify Transport"
msgstr "ä¸ç¶™å…ˆã®å¤‰æ›´ (_M)"
#. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:5868
msgid "_Rename"
msgstr "åå‰ã®å¤‰æ›´(_R)"
# (Mako)ã“ã“ã§ã¯ã€Œå¾©å…ƒã€ã®æ„味ã‹
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5928
msgid "_Maximize"
msgstr "ウィンドウã®å¾©å…ƒ (_M)"
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5937
msgid "_Reconnect"
msgstr "å†æŽ¥ç¶š (_R)"
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:5944
msgid "_Disconnect"
msgstr "åˆ‡æ– (_D)"
#. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6033
msgid "History Manager"
msgstr "å±¥æ´ãƒžãƒãƒ¼ã‚¸ãƒ£"
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6044
msgid "_Join New Group Chat"
msgstr "æ–°ã—ã„グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ (_J)"
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6263
msgid "Change Status Message..."
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’変更ã™ã‚‹..."
@@ -10303,21 +10191,16 @@ msgstr "ファイルをå—ã‘ã‚‹éš›ã®ã‚¨ãƒ©ãƒ¼"
msgid "No result"
msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/session.py:136
+#: ../src/session.py:95
msgid "Disk WriteError"
msgstr "ディスクã®æ›¸ãè¾¼ã¿ã‚¨ãƒ©ãƒ¼"
-#: ../src/session.py:258
-#, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "件å: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:406 ../src/session.py:450
msgid "Confirm these session options"
-msgstr ""
+msgstr "セッションã®ã‚ªãƒ—ションを確èªã™ã‚‹"
-#: ../src/session.py:448
-#, fuzzy, python-format
+#: ../src/session.py:407
+#, python-format
msgid ""
"The remote client wants '\n"
" 'to negotiate an session with these features:\n"
@@ -10326,14 +10209,15 @@ msgid ""
"\n"
"Are these options acceptable?"
msgstr ""
-"The remote client wants to negotiate an session with these features:\n"
+"é ãã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆãŒ\n"
+"次ã®æ©Ÿèƒ½ã¨ã¨ã‚‚ã«ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’確立ã—よã†ã¨ã—ã¦ã„ã¾ã™:\n"
"\n"
"\t%s\n"
"\n"
-"\tAre these options acceptable?"
+"\tã“れらã®ã‚ªãƒ—ションをå—ã‘付ã‘ã¾ã™ã‹ ?"
-#: ../src/session.py:492
-#, fuzzy, python-format
+#: ../src/session.py:451
+#, python-format
msgid ""
"The remote client selected these options:\n"
"\n"
@@ -10341,22 +10225,21 @@ msgid ""
"\n"
"Continue with the session?"
msgstr ""
-"The remote client selected these options:\n"
+"é ãã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆãŒæ¬¡ã®ã‚ªãƒ—ションをé¸æŠžã—ã¾ã—ãŸ:\n"
"\n"
"%s\n"
"\n"
-"Continue with the session?"
+"セッションを続ã‘ã¾ã™ã‹ ?"
-#: ../src/statusicon.py:227
+#: ../src/statusicon.py:228
msgid "_Change Status Message..."
msgstr "状æ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’変更ã™ã‚‹ (_C)..."
-#: ../src/statusicon.py:339
-#, fuzzy
+#: ../src/statusicon.py:342
msgid "Hide _Roster"
-msgstr "å簿㧠(_r)"
+msgstr "åç°¿ã‚’é–‰ã˜ã‚‹ (_R)"
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:353
msgid "Hide this menu"
msgstr "ã“ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示ã—ãªã„"
@@ -10375,11 +10258,11 @@ msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã® %(owner_or_admin_or_member)s "
#: ../src/tooltips.py:502
msgid " [blocked]"
-msgstr "[æ‹’å¦ã•ã‚Œã¦ã„ã¾ã™]"
+msgstr "é®æ–ã—ã¦ã„ã¾ã™]"
#: ../src/tooltips.py:506
msgid " [minimized]"
-msgstr "[最å°åŒ–ã•ã‚Œã¦ã„ã¾ã™]"
+msgstr "[最å°åŒ–ã—ã¦ã„ã¾ã™]"
#: ../src/tooltips.py:521 ../src/tooltips.py:777
msgid "Status: "
@@ -10413,34 +10296,34 @@ msgid "OpenPGP: "
msgstr "OpenPGP: "
#: ../src/tooltips.py:646
-#, fuzzy, python-format
+#, python-format
msgid "Idle since %s"
-msgstr " %s ã‹ã‚‰"
+msgstr " %s ã‹ã‚‰æ“作ã®ãªã„状態"
#: ../src/tooltips.py:647
-#, fuzzy, python-format
+#, python-format
msgid "Idle for %s"
-msgstr "%s 㮠XML コンソール"
+msgstr "%s é–“ã€æ“作ã®ãªã„状態"
#: ../src/tooltips.py:698
-#, fuzzy, python-format
+#, python-format
msgid "Mood: %s"
-msgstr "気分:"
+msgstr "気分: %s"
#: ../src/tooltips.py:702
-#, fuzzy, python-format
+#, python-format
msgid "Activity: %s"
-msgstr "å‹•å‘:"
+msgstr "å‹•å‘: %s"
#: ../src/tooltips.py:706
-#, fuzzy, python-format
+#, python-format
msgid "Tune: %s"
-msgstr "楽曲:"
+msgstr "楽曲: %s"
#: ../src/tooltips.py:710
-#, fuzzy, python-format
+#, python-format
msgid "Location: %s"
-msgstr "通知"
+msgstr "ä½ç½®: %s"
#: ../src/tooltips.py:735
msgid "Download"
@@ -10451,7 +10334,6 @@ msgid "Upload"
msgstr "アップãƒãƒ¼ãƒ‰"
#: ../src/tooltips.py:748
-#, fuzzy
msgid "Type: "
msgstr "種類: "
@@ -10496,32 +10378,32 @@ msgstr ""
"ã“ã®ã‚µãƒ¼ãƒ“スã¯è©³ç´°æƒ…å ±ã‚’è¿”ç”ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。\n"
"å¤ã„ã‹ã€ã¾ãŸã¯å£Šã‚Œã¦ã„ã¾ã™"
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
msgid "?Client:Unknown"
msgstr "ä¸æ˜Ž"
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
msgid "?OS:Unknown"
msgstr "ä¸æ˜Ž"
-#: ../src/vcard.py:288
+#: ../src/vcard.py:310
msgid "?Time:Unknown"
msgstr "ä¸æ˜Ž"
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
#, python-format
msgid "since %s"
msgstr "%s ã‹ã‚‰"
-#: ../src/vcard.py:345
+#: ../src/vcard.py:367
msgid "?Role in Group Chat:<b>Role:</b>"
-msgstr ""
+msgstr "<b>å½¹:</b>"
-#: ../src/vcard.py:349
+#: ../src/vcard.py:371
msgid "<b>Affiliation:</b>"
msgstr "<b>分掌:</b>"
-#: ../src/vcard.py:357
+#: ../src/vcard.py:379
msgid ""
"This contact is interested in your presence information, but you are not "
"interested in his/her presence"
@@ -10529,7 +10411,7 @@ msgstr ""
"ã“ã®ç›¸æ‰‹å…ˆã¯ã‚ãªãŸã®åœ¨å¸æƒ…å ±ã«é–¢å¿ƒãŒã‚ã‚Šã¾ã™ã€‚ã—ã‹ã—ã€ã‚ãªãŸã¯ã“ã®ç›¸æ‰‹å…ˆã®åœ¨"
"å¸æƒ…å ±ã«é–¢å¿ƒãŒã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/vcard.py:359
+#: ../src/vcard.py:381
msgid ""
"You are interested in the contact's presence information, but he/she is not "
"interested in yours"
@@ -10537,320 +10419,26 @@ msgstr ""
"ã‚ãªãŸã¯ç›¸æ‰‹å…ˆã®åœ¨å¸æƒ…å ±ã«é–¢å¿ƒãŒã‚ã‚Šã¾ã™ã€‚ã—ã‹ã—ã€ç›¸æ‰‹å…ˆã¯ã‚ãªãŸã®åœ¨å¸æƒ…å ±ã«"
"関心ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/vcard.py:361
+#: ../src/vcard.py:383
msgid "You and the contact are interested in each other's presence information"
msgstr "ã‚ãªãŸã¨ç›¸æ‰‹å…ˆã¯ç›¸äº’ã®åœ¨å¸æƒ…å ±ã«é–¢å¿ƒãŒã‚ã‚Šã¾ã™ã€‚"
#. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:385
msgid ""
"You are not interested in the contact's presence, and neither he/she is "
"interested in yours"
msgstr "ã‚ãªãŸã‚‚相手先も相互ã®åœ¨å¸æƒ…å ±ã«é–¢å¿ƒãŒã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/vcard.py:370
+#: ../src/vcard.py:392
msgid "You are waiting contact's answer about your subscription request"
msgstr "ã‚ãªãŸã‹ã‚‰ã®åœ¨å¸é€šçŸ¥ã®ç”³ã—è¾¼ã¿ã«å¯¾ã™ã‚‹ç›¸æ‰‹å…ˆã‹ã‚‰ã®å›žç”ã‚’å¾…ã£ã¦ã„ã¾ã™ã€‚"
-#: ../src/vcard.py:372
+#: ../src/vcard.py:394
msgid "There is no pending subscription request."
msgstr "ä¿ç•™ä¸ã®åœ¨å¸é€šçŸ¥ã®ç”³ã—è¾¼ã¿ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
msgid " resource with priority "
msgstr " ãƒªã‚½ãƒ¼ã‚¹ã€‚å„ªå…ˆé †ä½ã¯ "
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "_Disable showing event in systray"
-#~ msgstr "システムトレイã¸ã®ã‚¤ãƒ™ãƒ³ãƒˆã®è¡¨ç¤ºã‚’ã‚„ã‚ã‚‹ (_D)"
-
-#~ msgid "_Show event in systray"
-#~ msgstr "イベントをシステムトレイã«è¡¨ç¤ºã™ã‚‹ (_S)"
-
-#, fuzzy
-#~ msgid "Autodetect on every Gajim startup"
-#~ msgstr "Gajim 起動時ã«æŽ¥ç¶šã™ã‚‹ (_o)"
-
-#~ msgid "Show systray:"
-#~ msgstr "システムトレイã«è¡¨ç¤º:"
-
-#, fuzzy
-#~ msgid "Nickname not allowed: %s"
-#~ msgstr "ニックãƒãƒ¼ãƒ ã¯è¨±ã•ã‚Œã¾ã›ã‚“: %s"
-
-#~ msgid "Room has been destroyed"
-#~ msgstr "談話室ã¯é–‰éŽ–ã•ã‚Œã¾ã—ãŸ"
-
-#~ msgid "You can join this room instead: %s"
-#~ msgstr "代ã‚ã‚Šã«æ¬¡ã®è«‡è©±å®¤ã«å‚åŠ ã—ã¾ã™: %s"
-
-#~ msgid "I would like to add you to my roster."
-#~ msgstr "ã‚ãªãŸã‚’ç§ã®åç°¿ã«è¿½åŠ ã—ãŸã„ã¨æ€ã£ã¦ã„ã¾ã™ã€‚"
-
-#~ 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 "Account Modification"
-#~ msgstr "アカウントã®å¤‰æ›´"
-
-# (Mako)broadcast å›°ã£ãŸã€‚ã—ã‹ãŸãªãカタカナã§
-#~ 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 "Edit Personal Information..."
-#~ msgstr "å€‹äººæƒ…å ±ã‚’ç·¨é›†ã™ã‚‹..."
-
-#~ msgid "Hostname: "
-#~ msgstr "ホストå: "
-
-#~ msgid ""
-#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-#~ "permission only for you"
-#~ msgstr ""
-#~ "ãƒã‚§ãƒƒã‚¯ã‚’ã¤ã‘ã‚‹ã¨ã€Gajim ã¯ãƒ‘スワードを ~/.gajim/config ã«ä¿å˜ã—ã€ãƒ¦ãƒ¼"
-#~ "ザーã®ã¿ã«ã€Œèªã¿å‡ºã—ã€ã‚’許å¯ã—ã¾ã™"
-
-#~ msgid "Port: "
-#~ msgstr "ãƒãƒ¼ãƒˆç•ªå·: "
-
-#~ msgid "Proxy:"
-#~ msgstr "プãƒã‚ã‚·:"
-
-#~ msgid "Save _passphrase (insecure)"
-#~ msgstr "パスフレーズã®ä¿å˜ (安全ã§ã¯ãªã„) (_p)"
-
-#~ msgid "Send keep-alive packets"
-#~ msgstr "生å˜ãƒ‘ケットをé€ä¿¡ã™ã‚‹"
-
-#~ msgid "Use _SSL (legacy)"
-#~ msgstr "SSL を使ㆠ(æ—§å¼) (_S) "
-
-#~ msgid "_Adjust to status"
-#~ msgstr "在å¸çŠ¶æ³ã«åˆã‚ã›ã‚‹ (_A)"
-
-#~ msgid ""
-#~ "Receive a Message\n"
-#~ "Contact Disconnected \n"
-#~ "Contact Change Status \n"
-#~ "Group Chat Message Highlight \n"
-#~ "Group Chat Message Received \n"
-#~ "File Transfer Request \n"
-#~ "File Transfer Started \n"
-#~ "File Transfer Finished"
-#~ msgstr ""
-#~ "メッセージをå—ä¿¡ã—ãŸ\n"
-#~ "相手先ãŒåˆ‡æ–ã—ãŸ\n"
-#~ "相手先ã®åœ¨å¸çŠ¶æ³ãŒå¤‰åŒ–ã—ãŸ\n"
-#~ "グループãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’強調ã—ãŸ\n"
-#~ "グループãƒãƒ£ãƒƒãƒˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ã—ãŸ\n"
-#~ "ファイル転é€ã®è¦æ±‚ãŒã‚ã£ãŸ\n"
-#~ "ファイル転é€ã®é–‹å§‹ã—ãŸ\n"
-#~ "ファイル転é€ã®å®Œäº†ã—ãŸ"
-
-#~ msgid ""
-#~ "contact(s)\n"
-#~ "group(s)\n"
-#~ "everybody"
-#~ msgstr ""
-#~ "相手先\n"
-#~ "グループ\n"
-#~ "ã™ã¹ã¦"
-
-#~ msgid ""
-#~ "Account row\n"
-#~ "Group row\n"
-#~ "Contact row\n"
-#~ "Chat Banner"
-#~ msgstr ""
-#~ "アカウント行\n"
-#~ "グループ行\n"
-#~ "相手先\n"
-#~ "ãƒãƒ£ãƒƒãƒˆãƒãƒŠãƒ¼"
-
-#~ msgid ""
-#~ "Enter JID or Contact name\n"
-#~ "Groupchat Histories\n"
-#~ "All Chat Histories"
-#~ msgstr ""
-#~ "JID ã¾ãŸã¯ç›¸æ‰‹å…ˆå\n"
-#~ "グループãƒãƒ£ãƒƒãƒˆã®å±¥æ´\n"
-#~ "ã™ã¹ã¦ã®ãƒãƒ£ãƒƒãƒˆã®å±¥æ´"
-
-#~ msgid "Manage Accounts"
-#~ msgstr "アカウントã®ç®¡ç†"
-
-#~ msgid ""
-#~ "HTTP Connect\n"
-#~ "SOCKS5\n"
-#~ "BOSH"
-#~ msgstr ""
-#~ "HTTP 接続\n"
-#~ "SOCKS5\n"
-#~ "BOSH"
-
-#~ msgid "Send a file (Ctrl+F)"
-#~ msgstr "ファイルã®é€ä¿¡ (Ctrl+F)"
-
-#~ msgid ""
-#~ "All chat states\n"
-#~ "Composing only\n"
-#~ "Disabled"
-#~ msgstr ""
-#~ "ã™ã¹ã¦ã®çŠ¶æ…‹\n"
-#~ "入力ä¸ã®ã¿\n"
-#~ "通知ã—ãªã„"
-
-#~ msgid ""
-#~ "Autodetect on every Gajim startup\n"
-#~ "Always use GNOME default applications\n"
-#~ "Always use KDE default applications\n"
-#~ "Always use Xfce default applications\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "Gajim ã®èµ·å‹•ã®ãŸã³ã«ãƒã‚§ãƒƒã‚¯ã™ã‚‹\n"
-#~ "常㫠GNOME ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚¢ãƒ—リケーション\n"
-#~ "常㫠KDE ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚¢ãƒ—リケーション\n"
-#~ "常㫠Xfce ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚¢ãƒ—リケーション\n"
-#~ "ã“ã“ã§è¨å®š"
-
-#~ msgid ""
-#~ "Detached roster with detached chats\n"
-#~ "Detached roster with single chat\n"
-#~ "Single window for everything\n"
-#~ "Detached roster with chat grouped by account\n"
-#~ "Detached roster with chat grouped by type"
-#~ msgstr ""
-#~ "åç°¿ã¯åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ãƒãƒ£ãƒƒãƒˆã¯å€‹ã€…ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦\n"
-#~ "åç°¿ã¯åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ãƒãƒ£ãƒƒãƒˆã¯ã²ã¨ã¤ã«ã¾ã¨ã‚ãŸã‚¦ã‚£ãƒ³ãƒ‰ã‚¦\n"
-#~ "ã™ã¹ã¦ã‚’ã²ã¨ã¤ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦\n"
-#~ "åç°¿ã¯åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ãƒãƒ£ãƒƒãƒˆã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã¾ã¨ã‚ãŸã‚¦ã‚£ãƒ³ãƒ‰ã‚¦\n"
-#~ "åç°¿ã¯åˆ¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ãƒãƒ£ãƒƒãƒˆã¯ç¨®é¡žã§ã¾ã¨ã‚ãŸã‚¦ã‚£ãƒ³ãƒ‰ã‚¦"
-
-#~ msgid ""
-#~ "Pop it up\n"
-#~ "Notify me about it\n"
-#~ "Show only in roster"
-#~ msgstr ""
-#~ "ãƒãƒƒãƒ—アップã™ã‚‹\n"
-#~ "ãã‚Œã«ã¤ã„ã¦é€šçŸ¥ã™ã‚‹\n"
-#~ "åç°¿ã«è¡¨ç¤ºã™ã‚‹ã ã‘"
-
-#~ msgid "_Incoming message:"
-#~ msgstr "å—信メッセージ (_I):"
-
-#~ msgid "_Outgoing message:"
-#~ msgstr "é€ä¿¡ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ (_O):"
-
-#, fuzzy
-#~ msgid ""
-#~ "none\n"
-#~ "both\n"
-#~ "from\n"
-#~ "to"
-#~ msgstr ""
-#~ "ãªã—\n"
-#~ "両方\n"
-#~ "from\n"
-#~ "to"
-
-#~ msgid "_Quit"
-#~ msgstr "終了 (_Q)"
-
-#~ msgid "Enable"
-#~ msgstr "有効"
-
-#~ msgid "Invalid local address? :-O"
-#~ msgstr "ãƒãƒ¼ã‚«ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-
-#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-#~ msgstr ""
-#~ "pysqlite2 (æ—§ python-pysqlite2 ) ã®ä¾å˜æ€§ãŒå¤±ã‚ã‚Œã¦ã„ã¾ã™ã€‚終了ã—ã¾ã™..."
-
-#~ msgid ""
-#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
-#~ "not valid, so ignored."
-#~ msgstr ""
-#~ "詳細オプション ft_add_hosts_to_send ã§æŒ‡å®šã•ã‚ŒãŸãƒ›ã‚¹ãƒˆ %s ã¯æ£ã—ãã‚ã‚Šã¾ã›"
-#~ "ん。無視ã—ã¾ã™ã€‚"
-
-#~ msgid "OpenPGP passphrase was not given"
-#~ msgstr "OpenPGP ã®ãƒ‘スフレーズãŒã‚ã‚Šã¾ã›ã‚“。"
-
-#~ msgid ""
-#~ "To continue sending and receiving messages, you will need to reconnect."
-#~ msgstr "メッセージã®é€å—信を続ã‘ã‚‹ã«ã¯ã€å†æŽ¥ç¶šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-
-#~ msgid ""
-#~ "You are not connected or not visible to others. Your message could not be "
-#~ "sent."
-#~ msgstr ""
-#~ "ã‚ãªãŸã¯æŽ¥ç¶šã—ã¦ã„ãªã„ã‹ã€ä»–ã‹ã‚‰è¦‹ãˆãªã„状態ã§ã™ã€‚メッセージã¯é€ä¿¡ã•ã‚Œã¾ã›"
-#~ "ã‚“ã§ã—ãŸã€‚"
-
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯æš—å·åŒ–ã•ã‚Œã¦ã„ã¾ã™]"
-
-#~ msgid "%i days ago"
-#~ msgstr "%i æ—¥å‰"
-
-#~ msgid "Trayicon"
-#~ msgstr "トレイアイコン"
-
-#~ msgid "A icon in systemtray reflecting the current presence."
-#~ msgstr "システムトレイã«ç¾åœ¨ã®çŠ¶æ…‹ã«å¿œã˜ãŸã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã—ã¾ã™ã€‚"
-
-#~ msgid ""
-#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
-#~ "sources."
-#~ msgstr ""
-#~ "python-gnome2-extras , ã¾ãŸã¯ Gajim をソースã‹ã‚‰ã® trayicon モジュールã®ã‚³"
-#~ "ンパイルãŒå¿…è¦ã§ã™ã€‚"
-
-#~ msgid "Requires PyGTK >= 2.10."
-#~ msgstr "PyGTK (2.10以上) ãŒå¿…è¦ã§ã™ã€‚"
-
-#~ msgid "Banners and clickable links"
-#~ msgstr "ãƒãƒŠãƒ¼ã¨ã‚¯ãƒªãƒƒã‚¯ã§ãるリンク"
-
-#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
-#~ msgstr ""
-#~ "ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¨ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®ãƒãƒŠãƒ¼ã§ URL をクリックã§"
-#~ "ãるよã†ã«ã—ã¾ã™ã€‚"
-
-#~ msgid "Requires python-sexy."
-#~ msgstr "python-sexy ãŒå¿…è¦ã§ã™ã€‚"
-
-#~ msgid "GTK+ runtime is missing libglade support"
-#~ msgstr "GTK+ ランタイム㌠libglade をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
-
-#~ msgid ""
-#~ "Please remove your current GTK+ runtime and install the latest stable "
-#~ "version from %s"
-#~ msgstr ""
-#~ "ç¾åœ¨ã® GTK+ ランタイムを削除ã—ã€%s ã‹ã‚‰æœ€æ–°ã®å®‰å®šãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’インストール"
-#~ "ã—ã¦ãã ã•ã„"
-
-#~ msgid ""
-#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
-#~ msgstr ""
-#~ "システム㮠GTK+ 㨠PyGTK ㌠libglade をサãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã "
-#~ "ã•ã„。"
-
-#~ msgid "Gajim needs PySQLite2 to run"
-#~ msgstr "Gajim ã«ã¯ PySQLite2 ãŒå¿…è¦ã§ã™"
diff --git a/po/ru.po b/po/ru.po
index 01c466860aafaf95d62892a9c3f5926aae2b5d6d..2ba609f695729e306d5c96e8dfe09dd78797f28c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 17:04+0300\n"
-"PO-Revision-Date: 2011-03-24 21:13+0300\n"
+"POT-Creation-Date: 2011-11-11 00:06+0400\n"
+"PO-Revision-Date: 2011-11-15 23:22+0300\n"
"Last-Translator: Fomin Denis <fominde@mail.ru>\n"
"Language-Team: Linux Support LLC\n"
"Language: ru\n"
@@ -34,7 +34,7 @@ msgid "_Add Contact..."
msgstr "_Добавить контакт..."
#: ../data/gui/account_context_menu.ui.h:3
-#: ../data/gui/roster_window.ui.h:18
+#: ../data/gui/roster_window.ui.h:19
msgid "_Discover Services"
msgstr "_ПроÑмотреть ÑервиÑÑ‹"
@@ -115,7 +115,7 @@ msgid "I want to _register for a new account"
msgstr "Я хочу _зарегиÑтрировать новую учетную запиÑÑŒ"
#: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:30
msgid "If checked, Gajim will remember the password for this account"
msgstr "ЕÑли отмечено, то Gajim запомнит пароль учетной запиÑи"
@@ -124,24 +124,27 @@ msgid "Manage..."
msgstr "Управление..."
#: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:39
+#: ../data/gui/accounts_window.ui.h:41
#: ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1295
-#: ../src/config.py:1398
-#: ../src/config.py:1709
-#: ../src/config.py:1714
-#: ../src/config.py:2280
-#: ../src/config.py:2359
-#: ../src/config.py:2372
-#: ../src/config.py:3649
-#: ../src/config.py:3724
-#: ../src/dialogs.py:312
-#: ../src/dialogs.py:314
-#: ../src/dialogs.py:520
-#: ../src/dialogs.py:533
-#: ../src/roster_window.py:3047
-#: ../src/roster_window.py:3053
-#: ../src/roster_window.py:3058
+#: ../src/config.py:1264
+#: ../src/config.py:1278
+#: ../src/config.py:1283
+#: ../src/config.py:1331
+#: ../src/config.py:1434
+#: ../src/config.py:1745
+#: ../src/config.py:1750
+#: ../src/config.py:2326
+#: ../src/config.py:2405
+#: ../src/config.py:2418
+#: ../src/config.py:3697
+#: ../src/config.py:3772
+#: ../src/dialogs.py:311
+#: ../src/dialogs.py:313
+#: ../src/dialogs.py:519
+#: ../src/dialogs.py:532
+#: ../src/roster_window.py:3096
+#: ../src/roster_window.py:3102
+#: ../src/roster_window.py:3107
msgid "None"
msgstr "Ðет"
@@ -150,7 +153,7 @@ msgid "Prox_y:"
msgstr "Про_кÑи:"
#: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
+#: ../data/gui/accounts_window.ui.h:50
msgid "Save pass_word"
msgstr "Сохранить _пароль"
@@ -171,7 +174,7 @@ msgstr ""
"к Ñети Jabber."
#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
msgid "_Advanced"
msgstr "_Дополнительно"
@@ -184,12 +187,12 @@ msgid "_Hostname:"
msgstr "_ХоÑÑ‚: "
#: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
+#: ../data/gui/accounts_window.ui.h:63
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
#: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/accounts_window.ui.h:65
#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "_Password:"
msgstr "_Пароль:"
@@ -233,81 +236,96 @@ msgstr "Учетные запиÑи"
msgid "Accounts"
msgstr "Учётные запиÑи"
+#. Change label for accept_button to action name instead of 'OK'.
#: ../data/gui/accounts_window.ui.h:8
+#: ../src/dialogs.py:3382
+#: ../src/dialogs.py:3428
+msgid "Add"
+msgstr "Добавить"
+
+#: ../data/gui/accounts_window.ui.h:9
msgid "Administration operations"
msgstr "ÐдминиÑтративные операции"
-#: ../data/gui/accounts_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:10
msgid "Anonymous authentication"
msgstr "ÐÐ½Ð¾Ð½Ð¸Ð¼Ð½Ð°Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ"
-#: ../data/gui/accounts_window.ui.h:10
+#: ../data/gui/accounts_window.ui.h:11
msgid "Auto-reconnect when connection is lost"
msgstr "Ðвтоподключение при разрыве ÑвÑзи"
-#: ../data/gui/accounts_window.ui.h:11
+#: ../data/gui/accounts_window.ui.h:12
msgid "Browse..."
msgstr "_ПроÑмотреть"
-#: ../data/gui/accounts_window.ui.h:12
+#: ../data/gui/accounts_window.ui.h:13
msgid "C_onnect on Gajim startup"
msgstr "_СоединÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ запуÑке Gajim"
-#: ../data/gui/accounts_window.ui.h:13
+#: ../data/gui/accounts_window.ui.h:14
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Сертификат отклонен"
+
+#: ../data/gui/accounts_window.ui.h:15
msgid "Chan_ge Password"
msgstr "И_зменить пароль"
-#: ../data/gui/accounts_window.ui.h:14
+#: ../data/gui/accounts_window.ui.h:16
msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
msgstr "ЕÑли отмечено, то Gajim будет будет Ñпрашивать Ð²Ð°Ñ Ð¿ÐµÑ€ÐµÐ´ отправкой Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ‡ÐµÑ€ÐµÐ· незащищенное Ñоединение."
-#: ../data/gui/accounts_window.ui.h:15
-msgid "Choose Client Cert"
-msgstr "Выбрать Ñертификат"
-
-#: ../data/gui/accounts_window.ui.h:16
+#: ../data/gui/accounts_window.ui.h:17
msgid "Choose _Key..."
msgstr "Выбрать _ключ..."
-#: ../data/gui/accounts_window.ui.h:17
+#: ../data/gui/accounts_window.ui.h:18
msgid "Click to change account's password"
msgstr "Щелкните Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: ../data/gui/accounts_window.ui.h:18
+#: ../data/gui/accounts_window.ui.h:19
msgid "Click to request authorization to all contacts of another account"
msgstr "Щелкните, чтобы запроÑить авторизацию у вÑех контактов другой учетной запиÑи"
-#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/accounts_window.ui.h:20
msgid "Client certificate"
msgstr "Сертификат владельца"
-#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:21
msgid "Co_nnect on Gajim startup"
msgstr "_СоединÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ запуÑке Gajim"
-#: ../data/gui/accounts_window.ui.h:21
+#: ../data/gui/accounts_window.ui.h:22
msgid "Connection"
msgstr "Соединение"
-#: ../data/gui/accounts_window.ui.h:22
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:23
+#: ../src/dialogs.py:3386
+#: ../src/dialogs.py:3483
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../data/gui/accounts_window.ui.h:24
#: ../data/gui/zeroconf_information_window.ui.h:2
msgid "E-Mail:"
msgstr "Почта:"
-#: ../data/gui/accounts_window.ui.h:23
+#: ../data/gui/accounts_window.ui.h:25
#: ../data/gui/zeroconf_information_window.ui.h:3
msgid "First Name:"
msgstr "ИмÑ:"
#. No configured account
-#: ../data/gui/accounts_window.ui.h:24
+#: ../data/gui/accounts_window.ui.h:26
#: ../data/gui/roster_window.ui.h:5
#: ../src/common/helpers.py:1159
#: ../src/common/helpers.py:1171
-#: ../src/notify.py:530
-#: ../src/notify.py:553
-#: ../src/notify.py:602
-#: ../src/notify.py:618
+#: ../src/notify.py:314
+#: ../src/notify.py:337
+#: ../src/notify.py:387
+#: ../src/notify.py:403
msgid "Gajim"
msgstr "Gajim"
@@ -315,37 +333,37 @@ msgstr "Gajim"
#. FIXME: Ugly workaround.
#. Maybe we haven't been in any group (defaults to General)
#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25
+#: ../data/gui/accounts_window.ui.h:27
#: ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141
-#: ../src/dialogs.py:113
-#: ../src/dialogs.py:125
-#: ../src/roster_window.py:2989
-#: ../src/roster_window.py:5570
+#: ../src/common/contacts.py:132
+#: ../src/dialogs.py:112
+#: ../src/dialogs.py:124
+#: ../src/roster_window.py:3038
+#: ../src/roster_window.py:5656
msgid "General"
msgstr "Общие"
-#: ../data/gui/accounts_window.ui.h:26
+#: ../data/gui/accounts_window.ui.h:28
msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
msgstr "ЕÑли отмечено, Gajim будет передавать еще неÑколько IP адреÑов в дополнение к вашему, так что передача файла имеет больше шанÑов на уÑпех."
-#: ../data/gui/accounts_window.ui.h:27
+#: ../data/gui/accounts_window.ui.h:29
msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
msgstr "ЕÑли отмечено, то Gajim запомнит пароль учетной запиÑи"
-#: ../data/gui/accounts_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:31
msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
msgstr "ЕÑли отмечено, то Gajim будет пинговать Ñервер, чтобы избежать разрыва ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾ таймауту"
-#: ../data/gui/accounts_window.ui.h:30
+#: ../data/gui/accounts_window.ui.h:32
msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
msgstr "ЕÑли отмечено, Gajim поÑле запуÑка будет автоматичеÑки подÑоединÑÑ‚ÑŒÑÑ Ðº jabber Ñерверу Ñ Ð¸Ñпользованием Ñтой учетной запиÑи"
-#: ../data/gui/accounts_window.ui.h:31
+#: ../data/gui/accounts_window.ui.h:33
msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
msgstr "ЕÑли отмечено, то любые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ ÑтатуÑа (управлÑемого из выпадающего ÑпиÑка внизу окна роÑтера) повлекут за Ñобой изменение ÑтатуÑа Ñтой учетной запиÑи"
-#: ../data/gui/accounts_window.ui.h:32
+#: ../data/gui/accounts_window.ui.h:34
msgid ""
"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
"You might consider to change possible firewall settings."
@@ -353,136 +371,133 @@ msgstr ""
"ЕÑли порт по умолчанию, который иÑпользуетÑÑ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщих ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð²Ð°Ñ Ð½Ðµ уÑтраивает, вы можете выбрать другой.\n"
"Также, возможно, придетÑÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ некоторые наÑтройки брандмауÑра."
-#: ../data/gui/accounts_window.ui.h:34
+#: ../data/gui/accounts_window.ui.h:36
msgid "Information about you, as stored in the server"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ваÑ, ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð½Ð°Ñ Ð½Ð° Ñервере"
-#: ../data/gui/accounts_window.ui.h:35
+#: ../data/gui/accounts_window.ui.h:37
#: ../data/gui/zeroconf_information_window.ui.h:4
-#: ../src/config.py:1832
-#: ../src/dialogs.py:838
+#: ../src/config.py:1868
+#: ../src/dialogs.py:837
msgid "Jabber ID:"
msgstr "Jabber ID:"
-#: ../data/gui/accounts_window.ui.h:36
+#: ../data/gui/accounts_window.ui.h:38
#: ../data/gui/zeroconf_information_window.ui.h:5
msgid "Last Name:"
msgstr "ФамилиÑ:"
-#: ../data/gui/accounts_window.ui.h:37
+#: ../data/gui/accounts_window.ui.h:39
msgid "Mer_ge accounts"
msgstr "_Объединить учетные запиÑи"
-#: ../data/gui/accounts_window.ui.h:38
-#: ../src/config.py:1805
-#: ../src/config.py:2373
+#: ../data/gui/accounts_window.ui.h:40
+#: ../src/config.py:1841
+#: ../src/config.py:2419
msgid "No key selected"
msgstr "Ðе выбран ключ"
-#: ../data/gui/accounts_window.ui.h:40
+#: ../data/gui/accounts_window.ui.h:42
#: ../data/gui/profile_window.ui.h:35
msgid "Personal Information"
msgstr "Ð›Ð¸Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-#: ../data/gui/accounts_window.ui.h:41
+#: ../data/gui/accounts_window.ui.h:43
msgid "Priori_ty:"
msgstr "Приори_тет:"
-#: ../data/gui/accounts_window.ui.h:42
+#: ../data/gui/accounts_window.ui.h:44
msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
msgstr "Приоритет иÑпользуетÑÑ Ð² Jabber Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ‚Ð¾Ð³Ð¾, кто будет получать ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¾Ñ‚ jabber Ñервера когда подÑоединены два и более клиента Ñ Ð¾Ð´Ð½Ð¾Ð¹ и той же учетной запиÑью. Клиент Ñ Ð½Ð°Ð¸Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ приоритетом будет получать ÑобытиÑ"
-#: ../data/gui/accounts_window.ui.h:43
+#: ../data/gui/accounts_window.ui.h:45
msgid "Priority will change automatically according to your status."
msgstr "ИзменÑÑ‚ÑŒ приоритет автоматичеÑки в ÑоответÑтвии Ñо ÑтатуÑом."
#. Rename
-#: ../data/gui/accounts_window.ui.h:44
-#: ../src/roster_window.py:5520
+#: ../data/gui/accounts_window.ui.h:46
+#: ../src/roster_window.py:5606
msgid "Re_name"
msgstr "П_ереименовать"
-#: ../data/gui/accounts_window.ui.h:45
+#: ../data/gui/accounts_window.ui.h:47
msgid "Resour_ce:"
msgstr "РеÑу_Ñ€Ñ: "
-#: ../data/gui/accounts_window.ui.h:46
+#: ../data/gui/accounts_window.ui.h:48
msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
msgstr "РеÑÑƒÑ€Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑетÑÑ Jabber Ñерверу Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы различать два и более клиентов Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ð¾Ð¹ учетной запиÑью, подключенных к одному и тому же Ñерверу. Таким образом, вы можете одновременно подключитьÑÑ Ðº одному Ñерверу Ñ Ñ€ÐµÑурÑов 'Дом' или 'Работа'. РеÑурÑ, обладающий большим приоритетом, будет получать вÑе ÑобытиÑ. (См. ниже)"
-#: ../data/gui/accounts_window.ui.h:47
+#: ../data/gui/accounts_window.ui.h:49
msgid "Save conversation _logs for all contacts"
msgstr "_СохранÑÑ‚ÑŒ иÑторию Ð´Ð»Ñ Ð²Ñех контактов"
-#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/accounts_window.ui.h:51
msgid "Send _keep-alive packets"
msgstr "ОтправлÑÑ‚ÑŒ _пинг"
-#: ../data/gui/accounts_window.ui.h:50
+#: ../data/gui/accounts_window.ui.h:52
msgid "Synch_ronize account status with global status"
msgstr "Син_хронизировать ÑÑ‚Ð°Ñ‚ÑƒÑ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи Ñ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ñ‹Ð¼ ÑтатуÑом"
-#: ../data/gui/accounts_window.ui.h:51
+#: ../data/gui/accounts_window.ui.h:53
msgid "Synchroni_ze account status with global status"
msgstr "Син_хронизировать ÑÑ‚Ð°Ñ‚ÑƒÑ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи Ñ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ñ‹Ð¼ ÑтатуÑом"
-#: ../data/gui/accounts_window.ui.h:52
+#: ../data/gui/accounts_window.ui.h:54
#: ../data/gui/synchronise_select_account_dialog.ui.h:2
msgid "Synchronise contacts"
msgstr "Объединить контакты"
-#: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "Путь к Ñертификату и ключу в формате PKCS#12"
-
-#: ../data/gui/accounts_window.ui.h:54
+#: ../data/gui/accounts_window.ui.h:55
msgid "Use G_PG Agent"
msgstr "ИÑпользовать GPG _Agent"
-#: ../data/gui/accounts_window.ui.h:55
+#: ../data/gui/accounts_window.ui.h:56
msgid "Use cust_om hostname/port"
msgstr "ИÑпользовать польз_овательÑкие хоÑÑ‚/порт"
-#: ../data/gui/accounts_window.ui.h:56
+#: ../data/gui/accounts_window.ui.h:57
msgid "Use cust_om port:"
msgstr "_Другой порт:"
-#: ../data/gui/accounts_window.ui.h:57
+#: ../data/gui/accounts_window.ui.h:58
msgid "Use file transfer proxies"
msgstr "ИÑпользовать прокÑи Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ файла"
-#: ../data/gui/accounts_window.ui.h:58
+#: ../data/gui/accounts_window.ui.h:59
msgid "_Client Cert File:"
msgstr "Файл Ñертификата:"
-#: ../data/gui/accounts_window.ui.h:59
+#: ../data/gui/accounts_window.ui.h:60
msgid "_Edit Personal Information..."
msgstr "Редактировать личную информацию..."
#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60
+#: ../data/gui/accounts_window.ui.h:61
#: ../data/gui/xml_console_window.ui.h:11
msgid "_Enable"
msgstr "_Включить"
-#: ../data/gui/accounts_window.ui.h:61
+#: ../data/gui/accounts_window.ui.h:62
msgid "_Hostname: "
msgstr "_ХоÑÑ‚: "
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:133
msgid "_Manage..."
msgstr "_Управление..."
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:66
msgid "_Port: "
msgstr "_Порт:"
# insecure - небезопаÑтный или незащищенный?
-#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/accounts_window.ui.h:67
msgid "_Warn before using an insecure connection"
msgstr "_Предупреждать перед иÑпользованием незащищенного ÑоединениÑ"
-#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/accounts_window.ui.h:68
msgid "_use HTTP__PROXY environment variable"
msgstr "_иÑпользовать переменную HTTP_PROXY"
@@ -499,7 +514,7 @@ msgid "Add New Contact"
msgstr "Добавить новый контакт"
#: ../data/gui/add_new_contact_window.ui.h:4
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1350
msgid "I would like to add you to my contact list."
msgstr "Ð’Ñ‹ не возражаете, еÑли Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑŽ Ð’Ð°Ñ Ð² контакт лиÑÑ‚?"
@@ -653,181 +668,6 @@ msgstr "_ÐдминиÑтрирование"
msgid "_Send Server Message..."
msgstr "_Отправить Ñообщение Ñервера"
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " Ñ Ñтим контактом открытых окон/вкладок"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>ДейÑтвиÑ</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>УÑловиÑ</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Звуки</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Дополнительные дейÑтвиÑ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Дополнительное управление уведомлениÑми"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "Ð’Ñе ÑтатуÑÑ‹"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106
-#: ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Ушел"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "ЗанÑÑ‚ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-msgid "Contact Change Status "
-msgstr "Контакт изменил ÑтатуÑ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "Контакт отключилÑÑ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Ðет "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "Передача файлов заверешна"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ файлов"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "Передача файлов начата"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "ПодÑветка ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² групповом чате"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "Получено Ñообщение в групповом чате"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "ЕÑÑ‚ÑŒ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Ðевидимка"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Выполнить команду"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222
-#: ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "ÐедоÑтупен"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Один или неÑколько Ñпециальных ÑтатуÑов..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Ð’ Ñети / Готов поболтать"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Проигрывать звук"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "Получить Ñообщение"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Когда "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Ðктивировать функцию оконного менеджера «UrgencyHint», чтобы окно чата мигало на панели"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Отключить автоматичеÑкое открытие окна чата"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Отключить вÑе вÑплывающие окна"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Отключить звуки Ð´Ð»Ñ Ñтого ÑобытиÑ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr "_Отключить показ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² облаÑти уведомлений"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Отключить показ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² роÑтере"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Сообщить Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ вÑплывающего окна"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Открыть окно чата Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¾Ð¼"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in notification area"
-msgstr "_Показывать Ñобытие в облаÑти уведомлений"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Показывать Ñобытие в роÑтере"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "и у менÑ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "Контакты"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "вÑе"
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "Ð´Ð»Ñ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "Группы"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "Когда Ñ Ð² "
-
#: ../data/gui/archiving_preferences_window.ui.h:1
msgid "<i>Method Auto</i>"
msgstr ""
@@ -894,10 +734,10 @@ msgstr "Заблокированные контакты"
#: ../data/gui/blocked_contacts_window.ui.h:2
#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13
-#: ../src/roster_window.py:5539
-#: ../src/roster_window.py:5666
-#: ../src/roster_window.py:5799
+#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../src/roster_window.py:5625
+#: ../src/roster_window.py:5752
+#: ../src/roster_window.py:5885
msgid "_Unblock"
msgstr "_Разблокировать"
@@ -958,7 +798,7 @@ msgid "Join _Group Chat"
msgstr "Войти в _комнату"
#: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
+#: ../data/gui/contact_context_menu.ui.h:17
msgid "_Add to Roster..."
msgstr "_Добавить в роÑтер"
@@ -984,9 +824,7 @@ msgstr "_ПроÑмотреть ÑÑылку в браузере"
msgid "_Start Chat"
msgstr "_Ðачать беÑеду"
-#. # means number
#: ../data/gui/chat_control.ui.h:1
-#: ../src/dialogs.py:4754
msgid "#"
msgstr "â„–"
@@ -1079,7 +917,7 @@ msgstr "Переключить видео ÑеанÑ"
#: ../data/gui/chat_control.ui.h:23
#: ../data/gui/groupchat_control.ui.h:9
#: ../data/gui/xml_console_window.ui.h:16
-#: ../src/filetransfers_window.py:275
+#: ../src/filetransfers_window.py:277
msgid "_Send"
msgstr "_Отправить"
@@ -1135,8 +973,9 @@ msgstr "Редактировать _группы"
#. Invite to
#. Invite to Groupchat
#: ../data/gui/contact_context_menu.ui.h:6
-#: ../src/roster_window.py:5475
-#: ../src/roster_window.py:5634
+#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../src/roster_window.py:5561
+#: ../src/roster_window.py:5720
msgid "In_vite to"
msgstr "_ПриглаÑить в"
@@ -1145,71 +984,72 @@ msgid "Invite _Contacts"
msgstr "ПриглаÑить _учаÑтников"
#: ../data/gui/contact_context_menu.ui.h:8
+msgid "M_anage Contact"
+msgstr "_Управление контактом"
+
+#: ../data/gui/contact_context_menu.ui.h:9
msgid "Remo_ve"
msgstr "_Удалить"
-#: ../data/gui/contact_context_menu.ui.h:9
-#: ../src/roster_window.py:5485
-#: ../src/roster_window.py:5723
+#: ../data/gui/contact_context_menu.ui.h:10
+#: ../src/roster_window.py:5571
+#: ../src/roster_window.py:5809
msgid "Send Cus_tom Status"
msgstr "УÑтанови_Ñ‚ÑŒ ÑтатуÑ"
-#: ../data/gui/contact_context_menu.ui.h:10
+#: ../data/gui/contact_context_menu.ui.h:11
+#: ../data/gui/roster_window.ui.h:10
msgid "Send Single _Message..."
msgstr "Отправить одиночное _Ñообщение..."
-#: ../data/gui/contact_context_menu.ui.h:11
+#: ../data/gui/contact_context_menu.ui.h:12
msgid "Send _File..."
msgstr "Отправить _файл..."
-#: ../data/gui/contact_context_menu.ui.h:12
+#: ../data/gui/contact_context_menu.ui.h:13
msgid "Set Custom _Avatar..."
msgstr "УÑтановить _аватар..."
-#: ../data/gui/contact_context_menu.ui.h:13
+#: ../data/gui/contact_context_menu.ui.h:14
msgid "Start _Chat"
msgstr "Ðачать _беÑеду"
-#: ../data/gui/contact_context_menu.ui.h:14
+#: ../data/gui/contact_context_menu.ui.h:15
msgid "Toggle End to End Encryption"
msgstr "Включить End to End шифрование"
-#: ../data/gui/contact_context_menu.ui.h:15
+#: ../data/gui/contact_context_menu.ui.h:16
msgid "Toggle Open_PGP Encryption"
msgstr "Включить Open_PGP шифрование"
-#: ../data/gui/contact_context_menu.ui.h:17
+#: ../data/gui/contact_context_menu.ui.h:18
msgid "_Allow him/her to see my status"
msgstr "_Позволить ему или ей видеть мой ÑтатуÑ"
-#: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7
-#: ../src/roster_window.py:5547
-#: ../src/roster_window.py:5672
-#: ../src/roster_window.py:5802
+#: ../data/gui/contact_context_menu.ui.h:19
+#: ../data/gui/gc_occupants_menu.ui.h:8
+#: ../src/roster_window.py:5633
+#: ../src/roster_window.py:5758
+#: ../src/roster_window.py:5888
msgid "_Block"
msgstr "_Блокировать"
-#: ../data/gui/contact_context_menu.ui.h:19
+#: ../data/gui/contact_context_menu.ui.h:20
msgid "_Forbid him/her to see my status"
msgstr "_Запретить ему или ей видеть мой ÑтатуÑ"
-#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/contact_context_menu.ui.h:21
#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8
-#: ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5873
+#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/roster_window.ui.h:23
+#: ../src/roster_window.py:5959
msgid "_History"
msgstr "_ИÑториÑ"
-#: ../data/gui/contact_context_menu.ui.h:21
+#: ../data/gui/contact_context_menu.ui.h:22
msgid "_Ignore"
msgstr "_Игнорировать"
-#: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Управление контактом"
-
#: ../data/gui/contact_context_menu.ui.h:23
msgid "_Rename..."
msgstr "П_ереименовать"
@@ -1299,7 +1139,7 @@ msgid "When a file transfer is complete show a popup notification"
msgstr "Показать уведомление по окончании загрузки"
#: ../data/gui/filetransfers.ui.h:13
-#: ../src/filetransfers_window.py:798
+#: ../src/filetransfers_window.py:808
msgid "_Continue"
msgstr "_Продолжить"
@@ -1308,7 +1148,8 @@ msgid "_Notify me when a file transfer is complete"
msgstr "_Уведомить менÑ, когда передача файлов закончитÑÑ"
#: ../data/gui/filetransfers.ui.h:15
-#: ../src/filetransfers_window.py:205
+#: ../src/chat_control.py:3228
+#: ../src/filetransfers_window.py:206
msgid "_Open Containing Folder"
msgstr "_Открыть папку Ñ Ð¿Ñ€Ð¸Ð½Ñтым файлом"
@@ -1329,7 +1170,7 @@ msgid "Account row"
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
#: ../data/gui/gajim_themes_window.ui.h:3
-#: ../src/chat_control.py:996
+#: ../src/chat_control.py:1042
msgid "Bold"
msgstr "Полужирный"
@@ -1367,7 +1208,7 @@ msgid "Inactive"
msgstr "Ðеактивен"
#: ../data/gui/gajim_themes_window.ui.h:12
-#: ../src/chat_control.py:997
+#: ../src/chat_control.py:1043
msgid "Italic"
msgstr "КурÑив"
@@ -1414,7 +1255,7 @@ msgid "Configure _Room..."
msgstr "ÐаÑтроить _комнату"
#: ../data/gui/gc_control_popup_menu.ui.h:4
-#: ../src/disco.py:1801
+#: ../src/disco.py:1800
msgid "_Bookmark"
msgstr "Добавить Ñту комнату в _закладки"
@@ -1430,47 +1271,51 @@ msgstr "_Управление комнатой"
msgid "_Minimize on close"
msgstr "_Сворачивать при закрытии"
-#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+msgid "_Request Voice"
+msgstr "_ЗапроÑить право говорить"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
msgid "Mo_derator"
msgstr "_Модератор"
-#: ../data/gui/gc_occupants_menu.ui.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:3
msgid "Occupant Actions"
msgstr "ДейÑÑ‚Ð²Ð¸Ñ Ð½Ð°Ð´ поÑетителем"
-#: ../data/gui/gc_occupants_menu.ui.h:3
+#: ../data/gui/gc_occupants_menu.ui.h:4
msgid "Send _File"
msgstr "Отправить _файл"
-#: ../data/gui/gc_occupants_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:5
msgid "_Add to Roster"
msgstr "_Добавить в роÑтер"
-#: ../data/gui/gc_occupants_menu.ui.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:6
msgid "_Admin"
msgstr "_Ðдмин"
-#: ../data/gui/gc_occupants_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:7
msgid "_Ban"
msgstr "_Забанить"
-#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:10
msgid "_Kick"
msgstr "_Выгнать"
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:11
msgid "_Member"
msgstr "_УчаÑтник"
-#: ../data/gui/gc_occupants_menu.ui.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:12
msgid "_Owner"
msgstr "_Владелец"
-#: ../data/gui/gc_occupants_menu.ui.h:12
+#: ../data/gui/gc_occupants_menu.ui.h:13
msgid "_Send Private Message"
msgstr "_Отправить личное Ñообщение"
-#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:15
msgid "_Voice"
msgstr "_Право говорить"
@@ -1558,7 +1403,7 @@ msgstr "ПоиÑк:"
#: ../data/gui/history_window.ui.h:6
#: ../data/gui/zeroconf_information_window.ui.h:10
msgid "_Log conversation history"
-msgstr "_ИÑÑ‚Ð¾Ñ€Ð¸Ñ ÑообщениÑ"
+msgstr "_СохранÑÑ‚ÑŒ иÑторию перепиÑки"
#: ../data/gui/item_archiving_preferences_window.ui.h:1
msgid "approve"
@@ -1630,7 +1475,7 @@ msgid "Bro_wse Rooms"
msgstr "ПроÑмотр конферен_ций"
#: ../data/gui/join_groupchat_window.ui.h:3
-#: ../src/dialogs.py:2285
+#: ../src/dialogs.py:2333
msgid "Join Group Chat"
msgstr "Войти в комнату"
@@ -1655,7 +1500,7 @@ msgid "Room:"
msgstr "Комната:"
#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../src/config.py:1822
+#: ../src/config.py:1858
msgid "Server:"
msgstr "Сервер:"
@@ -1665,7 +1510,7 @@ msgstr "Добавить комнату в закладк_и"
#: ../data/gui/join_groupchat_window.ui.h:11
#: ../src/disco.py:1361
-#: ../src/disco.py:1805
+#: ../src/disco.py:1804
msgid "_Join"
msgstr "_ПриÑоединитьÑÑ"
@@ -1782,54 +1627,42 @@ msgid "Authors:"
msgstr "Ðвторы:"
#: ../data/gui/plugins_window.ui.h:4
-msgid "Available"
-msgstr "ДоÑтупен"
-
-#: ../data/gui/plugins_window.ui.h:5
msgid "Configure"
msgstr "ÐаÑтроить"
-#: ../data/gui/plugins_window.ui.h:6
+#: ../data/gui/plugins_window.ui.h:5
msgid "Description:"
msgstr "ОпиÑание: "
-#: ../data/gui/plugins_window.ui.h:7
-msgid "Descrition:"
-msgstr "ОпиÑание: "
-
-#: ../data/gui/plugins_window.ui.h:8
+#: ../data/gui/plugins_window.ui.h:6
msgid "Homepage:"
msgstr "ДомашнÑÑ Ñтраница:"
-#: ../data/gui/plugins_window.ui.h:9
-msgid "Install"
-msgstr "УÑтановить"
+#: ../data/gui/plugins_window.ui.h:7
+msgid "Install from zip"
+msgstr "УÑтановить из zip"
-#: ../data/gui/plugins_window.ui.h:10
+#: ../data/gui/plugins_window.ui.h:8
msgid "Installed"
msgstr "УÑтановленные"
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:9
msgid "Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization."
msgstr "ОпиÑание модулÑ. Ðта Ñтрока будет Ñтерта при загрузке модулÑ."
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:10
msgid "Plugins"
msgstr "Модули"
-#: ../data/gui/plugins_window.ui.h:13
+#: ../data/gui/plugins_window.ui.h:11
msgid "Uninstall"
msgstr "Удалить"
-#: ../data/gui/plugins_window.ui.h:14
+#: ../data/gui/plugins_window.ui.h:12
msgid "Version:"
msgstr "ВерÑиÑ:"
-#: ../data/gui/plugins_window.ui.h:15
-msgid "button"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:16
+#: ../data/gui/plugins_window.ui.h:13
msgid "homepage url"
msgstr "домашнÑÑ Ñтраница"
@@ -1898,6 +1731,10 @@ msgstr "<b>УведомлениÑ</b>"
msgid "<b>Roster Appearance</b>"
msgstr "<b>ÐаÑтройки роÑтера</b>"
+#: ../data/gui/preferences_window.ui.h:17
+msgid "<b>Sounds</b>"
+msgstr "<b>Звуки</b>"
+
#: ../data/gui/preferences_window.ui.h:18
msgid "<b>Status Messages</b>"
msgstr "<b>Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ ÑтатуÑе</b>"
@@ -1923,16 +1760,16 @@ msgid "Advanced"
msgstr "РаÑширенные"
#: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "РаÑширенные..."
-
-#: ../data/gui/preferences_window.ui.h:25
msgid "All chat states"
msgstr "При любых изменениÑÑ…"
+#: ../data/gui/preferences_window.ui.h:25
+msgid "Allow client / _OS information to be sent"
+msgstr "ОтÑылать информацию о клиенте / _ОС"
+
#: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "ОтÑылать информацию об _ОС"
+msgid "Allow local system time information to be sent"
+msgstr "ОтÑылать информацию о локальном времени"
#: ../data/gui/preferences_window.ui.h:27
msgid "Allow my _idle time to be sent"
@@ -1955,7 +1792,7 @@ msgid "Ask status message when I:"
msgstr "Запрашивать Ñообщение о ÑтатуÑе, когда Ñ: "
#: ../data/gui/preferences_window.ui.h:32
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
msgid "Audio / Video"
msgstr "Звук / Изображение"
@@ -2013,7 +1850,7 @@ msgstr "Окно контактов и окно Ñ Ð±ÐµÑедами"
#: ../data/gui/preferences_window.ui.h:46
#: ../src/config.py:170
-#: ../src/config.py:674
+#: ../src/config.py:682
msgid "Disabled"
msgstr "Отключены"
@@ -2058,138 +1895,146 @@ msgid "Gajim will notify you via a popup window in the bottom right of the scree
msgstr "Gajim будет уведомлÑÑ‚ÑŒ Ð²Ð°Ñ Ð¾Ð± отÑоединившемÑÑ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ðµ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² правом нижнем углу Ñкрана"
#: ../data/gui/preferences_window.ui.h:58
+msgid "Global proxy:"
+msgstr "Глобальный прокÑи:"
+
+#: ../data/gui/preferences_window.ui.h:59
msgid "Hide all buttons in chat windows"
msgstr "Ðе показывать кнопки в окнах чата"
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:60
msgid "If checked, Gajim will allow others to detect the operation system you are using"
msgstr "ЕÑли отмечено, то Gajim будет разрешать определÑÑ‚ÑŒ операционную ÑиÑтему, которую вы иÑпользуете"
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:61
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "ЕÑли отмечено, то Gajim будет разрешать определÑÑ‚ÑŒ Ð²Ñ€ÐµÐ¼Ñ Ð² ÑиÑтеме, которую вы иÑпользуете"
+
+#: ../data/gui/preferences_window.ui.h:62
msgid "If checked, Gajim will also include information about the sender of the new emails"
msgstr "ЕÑли отмечено, то Gajim будет включать информацию об отправителе новых пиÑем."
-#: ../data/gui/preferences_window.ui.h:61
+#: ../data/gui/preferences_window.ui.h:63
msgid "If checked, Gajim will change status to Away when the computer is unused."
msgstr "ЕÑли отмечено, то Gajim изменит ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° Away, еÑли компьютер не иÑпользуетÑÑ."
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:64
msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
msgstr "ЕÑли отмечено, Gajim будет менÑÑ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° ÐедоÑтупен, еÑли компьютер долго не иÑпользуетÑÑ"
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:65
msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
msgstr "ЕÑли отмечено, то Gajim будет показывать аватары контактов в окне роÑтера и в окнах комнат"
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:66
msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
msgstr "ЕÑли отмечено, то Gajim будет отображать Ñообщение о ÑтатуÑе контакта под его именем в окне роÑтера и в окнах комнат"
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:67
msgid "If checked, Gajim will display the activity of contacts in the roster window"
msgstr "ЕÑли отмечено, то Gajim будет показывать занÑÑ‚Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¾Ð² в окне роÑтера"
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:68
msgid "If checked, Gajim will display the location of contacts in the roster window"
msgstr "ЕÑли отмечено, то Gajim будет показывать меÑтоположение контактов в окне роÑтера"
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:69
msgid "If checked, Gajim will display the mood of contacts in the roster window"
msgstr "ЕÑли отмечено, то Gajim будет показывать наÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¾Ð² в окне роÑтера"
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:70
msgid "If checked, Gajim will display the tunes of contacts in the roster window"
msgstr "ЕÑли отмечено, то Gajim будет показывать tunes контактов в окне роÑтера"
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:71
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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:72
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/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:73
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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:74
msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
msgstr "ЕÑли отмечено, то Gajim будет Ñообщать о новых пиÑьмах, полученных в GMail"
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:75
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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:76
msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
msgstr "ЕÑли включено, Gajim не будет запрашивать Ñообщение о ÑтатуÑе. ВмеÑто него будет иÑпользовано ÑоответÑтвующее Ñообщение по умолчанию."
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:77
msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
msgstr "Gajim заменÑет текÑтовые Ñмайлики, например ':)', их графичеÑким или анимированным Ñквивалентом. Выберите «Отключены», чтобы Ñтого не проиÑходило."
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:78
msgid "Last state"
msgstr "ПоÑледнее ÑоÑтоÑние"
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:79
msgid "Log _encrypted chat session"
msgstr "ЗапиÑывать в лог _шифрованные ÑообщениÑ"
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:80
msgid "Ma_ke message windows compact"
msgstr "_Компактное окно Ñообщений"
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:81
msgid "Ma_nage..."
msgstr "_Управление..."
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:82
msgid "Never"
msgstr "Ðикогда"
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:83
msgid "Notifications"
msgstr "УведомлениÑ"
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:84
msgid "Notify me about contacts that sign _in"
msgstr "УведомлÑÑ‚ÑŒ о контактах, которые _вошли: "
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:85
msgid "Notify me about contacts that sign _out"
msgstr "УведомлÑÑ‚ÑŒ о контактах, которые _вышли: "
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:86
msgid "Notify me about it"
msgstr "УведомлÑÑ‚ÑŒ об Ñтом"
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:87
msgid "Notify on new _GMail email"
msgstr "Сообщать о новых пиÑьмах в _Gmail"
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:88
msgid "Only when pending events"
msgstr "Только при пропущенных ÑобытиÑÑ…"
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:89
msgid "Personal Events"
msgstr "РаÑширенные ÑтатуÑÑ‹"
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:90
msgid "Play _sounds"
msgstr "Проигрывать _звук"
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:91
msgid "Pop it up"
msgstr "Показать"
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:92
msgid "Preferences"
msgstr "ÐаÑтройки"
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:93
msgid ""
"STUN server hostname. If none given, Gajim will try\n"
"to discover one from server."
@@ -2197,56 +2042,56 @@ msgstr ""
"ÐÐ´Ñ€ÐµÑ Ñервера STUN. ЕÑли не указано, Gajim попробует\n"
"получить Ð°Ð´Ñ€ÐµÑ Ñ Ñервера."
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:95
msgid "STUN server:"
msgstr "STUN Ñервер:"
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:96
msgid "Show notification area icon:"
msgstr "Отображать значек в облаÑти уведомлений:"
-#: ../data/gui/preferences_window.ui.h:95
+#: ../data/gui/preferences_window.ui.h:97
msgid "Show only in roster"
msgstr "Показывать только в роÑтере"
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:98
msgid "Sign _in"
msgstr "В_ошел"
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:99
msgid "Sign _out"
msgstr "В_ышел"
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:100
msgid "Single window for everything"
msgstr "Ð’ÑÑ‘ в одном окне"
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:101
msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
msgstr "Ðекоторые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ Ñодержать форматирование (цвет, шрифт и Ñ‚.д.). ЕÑли отмечено, Gajim будет отображать только их текÑÑ‚, без форматированиÑ."
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:102
msgid "Sort contacts by status"
msgstr "Сортировать контакты по ÑтатуÑу"
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:103
#: ../src/config.py:400
msgid "Status"
msgstr "СтатуÑ"
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:104
msgid "Status _iconset:"
msgstr "Тема ÑтатуÑных _иконок:"
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:105
msgid "Style"
msgstr "Стиль"
-#: ../data/gui/preferences_window.ui.h:104
+#: ../data/gui/preferences_window.ui.h:106
msgid "T_heme:"
msgstr "_Тема:"
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:107
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"
@@ -2256,7 +2101,7 @@ msgstr ""
"$S заменÑетÑÑ Ð½Ð° предыдущее Ñообщение о ÑтатуÑе\n"
"$T заменÑетÑÑ Ð½Ð° Ð²Ñ€ÐµÐ¼Ñ ÑÑ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ð½Ð¸Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ ÑтатуÑе «Ушел»"
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:110
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"
@@ -2266,127 +2111,127 @@ msgstr ""
"$S заменÑетÑÑ Ð½Ð° предыдущее Ñообщение о ÑтатуÑе\n"
"$T заменÑетÑÑ Ð½Ð° Ð²Ñ€ÐµÐ¼Ñ ÑÑ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ð½Ð¸Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ ÑтатуÑе «ÐедоÑтупен»"
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:113
msgid "Use _transports icons"
msgstr "ИÑпользовать иконки _транÑпортов"
-#: ../data/gui/preferences_window.ui.h:112
+#: ../data/gui/preferences_window.ui.h:114
msgid "Use default applications"
msgstr "ИÑпользовать Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
-#: ../data/gui/preferences_window.ui.h:113
+#: ../data/gui/preferences_window.ui.h:115
msgid "Use system _default"
msgstr "ИÑпользовать _ÑиÑтемный шрифт"
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:116
msgid "Video framerate"
msgstr "ЧаÑтота кадров видео"
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:117
msgid "Video input device"
msgstr "УÑтройÑтво захвата изображениÑ"
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:118
msgid "Video output device"
msgstr "УÑтройÑтво вывода изображениÑ"
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:119
msgid "Video size"
msgstr "Разрешение видео"
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:120
msgid "When new event is received:"
msgstr "Когда получено новое Ñообытие:"
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:121
msgid "Your message:"
msgstr "Ваше Ñообщение:"
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:122
msgid "Your nickname:"
msgstr "Ваш ник:"
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:123
msgid "_Away after:"
msgstr "Ðвто-_отошел поÑле:"
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:124
msgid "_Browser:"
msgstr "_Браузер:"
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:125
msgid "_Display chat state notifications:"
msgstr "_Отображать ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ ÑоÑтоÑнии чата:"
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:126
msgid "_Emoticons:"
msgstr "_Смайлики:"
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:127
msgid "_File manager:"
msgstr "_Менеджер файлов:"
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:128
msgid "_Highlight misspelled words"
msgstr "ВыделÑÑ‚ÑŒ _Ñлова Ñ Ð¾Ð¿ÐµÑ‡Ð°Ñ‚ÐºÐ°Ð¼Ð¸"
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:129
msgid "_Ignore events from contacts not in the roster"
msgstr "_Игнорировать ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¾Ñ‚ контактов не из роÑтера"
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:130
msgid "_Ignore rich content in incoming messages"
msgstr "_Игнорировать форматирование во входÑщих ÑообщениÑÑ…"
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:131
msgid "_Log status changes of contacts"
msgstr "_ЗапиÑывать в лог Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑтатуÑов контактов"
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:132
msgid "_Mail client:"
msgstr "_Почтовый клиент:"
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:134
msgid "_Not available after:"
msgstr "Ðвто-_недоÑтупен поÑле:"
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:135
msgid "_Open..."
msgstr "_Открыть..."
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:136
msgid "_Reset to Default Colors"
msgstr "_ВернутьÑÑ Ðº цветам по умолчанию"
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:137
msgid "_Send chat state notifications:"
msgstr "_ОтправлÑÑ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ ÑоÑтоÑнии чата:"
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:138
msgid "_Show roster on startup:"
msgstr "Показ_ывать роÑтер при запуÑке:"
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:139
msgid "_Status message:"
msgstr "_Сообщение о ÑтатуÑе:"
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:140
msgid "_URL highlight:"
msgstr "_Цвет ÑÑылок:"
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:141
msgid "_Window behavior:"
msgstr "Поведение _окна:"
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:142
msgid "in _group chats"
msgstr "в _комнатах"
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:143
msgid "in _roster"
msgstr "в _роÑтере"
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:144
msgid "minutes"
msgstr "минут"
@@ -2439,7 +2284,7 @@ msgid "Order:"
msgstr "Ðомер:"
#: ../data/gui/privacy_list_window.ui.h:12
-#: ../src/dialogs.py:3923
+#: ../src/dialogs.py:3977
msgid "Privacy List"
msgstr "СпиÑок доÑтупа"
@@ -2508,108 +2353,108 @@ msgid "<b>Company:</b>"
msgstr "<b>КомпаниÑ:</b>"
#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:10
msgid "<b>Country:</b>"
msgstr "<b>Страна:</b>"
#: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/vcard_information_window.ui.h:11
msgid "<b>Department:</b>"
msgstr "<b>Отделение:</b>"
#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:12
msgid "<b>E-Mail:</b>"
msgstr "<b>Почта:</b>"
#: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:13
msgid "<b>Extra Address:</b>"
msgstr "<b>Дополнительный адреÑ:</b>"
#. Family Name
#: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:15
msgid "<b>Family:</b>"
msgstr "<b>ФамилиÑ:</b>"
#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:16
msgid "<b>Full Name</b>"
msgstr "<b>ИмÑ</b>"
#. Given Name
#: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:18
msgid "<b>Given:</b>"
msgstr "<b>ИмÑ:</b>"
#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:19
msgid "<b>Homepage:</b>"
msgstr "<b>Веб-Ñтраница:</b>"
#. Middle Name
#: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:22
msgid "<b>Middle:</b>"
msgstr "<b>ОтчеÑтво:</b>"
#: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:23
msgid "<b>Name:</b>"
msgstr "<b>ИмÑ:</b>"
#: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:24
msgid "<b>Nickname:</b>"
msgstr "<b>Ðик:</b>"
#: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:25
msgid "<b>Phone No.:</b>"
msgstr "<b>Телефон:</b>"
#: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:26
msgid "<b>Position:</b>"
msgstr "<b>ДолжноÑÑ‚ÑŒ:</b>"
#: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:27
msgid "<b>Postal Code:</b>"
msgstr "<b>ИндекÑ:</b>"
#. Prefix in Name
#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:29
msgid "<b>Prefix:</b>"
msgstr "<b>ПрефикÑ:</b>"
#: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:31
msgid "<b>Role:</b>"
msgstr "<b>ОбÑзанноÑти:</b>"
#: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:32
msgid "<b>State:</b>"
msgstr "<b>Штат:</b>"
#: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:34
msgid "<b>Street:</b>"
msgstr "<b>Улица:</b>"
#. Suffix in Name
#: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:38
msgid "<b>Suffix:</b>"
msgstr "<b>СуффикÑ:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:42
msgid "About"
msgstr "Подробнее"
@@ -2618,12 +2463,12 @@ msgid "Click to set your avatar"
msgstr "УÑтановить Ñвою аватару"
#: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:45
+#: ../data/gui/vcard_information_window.ui.h:46
msgid "Format: YYYY-MM-DD"
msgstr "Формат: YYYY-MM-DD"
#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:48
msgid "Personal Info"
msgstr "Ð›Ð¸Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
@@ -2647,9 +2492,9 @@ msgstr "Удалить учетную запиÑÑŒ из Gajim и Ñ _Ñерве
#. Remove group
#. Remove
#: ../data/gui/remove_account_window.ui.h:4
-#: ../src/roster_window.py:5557
-#: ../src/roster_window.py:5682
-#: ../src/roster_window.py:5812
+#: ../src/roster_window.py:5643
+#: ../src/roster_window.py:5768
+#: ../src/roster_window.py:5898
msgid "_Remove"
msgstr "_Удалить"
@@ -2698,54 +2543,50 @@ msgstr "Мо_дули"
msgid "Profile, A_vatar"
msgstr "Профиль и _аватар"
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
msgid "Show Only _Active Contacts"
msgstr "Показать _только активных"
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
-msgstr "Показать транÑ_порты"
-
#: ../data/gui/roster_window.ui.h:12
+msgid "Show T_rans_ports"
+msgstr "Показать Т_ранÑ_порты"
+
+#: ../data/gui/roster_window.ui.h:13
msgid "Show _Offline Contacts"
msgstr "Показать _отключенных"
-#: ../data/gui/roster_window.ui.h:13
-#: ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:14
+#: ../src/statusicon.py:346
msgid "Show _Roster"
msgstr "Показать _роÑтер"
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
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/gui/roster_window.ui.h:15
+#: ../data/gui/roster_window.ui.h:16
#: ../data/gui/subscription_request_window.ui.h:6
msgid "_Actions"
msgstr "_ДейÑтвиÑ"
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:18
msgid "_Contents"
msgstr "_Содержание"
-#: ../data/gui/roster_window.ui.h:19
-#: ../src/disco.py:1521
+#: ../data/gui/roster_window.ui.h:20
+#: ../src/disco.py:1520
msgid "_Edit"
msgstr "_Правка"
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
msgid "_FAQ"
msgstr "_ЧаВО"
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:22
msgid "_Help"
msgstr "_Помощь"
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "Отправить одиночное _Ñообщение..."
-
#: ../data/gui/roster_window.ui.h:25
msgid "_View"
msgstr "_Вид"
@@ -2764,7 +2605,7 @@ msgstr "Добавить _контакт"
#. Information
#: ../data/gui/search_window.ui.h:4
-#: ../src/roster_window.py:5824
+#: ../src/roster_window.py:5910
msgid "_Information"
msgstr "_Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ контакте"
@@ -2879,55 +2720,55 @@ msgid "<b>Client:</b>"
msgstr "<b>Клиент:</b>"
#: ../data/gui/vcard_information_window.ui.h:8
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>УÑтановленный аватар:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
msgid "<b>Contact time:</b>"
msgstr "<b>Ð’Ñ€ÐµÐ¼Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð°:</b>"
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:20
msgid "<b>Jabber ID:</b>"
msgstr "<b>Jabber ID:</b>"
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:30
msgid "<b>Resource:</b>"
msgstr "<b>РеÑурÑ:</b>"
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:33
msgid "<b>Status:</b>"
msgstr "<b>СтатуÑ:</b>"
#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:36
msgid "<b>Subscription:</b>"
msgstr "<b>ПодпиÑка:</b>"
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:39
msgid "<b>System:</b>"
msgstr "<b>СиÑтема:</b>"
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>User avatar:</b>"
+msgstr "<b>Ðватар пользователÑ:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:43
msgid "Comments"
msgstr "Комментарии"
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
-msgstr "ÐаÑтроить _аватар:"
-
-#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/vcard_information_window.ui.h:44
#: ../data/gui/zeroconf_information_window.ui.h:1
msgid "Contact"
msgstr "Контакт"
-#: ../data/gui/vcard_information_window.ui.h:44
+#: ../data/gui/vcard_information_window.ui.h:45
msgid "Contact Information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ контакте"
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:47
msgid "More"
msgstr "Еще"
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Ðватар:"
-
#: ../data/gui/xml_console_window.ui.h:1
msgid "<b>Filter</b>"
msgstr "<b>Фильтр</b>"
@@ -3063,7 +2904,7 @@ msgid "Text"
msgstr "ТекÑÑ‚"
#: ../src/advanced_configuration_window.py:96
-#: ../src/chat_control.py:1016
+#: ../src/chat_control.py:1062
msgid "Color"
msgstr "Цвет"
@@ -3101,262 +2942,261 @@ msgstr[2] "Ð’Ñ‹ получили новые запиÑи (и %d не отобр
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "English"
msgstr "ÐнглийÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Belarusian"
msgstr "БелоруÑÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Bulgarian"
msgstr "БолгарÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Breton"
msgstr "БретонÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Czech"
msgstr "ЧешÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "German"
msgstr "Ðемецкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Greek"
msgstr "ГречеÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "British"
msgstr "БританÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Esperanto"
msgstr "ÐÑперанто"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Spanish"
msgstr "ИÑпанÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Basque"
msgstr "БаÑкÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "French"
msgstr "ФранцузÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Croatian"
msgstr "ХорватÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Italian"
msgstr "ИтальÑнÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Norwegian (b)"
msgstr "ÐорвежÑкий (букмол)"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Dutch"
msgstr "ГолландÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Norwegian"
msgstr "ÐорвежÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Polish"
msgstr "ПольÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Portuguese"
msgstr "ПортугальÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Brazilian Portuguese"
msgstr "ПортугальÑкий (БразилиÑ)"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Russian"
msgstr "РуÑÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Serbian"
msgstr "СербÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Slovak"
msgstr "Словацкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Swedish"
msgstr "ШведÑкий"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Chinese (Ch)"
msgstr "КитайÑкий"
-#: ../src/chat_control.py:218
+#: ../src/chat_control.py:228
msgid "Ping?"
msgstr "Ping?"
-#: ../src/chat_control.py:223
+#: ../src/chat_control.py:233
#, python-format
msgid "Pong! (%s s.)"
msgstr "Pong! (%s Ñек.)"
-#: ../src/chat_control.py:228
+#: ../src/chat_control.py:238
msgid "Error."
msgstr "Ошибка."
-#: ../src/chat_control.py:550
+#: ../src/chat_control.py:574
msgid "Spelling language"
msgstr "Язык проверки орфографии"
#. we are not connected
-#: ../src/chat_control.py:582
-#: ../src/chat_control.py:791
+#: ../src/chat_control.py:606
+#: ../src/chat_control.py:822
msgid "A connection is not available"
msgstr "Подключение недоÑтупно"
-#: ../src/chat_control.py:583
-#: ../src/chat_control.py:792
+#: ../src/chat_control.py:607
+#: ../src/chat_control.py:823
msgid "Your message can not be sent until you are connected."
msgstr "Ваше Ñообщение не может быть отправлено, пока вы не подключитеÑÑŒ."
-#: ../src/chat_control.py:998
+#: ../src/chat_control.py:1044
msgid "Underline"
msgstr "Подчеркнутый"
-#: ../src/chat_control.py:999
+#: ../src/chat_control.py:1045
msgid "Strike"
msgstr "Зачеркнутый"
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1068
msgid "Font"
msgstr "Шрифт"
-#: ../src/chat_control.py:1031
+#: ../src/chat_control.py:1077
msgid "Clear formating"
msgstr "Удалить форматирование"
-#: ../src/chat_control.py:1109
+#: ../src/chat_control.py:1154
msgid "Really send file?"
msgstr "Отправить файл?"
-#: ../src/chat_control.py:1110
+#: ../src/chat_control.py:1155
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr "ЕÑли вы пошлете файл %s, он/она узнает ваш наÑтоÑщий Jabber ID."
-#: ../src/chat_control.py:1574
-#: ../src/chat_control.py:2098
+#: ../src/chat_control.py:1639
+#: ../src/chat_control.py:2165
msgid "GPG encryption enabled"
msgstr "GPG шифрование включено"
-#: ../src/chat_control.py:1595
-#: ../src/chat_control.py:1598
-#: ../src/features_window.py:107
+#: ../src/chat_control.py:1660
+#: ../src/chat_control.py:1663
msgid "Requires python-farsight."
msgstr "Требует python-farsight."
#. Add to roster
-#: ../src/chat_control.py:1624
-#: ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277
-#: ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251
-#: ../src/dialogs.py:1098
-#: ../src/dialogs.py:2182
-#: ../src/dialogs.py:2211
-#: ../src/gui_interface.py:497
-#: ../src/gui_menu_builder.py:252
-#: ../src/gui_menu_builder.py:395
+#: ../src/chat_control.py:1703
+#: ../src/common/contacts.py:149
+#: ../src/common/contacts.py:270
+#: ../src/common/helpers.py:61
+#: ../src/common/helpers.py:255
+#: ../src/dialogs.py:1099
+#: ../src/dialogs.py:2227
+#: ../src/dialogs.py:2256
+#: ../src/gui_interface.py:467
+#: ../src/gui_menu_builder.py:254
+#: ../src/gui_menu_builder.py:404
+#: ../src/roster_window.py:1644
#: ../src/roster_window.py:1646
-#: ../src/roster_window.py:1648
-#: ../src/roster_window.py:1981
-#: ../src/roster_window.py:3458
-#: ../src/roster_window.py:3485
+#: ../src/roster_window.py:1979
+#: ../src/roster_window.py:3511
+#: ../src/roster_window.py:3538
msgid "Not in Roster"
msgstr "Ðе в роÑтере"
-#: ../src/chat_control.py:1654
+#: ../src/chat_control.py:1734
msgid "This contact does not support file transfer."
msgstr "Ðтот контакт не поддерживает передачу файлов."
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1737
msgid "You need to know the real JID of the contact to send him or her a file."
msgstr "Ðеобходимо знать наÑтоÑщий JID контакта Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы отправить ему или ей файл."
-#: ../src/chat_control.py:1765
+#: ../src/chat_control.py:1844
#, python-format
msgid "%(type)s state : %(state)s, reason: %(reason)s"
msgstr "%(type)s ÑоÑтоÑние : %(state)s, причина: %(reason)s"
-#: ../src/chat_control.py:1957
+#: ../src/chat_control.py:2035
#, 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:2078
-#: ../src/dialogs.py:5454
+#: ../src/chat_control.py:2145
+#: ../src/dialogs.py:5038
msgid "No GPG key assigned"
msgstr "Ключ GPG не приÑвоен"
-#: ../src/chat_control.py:2079
+#: ../src/chat_control.py:2146
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
msgstr "Ðтому контакту не приÑвоен ключ GPG, поÑтому вы не можете зашифровать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG."
-#: ../src/chat_control.py:2088
+#: ../src/chat_control.py:2155
msgid "GPG encryption disabled"
msgstr "GPG шифрование выключено"
-#: ../src/chat_control.py:2114
+#: ../src/chat_control.py:2181
msgid "Session WILL be logged"
msgstr "Ð”Ð»Ñ ÑеанÑа БУДЕТ Ñохранена иÑÑ‚Ð¾Ñ€Ð¸Ñ Ñообщений"
-#: ../src/chat_control.py:2116
+#: ../src/chat_control.py:2183
msgid "Session WILL NOT be logged"
msgstr "Ð”Ð»Ñ ÑеанÑа ÐЕ БУДЕТ Ñохранена иÑÑ‚Ð¾Ñ€Ð¸Ñ Ñообщений"
#. encryption %s active
-#: ../src/chat_control.py:2133
+#: ../src/chat_control.py:2200
msgid "is"
msgstr "было"
-#: ../src/chat_control.py:2133
+#: ../src/chat_control.py:2200
msgid "is NOT"
msgstr "ÐЕ"
#. chat session %s be logged
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2202
msgid "will"
msgstr "будет"
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2202
msgid "will NOT"
msgstr "ÐЕ будет"
#. About encrypted chat session
-#: ../src/chat_control.py:2139
+#: ../src/chat_control.py:2206
msgid "and authenticated"
msgstr "и заверено"
#. About encrypted chat session
-#: ../src/chat_control.py:2143
+#: ../src/chat_control.py:2210
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:2150
+#: ../src/chat_control.py:2217
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3365,76 +3205,75 @@ msgstr ""
"%(type)s шифрование %(status)s включено %(authenticated)s.\n"
"Ð”Ð»Ñ ÑеанÑа %(logged)s Ñохранена иÑÑ‚Ð¾Ñ€Ð¸Ñ Ñообщений."
-#: ../src/chat_control.py:2293
+#: ../src/chat_control.py:2344
msgid "Session negotiation cancelled"
msgstr "УÑтановление ÑеанÑа отменено"
-#: ../src/chat_control.py:2303
+#: ../src/chat_control.py:2354
msgid "This session WILL be archived on server"
msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ ÑеанÑа БУДЕТ Ñохранена на Ñервере"
-#: ../src/chat_control.py:2305
+#: ../src/chat_control.py:2356
msgid "This session WILL NOT be archived on server"
msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ ÑеанÑа ÐЕ БУДЕТ Ñохранена на Ñервере"
-#: ../src/chat_control.py:2314
+#: ../src/chat_control.py:2365
msgid "This session is encrypted"
msgstr "Ð¡ÐµÐ°Ð½Ñ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½"
-#: ../src/chat_control.py:2317
+#: ../src/chat_control.py:2368
msgid " and WILL be logged"
msgstr " и БУДЕТ Ñохранена иÑÑ‚Ð¾Ñ€Ð¸Ñ Ñообщений"
-#: ../src/chat_control.py:2319
+#: ../src/chat_control.py:2370
msgid " and WILL NOT be logged"
msgstr " и ÐЕ БУДЕТ Ñохранена иÑÑ‚Ð¾Ñ€Ð¸Ñ Ñообщений"
-#: ../src/chat_control.py:2324
+#: ../src/chat_control.py:2375
msgid "Remote contact's identity not verified. Click the shield button for more details."
msgstr "ЛичноÑÑ‚ÑŒ удаленного контакта не подтверждена. Ðажмите на кнопке Ñо щитом Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñтей."
-#: ../src/chat_control.py:2326
+#: ../src/chat_control.py:2377
msgid "E2E encryption disabled"
msgstr "E2E шифрование выключено"
-#: ../src/chat_control.py:2370
-#: ../src/chat_control.py:2383
+#: ../src/chat_control.py:2424
+#: ../src/chat_control.py:2437
msgid "The following message was NOT encrypted"
msgstr "ПоÑледнее Ñообщение ÐЕ БЫЛО зашифровано"
-#: ../src/chat_control.py:2376
+#: ../src/chat_control.py:2430
msgid "The following message was encrypted"
msgstr "ПоÑледнее Ñообщение зашифровано"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2658
+#: ../src/chat_control.py:2699
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "Получено новое Ñообщение от «%s»"
-#: ../src/chat_control.py:2659
+#: ../src/chat_control.py:2700
msgid "If you close this tab and you have history disabled, this message will be lost."
msgstr "ЕÑли вы закроете Ñту вкладку и у Ð²Ð°Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¸Ñтории Ñообщений, то Ñто Ñообщение будет утерÑно."
-#: ../src/chat_control.py:2826
-#: ../src/common/connection_handlers_events.py:869
-#: ../src/common/connection_handlers.py:945
-#: ../src/common/connection_handlers.py:1042
-#: ../src/common/connection_handlers.py:1698
-#: ../src/common/connection.py:459
-#: ../src/common/logger.py:1126
-#: ../src/gajim.py:200
-#: ../src/session.py:93
+#: ../src/chat_control.py:2867
+#: ../src/common/connection_handlers_events.py:887
+#: ../src/common/connection_handlers.py:938
+#: ../src/common/connection_handlers.py:1050
+#: ../src/common/connection.py:451
+#: ../src/common/logger.py:1131
+#: ../src/gajim.py:209
+#: ../src/session.py:101
msgid "Database Error"
msgstr "Ошибка базы данных"
-#: ../src/chat_control.py:2827
+#: ../src/chat_control.py:2868
#, python-format
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:3061
-#: ../src/gui_interface.py:1042
+#: ../src/chat_control.py:3104
+#: ../src/gui_interface.py:1032
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
@@ -3443,11 +3282,57 @@ msgstr ""
"Ðе удалоÑÑŒ раÑшифровать Ñообщение от %s\n"
"Возможно, оно было иÑпорчено."
-#: ../src/chat_control.py:3094
+#: ../src/chat_control.py:3137
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s теперь %(status)s"
+#: ../src/chat_control.py:3196
+msgid "File transfer"
+msgstr "Передача файлов"
+
+#: ../src/chat_control.py:3199
+msgid "Size"
+msgstr "Размер"
+
+#: ../src/chat_control.py:3201
+msgid "_Accept"
+msgstr "_ПринÑÑ‚ÑŒ"
+
+#: ../src/chat_control.py:3224
+#: ../src/filetransfers_window.py:204
+msgid "File transfer completed"
+msgstr "Передача завершена"
+
+#: ../src/chat_control.py:3252
+#: ../src/gui_interface.py:903
+#: ../src/roster_window.py:1891
+msgid "Remote contact stopped transfer"
+msgstr "Удаленный контакт оÑтановил передачу"
+
+#: ../src/chat_control.py:3254
+#: ../src/gui_interface.py:906
+#: ../src/roster_window.py:1893
+msgid "Error opening file"
+msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°"
+
+#: ../src/chat_control.py:3256
+#: ../src/filetransfers_window.py:240
+msgid "File transfer stopped"
+msgstr "Передача файла оÑтановлена"
+
+#: ../src/chat_control.py:3259
+#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:226
+msgid "File transfer cancelled"
+msgstr "Передача отменена"
+
+#: ../src/chat_control.py:3260
+#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:227
+msgid "Connection with peer cannot be established."
+msgstr "Соединение не может быть уÑтановлено."
+
#: ../src/common/check_paths.py:38
msgid "creating logs database"
msgstr "ÑоздаетÑÑ Ð‘Ð” иÑтории"
@@ -3492,90 +3377,96 @@ msgstr "%s должен быть файлом, а не директорией"
msgid "creating %s directory"
msgstr "ÑоздаетÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ %s"
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:85
msgid "Change status information"
msgstr "Изменить информацию о ÑтатуÑе"
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:100
msgid "Change status"
msgstr "Контакт изменит ÑтатуÑ"
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:101
msgid "Set the presence type and description"
msgstr "УÑтановка ÑтатуÑа и ÑтатуÑного ÑообщениÑ"
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:107
msgid "Free for chat"
msgstr "Готов поболтать"
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:108
msgid "Online"
msgstr "Ð’ Ñети"
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:109
+#: ../src/common/helpers.py:243
+#: ../src/tooltips.py:193
+msgid "Away"
+msgstr "Ушел"
+
+#: ../src/common/commands.py:110
msgid "Extended away"
msgstr "ÐедоÑтупен (раÑширенный)"
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:111
msgid "Do not disturb"
msgstr "Ðе беÑпокоить."
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:112
msgid "Offline - disconnect"
msgstr "Ðе в Ñети — отключен"
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:117
msgid "Presence description:"
msgstr "ОпиÑание приÑутÑтвиÑ:"
-#: ../src/common/commands.py:149
-#: ../src/common/commands.py:317
+#: ../src/common/commands.py:152
+#: ../src/common/commands.py:320
msgid "The status has been changed."
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½."
-#: ../src/common/commands.py:181
-#: ../src/common/commands.py:207
+#: ../src/common/commands.py:184
+#: ../src/common/commands.py:210
msgid "Leave Groupchats"
msgstr "Покинуть конференции"
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:200
#, python-format
msgid "%(nickname)s on %(room_jid)s"
msgstr "%(nickname)s из комнаты %(room_jid)s"
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:204
msgid "You have not joined a groupchat."
msgstr "Вы не вошли в комнату."
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:211
msgid "Choose the groupchats you want to leave"
msgstr "Выберите конференции, которые вы хотите покинуть"
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212
-#: ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57
+#: ../src/common/commands.py:215
+#: ../src/common/contacts.py:128
+#: ../src/common/helpers.py:61
#: ../src/roster_window.py:817
+#: ../src/roster_window.py:1648
#: ../src/roster_window.py:1650
-#: ../src/roster_window.py:1652
-#: ../src/roster_window.py:2504
-#: ../src/roster_window.py:5442
+#: ../src/roster_window.py:2514
+#: ../src/roster_window.py:5528
msgid "Groupchats"
msgstr "Комнаты"
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:256
msgid "You left the following groupchats:"
msgstr "Ð’Ñ‹ покинули Ñледующие комнаты:"
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:268
msgid "Forward unread messages"
msgstr "ПереÑлать непрочитанные ÑообщениÑ"
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:290
msgid "All unread messages have been forwarded."
msgstr "Ð’Ñе непрочитанные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ñ‹."
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:298
msgid "Forward unread message then disconnect"
msgstr "ПереÑлать непрочитанные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ отключении"
@@ -3619,65 +3510,69 @@ msgstr "$S будет замещено текущим Ñообщением о Ñ
msgid "When to show notification area icon. Can be 'never', 'on_event', 'always'."
msgstr "Когда показывать иконку в облаÑти уведомлений. Возможные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ 'never', 'on_event', 'always'."
-#: ../src/common/config.py:94
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:95
msgid "Incoming nickname color."
msgstr "Цвет ника ÑобеÑедника."
-#: ../src/common/config.py:95
+#: ../src/common/config.py:96
msgid "Outgoing nickname color."
msgstr "Цвет вашего ника."
-#: ../src/common/config.py:96
+#: ../src/common/config.py:97
msgid "Incoming text color."
msgstr "Цвет входÑщих Ñообщений."
-#: ../src/common/config.py:97
+#: ../src/common/config.py:98
msgid "Outgoing text color."
msgstr "Цвет иÑходÑщих Ñообщений."
-#: ../src/common/config.py:98
+#: ../src/common/config.py:99
msgid "Status message text color."
msgstr "Цвет ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ ÑтатуÑе."
-#: ../src/common/config.py:101
+#: ../src/common/config.py:102
msgid "Incoming nickname font."
msgstr "Шрифт ника ÑобеÑедника."
-#: ../src/common/config.py:102
+#: ../src/common/config.py:103
msgid "Outgoing nickname font."
msgstr "Шрифт вашего ника."
-#: ../src/common/config.py:103
+#: ../src/common/config.py:104
msgid "Incoming text font."
msgstr "Шрифт входÑщих Ñообщений."
-#: ../src/common/config.py:104
+#: ../src/common/config.py:105
msgid "Outgoing text font."
msgstr "Шрифт иÑходÑщих Ñообщений."
-#: ../src/common/config.py:105
+#: ../src/common/config.py:106
msgid "Status message text font."
msgstr "Шрифт ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ ÑтатуÑе"
-#: ../src/common/config.py:106
+#: ../src/common/config.py:107
msgid "List (space separated) of rows (accounts and groups) that are collapsed."
msgstr "СпиÑок (через пробел) Ñтрок (учётных запиÑей и групп), которые Ñвёрнуты."
#. sorted alphanum
-#: ../src/common/config.py:107
-#: ../src/common/config.py:508
-#: ../src/common/optparser.py:294
-#: ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524
-#: ../src/gui_interface.py:2631
+#: ../src/common/config.py:108
+#: ../src/common/config.py:501
+#: ../src/common/optparser.py:296
+#: ../src/common/optparser.py:492
+#: ../src/common/optparser.py:526
+#: ../src/gui_interface.py:2639
msgid "default"
msgstr "По_умолчанию"
-#: ../src/common/config.py:113
+#: ../src/common/config.py:114
msgid "Language used by speller"
msgstr "Язык, иÑпользуемый при проверке правопиÑаниÑ"
-#: ../src/common/config.py:114
+#: ../src/common/config.py:115
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3687,221 +3582,229 @@ msgstr ""
"«sometimes» — печатать Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ð¶Ð´Ñ‹Ðµ неÑколько минут.\n"
"«never» — не печатать времÑ."
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
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:118
+#: ../src/common/config.py:119
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "Обрабатывать пары * / _ как возможные форматирующие Ñимволы."
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr "ЕÑли активно, то не будут удалÑÑ‚ÑŒÑÑ */_. Так что *фыва* будет напиÑано полужирным шрифтом, но * * удалены не будут"
-#: ../src/common/config.py:122
+#: ../src/common/config.py:123
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:131
+#: ../src/common/config.py:132
msgid "Character to add after nickname when using nick completion (tab) in group chat."
msgstr "Символ, который нужно добавлÑÑ‚ÑŒ к нику, когда иÑпользуетÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ (tab) в комнате."
-#: ../src/common/config.py:132
+#: ../src/common/config.py:133
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:160
+#: ../src/common/config.py:151
+msgid "If true, Gajim will save roster position when hiding roster, and restore it when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:162
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:161
+#: ../src/common/config.py:163
msgid "Characters that are printed before the nickname in conversations"
msgstr "Символы, которые будут отображатьÑÑ Ð¿ÐµÑ€ÐµÐ´ никами в чате."
-#: ../src/common/config.py:162
+#: ../src/common/config.py:164
msgid "Characters that are printed after the nickname in conversations"
msgstr "Символы, которые будут отображатьÑÑ Ð¿Ð¾Ñле ников в чате"
-#: ../src/common/config.py:165
+#: ../src/common/config.py:167
msgid "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
msgstr "Определение команды Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка при получении нового пиÑьма, например: /usr/bin/getmail -q"
-#: ../src/common/config.py:167
+#: ../src/common/config.py:169
msgid "Add * and [n] in roster title?"
msgstr "ДобавлÑÑ‚ÑŒ * и [n] в окно роÑтера?"
-#: ../src/common/config.py:168
+#: ../src/common/config.py:170
msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
msgstr "Сколько Ñтрок из предыдущей беÑеды выводить, когда вкладка/окно открываютÑÑ Ð²Ð½Ð¾Ð²ÑŒ."
-#: ../src/common/config.py:169
+#: ../src/common/config.py:171
msgid "How many minutes should last lines from previous conversation last."
msgstr "Сколько минут должны оÑтаватьÑÑ Ð¿Ð¾Ñледние Ñтроки из предыдущей беÑеды."
-#: ../src/common/config.py:170
-msgid "How many lines to request to server when entering a groupchat."
-msgstr "КоличеÑтво Ñтрок иÑтории Ñообщений, запрашиваемых при входе в комнату."
+#: ../src/common/config.py:172
+msgid "How many lines to request to server when entering a groupchat. -1 means no limit"
+msgstr "КоличеÑтво Ñтрок иÑтории Ñообщений, запрашиваемых при входе в комнату. -1 - не ограничено"
-#: ../src/common/config.py:171
-msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "За какой период (минут назад) запрашивать иÑторию Ñообщений при входе в комнату."
+#: ../src/common/config.py:173
+msgid "How many minutes back to request logs when a entering a groupchat. -1 means no limit"
+msgstr "За какой период (минут назад) запрашивать иÑторию Ñообщений при входе в комнату. -1 - не ограничено"
-#: ../src/common/config.py:172
+#: ../src/common/config.py:174
msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð² Ñекундах перед попыткой Ñнова автоматичеÑки войти в комнату, от которой вы были отключены. Чтобы отключить автоматичеÑкий вход в Ñтом Ñлучае, уÑтановите значение 0."
-#: ../src/common/config.py:173
+#: ../src/common/config.py:175
msgid "Should autorejoin be activated when we are being kicked from a conference?"
msgstr ""
-#: ../src/common/config.py:174
+#: ../src/common/config.py:176
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:176
+#: ../src/common/config.py:178
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "Сколько Ñтрок хранить Ð´Ð»Ñ Ctrl+Стрелка вверх"
-#: ../src/common/config.py:179
+#: ../src/common/config.py:181
#, 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», чтобы иÑпользовать ВикиÑловарь."
-#: ../src/common/config.py:182
+#: ../src/common/config.py:184
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr "ЕÑли отмечено, то Gajim'ом можно будет управлÑÑ‚ÑŒ удаленно Ñ Ð¸Ñпользованием gajim-remote."
-#: ../src/common/config.py:183
+#: ../src/common/config.py:185
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:184
+#: ../src/common/config.py:186
msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr "ОтÑылать ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ ÑоÑтоÑнии беÑеды. Варианты: all (вÑе), composing_only (только печать), disabled (никаких уведомлений)."
-#: ../src/common/config.py:185
+#: ../src/common/config.py:187
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:187
+#: ../src/common/config.py:189
msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
msgstr "ЕÑли отключена печать времени Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ ÑообщениÑ, то печатать его каждые X минут."
-#: ../src/common/config.py:188
+#: ../src/common/config.py:190
msgid "Ask before closing a group chat tab/window."
msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
-#: ../src/common/config.py:189
+#: ../src/common/config.py:191
msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
msgstr "Ð’Ñегда Ñпрашивать перед закрытием окна/вкладки комнаты из Ñтого ÑпиÑка. Комнаты в ÑпиÑке разделÑÑŽÑ‚ÑÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð¼."
-#: ../src/common/config.py:190
+#: ../src/common/config.py:192
msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
msgstr "Ðикогда не Ñпрашивать перед закрытием окна/вкладки комнаты из Ñтого ÑпиÑка. Комнаты в ÑпиÑке разделÑÑŽÑ‚ÑÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð¼."
-#: ../src/common/config.py:191
+#: ../src/common/config.py:193
msgid "Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)"
msgstr "Спрашивать перед закрытием окна разговора Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ°Ð¼Ð¸, еÑли ÑущеÑтвует Ñлемент, который может потерÑÑ‚ÑŒ данные (разговор, личный разговор, разговор в комнате, которые не будут Ñвёрнуты)"
-#: ../src/common/config.py:194
+#: ../src/common/config.py:196
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:196
+#: ../src/common/config.py:198
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "IEC Ñтандарт утверждает, что KiB = 1024 байт, KB = 1000 байт"
-#: ../src/common/config.py:198
+#: ../src/common/config.py:200
msgid "Notify of events in the notification area."
msgstr "УведомлÑÑ‚ÑŒ о ÑобытиÑÑ… в облаÑти уведомлений."
-#: ../src/common/config.py:204
+#: ../src/common/config.py:206
msgid "Show tab when only one conversation?"
msgstr "Показывать вкладку при одном чат-окне?"
-#: ../src/common/config.py:205
+#: ../src/common/config.py:207
msgid "Show tabbed notebook border in chat windows?"
msgstr "Показывать границу вкладки в окне чата?"
-#: ../src/common/config.py:206
+#: ../src/common/config.py:208
msgid "Show close button in tab?"
msgstr "Показывать кнопку Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð½Ð° вкладке?"
-#: ../src/common/config.py:207
+#: ../src/common/config.py:209
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:216
+#: ../src/common/config.py:218
msgid "Preview new messages in notification popup?"
msgstr "ПредпроÑмотр новых Ñообщений во вÑплывающем окне?"
-#: ../src/common/config.py:221
+#: ../src/common/config.py:223
msgid "A semicolon-separated list of words that will be highlighted in group chats."
msgstr "СпиÑок Ñлов (через точку Ñ Ð·Ð°Ð¿Ñтой), которые будут подÑвечиватьÑÑ Ð² комнатах."
-#: ../src/common/config.py:222
+#: ../src/common/config.py:224
msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if notification icon is used."
msgstr "ЕÑли активно, то Gajim будет завершатьÑÑ Ð¿Ñ€Ð¸ нажатии на кнопку Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¾ÐºÐ½Ð°. Ðта Ð¾Ð¿Ñ†Ð¸Ñ ÑƒÑ‡Ð¸Ñ‚Ñ‹Ð²Ð°ÐµÑ‚ÑÑ, только еÑли иÑпользуетÑÑ Ð¸ÐºÐ¾Ð½ÐºÐ° в облаÑти уведомлений."
-#: ../src/common/config.py:223
+#: ../src/common/config.py:225
msgid "If True, Gajim will check if it's the default jabber client on each startup."
msgstr "ЕÑли активно, то Gajim будет проверÑÑ‚ÑŒ при запуÑке, ÑвлÑетÑÑ Ð»Ð¸ он jabber-клиентом по умолчанию."
-#: ../src/common/config.py:224
+#: ../src/common/config.py:226
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:225
+#: ../src/common/config.py:227
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:231
+#: ../src/common/config.py:233
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr "ОпределÑет позицию аватар в роÑтере. Может быть left или right"
-#: ../src/common/config.py:232
+#: ../src/common/config.py:234
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:233
+#: ../src/common/config.py:235
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:234
+#: ../src/common/config.py:236
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:236
+#: ../src/common/config.py:238
+msgid "Log XHTML messages instead of plain text messages."
+msgstr "СохранÑÑ‚ÑŒ XHTML ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð²Ð¼ÐµÑто проÑÑ‚Ñ‹Ñ… текÑтовых Ñообщений"
+
+#: ../src/common/config.py:239
msgid "Background color of contacts when they just signed in."
msgstr "Фоновый цвет контакта, который только что вошел."
-#: ../src/common/config.py:237
+#: ../src/common/config.py:240
msgid "Background color of contacts when they just signed out."
msgstr "Фоновый цвет контакта, который только что вышел."
-#: ../src/common/config.py:239
+#: ../src/common/config.py:242
msgid "If True, restored messages will use a smaller font than the default one."
msgstr "ЕÑли активно, то воÑÑтановленные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ иметь меньший шрифт."
-#: ../src/common/config.py:240
+#: ../src/common/config.py:243
msgid "Don't show avatar for the transport itself."
msgstr "Ðе показывать аватар Ð´Ð»Ñ Ñ‚Ñ€Ð°Ð½Ñпорта."
-#: ../src/common/config.py:241
+#: ../src/common/config.py:244
msgid "Don't show roster in the system taskbar."
msgstr "Ðе показывать роÑтер в панели задач."
-#: ../src/common/config.py:242
+#: ../src/common/config.py:245
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:244
+#: ../src/common/config.py:247
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:247
+#: ../src/common/config.py:250
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
@@ -3917,500 +3820,607 @@ msgstr ""
"«peracct» — Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ учетной запиÑи отÑылаютÑÑ Ð² Ñвои окна.\n"
"«pertype» — Каждый тип ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ (например, беÑеда или комната) отÑылаетÑÑ Ð² Ñвое окно. Заметьте, что при изменении Ñтого параметра требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк Gajim, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу."
-#: ../src/common/config.py:248
+#: ../src/common/config.py:251
msgid ""
"Show roster on startup.\n"
"'always' - Always show roster.\n"
"'never' - Never show roster.\n"
"'last_state' - Restore the last state roster."
msgstr ""
+"Показывать роÑтер при запуÑке.\n"
+"'always' - Ð’Ñегда показывать роÑтер.\n"
+"'never' - Ðикогда не показывать роÑтер.\n"
+"'last_state' - ВоÑÑтанавливать поÑледнее ÑоÑтоÑние роÑтера."
-#: ../src/common/config.py:249
+#: ../src/common/config.py:252
msgid "If False, you will no longer see the avatar in the chat window."
msgstr "ЕÑли неактивно, вы больше не будете видеть аватары в окне беÑеды."
-#: ../src/common/config.py:250
+#: ../src/common/config.py:253
msgid "If True, pressing the escape key closes a tab/window."
msgstr "ЕÑли активно, то нажатие клавиши Escape будет закрывать вкладку/окно."
-#: ../src/common/config.py:251
+#: ../src/common/config.py:254
msgid "Hides the buttons in chat windows."
msgstr "Скрывает кнопки в окнах чата."
-#: ../src/common/config.py:252
+#: ../src/common/config.py:255
msgid "Hides the banner in a group chat window"
msgstr "Скрывает баннер в окне комнаты"
-#: ../src/common/config.py:253
+#: ../src/common/config.py:256
msgid "Hides the banner in two persons chat window"
msgstr "Скрывает баннер в окне чата"
-#: ../src/common/config.py:254
+#: ../src/common/config.py:257
msgid "Hides the group chat occupants list in group chat window."
msgstr "Скрывает ÑпиÑок поÑетителей в окне комнаты."
-#: ../src/common/config.py:255
+#: ../src/common/config.py:258
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:256
+#: ../src/common/config.py:259
msgid "Indentation when using merge consecutive nickname."
msgstr "Разделитель, иÑпользуемый при активированной наÑтройке chat_merge_consecutive_nickname."
-#: ../src/common/config.py:257
+#: ../src/common/config.py:260
msgid "Smooth scroll message in conversation window"
msgstr "Плавно прокручивать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² окне чата"
-#: ../src/common/config.py:258
+#: ../src/common/config.py:261
msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
msgstr "СпиÑок цветов, разделенных «:», которые будут иÑпользоватьÑÑ Ð´Ð»Ñ Ñ€Ð°ÑкраÑки ников в комнатах."
-#: ../src/common/config.py:259
+#: ../src/common/config.py:262
msgid "Ctrl-Tab go to next composing tab when none is unread."
msgstr "ИÑпользовать Ctrl-Tab, чтобы перейти к Ñледующей вкладке Ñ ÑоÑтавлÑемым Ñообщением, когда нет непрочитанных Ñообщений."
-#: ../src/common/config.py:260
+#: ../src/common/config.py:263
msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
msgstr "Следует ли показывать диалог Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾ Ñоздании метаконтакта? ПуÑÑ‚Ð°Ñ Ñтрока означает, что Ñообщение не будет показыватьÑÑ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ."
-#: ../src/common/config.py:261
+#: ../src/common/config.py:264
msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
msgstr "Следует ли показывать диалог Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸ контакта? ПуÑÑ‚Ð°Ñ Ñтрока означает, что Ñообщение не будет показыватьÑÑ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ."
-#: ../src/common/config.py:262
+#: ../src/common/config.py:265
msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
msgstr "Следует ли показывать диалог Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸ контакта? ПуÑÑ‚Ð°Ñ Ñтрока означает, что Ñообщение не будет показыватьÑÑ Ð²Ð¾Ð¾Ð±Ñ‰Ðµ."
-#: ../src/common/config.py:263
+#: ../src/common/config.py:266
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:264
+#: ../src/common/config.py:267
msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
msgstr "ЕÑли активно, Gajim будет иÑпользовать (еÑли возможно) Gnome Keyring Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹ учетных запиÑей."
-#: ../src/common/config.py:265
+#: ../src/common/config.py:268
msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
msgstr "ЕÑли активно, Gajim будет иÑпользовать (еÑли возможно) KDE Wallet Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹ учетных запиÑей."
-#: ../src/common/config.py:266
+#: ../src/common/config.py:269
msgid "If True, Gajim will show number of online and total contacts in account and group rows."
msgstr "ЕÑли активно, Gajim будет показывать количеÑтво контактов онлайн/вÑего в Ñтроках Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼ учетной запиÑи и групп."
-#: ../src/common/config.py:267
+#: ../src/common/config.py:270
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:268
+#: ../src/common/config.py:271
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:269
+#: ../src/common/config.py:272
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:270
+#: ../src/common/config.py:273
msgid "Time of inactivity needed before the change status window closes down."
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð½Ðµ активноÑти прежде чем окно Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑтатуÑа закроетÑÑ."
-#: ../src/common/config.py:271
+#: ../src/common/config.py:274
msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
msgstr "МакÑимальное количеÑтво Ñтрок в окне. Старые Ñтроки будут удалены."
-#: ../src/common/config.py:272
+#: ../src/common/config.py:275
msgid "If True, notification windows from notification-daemon will be attached to notification icon."
msgstr "ЕÑли активно, окно ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ notification-daemon будет прикреплено к облаÑти уведомлений."
-#: ../src/common/config.py:273
+#: ../src/common/config.py:276
msgid "Choose interval between 2 checks of idleness."
msgstr "Выберите интервал между 2 проверками на бездейÑтвие."
-#: ../src/common/config.py:274
+#: ../src/common/config.py:277
msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
msgstr "Измените значение Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° отображаемых формул LaTeX."
-#: ../src/common/config.py:275
+#: ../src/common/config.py:278
msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
msgstr "ДопуÑтимые uri Ñхемы. Только Ñхемы из Ñтого ÑпиÑка будут принÑÑ‚Ñ‹ как «real» uri.(mailto и xmpp обрабатываютÑÑ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ð¾)"
-#: ../src/common/config.py:276
+#: ../src/common/config.py:279
msgid "Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!"
msgstr "Запрашивать Ñообщение о ÑтатуÑе «отключен» у вÑех отключенных контактов при уÑтановлении ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑью. Ð’ÐИМÐÐИЕ: Ð”Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ð²Ð¾Ð´Ð¸Ñ‚ к большому количеÑтву поÑылаемых запроÑов!"
-#: ../src/common/config.py:277
+#: ../src/common/config.py:280
msgid "If True, completion in groupchats will be like a shell auto-completion"
msgstr "ЕÑли Ðктивно, автодополнение ников в конференциÑÑ… будет работать как автодополнение в командной оболочке"
-#: ../src/common/config.py:278
+#: ../src/common/config.py:281
msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
msgstr "Ð’ каких ÑлучаÑÑ… показывать ÑпиÑок Ñвоих ÑобÑтвенных контактов. Может принимать Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Â«always» (вÑегда), «when_other_resource» (еÑли другой реÑурÑ) и «never» (никогда)."
-#: ../src/common/config.py:283
+#: ../src/common/config.py:286
msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
msgstr "Опциональное изменение чаÑтоты кадров видео в jingle. Ðапример: 10/1 или 25/2"
-#: ../src/common/config.py:284
+#: ../src/common/config.py:287
msgid "Optionally resize jingle output video. Example: 320x240"
msgstr "Опциональное изменение размера кадра видео в jingle. Ðапример: 320x240"
-#: ../src/common/config.py:287
+#: ../src/common/config.py:290
msgid "If True, Gajim will try to use a STUN server when using jingle. The one in \"stun_server\" option, or the one given by the jabber server."
msgstr "ЕÑли включено, Gajim попробует иÑпользовать STUN Ñервер Ñ jingle. Либо указанный опцией \"stun_server\", либо предоÑтавленный jabber Ñервером."
-#: ../src/common/config.py:288
+#: ../src/common/config.py:291
msgid "STUN server to use when using jingle"
msgstr "Сервер STUN Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ jingle"
-#: ../src/common/config.py:289
+#: ../src/common/config.py:292
msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
msgstr "ЕÑли включено, Gajim покажет принадлежноÑÑ‚ÑŒ пользователей группового чата, добавив цветные квадраты к значку ÑтатуÑа"
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
+msgid "Proxy used for all outgoing connections if the account does not have a specific proxy configured"
+msgstr "ПрокÑи иÑпользуетÑÑ Ð´Ð»Ñ Ð²Ñех иÑходÑщих Ñоединений, еÑли в наÑтройках учетной запиÑи не задан прокÑи "
+
+#: ../src/common/config.py:307
msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
msgstr "Приоритет будет изменÑÑ‚ÑŒÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки ÑоглаÑно вашему ÑтатуÑу. Приоритеты Ð´Ð»Ñ ÑтатуÑов задаютÑÑ Ð² пункте autopriority_* ."
-#: ../src/common/config.py:310
+#: ../src/common/config.py:315
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:311
+#: ../src/common/config.py:316
msgid "If enabled, restore the last status that was used."
msgstr "ЕÑли включено, воÑÑтанавливать поÑледний иÑпользованный ÑтатуÑ."
-#: ../src/common/config.py:313
+#: ../src/common/config.py:318
msgid "If True, Contacts requesting authorization will be automatically accepted."
msgstr "ЕÑли активно, контакты, запрашивающие авторизацию, будут автоматичеÑки её получать."
-#: ../src/common/config.py:314
+#: ../src/common/config.py:319
msgid "If False, this account will be disabled and will not appear in roster window."
msgstr "ЕÑли неактивно, Ñта ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ будет отключена и не будет отображатьÑÑ Ð² окне роÑтера."
-#: ../src/common/config.py:317
+#: ../src/common/config.py:322
msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
msgstr "ЕÑли отключено, не подпиÑывать приÑутÑтвие ключом GPG, даже еÑли GPG наÑтроен."
-#: ../src/common/config.py:319
+#: ../src/common/config.py:324
msgid "Enable ESessions encryption for this account."
msgstr "Включить ESessions шифрование Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ учетной запиÑи."
-#: ../src/common/config.py:320
+#: ../src/common/config.py:325
msgid "Should Gajim automatically start an encrypted session when possible?"
msgstr "Должен ли Gajim по возможноÑти автоматичеÑки начинать зашифрованный ÑеанÑ?"
-#: ../src/common/config.py:321
+#: ../src/common/config.py:326
msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
msgstr "УпорÑдоченный ÑпиÑок (разделённый пробелами) типов подключениÑ, которые будут перепробованы. Может включать tls, ssl или plain"
-#: ../src/common/config.py:322
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "ЕÑли отмечено, то Gajim будет будет Ñпрашивать Ð²Ð°Ñ Ð¿ÐµÑ€ÐµÐ´ отправкой Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ‡ÐµÑ€ÐµÐ· незащищенное Ñоединение."
+#: ../src/common/config.py:327
+msgid "Show a warning dialog before sending password on an plaintext connection. Can be 'warn', 'connect', 'disconnect'"
+msgstr "ЕÑли отмечено, то Gajim будет будет Ñпрашивать Ð²Ð°Ñ Ð¿ÐµÑ€ÐµÐ´ отправкой Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ‡ÐµÑ€ÐµÐ· незащищенное Ñоединение. Может быть 'warn', 'connect', 'disconnect'"
-#: ../src/common/config.py:323
+#: ../src/common/config.py:328
msgid "Show a warning dialog before using standard SSL library."
msgstr "Предупреждать, прежде чем иÑпользовать Ñтандартную библиотеку SSL."
-#: ../src/common/config.py:324
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
-msgstr "ЕÑли отмечено, Gajim будет Ñпрашивать Ð²Ð°Ñ Ð¿ÐµÑ€ÐµÐ´ отправкой Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ‡ÐµÑ€ÐµÐ· незащищенное Ñоединение."
+#: ../src/common/config.py:329
+msgid "Show a warning dialog before sending PLAIN password over a plain connection."
+msgstr "Показывать предупреждение перед отправкой Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ‡ÐµÑ€ÐµÐ· незащищенное Ñоединение."
-#: ../src/common/config.py:326
+#: ../src/common/config.py:331
msgid "Space separated list of ssl errors to ignore."
msgstr "Разделенный пробелами ÑпиÑок Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑˆÐ¸Ð±Ð¾Ðº ssl"
-#: ../src/common/config.py:335
+#: ../src/common/config.py:337
+msgid "Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:338
+msgid "Space separated list of JIDs for which you accept to not log conversations if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:341
msgid "Whitespace sent after inactivity"
msgstr "Пробел, поÑылаемый поÑле бездейÑтвиÑ"
# доÑловно: пинг XMPP поÑлал поÑле бездейÑтвиÑ. Возможно, ошибка в оригинале.
-#: ../src/common/config.py:336
+#: ../src/common/config.py:342
msgid "XMPP ping sent after inactivity"
msgstr "пинг XMPP, поÑылаемый поÑле бездейÑтвиÑ"
-#: ../src/common/config.py:340
+#: ../src/common/config.py:346
msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ (в Ñекундах) ответа на пинг перед повторной попыткой ÑоединениÑ."
#. yes, no, ask
-#: ../src/common/config.py:344
+#: ../src/common/config.py:350
msgid "Jabberd2 workaround"
msgstr "КоÑтыль Ð´Ð»Ñ jabberd2"
-#: ../src/common/config.py:347
+#: ../src/common/config.py:353
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:361
+#: ../src/common/config.py:354
+msgid "If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:368
msgid "Answer to receipt requests"
msgstr "Отвечать на запроÑÑ‹ уведомлениÑ"
-#: ../src/common/config.py:362
+#: ../src/common/config.py:369
msgid "Sent receipt requests"
msgstr "ПоÑылать запроÑÑ‹ уведомлениÑ"
-#: ../src/common/config.py:371
+#: ../src/common/config.py:378
msgid "Allow Gajim to send information about the operating system you are running."
msgstr "Разрешить Gajim отправлÑÑ‚ÑŒ информацию о операционной ÑиÑтеме, которую вы иÑпользуете"
-#: ../src/common/config.py:372
+#: ../src/common/config.py:379
msgid "Allow Gajim to send your local time."
msgstr "Разрешить Gajim отправлÑÑ‚ÑŒ ваше локальное времÑ."
-#: ../src/common/config.py:373
+#: ../src/common/config.py:380
msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
msgstr "Когда уÑтанавливаетÑÑ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ ÑеанÑ, должен ли Gajim предположить, что вы хотите Ñохранить иÑторию Ñообщений?"
-#: ../src/common/config.py:376
+#: ../src/common/config.py:383
msgid "Message that is sent to contacts you want to add"
msgstr "Сообщение отправлÑемое контактам, которых вы хотите добавить"
-#: ../src/common/config.py:377
+#: ../src/common/config.py:384
msgid "Last time we syncronized with logs from server."
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ñледней Ñинхронизации Ñ Ñервером."
-#: ../src/common/config.py:439
+#: ../src/common/config.py:385
+msgid "If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:386
+msgid "If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:448
msgid "Is OpenPGP enabled for this contact?"
msgstr "ИÑпользуетÑÑ Ð»Ð¸ Ð´Ð»Ñ Ñтого контакта OpenPGP?"
-#: ../src/common/config.py:440
+#: ../src/common/config.py:449
msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
msgstr "Должен ли Gajim по возможноÑти автоматичеÑки начинать Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ контакта зашифрованный ÑеанÑ?"
-#: ../src/common/config.py:441
-#: ../src/common/config.py:444
+#: ../src/common/config.py:450
+#: ../src/common/config.py:453
msgid "Language for which we want to check misspelled words"
msgstr "Язык, который иÑпользуетÑÑ Ð¿Ñ€Ð¸ проверке правопиÑаниÑ"
-#: ../src/common/config.py:450
-msgid "all or space separated status"
-msgstr "вÑе или ÑтатуÑÑ‹, разделенные пробелом"
-
-#: ../src/common/config.py:451
-msgid "'yes', 'no', or 'both'"
-msgstr "«yes» (да), «no» (нет) или «both» (оба)"
-
-#: ../src/common/config.py:452
-#: ../src/common/config.py:454
-#: ../src/common/config.py:455
-#: ../src/common/config.py:458
-#: ../src/common/config.py:459
-msgid "'yes', 'no' or ''"
-msgstr "«yes» (да), «no» (нет) или «» (пуÑто)"
-
-#: ../src/common/config.py:463
+#: ../src/common/config.py:456
msgid "State whether plugins should be activated on exit (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead."
msgstr "СоÑтоÑние модулей при выходе(Ñто ÑохранÑетÑÑ Ð¿Ñ€Ð¸ выключении Gajim). Ðта Ð¾Ð¿Ñ†Ð¸Ñ ÐЕ ДОЛЖÐРиÑпользоватьÑÑ Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¹. ИÑпользуйте графичеÑкий Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð´Ð»Ñ Ñтого."
-#: ../src/common/config.py:468
+#: ../src/common/config.py:461
#: ../src/common/pep.py:157
msgid "Sleeping"
msgstr "Сплю"
-#: ../src/common/config.py:469
+#: ../src/common/config.py:462
msgid "Back soon"
msgstr "Скоро буду"
-#: ../src/common/config.py:469
+#: ../src/common/config.py:462
msgid "Back in some minutes."
msgstr "ВернуÑÑŒ через неÑколько минут"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:463
#: ../src/common/pep.py:127
msgid "Eating"
msgstr "Ем"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:463
msgid "I'm eating, so leave me a message."
msgstr "Кушаю, так что оÑтавьте Ñообщение Ñекретарю."
-#: ../src/common/config.py:471
+#: ../src/common/config.py:464
msgid "Movie"
msgstr "В кино"
-#: ../src/common/config.py:471
+#: ../src/common/config.py:464
msgid "I'm watching a movie."
msgstr "Смотрю кино"
-#: ../src/common/config.py:472
+#: ../src/common/config.py:465
#: ../src/common/pep.py:186
msgid "Working"
msgstr "Работаю"
-#: ../src/common/config.py:472
+#: ../src/common/config.py:465
msgid "I'm working."
msgstr "Работаю"
-#: ../src/common/config.py:473
+#: ../src/common/config.py:466
msgid "Phone"
msgstr "Телефон"
-#: ../src/common/config.py:473
+#: ../src/common/config.py:466
msgid "I'm on the phone."
msgstr "Говорю по телефону"
-#: ../src/common/config.py:474
+#: ../src/common/config.py:467
msgid "Out"
msgstr "Вышел"
-#: ../src/common/config.py:474
+#: ../src/common/config.py:467
msgid "I'm out enjoying life."
msgstr "ÐаÑлаждаюÑÑŒ жизнью, чего и вам желаю."
-#: ../src/common/config.py:485
+#: ../src/common/config.py:478
msgid "I'm available."
msgstr "Я здеÑÑŒ."
-#: ../src/common/config.py:486
+#: ../src/common/config.py:479
msgid "I'm free for chat."
msgstr "Я готов поболтать."
-#: ../src/common/config.py:487
-#: ../src/config.py:1615
+#: ../src/common/config.py:480
+#: ../src/config.py:1651
msgid "Be right back."
msgstr "Скоро буду."
-#: ../src/common/config.py:488
+#: ../src/common/config.py:481
msgid "I'm not available."
msgstr "ÐœÐµÐ½Ñ Ð½ÐµÑ‚."
-#: ../src/common/config.py:489
+#: ../src/common/config.py:482
msgid "Do not disturb."
msgstr "Ðе беÑпокоить."
-#: ../src/common/config.py:490
-#: ../src/common/config.py:491
+#: ../src/common/config.py:483
+#: ../src/common/config.py:484
msgid "Bye!"
msgstr "Пока!"
-#: ../src/common/config.py:501
+#: ../src/common/config.py:494
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:502
+#: ../src/common/config.py:495
msgid "Sound to play when any MUC message arrives."
msgstr "Звук, который нужно проигрывать, когда приходит любое Ñообщение MUC."
-#: ../src/common/config.py:511
-#: ../src/common/optparser.py:308
+#: ../src/common/config.py:504
+#: ../src/common/optparser.py:310
msgid "green"
msgstr "зеленый"
-#: ../src/common/config.py:515
-#: ../src/common/optparser.py:294
+#: ../src/common/config.py:508
+#: ../src/common/optparser.py:296
msgid "grocery"
msgstr "овощной"
-#: ../src/common/config.py:519
+#: ../src/common/config.py:512
msgid "human"
msgstr "телеÑный"
-#: ../src/common/config.py:523
+#: ../src/common/config.py:516
msgid "marine"
msgstr "морÑкой"
-#: ../src/common/connection_handlers_events.py:353
+#: ../src/common/connection_handlers_events.py:367
#, 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/, чтобы удалить его"
-#: ../src/common/connection_handlers_events.py:782
+#: ../src/common/connection_handlers_events.py:799
#, python-format
msgid "unsubscribe request from %s"
msgstr "%s хочет отменить подпиÑку"
-#: ../src/common/connection_handlers_events.py:866
-#: ../src/common/connection_handlers.py:339
-#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1040
-#: ../src/common/connection_handlers.py:1696
-#: ../src/common/connection.py:456
-#: ../src/common/logger.py:1124
-#: ../src/gajim.py:382
+#: ../src/common/connection_handlers_events.py:884
+#: ../src/common/connection_handlers.py:331
+#: ../src/common/connection_handlers.py:936
+#: ../src/common/connection_handlers.py:1048
+#: ../src/common/connection.py:448
+#: ../src/common/logger.py:1129
+#: ../src/gajim.py:391
msgid "Disk Write Error"
msgstr "Ошибка запиÑи на диÑк"
-#: ../src/common/connection_handlers_events.py:870
-#: ../src/common/connection_handlers.py:946
-#: ../src/common/connection_handlers.py:1043
-#: ../src/common/connection_handlers.py:1699
-#: ../src/common/connection.py:460
-#: ../src/common/logger.py:1127
-#: ../src/gajim.py:201
-#: ../src/session.py:94
+#: ../src/common/connection_handlers_events.py:888
+#: ../src/common/connection_handlers.py:939
+#: ../src/common/connection_handlers.py:1051
+#: ../src/common/connection.py:452
+#: ../src/common/logger.py:1132
+#: ../src/gajim.py:210
+#: ../src/session.py:102
#, 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) или удалить (вÑÑ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ утерÑна)."
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:891
+#: ../src/common/connection_handlers_events.py:909
msgid "Room has been destroyed"
msgstr "Комната была удалена"
-#: ../src/common/connection_handlers_events.py:899
+#: ../src/common/connection_handlers_events.py:917
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Взамен, вы можете приÑоединитьÑÑ Ðº комнате: %s"
+
+#: ../src/common/connection_handlers_events.py:1000
+#: ../src/common/connection_handlers_events.py:1030
+#: ../src/common/connection_handlers_events.py:1044
+#: ../src/common/connection.py:259
+#: ../src/config.py:2148
+#: ../src/config.py:2157
+#: ../src/config.py:2225
+#: ../src/config.py:3661
+#: ../src/dataforms_widget.py:623
+#: ../src/dialogs.py:3090
+msgid "Invalid Jabber ID"
+msgstr "Ðеверный Jabber ID"
+
+#: ../src/common/connection_handlers_events.py:1001
+#: ../src/common/connection_handlers_events.py:1031
+#: ../src/common/connection_handlers_events.py:1045
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Было получено Ñообщение от неверного JID, оно было проигнорировано."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1071
+#: ../src/gui_interface.py:415
+#: ../src/gui_interface.py:429
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "ошибка при отправке %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1502
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° SSL: %d"
+
+#: ../src/common/connection_handlers_events.py:2030
+#: ../src/dialogs.py:2777
+#: ../src/notify.py:263
+msgid "New Single Message"
+msgstr "Ðовое одиночное Ñообщение"
+
+#: ../src/common/connection_handlers_events.py:2032
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Ðовое Ñообщение от %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2036
+#: ../src/dialogs.py:2778
+#: ../src/notify.py:264
+msgid "New Private Message"
+msgstr "Ðовое личное Ñообщение"
+
+#: ../src/common/connection_handlers_events.py:2038
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Ðовое личное Ñообщение из комнаты %s"
+
+#: ../src/common/connection_handlers_events.py:2041
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2044
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Ðовое Ñообщение от %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2048
+#: ../src/dialogs.py:2777
+#: ../src/notify.py:263
+msgid "New Message"
+msgstr "Ðовое Ñообщение"
+
+#: ../src/common/connection_handlers_events.py:2050
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Ðовое Ñообщение от %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2179
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s менÑет ÑтатуÑ"
+
+#: ../src/common/connection_handlers_events.py:2181
+#: ../src/groupchat_control.py:205
+#: ../src/groupchat_control.py:1766
+#: ../src/history_window.py:447
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s теперь %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2186
+#: ../src/dialogs.py:2789
+#: ../src/notify.py:277
+msgid "Contact Changed Status"
+msgstr "Контакт изменит ÑтатуÑ"
+
+#: ../src/common/connection_handlers_events.py:2188
#, python-format
-msgid "You can join this room instead: %s"
-msgstr "Взамен, вы можете приÑоединитьÑÑ Ðº комнате: %s"
-
-#: ../src/common/connection_handlers_events.py:972
-#: ../src/common/connection.py:258
-#: ../src/config.py:2108
-#: ../src/config.py:2117
-#: ../src/config.py:2185
-#: ../src/config.py:3613
-#: ../src/dataforms_widget.py:623
-#: ../src/dialogs.py:3036
-msgid "Invalid Jabber ID"
-msgstr "Ðеверный Jabber ID"
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s подключаетÑÑ"
-#: ../src/common/connection_handlers_events.py:973
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "Было получено Ñообщение от неверного JID, оно было проигнорировано."
+#. default value
+#: ../src/common/connection_handlers_events.py:2193
+#: ../src/dialogs.py:2773
+#: ../src/notify.py:259
+msgid "Contact Signed In"
+msgstr "Контакт подключилÑÑ"
-#: ../src/common/connection_handlers_events.py:1421
+#: ../src/common/connection_handlers_events.py:2195
#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° SSL: %d"
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s отключаетÑÑ"
+
+#: ../src/common/connection_handlers_events.py:2200
+#: ../src/dialogs.py:2775
+#: ../src/notify.py:261
+msgid "Contact Signed Out"
+msgstr "Контакт отключилÑÑ"
-#: ../src/common/connection_handlers.py:95
+#: ../src/common/connection_handlers.py:88
#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
msgid "Unable to load idle module"
msgstr "Ðе могу загрузить модуль «idle»"
-#: ../src/common/connection_handlers.py:128
+#: ../src/common/connection_handlers.py:121
#, python-format
msgid "Registration information for transport %s has not arrived in time"
msgstr "Данные о региÑтрации Ð´Ð»Ñ Ñ‚Ñ€Ð°Ð½Ñпорта %s не пришли вовремÑ."
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:128
msgid "Registration succeeded"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
-#: ../src/common/connection_handlers.py:136
+#: ../src/common/connection_handlers.py:129
#, python-format
msgid "Registration with agent %s succeeded"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑервиÑа %s завершена уÑпешно"
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:137
msgid "Registration failed"
msgstr "Ошибка региÑтрации"
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:137
#, python-format
msgid "Registration 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:564
-#: ../src/common/connection.py:1511
+#: ../src/common/connection_handlers.py:567
+#: ../src/common/connection.py:1519
msgid "Invisibility not supported"
msgstr "ÐевидимоÑÑ‚ÑŒ не поддерживаетÑÑ"
-#: ../src/common/connection_handlers.py:565
-#: ../src/common/connection.py:1512
+#: ../src/common/connection_handlers.py:568
+#: ../src/common/connection.py:1520
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ %s не поддерживает невидимоÑÑ‚ÑŒ."
-#: ../src/common/connection_handlers.py:1741
+#: ../src/common/connection_handlers.py:1710
msgid "I would like to add you to my roster."
msgstr "Ð’Ñ‹ не возражаете, еÑли Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑŽ Ð’Ð°Ñ Ð² Ñвой роÑтер?"
@@ -4542,17 +4552,17 @@ msgstr "Ðазначение ключа не включает подпиÑыва
msgid "Application verification failure"
msgstr "Ошибка при проверке приложениÑ"
-#: ../src/common/connection.py:259
-#: ../src/dialogs.py:3037
+#: ../src/common/connection.py:260
+#: ../src/dialogs.py:3091
#, 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:281
+#: ../src/common/connection.py:282
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "Ðи удаленное приÑутÑтвие не подпиÑано, ни ключ не приÑвоен."
-#: ../src/common/connection.py:284
+#: ../src/common/connection.py:285
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
msgstr "Ключ (%s) контакта не ÑоответÑтвует ключу, приÑвоенному в Gajim."
@@ -4563,7 +4573,7 @@ msgstr "Ключ (%s) контакта не ÑоответÑтвует ключ
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[Ðто Ñообщение *зашифровано* (Ñм. :XEP:`27`]"
-#: ../src/common/connection.py:446
+#: ../src/common/connection.py:435
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -4572,78 +4582,78 @@ msgstr ""
"Тема: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:831
+#: ../src/common/connection.py:845
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "СвÑзь Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑью «%s» была потерÑна"
-#: ../src/common/connection.py:832
+#: ../src/common/connection.py:846
msgid "Reconnect manually."
msgstr "ПереподключатьÑÑ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ."
#. it's a new account
#. wrong answer
-#: ../src/common/connection.py:843
+#: ../src/common/connection.py:857
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr "Сервер %(name)s неверно ответил на Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾ региÑтрации: %(error)s"
#. requested config has changed since first connection
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:899
#, python-format
msgid "Server %s provided a different registration form"
msgstr "Сервер %s предоÑтавил другую региÑтрационную форму"
#. wrong answer
-#: ../src/common/connection.py:901
+#: ../src/common/connection.py:915
msgid "Invalid answer"
msgstr "Ðеверный ответ"
-#: ../src/common/connection.py:902
+#: ../src/common/connection.py:916
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr "ТранÑпорт %(name)s неверно ответил на Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾ региÑтрации: %(error)s"
-#: ../src/common/connection.py:1190
-#: ../src/common/connection.py:1323
-#: ../src/common/connection.py:1906
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/connection.py:1191
+#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1954
+#: ../src/common/zeroconf/connection_zeroconf.py:204
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Ðе могу ÑоединитьÑÑ Ñ Â«%s»"
-#: ../src/common/connection.py:1191
-#: ../src/gui_interface.py:554
+#: ../src/common/connection.py:1192
+#: ../src/gui_interface.py:524
msgid "Check your connection or try again later."
msgstr "Проверьте наÑтройки Ñети или попробуйте еще раз позже."
-#: ../src/common/connection.py:1196
+#: ../src/common/connection.py:1197
#, python-format
msgid "Server replied: %s"
msgstr "Сервер ответил: %s"
-#: ../src/common/connection.py:1209
+#: ../src/common/connection.py:1210
msgid "Connection to proxy failed"
msgstr "Соединение Ñ Ð¿Ñ€Ð¾ÐºÑи разорвалоÑÑŒ"
-#: ../src/common/connection.py:1241
-#: ../src/common/connection.py:1302
+#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1310
#, python-format
msgid "Could not connect to account %s"
msgstr "Ðе могу ÑоединитьÑÑ Ñ %s"
-#: ../src/common/connection.py:1242
-#: ../src/common/connection.py:1303
+#: ../src/common/connection.py:1249
+#: ../src/common/connection.py:1311
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr "СвÑзь Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑью %s была потерÑна.Попытка подключениÑ."
-#: ../src/common/connection.py:1267
+#: ../src/common/connection.py:1274
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "ДоÑтоверноÑÑ‚ÑŒ Ñертификата %s может быть недейÑтвительной."
-#: ../src/common/connection.py:1270
+#: ../src/common/connection.py:1277
#, python-format
msgid ""
"\n"
@@ -4652,7 +4662,7 @@ msgstr ""
"\n"
"Ошибка SSL: <b>%s</b>"
-#: ../src/common/connection.py:1272
+#: ../src/common/connection.py:1279
#, python-format
msgid ""
"\n"
@@ -4661,73 +4671,73 @@ msgstr ""
"\n"
"ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° SSL: %d"
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1332
msgid "Check your connection or try again later"
msgstr "Проверьте наÑтройки Ñети или попробуйте еще раз позже"
-#: ../src/common/connection.py:1358
+#: ../src/common/connection.py:1366
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Ошибка аутентификации Ñ Â«%s»"
-#: ../src/common/connection.py:1360
+#: ../src/common/connection.py:1368
msgid "Please check your login and password for correctness."
msgstr "Проверьте правильноÑÑ‚ÑŒ логина и паролÑ."
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1441
msgid "Error while removing privacy list"
msgstr "Ошибка при удалении ÑпиÑка доÑтупа"
-#: ../src/common/connection.py:1434
+#: ../src/common/connection.py:1442
#, 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 не может быть удален. Возможно, он иÑпользуетÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших активных реÑурÑов. Отключите реÑÑƒÑ€Ñ Ð¸ попробуйте Ñнова."
-#: ../src/common/connection.py:1773
+#: ../src/common/connection.py:1821
#, python-format
msgid "Sent contact: \"%s\" (%s)"
msgstr "Контакт Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: «%s» (%s)"
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1824
msgid "Sent contacts:"
msgstr "Контакты Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸:"
-#: ../src/common/connection.py:1923
-#: ../src/common/connection.py:1946
+#: ../src/common/connection.py:1971
+#: ../src/common/connection.py:1994
msgid "Not fetched because of invisible status"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ из-за невидимоÑти"
-#: ../src/common/connection.py:2470
+#: ../src/common/connection.py:2525
msgid "Unregister failed"
msgstr "Ошибка отказа от региÑтрации"
-#: ../src/common/connection.py:2471
+#: ../src/common/connection.py:2526
#, python-format
msgid "Unregistration with server %(server)s failed: %(error)s"
msgstr "Отказ от региÑтрации на Ñервере %(server)s завершилÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹: %(error)s"
-#: ../src/common/contacts.py:135
-#: ../src/common/helpers.py:57
-#: ../src/gui_interface.py:497
+#: ../src/common/contacts.py:126
+#: ../src/common/helpers.py:61
+#: ../src/gui_interface.py:467
msgid "Observers"
msgstr "Ðаблюдатели"
-#: ../src/common/contacts.py:139
-#: ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57
+#: ../src/common/contacts.py:130
+#: ../src/common/contacts.py:358
+#: ../src/common/helpers.py:61
#: ../src/disco.py:120
#: ../src/disco.py:121
-#: ../src/disco.py:1518
+#: ../src/disco.py:1517
#: ../src/roster_window.py:856
-#: ../src/roster_window.py:1556
+#: ../src/roster_window.py:1552
+#: ../src/roster_window.py:1640
#: ../src/roster_window.py:1642
-#: ../src/roster_window.py:1644
-#: ../src/roster_window.py:1806
+#: ../src/roster_window.py:1804
#: ../src/roster_window.py:2482
msgid "Transports"
msgstr "ТранÑпорты"
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:366
msgid "Not in roster"
msgstr "Ðе в роÑтере"
@@ -4763,6 +4773,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
msgstr "Ð¡ÐµÑ€Ð²Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупен: Gajim не запущен или отключена Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ (наÑтройка remote_control)"
#: ../src/common/exceptions.py:67
+#: ../src/gajim-remote.py:55
msgid "D-Bus is not present on this machine or python module is missing"
msgstr "Ðа машине отÑутÑтвует D-Bus или модуль питона Ð´Ð»Ñ Ð½ÐµÐµ"
@@ -4949,225 +4960,234 @@ msgstr "Конец недели"
msgid "Weekend!"
msgstr "Выходные!"
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:152
msgid "Username must be between 1 and 1023 chars"
msgstr "Ð˜Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ быть от 1 до 1023 Ñимволов"
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:157
msgid "Invalid character in username."
msgstr "Ðеверный Ñимвол в имени пользователÑ."
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:163
msgid "Server must be between 1 and 1023 chars"
msgstr "Ð˜Ð¼Ñ Ñервера должно быть от 1 до 1023 Ñимволов"
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
msgid "Invalid character in hostname."
msgstr "Ðеверный Ñимвол в имени Ñервера"
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:170
msgid "Server address required."
msgstr "ТребуетÑÑ Ð°Ð´Ñ€ÐµÑ Ñервера."
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:174
msgid "Resource must be between 1 and 1023 chars"
msgstr "Ð˜Ð¼Ñ Ñ€ÐµÑурÑа должно быть от 1 до 1023 Ñимволов"
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:179
msgid "Invalid character in resource."
msgstr "Ðеверный Ñимвол в реÑурÑе"
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:219
msgid "_Busy"
msgstr "_ЗанÑÑ‚"
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:221
#: ../src/tooltips.py:195
msgid "Busy"
msgstr "ЗанÑÑ‚"
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:224
msgid "_Not Available"
msgstr "_ÐедоÑтупен"
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:226
+#: ../src/tooltips.py:197
+msgid "Not Available"
+msgstr "ÐедоÑтупен"
+
+#: ../src/common/helpers.py:229
msgid "_Free for Chat"
msgstr "_Готов поболтать"
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
#: ../src/tooltips.py:191
msgid "Free for Chat"
msgstr "Готов поболтать"
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:234
msgid "?user status:_Available"
msgstr "Д_оÑтупен"
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
#: ../src/tooltips.py:189
msgid "?user status:Available"
msgstr "ДоÑтупен"
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
msgid "Connecting"
msgstr "СоединÑÑŽÑÑŒ"
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:241
msgid "A_way"
msgstr "_Ушел"
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:246
msgid "_Offline"
msgstr "_Отключен"
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:248
#: ../src/tooltips.py:199
msgid "Offline"
msgstr "Отключен"
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:251
msgid "_Invisible"
msgstr "_Ðевидимка"
#: ../src/common/helpers.py:253
+msgid "Invisible"
+msgstr "Ðевидимка"
+
+#: ../src/common/helpers.py:257
msgid "?contact has status:Unknown"
msgstr "ÐеизвеÑтен"
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:259
msgid "?contact has status:Has errors"
msgstr "Ошибка"
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
msgid "?Subscription we already have:None"
msgstr "Ðет"
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
msgid "To"
msgstr "К"
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:268
msgid "From"
msgstr "От"
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:270
msgid "Both"
msgstr "Оба"
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:278
msgid "?Ask (for Subscription):None"
msgstr "Ðет"
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:280
msgid "Subscribe"
msgstr "ПодпиÑатьÑÑ"
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:289
msgid "?Group Chat Contact Role:None"
msgstr "ОтÑутÑтвует"
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:292
msgid "Moderators"
msgstr "Модераторы"
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:294
msgid "Moderator"
msgstr "Модератор"
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:297
msgid "Participants"
msgstr "УчаÑтники"
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:299
msgid "Participant"
msgstr "УчаÑтник"
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:302
msgid "Visitors"
msgstr "ПоÑетители"
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:304
msgid "Visitor"
msgstr "ПоÑетитель"
-#: ../src/common/helpers.py:306
+#: ../src/common/helpers.py:310
#: ../src/tooltips.py:210
msgid "?Group Chat Contact Affiliation:None"
msgstr "?Group Chat Contact Affiliation:ОтÑутÑтвует"
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
#: ../src/tooltips.py:216
msgid "Owner"
msgstr "Владелец"
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
#: ../src/tooltips.py:214
msgid "Administrator"
msgstr "ÐдминиÑтратор"
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
#: ../src/tooltips.py:212
msgid "Member"
msgstr "УчаÑтник"
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:355
msgid "is paying attention to the conversation"
msgstr "читает Ñообщение"
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:357
msgid "is doing something else"
msgstr "занÑÑ‚ чем-то еще"
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:359
msgid "is composing a message..."
msgstr "печатает Ñообщение..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:362
msgid "paused composing a message"
msgstr "переÑтал печатать Ñообщение"
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:364
msgid "has closed the chat window or tab"
msgstr "закрыл окно чата или вкладку"
#. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:639
#, python-format
msgid "%s GiB"
msgstr "%s GiB"
#. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:642
#, python-format
msgid "%s GB"
msgstr "%s GB"
#. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:646
#, python-format
msgid "%s MiB"
msgstr "%s MiB"
#. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:649
#, python-format
msgid "%s MB"
msgstr "%s MB"
#. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:653
#, python-format
msgid "%s KiB"
msgstr "%s KiB"
#. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:656
#, python-format
msgid "%s KB"
msgstr "%s KB"
#. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:659
#, python-format
msgid "%s B"
msgstr "%s B"
@@ -5211,7 +5231,7 @@ msgstr[2] "%d Ñобытий пропущено"
msgid "Gajim - %s"
msgstr "Gajim — %s"
-#: ../src/common/helpers.py:1343
+#: ../src/common/helpers.py:1352
msgid "Hello, I am $name."
msgstr "Привет, Ñ $name."
@@ -5264,7 +5284,7 @@ msgstr "звуковой выход"
msgid "video input"
msgstr "видео вход"
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:390
msgid "video output"
msgstr "видео выход"
@@ -5278,59 +5298,66 @@ msgstr "Ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«%(command)s»: %(error)s"
msgid "%s is not a valid loglevel"
msgstr "%s не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым loglevel"
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:39
msgid " Default device"
msgstr "УÑтройÑтво по умолчанию"
#. Test src
-#: ../src/common/multimedia_helpers.py:57
+#: ../src/common/multimedia_helpers.py:60
msgid "Audio test"
msgstr "ТеÑÑ‚ звука"
#. Auto src
#. Auto sink
#. Auto src
-#: ../src/common/multimedia_helpers.py:60
-#: ../src/common/multimedia_helpers.py:73
-#: ../src/common/multimedia_helpers.py:86
-#: ../src/common/multimedia_helpers.py:103
+#: ../src/common/multimedia_helpers.py:63
+#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:111
msgid "Autodetect"
msgstr "Ðвтоопределение"
#. Alsa src
#. Alsa sink
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:75
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:81
#, python-format
msgid "ALSA: %s"
msgstr "ALSA: %s"
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:83
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Файл: %s"
+
#. Fake sink
#. Fake video output
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:105
msgid "Fake audio output"
msgstr "Виртуальный аудио выход"
#. Test src
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:90
msgid "Video test"
msgstr "ТеÑÑ‚ видео"
#. V4L2 src
-#: ../src/common/multimedia_helpers.py:88
+#: ../src/common/multimedia_helpers.py:95
#, python-format
msgid "V4L2: %s"
msgstr "V4L2: %s"
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:108
#, python-format
msgid "X Window System (X11/XShm/Xv): %s"
msgstr "СиÑтема X Window (X11/XShm/Xv): %s"
#. ximagesink
-#: ../src/common/multimedia_helpers.py:102
+#: ../src/common/multimedia_helpers.py:110
msgid "X Window System (without Xv)"
msgstr "СиÑтема X Window (без Xv)"
@@ -5340,12 +5367,12 @@ msgstr "СиÑтема X Window (без Xv)"
msgid "error: cannot open %s for reading"
msgstr "ошибка: не могу открыть %s Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
-#: ../src/common/optparser.py:303
-#: ../src/common/optparser.py:304
+#: ../src/common/optparser.py:305
+#: ../src/common/optparser.py:306
msgid "cyan"
msgstr "Ñиний"
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:385
msgid "migrating logs database to indices"
msgstr "переноÑим журнал на индекÑÑ‹"
@@ -6015,17 +6042,17 @@ msgid "Maybe you have another running instance of Gajim. File Transfer will be c
msgstr "Возможно, запущен ещё один ÑкземплÑÑ€ Gajim. Передача файлов будет отменена."
#. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:424
msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
msgstr "[Ðто чаÑÑ‚ÑŒ зашифрованного ÑообщениÑ. ЕÑли вы видите Ñто Ñообщение, возможно, произошла ошибка.]"
-#: ../src/common/zeroconf/connection_zeroconf.py:188
+#: ../src/common/zeroconf/connection_zeroconf.py:192
msgid "Avahi error"
msgstr "Ошибка Avahi"
# link-local Ñто вроде не проÑто локальный. http://en.wikipedia.org/wiki/Link-
# local_address
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/zeroconf/connection_zeroconf.py:193
#, python-format
msgid ""
"%s\n"
@@ -6034,43 +6061,45 @@ msgstr ""
"%s\n"
"Возможно, обмен локальными ÑообщениÑми работает не верно."
-#: ../src/common/zeroconf/connection_zeroconf.py:201
+#: ../src/common/zeroconf/connection_zeroconf.py:205
msgid "Please check if Avahi or Bonjour is installed."
msgstr "УдоÑтоверьтеÑÑŒ, что Avahi или Bonjour уÑтановлен."
-#: ../src/common/zeroconf/connection_zeroconf.py:211
#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:219
msgid "Could not start local service"
msgstr "Ðе могу запуÑтить локальный ÑервиÑ"
-#: ../src/common/zeroconf/connection_zeroconf.py:212
+#: ../src/common/zeroconf/connection_zeroconf.py:216
#, python-format
msgid "Unable to bind to port %d."
msgstr "Ðе могу иÑпользовать порт %d."
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-#: ../src/common/zeroconf/connection_zeroconf.py:300
-#: ../src/common/zeroconf/connection_zeroconf.py:313
-#: ../src/common/zeroconf/connection_zeroconf.py:329
+#: ../src/common/zeroconf/connection_zeroconf.py:220
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
msgid "Please check if avahi-daemon is running."
msgstr "УдоÑтоверьтеÑÑŒ, что демон avahi запущен."
-#: ../src/common/zeroconf/connection_zeroconf.py:299
-#: ../src/common/zeroconf/connection_zeroconf.py:312
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:303
+#: ../src/common/zeroconf/connection_zeroconf.py:316
+#: ../src/common/zeroconf/connection_zeroconf.py:332
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "Ðе могу изменить ÑÑ‚Ð°Ñ‚ÑƒÑ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑи «%s»"
-#: ../src/common/zeroconf/connection_zeroconf.py:347
+#: ../src/common/zeroconf/connection_zeroconf.py:351
+#: ../src/common/zeroconf/connection_zeroconf.py:390
msgid "Your message could not be sent."
msgstr "Ваше Ñообщение не может быть отправлено."
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:404
msgid "Contact is offline. Your message could not be sent."
msgstr "Контакт не в Ñети. Отправить Ñообщение не удалоÑÑŒ."
-#: ../src/common/zeroconf/connection_zeroconf.py:387
+#: ../src/common/zeroconf/connection_zeroconf.py:431
msgid "Connection to host could not be established: Timeout while sending data."
msgstr "Ðе удалоÑÑŒ ÑоединитьÑÑ Ñ Ñ…Ð¾Ñтом: иÑтекло Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ."
@@ -6090,241 +6119,241 @@ msgstr "Включено"
#: ../src/config.py:468
#: ../src/config.py:472
-#: ../src/config.py:3110
+#: ../src/config.py:3157
msgid "Default"
msgstr "По умолчанию"
-#: ../src/config.py:748
-#: ../src/dialogs.py:1491
+#: ../src/config.py:756
+#: ../src/dialogs.py:1493
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Ðет ÑÐ»Ð¾Ð²Ð°Ñ€Ñ Ð´Ð»Ñ Ñзыка %s"
-#: ../src/config.py:749
+#: ../src/config.py:757
#, 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."
-#: ../src/config.py:1229
+#: ../src/config.py:1237
msgid "status message title"
msgstr "заголовок ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ ÑтатуÑе"
-#: ../src/config.py:1229
+#: ../src/config.py:1237
msgid "status message text"
msgstr "текÑÑ‚ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ ÑтатуÑе"
#. Name column
-#: ../src/config.py:1529
-#: ../src/dialogs.py:2486
-#: ../src/dialogs.py:2553
-#: ../src/dialogs.py:3339
+#: ../src/config.py:1565
+#: ../src/dialogs.py:2534
+#: ../src/dialogs.py:2601
+#: ../src/dialogs.py:3393
#: ../src/disco.py:886
-#: ../src/disco.py:1745
-#: ../src/disco.py:2047
+#: ../src/disco.py:1744
+#: ../src/disco.py:2046
#: ../src/history_window.py:90
msgid "Name"
msgstr "ИмÑ"
-#: ../src/config.py:1624
+#: ../src/config.py:1660
msgid "Relogin now?"
msgstr "ПереподключитьÑÑ ÑейчаÑ?"
-#: ../src/config.py:1625
+#: ../src/config.py:1661
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr "ЕÑли вы хотите, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ применены немедленно, вы должны переподключитьÑÑ."
-#: ../src/config.py:1779
-#: ../src/config.py:1908
+#: ../src/config.py:1815
+#: ../src/config.py:1948
msgid "OpenPGP is not usable on this computer"
msgstr "Ðевозможно иÑпользовать OpenPGP на Ñтом компьютере"
-#: ../src/config.py:1948
-#: ../src/config.py:1995
+#: ../src/config.py:1988
+#: ../src/config.py:2035
msgid "Unread events"
msgstr "ÐепроÑмотренные ÑобытиÑ"
-#: ../src/config.py:1949
+#: ../src/config.py:1989
msgid "Read all pending events before removing this account."
msgstr "ПроÑмотрите вÑе ожидающие ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ удалением учетной запиÑи."
-#: ../src/config.py:1978
+#: ../src/config.py:2018
#, python-format
msgid "You have opened chat in account %s"
msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ окна чата под учётной запиÑью %s"
-#: ../src/config.py:1979
+#: ../src/config.py:2019
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr "Ð’Ñе окна чатов и комнат будут закрыты. Продолжить?"
-#: ../src/config.py:1991
-#: ../src/config.py:2526
-#: ../src/config.py:2562
+#: ../src/config.py:2031
+#: ../src/config.py:2573
+#: ../src/config.py:2609
msgid "You are currently connected to the server"
msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¿Ð¾Ð´Ñоединены к Ñерверу"
-#: ../src/config.py:1992
+#: ../src/config.py:2032
msgid "To change the account name, you must be disconnected."
msgstr "Ð”Ð»Ñ Ñмены имени учетной запиÑи необходимо отключитьÑÑ."
-#: ../src/config.py:1996
+#: ../src/config.py:2036
msgid "To change the account name, you must read all pending events."
msgstr "Ð”Ð»Ñ Ñмены имени учетной запиÑи необходимо проÑмотреть ожидающие ÑобытиÑ."
-#: ../src/config.py:2002
+#: ../src/config.py:2042
msgid "Account Name Already Used"
msgstr "Такое Ð¸Ð¼Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи уже иÑпользуетÑÑ"
-#: ../src/config.py:2003
+#: ../src/config.py:2043
msgid "This name is already used by another of your accounts. Please choose another name."
msgstr "Ðто Ð¸Ð¼Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ Ð² другой вашей учетной запиÑи. Выберите другое."
-#: ../src/config.py:2007
-#: ../src/config.py:2011
+#: ../src/config.py:2047
+#: ../src/config.py:2051
msgid "Invalid account name"
msgstr "Ðеверное Ð¸Ð¼Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи"
-#: ../src/config.py:2008
+#: ../src/config.py:2048
msgid "Account name cannot be empty."
msgstr "Ð˜Ð¼Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи не может быть пуÑтым."
-#: ../src/config.py:2012
+#: ../src/config.py:2052
msgid "Account name cannot contain spaces."
msgstr "Ð˜Ð¼Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи не может Ñодержать пробелы."
-#: ../src/config.py:2089
+#: ../src/config.py:2129
msgid "Rename Account"
msgstr "Переименовать учетную запиÑÑŒ"
-#: ../src/config.py:2090
+#: ../src/config.py:2130
#, python-format
msgid "Enter a new name for account %s"
msgstr "Введите новое название Ð´Ð»Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %s"
-#: ../src/config.py:2118
+#: ../src/config.py:2158
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Jabber ID должен иметь формат «имÑ_пользователÑ@Ñервер»."
-#: ../src/config.py:2335
-#: ../src/config.py:3659
+#: ../src/config.py:2381
+#: ../src/config.py:3707
msgid "Invalid entry"
msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
-#: ../src/config.py:2336
-#: ../src/config.py:3660
+#: ../src/config.py:2382
+#: ../src/config.py:3708
msgid "Custom port must be a port number."
msgstr "Ð’ качеÑтве номера порта должно выÑтупать чиÑло"
-#: ../src/config.py:2357
+#: ../src/config.py:2403
msgid "Failed to get secret keys"
msgstr "Ðе удалоÑÑŒ получить Ñекретный ключ"
-#: ../src/config.py:2358
+#: ../src/config.py:2404
msgid "There is no OpenPGP secret key available."
msgstr "Ðет Ñекретного ключа OpenPGP."
-#: ../src/config.py:2392
+#: ../src/config.py:2438
msgid "OpenPGP Key Selection"
msgstr "Выбор ключа OpenPGP"
-#: ../src/config.py:2393
+#: ../src/config.py:2439
msgid "Choose your OpenPGP key"
msgstr "Выберите Ñвой ключ OpenPGP"
-#: ../src/config.py:2400
+#: ../src/config.py:2446
msgid "No such account available"
msgstr "Ð¢Ð°ÐºÐ°Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ недоÑтупна"
-#: ../src/config.py:2401
+#: ../src/config.py:2447
msgid "You must create your account before editing your personal information."
msgstr "Перед редактированием личных данных необходимо Ñначала Ñоздать учетную запиÑÑŒ."
-#: ../src/config.py:2408
-#: ../src/dialogs.py:2241
-#: ../src/dialogs.py:2475
-#: ../src/dialogs.py:2662
+#: ../src/config.py:2454
+#: ../src/dialogs.py:2286
+#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2711
#: ../src/disco.py:515
-#: ../src/profile_window.py:360
+#: ../src/profile_window.py:361
msgid "You are not connected to the server"
msgstr "Ð’Ñ‹ не подключены к Ñерверу"
-#: ../src/config.py:2409
+#: ../src/config.py:2455
msgid "Without a connection, you can not edit your personal information."
msgstr "Чтобы отредактировать личную информацию, нужно подключитьÑÑ Ðº Ñерверу."
-#: ../src/config.py:2413
+#: ../src/config.py:2459
msgid "Your server doesn't support Vcard"
msgstr "Сервер не поддерживает Vcard"
-#: ../src/config.py:2414
+#: ../src/config.py:2460
msgid "Your server can't save your personal information."
msgstr "Ваш Ñервер не может хранить личную информацию."
-#: ../src/config.py:2527
-#: ../src/config.py:2563
+#: ../src/config.py:2574
+#: ../src/config.py:2610
msgid "To disable the account, you must be disconnected."
msgstr "Чтобы отключить Ñту учетную запиÑÑŒ, необходимо отÑоединитьÑÑ Ð¾Ñ‚ Ñервера."
-#: ../src/config.py:2532
+#: ../src/config.py:2579
msgid "Account Local already exists."
msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Local уже ÑущеÑтвует."
-#: ../src/config.py:2533
+#: ../src/config.py:2580
msgid "Please rename or remove it before enabling link-local messaging."
msgstr "Переименуйте или удалите её, прежде чем включать локальные ÑообщениÑ."
-#: ../src/config.py:2690
+#: ../src/config.py:2737
#, python-format
msgid "Edit %s"
msgstr "Править %s"
-#: ../src/config.py:2692
+#: ../src/config.py:2739
#, python-format
msgid "Register to %s"
msgstr "ЗарегиÑтрировать %s"
#. list at the beginning
-#: ../src/config.py:2728
+#: ../src/config.py:2775
msgid "Ban List"
msgstr "Черный ÑпиÑок"
-#: ../src/config.py:2729
+#: ../src/config.py:2776
msgid "Member List"
msgstr "СпиÑок учаÑтников"
-#: ../src/config.py:2729
+#: ../src/config.py:2776
msgid "Owner List"
msgstr "СпиÑок владельцев"
-#: ../src/config.py:2730
+#: ../src/config.py:2777
msgid "Administrator List"
msgstr "СпиÑок админиÑтраторов"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2794
+#: ../src/config.py:2841
#: ../src/disco.py:893
-#: ../src/history_manager.py:201
+#: ../src/history_manager.py:207
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2804
+#: ../src/config.py:2851
msgid "Reason"
msgstr "Причина"
-#: ../src/config.py:2811
+#: ../src/config.py:2858
msgid "Nick"
msgstr "Ðик"
-#: ../src/config.py:2817
+#: ../src/config.py:2864
msgid "Role"
msgstr "ОбÑзанноÑÑ‚ÑŒ"
-#: ../src/config.py:2844
+#: ../src/config.py:2891
msgid "Banning..."
msgstr "Баню..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2846
+#: ../src/config.py:2893
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -6332,11 +6361,11 @@ msgstr ""
"<b>Кого вы хотите забанить?</b>\n"
"\n"
-#: ../src/config.py:2848
+#: ../src/config.py:2895
msgid "Adding Member..."
msgstr "ДобавлÑÑŽ учаÑтника..."
-#: ../src/config.py:2849
+#: ../src/config.py:2896
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -6344,11 +6373,11 @@ msgstr ""
"<b>Кого вы хотите Ñделать учаÑтником?</b>\n"
"\n"
-#: ../src/config.py:2851
+#: ../src/config.py:2898
msgid "Adding Owner..."
msgstr "ДобавлÑÑŽ владельца..."
-#: ../src/config.py:2852
+#: ../src/config.py:2899
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -6356,11 +6385,11 @@ msgstr ""
"<b>Кого вы хотите Ñделать владельцем?</b>\n"
"\n"
-#: ../src/config.py:2854
+#: ../src/config.py:2901
msgid "Adding Administrator..."
msgstr "ДобавлÑÑŽ админиÑтратора..."
-#: ../src/config.py:2855
+#: ../src/config.py:2902
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -6368,7 +6397,7 @@ msgstr ""
"<b>Кого вы хотите Ñделать админиÑтратором?</b>\n"
"\n"
-#: ../src/config.py:2856
+#: ../src/config.py:2903
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -6384,148 +6413,148 @@ msgstr ""
"4. domain (Ñам домен, Ñ‚.е. как любое Ñочетание user@domain,\n"
"domain/resource, так и адреÑ, Ñодержащий Ñтот поддомен)"
-#: ../src/config.py:2957
+#: ../src/config.py:3004
#, python-format
msgid "Removing %s account"
msgstr "Удаление учетной запиÑи %s"
-#: ../src/config.py:2972
+#: ../src/config.py:3019
msgid "Account is disabled"
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ отключена"
-#: ../src/config.py:2973
+#: ../src/config.py:3020
msgid "To unregister from a server, account must be enabled."
msgstr "Ð”Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñ€ÐµÐ³Ð¸Ñтрации Ñ Ñервера, ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ должна быть активна."
-#: ../src/config.py:2986
-#: ../src/gui_interface.py:264
-#: ../src/gui_interface.py:713
+#: ../src/config.py:3033
+#: ../src/gui_interface.py:278
+#: ../src/gui_interface.py:696
msgid "Password Required"
msgstr "ТребуетÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
-#: ../src/config.py:2987
-#: ../src/gui_interface.py:693
+#: ../src/config.py:3034
+#: ../src/gui_interface.py:676
#, python-format
msgid "Enter your password for account %s"
msgstr "Введите пароль Ð´Ð»Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %s"
-#: ../src/config.py:2988
-#: ../src/gui_interface.py:713
+#: ../src/config.py:3035
+#: ../src/gui_interface.py:696
msgid "Save password"
msgstr "Сохранить пароль"
-#: ../src/config.py:2998
+#: ../src/config.py:3045
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ «%s» подключена к Ñерверу"
-#: ../src/config.py:2999
+#: ../src/config.py:3046
msgid "If you remove it, the connection will be lost."
msgstr "ЕÑли вы удалите его, произойдет отключение."
-#: ../src/config.py:3013
+#: ../src/config.py:3060
#, python-format
msgid "Connection to server %s failed"
msgstr "Ðе удалоÑÑŒ ÑоединитьÑÑ Ñ Ñервером %s"
-#: ../src/config.py:3014
+#: ../src/config.py:3061
msgid "What would you like to do?"
msgstr "Что вы хотите Ñделать?"
-#: ../src/config.py:3015
+#: ../src/config.py:3062
msgid "Remove only from Gajim"
msgstr "Удалить только из Gajim"
-#: ../src/config.py:3016
+#: ../src/config.py:3063
msgid "Don't remove anything. I'll try again later"
msgstr "Ðичего не удалÑÑ‚ÑŒ. Я попробую позже."
-#: ../src/config.py:3110
+#: ../src/config.py:3157
msgid "?print_status:All"
msgstr "?print_status:Ð’Ñе"
-#: ../src/config.py:3111
+#: ../src/config.py:3158
msgid "Enter and leave only"
msgstr "Только приход и уход"
-#: ../src/config.py:3112
+#: ../src/config.py:3159
msgid "?print_status:None"
msgstr "?print_status:Ðет"
-#: ../src/config.py:3184
+#: ../src/config.py:3231
msgid "New Group Chat"
msgstr "ÐÐ¾Ð²Ð°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ð°"
-#: ../src/config.py:3217
+#: ../src/config.py:3264
msgid "This bookmark has invalid data"
msgstr "Ðта закладка Ñодержит неверные данные"
-#: ../src/config.py:3218
+#: ../src/config.py:3265
msgid "Please be sure to fill out server and room fields or remove this bookmark."
msgstr "УдоÑтоверьтеÑÑŒ, что заполнены Ð¿Ð¾Ð»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ñервера и комнаты, либо удалите Ñту закладку."
#. invalid char
-#: ../src/config.py:3343
-#: ../src/dialogs.py:2038
+#: ../src/config.py:3390
+#: ../src/dialogs.py:2075
msgid "Invalid nickname"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: ../src/config.py:3344
-#: ../src/config.py:3355
-#: ../src/config.py:3364
-#: ../src/config.py:3375
-#: ../src/config.py:3383
+#: ../src/config.py:3391
+#: ../src/config.py:3402
+#: ../src/config.py:3411
+#: ../src/config.py:3422
+#: ../src/config.py:3430
msgid "Character not allowed"
msgstr "Символ недопуÑтим"
-#: ../src/config.py:3355
-#: ../src/config.py:3363
-#: ../src/config.py:3375
-#: ../src/config.py:3635
+#: ../src/config.py:3402
+#: ../src/config.py:3410
+#: ../src/config.py:3422
+#: ../src/config.py:3683
msgid "Invalid server"
msgstr "Ðеверный Ñервер"
-#: ../src/config.py:3382
+#: ../src/config.py:3429
msgid "Invalid room"
msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ð°"
-#: ../src/config.py:3551
+#: ../src/config.py:3599
msgid "Account has been added successfully"
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ уÑпешно добавлена"
-#: ../src/config.py:3552
-#: ../src/config.py:3558
+#: ../src/config.py:3600
+#: ../src/config.py:3606
msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menu item under the Edit menu from the main window."
msgstr "Ð’Ñ‹ можете уÑтановить раÑширенные наÑтройки учетной запиÑи нажатием кнопки «Дополнительно», или Ñделать Ñто позже поÑредÑтвом пункта «Учетные запиÑи» меню «Правка» в главном окне программы."
-#: ../src/config.py:3557
+#: ../src/config.py:3605
msgid "Your new account has been created successfully"
msgstr "Ваша Ð½Ð¾Ð²Ð°Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ уÑпешно Ñоздана"
-#: ../src/config.py:3596
+#: ../src/config.py:3644
msgid "Invalid username"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: ../src/config.py:3598
+#: ../src/config.py:3646
msgid "You must provide a username to configure this account."
msgstr "Ð”Ð»Ñ Ð½Ð°Ñтройки учетной запиÑи необходимо ввеÑти Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ."
-#: ../src/config.py:3636
+#: ../src/config.py:3684
msgid "Please provide a server on which you want to register."
msgstr "Укажите Ñервер, на котором вы хотите зарегиÑтрироватьÑÑ."
-#: ../src/config.py:3692
-#: ../src/gui_interface.py:1184
+#: ../src/config.py:3740
+#: ../src/gui_interface.py:1174
msgid "Certificate Already in File"
msgstr "Сертификат уже находитÑÑ Ð² файле"
-#: ../src/config.py:3693
-#: ../src/gui_interface.py:1185
+#: ../src/config.py:3741
+#: ../src/gui_interface.py:1175
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "Ðтот Ñертификат уже еÑÑ‚ÑŒ в файле %s, поÑтому он не был добавлен."
-#: ../src/config.py:3770
+#: ../src/config.py:3828
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6540,8 +6569,8 @@ msgstr ""
"Ошибка SSL: %(error)s\n"
"СоединитьÑÑ Ñ Ñтим Ñервером?"
-#: ../src/config.py:3776
-#: ../src/gui_interface.py:1213
+#: ../src/config.py:3834
+#: ../src/gui_interface.py:1203
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6552,75 +6581,75 @@ msgstr ""
"Отпечаток SHA1 Ñертификата:\n"
"%s"
-#: ../src/config.py:3808
-#: ../src/config.py:3842
+#: ../src/config.py:3866
+#: ../src/config.py:3900
msgid "An error occurred during account creation"
msgstr "Произошла ошибка при Ñоздании учетной запиÑи"
-#: ../src/config.py:3907
+#: ../src/config.py:3965
msgid "Account name is in use"
msgstr "Такое Ð¸Ð¼Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи уже иÑпользуетÑÑ"
-#: ../src/config.py:3908
+#: ../src/config.py:3966
msgid "You already have an account using this name."
msgstr "У Ð²Ð°Ñ ÑƒÐ¶Ðµ еÑÑ‚ÑŒ ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ именем."
-#: ../src/config.py:4037
+#: ../src/config.py:4096
msgid "PEP node was not removed"
msgstr "PEP узел не был удален"
-#: ../src/config.py:4038
+#: ../src/config.py:4097
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "PEP узел %(node)s не был удален: %(message)s"
-#: ../src/config.py:4066
+#: ../src/config.py:4125
#, python-format
msgid "Configure %s"
msgstr "ÐаÑтроить %s"
-#: ../src/config.py:4082
+#: ../src/config.py:4141
#: ../src/plugins/gui.py:73
msgid "Active"
msgstr "Ðктивен"
-#: ../src/config.py:4090
+#: ../src/config.py:4149
msgid "Event"
msgstr "Событие"
-#: ../src/config.py:4125
+#: ../src/config.py:4184
msgid "First Message Received"
msgstr "Получено первое Ñообщение"
-#: ../src/config.py:4126
+#: ../src/config.py:4185
msgid "Next Message Received Focused"
msgstr "Следующее Ñообщение получено в окне Ñ Ñ„Ð¾ÐºÑƒÑом"
-#: ../src/config.py:4128
+#: ../src/config.py:4187
msgid "Next Message Received Unfocused"
msgstr "Следующее Ñообщение получено в окне без фокуÑа"
-#: ../src/config.py:4129
+#: ../src/config.py:4188
msgid "Contact Connected"
msgstr "Контакт подключилÑÑ"
-#: ../src/config.py:4130
+#: ../src/config.py:4189
msgid "Contact Disconnected"
msgstr "Контакт отключилÑÑ"
-#: ../src/config.py:4131
+#: ../src/config.py:4190
msgid "Message Sent"
msgstr "Сообщение отправлено"
-#: ../src/config.py:4132
+#: ../src/config.py:4191
msgid "Group Chat Message Highlight"
msgstr "Ð’Ð°Ñ ÑƒÐ¿Ð¾Ð¼Ñнули в комнате"
-#: ../src/config.py:4133
+#: ../src/config.py:4192
msgid "Group Chat Message Received"
msgstr "Получено Ñообщение в комнате"
-#: ../src/config.py:4134
+#: ../src/config.py:4193
msgid "GMail Email Received"
msgstr "Получено пиÑьмо на Gmail"
@@ -6679,7 +6708,7 @@ msgid "Open as _Link"
msgstr "Открыть как _ÑÑылку"
#. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1311
+#: ../src/conversation_textview.py:1319
#, python-format
msgid "Yesterday"
msgid_plural "%(nb_days)i days ago"
@@ -6688,7 +6717,7 @@ msgstr[1] "%(nb_days)i Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
msgstr[2] "%(nb_days)i дней назад"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1360
+#: ../src/conversation_textview.py:1368
#: ../src/history_window.py:480
#, python-format
msgid "Subject: %s\n"
@@ -6726,152 +6755,152 @@ msgstr "new@jabber.id"
msgid "new%d@jabber.id"
msgstr "new%d@jabber.id"
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:81
#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "Ð˜Ð¼Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð°: <i>%s</i>"
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:83
#, python-format
msgid "Jabber ID: <i>%s</i>"
msgstr "Jabber ID: <i>%s</i>"
-#: ../src/dialogs.py:198
+#: ../src/dialogs.py:197
msgid "Group"
msgstr "Группа"
-#: ../src/dialogs.py:205
+#: ../src/dialogs.py:204
msgid "In the group"
msgstr "В группе"
-#: ../src/dialogs.py:296
+#: ../src/dialogs.py:295
msgid "KeyID"
msgstr "KeyID"
-#: ../src/dialogs.py:301
+#: ../src/dialogs.py:300
msgid "Contact name"
msgstr "Ð˜Ð¼Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð°"
-#: ../src/dialogs.py:476
+#: ../src/dialogs.py:475
msgid "Set Mood"
msgstr "УÑтановить наÑтроение"
-#: ../src/dialogs.py:596
+#: ../src/dialogs.py:595
#, python-format
msgid "%s Status Message"
msgstr "Сообщение о ÑтатуÑе %s"
-#: ../src/dialogs.py:610
+#: ../src/dialogs.py:609
msgid "Status Message"
msgstr "Сообщение о ÑтатуÑе"
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:800
msgid "Overwrite Status Message?"
msgstr "Изменить Ñообщение о ÑтатуÑе?"
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:801
msgid "This name is already used. Do you want to overwrite this status message?"
msgstr "Ðто Ð¸Ð¼Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ. ПерезапиÑать Ñто Ñообщение о ÑтатуÑе?"
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:809
msgid "Save as Preset Status Message"
msgstr "Сохранить уÑтановленное Ñообщение о ÑтатуÑе"
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:810
msgid "Please type a name for this status message"
msgstr "Введите Ð¸Ð¼Ñ Ð´Ð»Ñ Ñтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ ÑтатуÑе"
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:838
msgid "AIM Address:"
msgstr "ÐÐ´Ñ€ÐµÑ AIM:"
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:839
msgid "GG Number:"
msgstr "Ðомер GaduGadu"
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:840
msgid "ICQ Number:"
msgstr "Ðомер ICQ:"
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:841
msgid "MSN Address:"
msgstr "ÐÐ´Ñ€ÐµÑ Ð² MSN:"
-#: ../src/dialogs.py:843
+#: ../src/dialogs.py:842
msgid "Yahoo! Address:"
msgstr "ÐÐ´Ñ€ÐµÑ Yahoo:"
-#: ../src/dialogs.py:880
+#: ../src/dialogs.py:879
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr ""
"Заполните данные о контакте,\n"
"который хотите добавить в роÑтер учетной запиÑи %s"
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:882
msgid "Please fill in the data of the contact you want to add"
msgstr "Заполните данные о контакте, который вы хотите добавить"
-#: ../src/dialogs.py:1073
-#: ../src/dialogs.py:1079
-#: ../src/dialogs.py:1084
-#: ../src/dialogs.py:3572
+#: ../src/dialogs.py:1074
+#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1085
+#: ../src/dialogs.py:3626
msgid "Invalid User ID"
msgstr "Ðеверный ID пользователÑ"
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1081
msgid "The user ID must not contain a resource."
msgstr "ID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ðµ должен Ñодержать реÑурÑ."
-#: ../src/dialogs.py:1085
+#: ../src/dialogs.py:1086
msgid "You cannot add yourself to your roster."
msgstr "Ð’Ñ‹ не можете добавлÑÑ‚ÑŒ ÑÐµÐ±Ñ Ð² Ñвой роÑтер."
-#: ../src/dialogs.py:1099
+#: ../src/dialogs.py:1100
msgid "Contact already in roster"
msgstr "Контакт уже в роÑтере"
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1101
msgid "This contact is already listed in your roster."
msgstr "Ðтот контакт уже ÑодержитÑÑ Ð² вашем роÑтере."
-#: ../src/dialogs.py:1152
-#: ../src/dialogs.py:1186
+#: ../src/dialogs.py:1154
+#: ../src/dialogs.py:1188
msgid "User ID:"
msgstr "ID пользователÑ:"
-#: ../src/dialogs.py:1271
-msgid "A GTK+ jabber client"
-msgstr "Jabber-клиент на GTK+"
+#: ../src/dialogs.py:1273
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Jabber/XMPP-клиент на GTK+"
-#: ../src/dialogs.py:1272
+#: ../src/dialogs.py:1274
msgid "GTK+ Version:"
msgstr "ВерÑÐ¸Ñ GTK+:"
-#: ../src/dialogs.py:1273
+#: ../src/dialogs.py:1275
msgid "PyGTK Version:"
msgstr "ВерÑÐ¸Ñ PyGTK:"
-#: ../src/dialogs.py:1283
+#: ../src/dialogs.py:1285
msgid "Current Developers:"
msgstr "Разработчики:"
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1287
msgid "Past Developers:"
msgstr "Разработчики прошлых верÑий:"
-#: ../src/dialogs.py:1291
+#: ../src/dialogs.py:1293
msgid "THANKS:"
msgstr "БЛÐГОДÐÐ ÐОСТИ:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1297
+#: ../src/dialogs.py:1299
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:1309
+#: ../src/dialogs.py:1311
msgid "translator-credits"
msgstr ""
"Яков Безруков <nebulam51@gmail.com>\n"
@@ -6880,7 +6909,7 @@ msgstr ""
"Ð”ÐµÐ½Ð¸Ñ Ð¤Ð¾Ð¼Ð¸Ð½ <fominde@mail.ru>\n"
"Григорий Сарницкий <sargrigory@ya.ru>"
-#: ../src/dialogs.py:1492
+#: ../src/dialogs.py:1494
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n"
@@ -6888,500 +6917,442 @@ msgid ""
"Highlighting misspelled words feature will not be used"
msgstr "Чтобы воÑпользоватьÑÑ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¾Ð¹ правопиÑаниÑ, уÑтановите Ñловарь Ð´Ð»Ñ Ñзыка %s или выберите другой Ñзык, иÑправив наÑтройку speller_language."
-#: ../src/dialogs.py:1840
+#: ../src/dialogs.py:1877
msgid "_Resume"
msgstr "_Продолжить"
-#: ../src/dialogs.py:1848
+#: ../src/dialogs.py:1885
msgid "Re_place"
msgstr "_Заменить"
-#: ../src/dialogs.py:2039
-#: ../src/dialogs.py:2426
+#: ../src/dialogs.py:2076
+#: ../src/dialogs.py:2475
msgid "The nickname has not allowed characters."
msgstr "Ð’ Jabber ID комнаты или Ñервера ÑодержатÑÑ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтимые Ñимволы."
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2194
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° подпиÑку Ð´Ð»Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %(account)s от %(jid)s"
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2197
#, python-format
msgid "Subscription request from %s"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° подпиÑку от %s"
-#: ../src/dialogs.py:2236
-#: ../src/gui_interface.py:1915
+#: ../src/dialogs.py:2281
+#: ../src/gui_interface.py:1930
#, python-format
msgid "You are already in group chat %s"
msgstr "Вы уже в комнате %s"
-#: ../src/dialogs.py:2242
+#: ../src/dialogs.py:2287
msgid "You can not join a group chat unless you are connected."
msgstr "Ð’Ñ‹ не можете зайти в комнату без подключениÑ."
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2331
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Войти в комнату Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %s"
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2462
msgid "Invalid Account"
msgstr "Ðеверное Ð¸Ð¼Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи"
-#: ../src/dialogs.py:2414
+#: ../src/dialogs.py:2463
msgid "You have to choose an account from which you want to join the groupchat."
msgstr "Выберите учетную запиÑÑŒ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ вы хотите войти в комнату."
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2474
msgid "Invalid Nickname"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: ../src/dialogs.py:2430
-#: ../src/dialogs.py:2436
-#: ../src/groupchat_control.py:2036
+#: ../src/dialogs.py:2479
+#: ../src/dialogs.py:2485
+#: ../src/groupchat_control.py:2092
msgid "Invalid group chat Jabber ID"
msgstr "Ðеверное Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ñ‹"
-#: ../src/dialogs.py:2431
+#: ../src/dialogs.py:2480
msgid "Please enter the group chat Jabber ID as room@server."
msgstr "Ð’ Jabber ID комнаты или Ñервера ÑодержатÑÑ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтимые Ñимволы."
-#: ../src/dialogs.py:2437
-#: ../src/groupchat_control.py:2037
+#: ../src/dialogs.py:2486
+#: ../src/groupchat_control.py:2093
msgid "The group chat Jabber ID has not allowed characters."
msgstr "Ð’ Jabber ID комнаты или Ñервера ÑодержатÑÑ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтимые Ñимволы."
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2491
+#: ../src/gui_interface.py:1912
msgid "This is not a group chat"
msgstr "Ðто не комната"
-#: ../src/dialogs.py:2445
+#: ../src/dialogs.py:2492
+#: ../src/gui_interface.py:1913
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s не ÑвлÑетÑÑ Ð¸Ð¼ÐµÐ½ÐµÐ¼ комнаты."
-#: ../src/dialogs.py:2476
+#: ../src/dialogs.py:2524
msgid "Without a connection, you can not synchronise your contacts."
msgstr "Чтобы объединить контакты, необходимо подключитьÑÑ Ðº Ñерверу."
-#: ../src/dialogs.py:2489
+#: ../src/dialogs.py:2537
msgid "Server"
msgstr "Сервер"
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2573
msgid "This account is not connected to the server"
msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ не подключена к Ñерверу"
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2574
msgid "You cannot synchronize with an account unless it is connected."
msgstr "Ð’Ñ‹ не можете Ñинхронизировать учетную запиÑÑŒ еÑли она не подключена."
-#: ../src/dialogs.py:2551
+#: ../src/dialogs.py:2599
msgid "Synchronise"
msgstr "Синхронизировать"
-#: ../src/dialogs.py:2612
+#: ../src/dialogs.py:2660
#, python-format
msgid "Start Chat with account %s"
msgstr "Ðачать чат Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑью %s"
-#: ../src/dialogs.py:2614
+#: ../src/dialogs.py:2662
msgid "Start Chat"
msgstr "Ðачать чат"
-#: ../src/dialogs.py:2615
+#: ../src/dialogs.py:2663
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
msgstr "Введите ник или ID пользователÑ, которому вы хотите отправить Ñообщение:"
#. if offline or connecting
-#: ../src/dialogs.py:2641
-#: ../src/dialogs.py:3022
-#: ../src/dialogs.py:3252
+#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:3071
+#: ../src/dialogs.py:3306
msgid "Connection not available"
msgstr "Соединение недоÑтупно"
-#: ../src/dialogs.py:2642
-#: ../src/dialogs.py:3023
-#: ../src/dialogs.py:3253
+#: ../src/dialogs.py:2691
+#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3307
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "УдоÑтоверьтеÑÑŒ, что вы подключены к «%s»."
-#: ../src/dialogs.py:2651
-#: ../src/dialogs.py:2654
+#: ../src/dialogs.py:2700
+#: ../src/dialogs.py:2703
msgid "Invalid JID"
msgstr "Ðеверный JID"
-#: ../src/dialogs.py:2654
+#: ../src/dialogs.py:2703
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Ðе понимаю адреÑа «%s»."
-#: ../src/dialogs.py:2663
+#: ../src/dialogs.py:2712
msgid "Without a connection, you can not change your password."
msgstr "Чтобы изменить пароль, необходимо подключитьÑÑ Ðº Ñерверу."
-#: ../src/dialogs.py:2682
+#: ../src/dialogs.py:2731
msgid "Invalid password"
msgstr "Ðеверный пароль"
-#: ../src/dialogs.py:2682
+#: ../src/dialogs.py:2731
msgid "You must enter a password."
msgstr "Ðеобходимо ввеÑти пароль."
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2735
msgid "Passwords do not match"
msgstr "Пароли не Ñовпадают"
-#: ../src/dialogs.py:2687
+#: ../src/dialogs.py:2736
msgid "The passwords typed in both fields must be identical."
msgstr "Пароли, введенные в оба полÑ, должны быть одинаковыми."
-#. default value
-#: ../src/dialogs.py:2724
-#: ../src/notify.py:249
-#: ../src/notify.py:475
-msgid "Contact Signed In"
-msgstr "Контакт подключилÑÑ"
-
-#: ../src/dialogs.py:2726
-#: ../src/notify.py:257
-#: ../src/notify.py:477
-msgid "Contact Signed Out"
-msgstr "Контакт отключилÑÑ"
-
-#. chat message
-#: ../src/dialogs.py:2728
-#: ../src/notify.py:279
-#: ../src/notify.py:479
-msgid "New Message"
-msgstr "Ðовое Ñообщение"
-
-#. single message
-#: ../src/dialogs.py:2728
-#: ../src/notify.py:261
-#: ../src/notify.py:479
-msgid "New Single Message"
-msgstr "Ðовое одиночное Ñообщение"
-
-#. private message
-#: ../src/dialogs.py:2729
-#: ../src/notify.py:267
-#: ../src/notify.py:480
-msgid "New Private Message"
-msgstr "Ðовое личное Ñообщение"
-
-#: ../src/dialogs.py:2729
-#: ../src/gui_interface.py:823
-#: ../src/notify.py:489
+#: ../src/dialogs.py:2778
+#: ../src/gui_interface.py:813
+#: ../src/notify.py:273
msgid "New E-mail"
msgstr "Ðовое пиÑьмо"
-#: ../src/dialogs.py:2731
-#: ../src/gui_interface.py:878
-#: ../src/notify.py:482
+#: ../src/dialogs.py:2780
+#: ../src/gui_interface.py:868
+#: ../src/notify.py:266
msgid "File Transfer Request"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸"
-#: ../src/dialogs.py:2733
-#: ../src/gui_interface.py:785
-#: ../src/gui_interface.py:849
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2782
+#: ../src/gui_interface.py:775
+#: ../src/gui_interface.py:839
+#: ../src/notify.py:268
msgid "File Transfer Error"
msgstr "Ошибка передачи"
-#: ../src/dialogs.py:2735
-#: ../src/gui_interface.py:924
-#: ../src/gui_interface.py:947
-#: ../src/gui_interface.py:964
-#: ../src/notify.py:486
+#: ../src/dialogs.py:2784
+#: ../src/gui_interface.py:914
+#: ../src/gui_interface.py:937
+#: ../src/gui_interface.py:954
+#: ../src/notify.py:270
msgid "File Transfer Completed"
msgstr "Передача файла завершена"
-#: ../src/dialogs.py:2736
-#: ../src/gui_interface.py:927
-#: ../src/notify.py:487
+#: ../src/dialogs.py:2785
+#: ../src/gui_interface.py:917
+#: ../src/notify.py:271
msgid "File Transfer Stopped"
msgstr "Передача оÑтановлена"
-#: ../src/dialogs.py:2738
-#: ../src/gui_interface.py:639
-#: ../src/notify.py:491
+#: ../src/dialogs.py:2787
+#: ../src/gui_interface.py:609
+#: ../src/notify.py:275
msgid "Groupchat Invitation"
msgstr "Приглашение в комнату"
-#: ../src/dialogs.py:2740
-#: ../src/notify.py:241
-#: ../src/notify.py:493
-msgid "Contact Changed Status"
-msgstr "Контакт изменит ÑтатуÑ"
-
-#: ../src/dialogs.py:2941
+#: ../src/dialogs.py:2990
#, python-format
msgid "Single Message using account %s"
msgstr "Ðовое Ñообщение Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %s"
-#: ../src/dialogs.py:2943
+#: ../src/dialogs.py:2992
#, python-format
msgid "Single Message in account %s"
msgstr "Ðовое Ñообщение Ð´Ð»Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %s"
-#: ../src/dialogs.py:2945
+#: ../src/dialogs.py:2994
msgid "Single Message"
msgstr "Сообщение"
#. prepare UI for Sending
-#: ../src/dialogs.py:2948
+#: ../src/dialogs.py:2997
#, python-format
msgid "Send %s"
msgstr "Отправить %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2971
+#: ../src/dialogs.py:3020
#, python-format
msgid "Received %s"
msgstr "Получено %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2994
+#: ../src/dialogs.py:3043
#, 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:3073
+#: ../src/dialogs.py:3127
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:3074
+#: ../src/dialogs.py:3128
#, python-format
msgid "%s wrote:\n"
msgstr "%s напиÑал:\n"
-#: ../src/dialogs.py:3133
+#: ../src/dialogs.py:3187
#, python-format
msgid "XML Console for %s"
msgstr "КонÑоль XML Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:3135
+#: ../src/dialogs.py:3189
msgid "XML Console"
msgstr "КонÑоль XML"
#. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3336
msgid "add"
msgstr "добавить"
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3336
msgid "modify"
msgstr "изменить"
-#: ../src/dialogs.py:3283
+#: ../src/dialogs.py:3337
msgid "remove"
msgstr "удалить"
-#: ../src/dialogs.py:3312
+#: ../src/dialogs.py:3366
#, python-format
msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
msgstr "<b>%(jid)s</b> хочет <b>%(action)s</b> неÑколько контактов в ваш ÑпиÑок контактов."
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3328
-#: ../src/dialogs.py:3374
-msgid "Add"
-msgstr "Добавить"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3330
-#: ../src/dialogs.py:3405
+#: ../src/dialogs.py:3384
+#: ../src/dialogs.py:3459
msgid "Modify"
msgstr "Изменить"
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3332
-#: ../src/dialogs.py:3429
-msgid "Delete"
-msgstr "Удалить"
-
-#: ../src/dialogs.py:3336
+#: ../src/dialogs.py:3390
msgid "Jabber ID"
msgstr "Jabber ID"
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3396
msgid "Groups"
msgstr "Группы"
#. it is selected
#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3450
+#: ../src/dialogs.py:3504
#, python-format
msgid "%s suggested me to add you in my roster."
msgstr "%s предложил мне добавить Ð²Ð°Ñ Ð² мой ÑпиÑок контактов."
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:3518
#, python-format
msgid "Added %s contacts"
msgstr "Добавлены контакты %s"
-#: ../src/dialogs.py:3501
+#: ../src/dialogs.py:3555
#, python-format
msgid "Removed %s contacts"
msgstr "Удалены контакты %s"
-#: ../src/dialogs.py:3541
-#: ../src/dialogs.py:3718
+#: ../src/dialogs.py:3595
+#: ../src/dialogs.py:3772
#, python-format
msgid "Archiving Preferences for %s"
msgstr "ÐаÑтройки архивации Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:3581
+#: ../src/dialogs.py:3635
#, fuzzy
msgid "Invalid expire value"
msgstr "Ðеверное Ð¸Ð¼Ñ Ñервера"
-#: ../src/dialogs.py:3582
+#: ../src/dialogs.py:3636
msgid "Expire must be a valid positive integer."
msgstr ""
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3683
msgid "There is an error with the form"
msgstr ""
-#: ../src/dialogs.py:3849
+#: ../src/dialogs.py:3903
#, fuzzy
msgid "There is an error"
msgstr "Ð¡ÐµÑ€Ð²Ð¸Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ð» ошибкой."
-#: ../src/dialogs.py:3917
+#: ../src/dialogs.py:3971
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "СпиÑок доÑтупа <b><i>%s</i></b>"
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:3975
#, python-format
msgid "Privacy List for %s"
msgstr "СпиÑок доÑтупа Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:3988
+#: ../src/dialogs.py:4042
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr "Ðомер: %(order)s, дейÑтвие: %(action)s, тип: %(type)s, значение: %(value)s"
-#: ../src/dialogs.py:3993
+#: ../src/dialogs.py:4047
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "Ðомер: %(order)s, дейÑтвие: %(action)s"
-#: ../src/dialogs.py:4044
+#: ../src/dialogs.py:4098
msgid "<b>Edit a rule</b>"
msgstr "<b>Изменить правило</b>"
-#: ../src/dialogs.py:4155
+#: ../src/dialogs.py:4209
msgid "<b>Add a rule</b>"
msgstr "<b>Добавить правило</b>"
-#: ../src/dialogs.py:4254
+#: ../src/dialogs.py:4308
#, python-format
msgid "Privacy Lists for %s"
msgstr "СпиÑки доÑтупа Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:4256
+#: ../src/dialogs.py:4310
msgid "Privacy Lists"
msgstr "СпиÑки доÑтупа"
-#: ../src/dialogs.py:4345
+#: ../src/dialogs.py:4399
msgid "Invalid List Name"
msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ ÑпиÑка"
-#: ../src/dialogs.py:4346
+#: ../src/dialogs.py:4400
msgid "You must enter a name to create a privacy list."
msgstr "Ðеобходимо ввеÑти Ð¸Ð¼Ñ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑпиÑка доÑтупа."
-#: ../src/dialogs.py:4378
+#: ../src/dialogs.py:4432
msgid "You are invited to a groupchat"
msgstr "Вы приглашены в конференцию"
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4435
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact приглашает Ð²Ð°Ñ Ð¿Ñ€Ð¸ÑоединитьÑÑ Ðº обÑуждению."
-#: ../src/dialogs.py:4383
+#: ../src/dialogs.py:4437
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact приглашает Ð²Ð°Ñ Ð² комнату %(room_jid)s."
-#: ../src/dialogs.py:4391
+#: ../src/dialogs.py:4445
#, python-format
msgid "Comment: %s"
msgstr "Комментарий: %s"
-#: ../src/dialogs.py:4393
+#: ../src/dialogs.py:4447
msgid "Do you want to accept the invitation?"
msgstr "Вы принимаете приглашение?"
-#: ../src/dialogs.py:4455
+#: ../src/dialogs.py:4509
msgid "Choose Client Cert #PCKS12"
msgstr "Выберите Ñертификат владельца #PCKS12"
-#: ../src/dialogs.py:4465
-#: ../src/dialogs.py:4507
-#: ../src/dialogs.py:4563
-#: ../src/dialogs.py:4651
+#: ../src/dialogs.py:4519
+#: ../src/dialogs.py:4561
+#: ../src/dialogs.py:4617
+#: ../src/dialogs.py:4705
msgid "All files"
msgstr "Ð’Ñе файлы"
-#: ../src/dialogs.py:4470
+#: ../src/dialogs.py:4524
msgid "PKCS12 Files"
msgstr "Файлы PKCS12"
-#: ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551
msgid "Choose Sound"
msgstr "Выберите звуковой файл"
-#: ../src/dialogs.py:4512
+#: ../src/dialogs.py:4566
msgid "Wav Sounds"
msgstr "В формате Wav"
-#: ../src/dialogs.py:4550
+#: ../src/dialogs.py:4604
msgid "Choose Image"
msgstr "Выбрать картинку"
-#: ../src/dialogs.py:4568
+#: ../src/dialogs.py:4622
msgid "Images"
msgstr "Картинки"
-#: ../src/dialogs.py:4638
+#: ../src/dialogs.py:4692
msgid "Choose Archive"
msgstr "Выбрать Ðрхив"
-#: ../src/dialogs.py:4656
+#: ../src/dialogs.py:4710
msgid "Zip files"
msgstr "Zip файлы"
-#: ../src/dialogs.py:4682
+#: ../src/dialogs.py:4736
#, python-format
msgid "When %s becomes:"
msgstr "Когда %s проиÑходит:"
-#: ../src/dialogs.py:4684
+#: ../src/dialogs.py:4738
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Добавление Ñпециального ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:4760
-msgid "Condition"
-msgstr "УÑловие"
-
-#: ../src/dialogs.py:4880
-msgid "when I am "
-msgstr "когда Ñ "
-
-#: ../src/dialogs.py:5374
+#: ../src/dialogs.py:4958
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7392,38 +7363,38 @@ msgstr ""
"\n"
"Short Authentication String данного ÑеанÑа <b>%(sas)s</b>."
-#: ../src/dialogs.py:5377
+#: ../src/dialogs.py:4961
msgid "You have already verified this contact's identity."
msgstr "Ð’Ñ‹ уже удоÑтоверили личноÑÑ‚ÑŒ Ñтого контакта."
-#: ../src/dialogs.py:5383
-#: ../src/dialogs.py:5467
+#: ../src/dialogs.py:4967
+#: ../src/dialogs.py:5051
msgid "Contact's identity verified"
msgstr "ЛичноÑÑ‚ÑŒ контакта удоÑтоверена"
-#: ../src/dialogs.py:5389
+#: ../src/dialogs.py:4973
msgid "Verify again..."
msgstr "УдоÑтоверить Ñнова..."
-#: ../src/dialogs.py:5394
+#: ../src/dialogs.py:4978
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:5397
-#: ../src/dialogs.py:5448
-#: ../src/dialogs.py:5461
+#: ../src/dialogs.py:4981
+#: ../src/dialogs.py:5032
+#: ../src/dialogs.py:5045
msgid "Contact's identity NOT verified"
msgstr "ЛичноÑÑ‚ÑŒ контакта ÐЕ удоÑтоверена"
-#: ../src/dialogs.py:5402
+#: ../src/dialogs.py:4986
msgid "Verify..."
msgstr "УдоÑтоверить..."
-#: ../src/dialogs.py:5413
+#: ../src/dialogs.py:4997
msgid "Have you verified the contact's identity?"
msgstr "Ð’Ñ‹ удоÑтоверили личноÑÑ‚ÑŒ удаленного контакта?"
-#: ../src/dialogs.py:5414
+#: ../src/dialogs.py:4998
#, 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"
@@ -7434,44 +7405,76 @@ msgstr ""
"\n"
"Short Authentication String Ñтого ÑеанÑа <b>%(sas)s</b>"
-#: ../src/dialogs.py:5415
+#: ../src/dialogs.py:4999
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "Ð’Ñ‹ переговорили Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ñ‹Ð¼ контактом и удоÑтоверили SAS?"
-#: ../src/dialogs.py:5449
+#: ../src/dialogs.py:5033
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
msgstr "Ключ (%s) контакта <b>не ÑоответÑтвует</b> ключу, приÑвоенному в Gajim."
-#: ../src/dialogs.py:5455
+#: ../src/dialogs.py:5039
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr "Ðтому контакту не приÑвоен ключ GPG, поÑтому вы не можете зашифровать ÑообщениÑ."
-#: ../src/dialogs.py:5462
+#: ../src/dialogs.py:5046
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:5468
+#: ../src/dialogs.py:5052
msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
msgstr "Ðтому контакту приÑвоен ключ GPG, и вы доверÑете Ñтому ключу. Таким образом, ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ зашифрованы."
-#: ../src/dialogs.py:5533
+#: ../src/dialogs.py:5117
msgid "an audio and video"
msgstr "аудио и видео"
-#: ../src/dialogs.py:5535
+#: ../src/dialogs.py:5119
msgid "an audio"
msgstr "аудио"
-#: ../src/dialogs.py:5537
+#: ../src/dialogs.py:5121
msgid "a video"
msgstr "видео"
-#: ../src/dialogs.py:5541
+#: ../src/dialogs.py:5125
#, python-format
msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
msgstr "%(contact)s хочет начать %(type)s ÑÐµÐ°Ð½Ñ Ñ Ð²Ð°Ð¼Ð¸. Ð’Ñ‹ хотите ответить?"
+#: ../src/dialogs.py:5193
+#, python-format
+msgid "Certificate for account %s"
+msgstr "Сертификат учетной запиÑи %s"
+
+#: ../src/dialogs.py:5193
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+
+#: ../src/dialogs.py:5227
+#: ../src/dialogs.py:5244
+msgid "View cert..."
+msgstr ""
+
#: ../src/disco.py:119
msgid "Others"
msgstr "Другие"
@@ -7534,281 +7537,311 @@ msgid "_Execute Command"
msgstr "В_ыполнить команду..."
#: ../src/disco.py:1353
-#: ../src/disco.py:1523
+#: ../src/disco.py:1522
msgid "Re_gister"
msgstr "За_региÑтрироватьÑÑ"
-#: ../src/disco.py:1564
+#: ../src/disco.py:1563
#, python-format
msgid "Scanning %(current)d / %(total)d.."
msgstr "Сканирую %(current)d / %(total)d.."
#. Users column
-#: ../src/disco.py:1755
+#: ../src/disco.py:1754
msgid "Users"
msgstr "Пользователи"
#. Description column
-#: ../src/disco.py:1763
+#: ../src/disco.py:1762
msgid "Description"
msgstr "ОпиÑание"
#. Id column
-#: ../src/disco.py:1771
+#: ../src/disco.py:1770
msgid "Id"
msgstr "ID"
-#: ../src/disco.py:1836
-#: ../src/gui_interface.py:2440
+#: ../src/disco.py:1835
+#: ../src/gui_interface.py:2448
msgid "Bookmark already set"
msgstr "Закладка уже уÑтановлена"
-#: ../src/disco.py:1837
-#: ../src/gui_interface.py:2441
+#: ../src/disco.py:1836
+#: ../src/gui_interface.py:2449
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Комната «%s» уже еÑÑ‚ÑŒ в ваших закладках."
-#: ../src/disco.py:1846
-#: ../src/gui_interface.py:2455
+#: ../src/disco.py:1845
+#: ../src/gui_interface.py:2463
msgid "Bookmark has been added successfully"
msgstr "Закладка уÑпешно добавлена"
-#: ../src/disco.py:1847
-#: ../src/gui_interface.py:2456
+#: ../src/disco.py:1846
+#: ../src/gui_interface.py:2464
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "Ð’Ñ‹ можете управлÑÑ‚ÑŒ закладками через меню «ДейÑтвиÑ» в роÑтере."
-#: ../src/disco.py:2056
+#: ../src/disco.py:2055
msgid "Subscribed"
msgstr "ПодпиÑка"
-#: ../src/disco.py:2064
+#: ../src/disco.py:2063
msgid "Node"
msgstr "Узел"
-#: ../src/disco.py:2128
+#: ../src/disco.py:2127
msgid "New post"
msgstr "Ðовое Ñообщение"
-#: ../src/disco.py:2134
+#: ../src/disco.py:2133
msgid "_Subscribe"
msgstr "_ПодпиÑатьÑÑ"
-#: ../src/disco.py:2140
+#: ../src/disco.py:2139
msgid "_Unsubscribe"
msgstr "_ОтпиÑатьÑÑ"
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
msgstr "Подтверждение SSL Ñертификата"
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
msgid "A library used to validate server certificates to ensure a secure connection."
msgstr "Библиотека иÑпользуетÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð´ÐµÐ¹ÑтвительноÑти Ñертификатов Ñервера Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы удоÑтоверитьÑÑ Ð² защищенноÑти ÑоединениÑ."
-#: ../src/features_window.py:51
#: ../src/features_window.py:52
+#: ../src/features_window.py:53
msgid "Requires python-pyopenssl."
msgstr "Требует python-pyopenssl."
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
msgid "Bonjour / Zeroconf"
msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
msgid "Serverless chatting with autodetected clients in a local network."
msgstr "Ðе требующее Ñервера общение между автоматичеÑки обнаруживаемыми клиентами в локальной Ñети."
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
msgid "Requires python-avahi."
msgstr "Требует python-avahi."
-#: ../src/features_window.py:56
+#: ../src/features_window.py:57
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:57
+#: ../src/features_window.py:58
msgid "Command line"
msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока"
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
msgid "A script to control Gajim via commandline."
msgstr "Скрипт Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Gajim'ом через командную Ñтроку."
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
msgid "Requires python-dbus."
msgstr "Требует python-dbus."
-#: ../src/features_window.py:60
-#: ../src/features_window.py:68
-#: ../src/features_window.py:72
-#: ../src/features_window.py:76
-#: ../src/features_window.py:84
-#: ../src/features_window.py:88
-#: ../src/features_window.py:108
+#: ../src/features_window.py:61
+#: ../src/features_window.py:69
+#: ../src/features_window.py:73
+#: ../src/features_window.py:77
+#: ../src/features_window.py:85
+#: ../src/features_window.py:89
+#: ../src/features_window.py:109
+#: ../src/features_window.py:113
+#: ../src/features_window.py:117
msgid "Feature not available under Windows."
msgstr "Ðта возможноÑÑ‚ÑŒ отÑутÑтвует в Windows."
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
msgid "OpenGPG message encryption"
msgstr "OpenPGP шифрование"
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
msgid "Encrypting chat messages with gpg keys."
msgstr "Шифрование Ñообщений при помощи gpg ключей."
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
msgstr "Требует gpg и python-gnupg (http://code.google.com/p/python-gnupg/)."
-#: ../src/features_window.py:64
+#: ../src/features_window.py:65
msgid "Requires gpg.exe in PATH."
msgstr "Требует gpg.exe в PATH."
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
msgid "Network-manager"
msgstr "Network-manager"
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
msgid "Autodetection of network status."
msgstr "Ðвтоопределение ÑоÑтоÑÐ½Ð¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ Ñетью."
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
msgid "Requires gnome-network-manager and python-dbus."
msgstr "Требует gnome-network-manager и python-dbus."
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
msgid "Session Management"
msgstr "Управление ÑеанÑами"
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
msgid "Gajim session is stored on logout and restored on login."
msgstr "Ð¡ÐµÐ°Ð½Ñ Gajim ÑохранÑетÑÑ Ð¿Ñ€Ð¸ выходе (logout) и воÑÑтанавливаетÑÑ Ð¿Ñ€Ð¸ входе (login)."
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
msgid "Requires python-gnome2."
msgstr "Требует python-gnome2."
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
msgid "Password encryption"
msgstr "Шифрование паролей"
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
msgid "Passwords can be stored securely and not just in plaintext."
msgstr "Пароли могут хранитьÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñно, а не проÑто открытым текÑтом."
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
msgstr "Требует gnome-keyring и python-gnome2-desktop или kwalletcli."
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
msgid "SRV"
msgstr "SRV"
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
msgid "Ability to connect to servers which are using SRV records."
msgstr "ВозможноÑÑ‚ÑŒ ÑоединÑÑ‚ÑŒÑÑ Ñ Ñерверами, иÑпользующими SRV запиÑи."
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
msgid "Requires dnsutils."
msgstr "Требует dnsutils."
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
msgid "Requires nslookup to use SRV records."
msgstr "Требует nslookup Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ SRV запиÑей."
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
msgid "Spell Checker"
msgstr "Проверка орфографии"
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
msgid "Spellchecking of composed messages."
msgstr "Проверка орфографии набираемых Ñообщений"
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
msgid "Requires libgtkspell."
msgstr "Требует библиотеку libgtkspell."
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
msgid "Notification"
msgstr "УведомлениÑ"
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
msgid "Passive popups notifying for new events."
msgstr "ПаÑÑивные вÑплывающие окна Ð´Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ новых ÑобытиÑÑ…."
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
msgstr "Требует python-notify или python-dbus ÑовмеÑтно Ñ notification-daemon."
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
msgid "Automatic status"
msgstr "Ðвто ÑтатуÑ"
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
msgid "Ability to measure idle time, in order to set auto status."
msgstr "ВозможноÑÑ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ бездейÑÑ‚Ð²Ð¸Ñ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы уÑтановить автоÑтатуÑ."
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
msgid "Requires libxss library."
msgstr "Требует библиотеку libxss."
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
msgid "Requires python2.5."
msgstr "Требует python2.5."
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
msgid "LaTeX"
msgstr "LaTeX"
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
msgid "Transform LaTeX expressions between $$ $$."
msgstr "Преобразовывать LaTeX выражениÑ, заключенные в $$ $$"
-#: ../src/features_window.py:95
+#: ../src/features_window.py:96
msgid "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set 'use_latex' to True in the Advanced Configuration Editor."
msgstr "Требует texlive-latex-base и (dvipng или ImageMagick). Ðеобходимо приÑвоить пункту 'use_latex' значение «Ðктивно» в РаÑширенном редакторе наÑтроек."
-#: ../src/features_window.py:96
+#: ../src/features_window.py:97
msgid "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). You have to set 'use_latex' to True in the Advanced Configuration Editor."
msgstr "Требует texlive-latex-base и (dvipng или ImageMagick) (оба еÑÑ‚ÑŒ в MikTeX). Ðеобходимо приÑвоить пункту 'use_latex' значение «Ðктивно» в РаÑширенном редакторе наÑтроек."
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
msgid "End to End message encryption"
msgstr "End to end шифрование"
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
msgid "Encrypting chat messages."
msgstr "Шифрование Ñообщений чата."
-#: ../src/features_window.py:99
#: ../src/features_window.py:100
+#: ../src/features_window.py:101
msgid "Requires python-crypto."
msgstr "Требует python-crypto."
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
msgid "RST Generator"
msgstr "Генератор RST"
-#: ../src/features_window.py:102
+#: ../src/features_window.py:103
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:103
#: ../src/features_window.py:104
+#: ../src/features_window.py:105
msgid "Requires python-docutils."
msgstr "Требует python-docutils."
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
msgid "Ability to start audio and video chat."
msgstr "ВозможноÑÑ‚ÑŒ голоÑового и видео общениÑ."
+#: ../src/features_window.py:108
+msgid "Requires python-farsight and gstreamer-plugins-bad."
+msgstr "Требует python-farsight и gstreamer-plugins-bad."
+
+#: ../src/features_window.py:110
+msgid "UPnP-IGD"
+msgstr ""
+
+#: ../src/features_window.py:111
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:112
+msgid "Requires python-gupnp-igd."
+msgstr "Требует python-gupnp-igd."
+
+#: ../src/features_window.py:114
+msgid "UPower"
+msgstr ""
+
#: ../src/features_window.py:115
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:116
+msgid "Requires upower and python-dbus."
+msgstr "Требует upower и python-dbus."
+
+#: ../src/features_window.py:124
msgid "?features:Available"
msgstr "?features:ДоÑтупно"
-#: ../src/features_window.py:122
+#: ../src/features_window.py:131
msgid "Feature"
msgstr "Функции"
@@ -7825,148 +7858,131 @@ msgid "Progress"
msgstr "ПрогреÑÑ"
#: ../src/filetransfers_window.py:178
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
#, python-format
msgid "Filename: %s"
msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°: %s"
-#: ../src/filetransfers_window.py:179
-#: ../src/filetransfers_window.py:333
+#: ../src/filetransfers_window.py:180
+#: ../src/filetransfers_window.py:400
#, 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:188
-#: ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:523
+#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:199
+#: ../src/history_manager.py:541
msgid "You"
msgstr "Ð’Ñ‹"
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:190
#, python-format
msgid "Sender: %s"
msgstr "Отправитель: %s"
-#: ../src/filetransfers_window.py:190
-#: ../src/filetransfers_window.py:627
+#: ../src/filetransfers_window.py:191
+#: ../src/filetransfers_window.py:637
#: ../src/tooltips.py:742
msgid "Recipient: "
msgstr "Получатель:"
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:202
#, python-format
msgid "Saved in: %s"
msgstr "Сохранено в: %s"
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Передача завершена"
-
-#: ../src/filetransfers_window.py:218
-#: ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Передача отменена"
-
-#: ../src/filetransfers_window.py:218
-#: ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Соединение не может быть уÑтановлено."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:237
#, python-format
msgid "Recipient: %s"
msgstr "Получатель: %s"
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:239
#, python-format
msgid "Error message: %s"
msgstr "Сообщение об ошибке: %s"
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "Передача файла оÑтановлена"
-
-#: ../src/filetransfers_window.py:266
+#: ../src/filetransfers_window.py:268
msgid "Choose File to Send..."
msgstr "Выбрать файл Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸..."
-#: ../src/filetransfers_window.py:282
+#: ../src/filetransfers_window.py:284
#: ../src/tooltips.py:780
msgid "Description: "
msgstr "ОпиÑание: "
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:297
msgid "Gajim cannot access this file"
msgstr "Ðет доÑтупа к файлу"
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:298
msgid "This file is being used by another process."
msgstr "Файл занÑÑ‚ другим процеÑÑом."
-#: ../src/filetransfers_window.py:330
-#, python-format
-msgid "File: %s"
-msgstr "Файл: %s"
-
#: ../src/filetransfers_window.py:336
-#, python-format
-msgid "Type: %s"
-msgstr "Тип: %s"
-
-#: ../src/filetransfers_window.py:338
-#, python-format
-msgid "Description: %s"
-msgstr "ОпиÑание: %s"
-
-#: ../src/filetransfers_window.py:339
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s хочет отправить вам файл:"
-
-#: ../src/filetransfers_window.py:352
-#: ../src/gtkgui_helpers.py:879
+#: ../src/gtkgui_helpers.py:850
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "Ðе могу замеÑтить ÑущеÑтвующий файл «%s»"
-#: ../src/filetransfers_window.py:353
-#: ../src/gtkgui_helpers.py:880
+#: ../src/filetransfers_window.py:337
+#: ../src/gtkgui_helpers.py:851
msgid "A file with this name already exists and you do not have permission to overwrite it."
msgstr "Ðтот файл уже ÑущеÑтвует, и у Ð²Ð°Ñ Ð½ÐµÑ‚ права его перезапиÑать."
-#: ../src/filetransfers_window.py:369
-#: ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:354
+#: ../src/gtkgui_helpers.py:855
msgid "This file already exists"
msgstr "Файл уже ÑущеÑтвует"
-#: ../src/filetransfers_window.py:369
-#: ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:354
+#: ../src/gtkgui_helpers.py:855
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:379
-#: ../src/gtkgui_helpers.py:891
+#. 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:365
+#: ../src/gtkgui_helpers.py:862
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "Папка «%s» не доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: ../src/filetransfers_window.py:379
-#: ../src/gtkgui_helpers.py:892
+#: ../src/filetransfers_window.py:366
+#: ../src/gtkgui_helpers.py:863
msgid "You do not have permission to create files in this directory."
msgstr "У Ð²Ð°Ñ Ð½ÐµÑ‚ права Ñоздавать файлы в Ñтой директории."
-#: ../src/filetransfers_window.py:389
+#: ../src/filetransfers_window.py:377
msgid "Save File as..."
msgstr "Сохранить файл как..."
+#: ../src/filetransfers_window.py:397
+#, python-format
+msgid "File: %s"
+msgstr "Файл: %s"
+
+#: ../src/filetransfers_window.py:403
+#, python-format
+msgid "Type: %s"
+msgstr "Тип: %s"
+
+#: ../src/filetransfers_window.py:405
+#, python-format
+msgid "Description: %s"
+msgstr "ОпиÑание: %s"
+
+#: ../src/filetransfers_window.py:406
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s хочет отправить вам файл:"
+
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
#. they are not translatable.
-#: ../src/filetransfers_window.py:459
+#: ../src/filetransfers_window.py:469
#, python-format
msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7974,78 +7990,78 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
#. This should make the string Kb/s,
#. where 'Kb' part is taken from %s.
#. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:552
+#: ../src/filetransfers_window.py:562
#, python-format
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/s)"
-#: ../src/filetransfers_window.py:595
-#: ../src/filetransfers_window.py:598
+#: ../src/filetransfers_window.py:605
+#: ../src/filetransfers_window.py:608
msgid "Invalid File"
msgstr "Ðеверный файл"
-#: ../src/filetransfers_window.py:595
+#: ../src/filetransfers_window.py:605
msgid "File: "
msgstr "Файл: "
-#: ../src/filetransfers_window.py:599
+#: ../src/filetransfers_window.py:609
msgid "It is not possible to send empty files"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ñылать пуÑтые файлы"
-#: ../src/filetransfers_window.py:623
+#: ../src/filetransfers_window.py:633
#: ../src/tooltips.py:732
msgid "Name: "
msgstr "ИмÑ: "
-#: ../src/filetransfers_window.py:625
+#: ../src/filetransfers_window.py:635
#: ../src/tooltips.py:736
msgid "Sender: "
msgstr "Отправитель:"
-#: ../src/filetransfers_window.py:787
+#: ../src/filetransfers_window.py:797
msgid "Pause"
msgstr "Пауза"
-#: ../src/gajim.py:183
+#: ../src/gajim.py:192
msgid "Gajim needs X server to run. Quiting..."
msgstr "Gajim Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка требуетÑÑ X-Ñервер. Выход..."
-#: ../src/gajim.py:185
+#: ../src/gajim.py:194
#, python-format
msgid "importing PyGTK failed: %s"
msgstr "ошибка Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ PyGTK: %s"
-#: ../src/gajim.py:227
+#: ../src/gajim.py:236
msgid "Gajim needs PyGTK 2.16 or above"
msgstr "Gajim требуетÑÑ PyGTK 2.16 или выше"
-#: ../src/gajim.py:228
+#: ../src/gajim.py:237
msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
msgstr "Gajim Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка требуетÑÑ PyGTK 2.16 или выше. Выход..."
-#: ../src/gajim.py:230
+#: ../src/gajim.py:239
msgid "Gajim needs GTK 2.16 or above"
msgstr "Gajim требуетÑÑ GTK 2.16 или выше"
-#: ../src/gajim.py:231
+#: ../src/gajim.py:240
msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
msgstr "Gajim Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка требуетÑÑ GTK 2.16 или выше. Выход..."
-#: ../src/gajim.py:240
+#: ../src/gajim.py:249
msgid "Gajim needs pywin32 to run"
msgstr "Gajim Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка требуетÑÑ pywin32"
-#: ../src/gajim.py:241
+#: ../src/gajim.py:250
#, python-format
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:357
+#: ../src/gajim.py:366
msgid "Gajim is already running"
msgstr "Gajim уже запущен"
-#: ../src/gajim.py:358
+#: ../src/gajim.py:367
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -8396,7 +8412,7 @@ msgstr "Скрывает или показывает окно ipython"
msgid "Missing argument \"contact_jid\""
msgstr "Пропущен аргумент «JID контакта»"
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:349
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -8405,15 +8421,15 @@ msgstr ""
"'%s' не в вашем роÑтере.\n"
"Укажите учетную запиÑÑŒ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑообщениÑ."
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:352
msgid "You have no active account"
msgstr "У Ð²Ð°Ñ Ð½ÐµÑ‚ ни одной активной учетной запиÑи"
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:405
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr "По-видимому, Gajim не запущен. Ð’Ñ‹ не можете иÑпользовать gajim-remote."
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote.py:432
#, python-format
msgid ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8422,16 +8438,16 @@ msgstr ""
"ИÑпользование: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:436
msgid "Arguments:"
msgstr "Ðргументы:"
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:440
#, python-format
msgid "%s not found"
msgstr "%s не найден"
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote.py:446
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -8440,7 +8456,7 @@ msgstr ""
"ИÑпользование: %s команда [аргумента]\n"
"Команда одна из:\n"
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:515
#, python-format
msgid ""
"Too many arguments. \n"
@@ -8449,7 +8465,7 @@ msgstr ""
"Много аргументов. \n"
"Ðаберите «%(basename)s help %(command)s» Ð´Ð»Ñ Ñправки"
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:520
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8458,11 +8474,11 @@ msgstr ""
"Ðргумент «%(arg)s» не задан. \n"
"Ðаберите «%(basename)s help %(command)s» Ð´Ð»Ñ Ñправки"
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:539
msgid "No uri given"
msgstr "Ðе указан идентификатор реÑурÑа"
-#: ../src/gajim-remote.py:540
+#: ../src/gajim-remote.py:541
msgid "Wrong uri"
msgstr "Ðеверный хоÑÑ‚"
@@ -8491,222 +8507,214 @@ msgstr "Вы не можете удалить вашу текущую тему"
msgid "Please first choose another for your current theme."
msgstr "Выберите Ñначала другую тему."
-#: ../src/groupchat_control.py:175
-#: ../src/groupchat_control.py:1511
+#: ../src/groupchat_control.py:179
+#: ../src/groupchat_control.py:1568
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s теперь извеÑтен как %(new_nick)s"
-#: ../src/groupchat_control.py:201
-#: ../src/groupchat_control.py:1709
-#: ../src/history_window.py:447
-#: ../src/notify.py:236
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s теперь %(status)s"
-
-#: ../src/groupchat_control.py:229
+#: ../src/groupchat_control.py:233
msgid "Sending private message failed"
msgstr "Ðе удалоÑÑŒ отправить личное Ñообщение"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:231
+#: ../src/groupchat_control.py:235
#, 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:539
+#: ../src/groupchat_control.py:563
msgid "Insert Nickname"
msgstr "Ð’Ñтавить ник"
-#: ../src/groupchat_control.py:724
+#: ../src/groupchat_control.py:746
msgid "Conversation with "
msgstr "БеÑеда Ñ "
-#: ../src/groupchat_control.py:726
+#: ../src/groupchat_control.py:748
msgid "Continued conversation"
msgstr "Ð’Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð»Ñ‘Ð½Ð½Ð°Ñ Ð±ÐµÑеда"
-#: ../src/groupchat_control.py:1194
+#: ../src/groupchat_control.py:1225
#, python-format
msgid "%(nick)s has set the subject to %(subject)s"
msgstr "%(nick)s уÑтановил(а) тему: %(subject)s"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1212
-#: ../src/groupchat_control.py:1454
+#: ../src/groupchat_control.py:1243
+#: ../src/groupchat_control.py:1510
msgid "Any occupant is allowed to see your full JID"
msgstr "Любой учаÑтник может увидеть ваш наÑтоÑщий JID"
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1246
msgid "Room now shows unavailable member"
msgstr "Теперь в комнате отображаетÑÑ Ð½ÐµÐ´Ð¾Ñтупный учаÑтник"
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1248
msgid "room now does not show unavailable members"
msgstr "теперь в комнате не отображаютÑÑ Ð½ÐµÐ´Ð¾Ñтупные учаÑтники"
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1250
msgid "A non-privacy-related room configuration change has occurred"
msgstr "Произошло изменение наÑтроек комнаты, не отноÑÑщееÑÑ Ðº наÑтройкам приватноÑти"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1254
msgid "Room logging is now enabled"
msgstr "ЗапиÑÑŒ логов конференции включена"
-#: ../src/groupchat_control.py:1225
+#: ../src/groupchat_control.py:1256
msgid "Room logging is now disabled"
msgstr "ЗапиÑÑŒ логов конференции выключена"
-#: ../src/groupchat_control.py:1227
+#: ../src/groupchat_control.py:1258
msgid "Room is now non-anonymous"
msgstr "ÐšÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ñ Ð½Ðµ анонимна"
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1261
msgid "Room is now semi-anonymous"
msgstr "ÐšÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ñ Ñ‡Ð°Ñтично анонимна"
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1264
msgid "Room is now fully-anonymous"
msgstr "ÐšÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ñтью анонимна"
#. Can be a message (see handle_event_gc_config_change in
#. gajim.py)
-#: ../src/groupchat_control.py:1458
+#: ../src/groupchat_control.py:1515
msgid "Room logging is enabled"
msgstr "ЗапиÑÑŒ логов конференции включена"
-#: ../src/groupchat_control.py:1460
+#: ../src/groupchat_control.py:1517
msgid "A new room has been created"
msgstr "ÐÐ¾Ð²Ð°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ð° была Ñоздана"
-#: ../src/groupchat_control.py:1463
+#: ../src/groupchat_control.py:1520
msgid "The server has assigned or modified your roomnick"
msgstr "Сервер приÑвоил или изменил ваш ник в комнате"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1469
+#: ../src/groupchat_control.py:1526
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s выгнали из комнаты: %(reason)s"
-#: ../src/groupchat_control.py:1472
+#: ../src/groupchat_control.py:1529
#, 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:1481
+#: ../src/groupchat_control.py:1538
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
-#: ../src/groupchat_control.py:1484
+#: ../src/groupchat_control.py:1541
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
-#: ../src/groupchat_control.py:1495
-#: ../src/groupchat_control.py:1599
+#: ../src/groupchat_control.py:1552
+#: ../src/groupchat_control.py:1656
#, python-format
msgid "You are now known as %s"
msgstr "Ð’Ñ‹ теперь извеÑтны как %s"
-#: ../src/groupchat_control.py:1553
-#: ../src/groupchat_control.py:1558
-#: ../src/groupchat_control.py:1564
+#: ../src/groupchat_control.py:1610
+#: ../src/groupchat_control.py:1615
+#: ../src/groupchat_control.py:1621
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
-#: ../src/groupchat_control.py:1555
+#: ../src/groupchat_control.py:1612
msgid "affiliation changed"
msgstr "ранг изменен"
-#: ../src/groupchat_control.py:1560
+#: ../src/groupchat_control.py:1617
msgid "room configuration changed to members-only"
msgstr "наÑтройки комнаты были изменены на 'только Ð´Ð»Ñ ÑƒÑ‡Ð°Ñтников'"
-#: ../src/groupchat_control.py:1566
+#: ../src/groupchat_control.py:1623
msgid "system shutdown"
msgstr "выключение Ñервера"
-#: ../src/groupchat_control.py:1649
+#: ../src/groupchat_control.py:1706
#, 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:1653
+#: ../src/groupchat_control.py:1710
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1725
#, 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:1672
+#: ../src/groupchat_control.py:1729
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
msgstr "** ОбÑзанноÑти %(nick)s были изменены на %(role)s"
-#: ../src/groupchat_control.py:1702
+#: ../src/groupchat_control.py:1759
#, python-format
msgid "%s has left"
msgstr "%s ушел"
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1764
#, python-format
msgid "%s has joined the group chat"
msgstr "%s зашёл в комнату"
-#: ../src/groupchat_control.py:1963
+#: ../src/groupchat_control.py:2019
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "Вы точно хотите выйти из комнаты «%s»?"
-#: ../src/groupchat_control.py:1965
+#: ../src/groupchat_control.py:2021
msgid "If you close this window, you will be disconnected from this group chat."
msgstr "ЕÑли вы закроете Ñто окно, то вы выйдете из Ñтой комнаты."
-#: ../src/groupchat_control.py:1969
-#: ../src/gui_interface.py:685
-#: ../src/gui_interface.py:1283
-#: ../src/gui_interface.py:1323
-#: ../src/gui_interface.py:1364
+#: ../src/groupchat_control.py:2025
+#: ../src/gui_interface.py:668
+#: ../src/gui_interface.py:1282
+#: ../src/gui_interface.py:1322
+#: ../src/gui_interface.py:1363
#: ../src/message_window.py:224
-#: ../src/roster_window.py:2897
-#: ../src/roster_window.py:3568
-#: ../src/roster_window.py:4307
+#: ../src/roster_window.py:2946
+#: ../src/roster_window.py:3621
+#: ../src/roster_window.py:4390
msgid "_Do not ask me again"
msgstr "Ðе _Ñпрашивать Ð¼ÐµÐ½Ñ Ñнова"
-#: ../src/groupchat_control.py:2003
+#: ../src/groupchat_control.py:2059
msgid "Changing Subject"
msgstr "Смена темы"
-#: ../src/groupchat_control.py:2004
+#: ../src/groupchat_control.py:2060
msgid "Please specify the new subject:"
msgstr "Введите новую тему:"
-#: ../src/groupchat_control.py:2011
+#: ../src/groupchat_control.py:2067
msgid "Changing Nickname"
msgstr "Смена ника"
-#: ../src/groupchat_control.py:2012
+#: ../src/groupchat_control.py:2068
msgid "Please specify the new nickname you want to use:"
msgstr "Введите новый ник, который вы хотите иÑпользовать:"
# ÑÐ¼Ð¾Ñ‚Ñ€Ñ Ð³Ð´Ðµ вылазит меÑедж - нужно приÑмотретьÑÑ
#. Ask for a reason
-#: ../src/groupchat_control.py:2043
+#: ../src/groupchat_control.py:2099
#, python-format
msgid "Destroying %s"
msgstr "Удаление %s"
-#: ../src/groupchat_control.py:2044
+#: ../src/groupchat_control.py:2100
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
@@ -8714,23 +8722,23 @@ msgstr ""
"Ð’Ñ‹ ÑобираетеÑÑŒ полноÑтью уничтожить Ñту комнату.\n"
"Можете указать причину:"
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2102
msgid "You may also enter an alternate venue:"
msgstr "Можете указать альтернативную комнату:"
#. ask for reason
-#: ../src/groupchat_control.py:2235
+#: ../src/groupchat_control.py:2297
#, python-format
msgid "Kicking %s"
msgstr "ВыгонÑем %s"
-#: ../src/groupchat_control.py:2236
-#: ../src/groupchat_control.py:2563
+#: ../src/groupchat_control.py:2298
+#: ../src/groupchat_control.py:2630
msgid "You may specify a reason below:"
msgstr "Вы можете указать причину ниже:"
#. ask for reason
-#: ../src/groupchat_control.py:2562
+#: ../src/groupchat_control.py:2629
#, python-format
msgid "Banning %s"
msgstr "Забанить %s"
@@ -8758,56 +8766,56 @@ msgstr "Детали"
msgid "Error: cannot open %s for reading"
msgstr "Ошибка: не могу открыть %s Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
-#: ../src/gtkgui_helpers.py:377
+#: ../src/gtkgui_helpers.py:348
msgid "Error reading file:"
msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°:"
-#: ../src/gtkgui_helpers.py:380
+#: ../src/gtkgui_helpers.py:351
msgid "Error parsing file:"
msgstr "Ошибка обработки файла:"
#. do not traceback (could be a permission problem)
#. we talk about a file here
-#: ../src/gtkgui_helpers.py:421
+#: ../src/gtkgui_helpers.py:392
#, python-format
msgid "Could not write to %s. Session Management support will not work"
msgstr "Ðе могу пиÑать в %s. Управление ÑеанÑами будет недоÑтупно"
#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:795
+#: ../src/gtkgui_helpers.py:766
msgid "Gajim is not the default Jabber client"
msgstr "Gajim не ÑвлÑетÑÑ Ð¾Ñновным jabber-клиентом"
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:767
msgid "Would you like to make Gajim the default Jabber client?"
msgstr "Ð’Ñ‹ хотите Ñделать Gajim оÑновным jabber-клиентом?"
-#: ../src/gtkgui_helpers.py:797
+#: ../src/gtkgui_helpers.py:768
msgid "Always check to see if Gajim is the default Jabber client on startup"
msgstr "Ð’Ñегда проверÑÑ‚ÑŒ при запуÑке ÑвлÑетÑÑ Ð»Ð¸ Gajim оÑновным jabber-клиентом"
-#: ../src/gtkgui_helpers.py:864
+#: ../src/gtkgui_helpers.py:835
msgid "Extension not supported"
msgstr "РаÑширение не поддерживаетÑÑ"
-#: ../src/gtkgui_helpers.py:865
+#: ../src/gtkgui_helpers.py:836
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
msgstr "Изображение Ð½ÐµÐ»ÑŒÐ·Ñ Ñохранить в формате %(type)s. Сохранить как %(new_filename)s?"
-#: ../src/gtkgui_helpers.py:901
+#: ../src/gtkgui_helpers.py:872
msgid "Save Image as..."
msgstr "Сохранить изображение как..."
#. we are banned
#. group chat does not exist
#: ../src/gui_interface.py:126
-#: ../src/gui_interface.py:276
-#: ../src/gui_interface.py:285
#: ../src/gui_interface.py:290
-#: ../src/gui_interface.py:293
-#: ../src/gui_interface.py:296
-#: ../src/gui_interface.py:301
+#: ../src/gui_interface.py:299
+#: ../src/gui_interface.py:305
+#: ../src/gui_interface.py:308
+#: ../src/gui_interface.py:311
+#: ../src/gui_interface.py:316
msgid "Unable to join group chat"
msgstr "Ðе получаетÑÑ Ð²Ð¾Ð¹Ñ‚Ð¸ в комнату"
@@ -8839,77 +8847,70 @@ msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ %(url)s (id: %(id)s)"
#: ../src/gui_interface.py:195
-#: ../src/notify.py:495
+#: ../src/notify.py:279
msgid "Connection Failed"
msgstr "Соединение разорвалоÑÑŒ"
-#: ../src/gui_interface.py:265
+#: ../src/gui_interface.py:279
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "Чтобы войти в комнату %s, нужен пароль."
-#: ../src/gui_interface.py:277
+#: ../src/gui_interface.py:291
#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Было доÑтигнуто макÑимальное количеÑтво пользователей %s"
+msgid "Maximum number of users for <b>%s</b> has been reached"
+msgstr "Было доÑтигнуто макÑимальное количеÑтво пользователей <b>%s</b>"
-#: ../src/gui_interface.py:286
+#: ../src/gui_interface.py:300
#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Вам запрещено входить в комнату %s."
+msgid "You are banned from group chat <b>%s</b>."
+msgstr "Вам запрещено входить в комнату <b>%s</b>."
-#: ../src/gui_interface.py:291
+#: ../src/gui_interface.py:306
#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Комнаты %s не ÑущеÑтвует."
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "Комнаты <b>%s</b> не ÑущеÑтвует."
-#: ../src/gui_interface.py:294
+#: ../src/gui_interface.py:309
msgid "Group chat creation is restricted."
msgstr "Создание комнат запрещено."
-#: ../src/gui_interface.py:297
+#: ../src/gui_interface.py:312
#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Ðеобходимо иÑпользовать ваш зарегиÑтрированный ник в комнате %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
+msgstr "Ðеобходимо иÑпользовать ваш зарегиÑтрированный ник в комнате <b>%s</b>."
-#: ../src/gui_interface.py:302
+#: ../src/gui_interface.py:317
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "Ð’Ð°Ñ Ð½ÐµÑ‚ в ÑпиÑке членов комнаты %s."
-#: ../src/gui_interface.py:433
-#: ../src/gui_interface.py:437
+#: ../src/gui_interface.py:400
+#: ../src/gui_interface.py:404
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Ошибка %(code)s: %(msg)s"
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:448
-#: ../src/gui_interface.py:462
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "ошибка при отправке %(message)s ( %(error)s )"
-
-#: ../src/gui_interface.py:486
-#: ../src/notify.py:497
+#: ../src/gui_interface.py:456
+#: ../src/notify.py:281
msgid "Subscription request"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñки"
-#: ../src/gui_interface.py:511
+#: ../src/gui_interface.py:481
msgid "Authorization accepted"
msgstr "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ð½Ñта"
-#: ../src/gui_interface.py:512
+#: ../src/gui_interface.py:482
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Контакт «%s» авторизовал ваÑ, теперь вы можете видеть его ÑтатуÑ."
-#: ../src/gui_interface.py:520
+#: ../src/gui_interface.py:490
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Контакт «%s» отозвал подпиÑку Ñ Ð²Ð°Ð¼Ð¸"
-#: ../src/gui_interface.py:521
+#: ../src/gui_interface.py:491
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -8917,51 +8918,61 @@ msgstr ""
"Ð’Ñ‹ вÑегда будете видеть его или её как отключенными.\n"
"Удалить его или её из контакт-лиÑта?"
-#: ../src/gui_interface.py:542
-#: ../src/notify.py:499
+#: ../src/gui_interface.py:512
+#: ../src/notify.py:283
msgid "Unsubscribed"
msgstr "От подпиÑки отказалÑÑ"
-#: ../src/gui_interface.py:553
+#: ../src/gui_interface.py:523
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "СвÑзь Ñ Â«%s» не может быть уÑтановлена"
-#: ../src/gui_interface.py:651
+#: ../src/gui_interface.py:621
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/gui_interface.py:653
-#: ../src/gui_interface.py:661
+#: ../src/gui_interface.py:623
+#: ../src/gui_interface.py:631
msgid "You are currently connected without your OpenPGP key."
msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñоединены без ключа OpenPGP."
-#: ../src/gui_interface.py:655
+#: ../src/gui_interface.py:625
msgid "Your passphrase is incorrect"
msgstr "Ваша Ð¿Ð°Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñ„Ñ€Ð°Ð·Ð° неверна"
-#: ../src/gui_interface.py:660
+#: ../src/gui_interface.py:630
msgid "OpenGPG Passphrase Incorrect"
msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñ„Ñ€Ð°Ð·Ð° OpenGPG неверна"
-#: ../src/gui_interface.py:683
+#: ../src/gui_interface.py:643
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Сертификат проÑрочен"
+
+#: ../src/gui_interface.py:644
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Введите пароль Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° %(keyid)s (аккаунт %(account)s)."
+
+#: ../src/gui_interface.py:666
msgid "GPG key not trusted"
msgstr "Ключ GPG не ÑвлÑетÑÑ Ð´Ð¾Ð²ÐµÑ€ÐµÐ½Ð½Ñ‹Ð¼"
-#: ../src/gui_interface.py:683
+#: ../src/gui_interface.py:666
msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
msgstr "Ключ GPG иÑпользуемый Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ ÑвлÑетÑÑ Ð´Ð¾Ð²ÐµÑ€ÐµÐ½Ð½Ñ‹Ð¼. Ð’Ñ‹ дейÑтвительно хотите зашифровать Ñти ÑообщениÑ?"
-#: ../src/gui_interface.py:696
-msgid "Gnome Keyring is installed but not correctly started (environment variable probably not correctly set)"
+#: ../src/gui_interface.py:679
+msgid "Gnome Keyring is installed but not correctly started (environment variable probably not correctly set)"
msgstr "Gnome Keyring уÑтановлен, но некорректно запущен (возможно, неверно уÑтановлена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñреды)"
-#: ../src/gui_interface.py:796
+#: ../src/gui_interface.py:786
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Ðовое пиÑьмо на %(gmail_mail_address)s"
-#: ../src/gui_interface.py:798
+#: ../src/gui_interface.py:788
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
@@ -8969,7 +8980,7 @@ msgstr[0] "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ %d непрочитанное пиÑьмо"
msgstr[1] "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ %d непрочитанных пиÑьма"
msgstr[2] "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ %d непрочитанных пиÑем"
-#: ../src/gui_interface.py:811
+#: ../src/gui_interface.py:801
#, python-format
msgid ""
"\n"
@@ -8984,78 +8995,68 @@ msgstr ""
"Тема: %(subject)s\n"
"%(snippet)s"
-#: ../src/gui_interface.py:876
+#: ../src/gui_interface.py:866
#, python-format
msgid "%s wants to send you a file."
msgstr "%s хочет отправить вам файл."
-#: ../src/gui_interface.py:913
-#: ../src/roster_window.py:1893
-msgid "Remote contact stopped transfer"
-msgstr "Удаленный контакт оÑтановил передачу"
-
-#: ../src/gui_interface.py:916
-#: ../src/roster_window.py:1895
-msgid "Error opening file"
-msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°"
-
-#: ../src/gui_interface.py:948
+#: ../src/gui_interface.py:938
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "УÑпешно получен файл %(filename)s от %(name)s."
#. ft stopped
-#: ../src/gui_interface.py:952
+#: ../src/gui_interface.py:942
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "Передача файла %(filename)s от %(name)s приоÑтановлена."
-#: ../src/gui_interface.py:965
+#: ../src/gui_interface.py:955
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "%(name)s уÑпешно получил(а) отправленный вами файл %(filename)s."
#. ft stopped
-#: ../src/gui_interface.py:969
+#: ../src/gui_interface.py:959
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "Передача файла %(filename)s к %(name)s приоÑтановлена."
-#: ../src/gui_interface.py:1044
+#: ../src/gui_interface.py:1034
msgid "Unable to decrypt message"
msgstr "Сообщение не удалоÑÑŒ раÑшифровать"
-#: ../src/gui_interface.py:1056
+#: ../src/gui_interface.py:1046
msgid "Username Conflict"
msgstr "Такое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ еÑÑ‚ÑŒ"
-#: ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1047
msgid "Please type a new username for your local account"
msgstr "Введите новое Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð¹ учетной запиÑи"
-#: ../src/gui_interface.py:1072
+#: ../src/gui_interface.py:1062
msgid "Resource Conflict"
msgstr "Такое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ еÑÑ‚ÑŒ"
-#: ../src/gui_interface.py:1073
+#: ../src/gui_interface.py:1063
msgid "You are already connected to this account with the same resource. Please type a new one"
msgstr "Ð’Ñ‹ уже подÑоединены к Ñтой учетной запиÑи Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же реÑурÑом. Введите другой реÑурÑ"
#. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1118
+#: ../src/gui_interface.py:1108
#, python-format
msgid "%s wants to start a voice chat."
msgstr "%s хочет начать видео ÑеанÑ."
-#: ../src/gui_interface.py:1121
+#: ../src/gui_interface.py:1111
msgid "Voice Chat Request"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð°ÑƒÐ´Ð¸Ð¾ ÑеанÑа"
-#: ../src/gui_interface.py:1208
+#: ../src/gui_interface.py:1198
msgid "Error verifying SSL certificate"
msgstr "Ошибка при проверке SSL Ñертификата"
-#: ../src/gui_interface.py:1209
+#: ../src/gui_interface.py:1199
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: %(error)s\n"
@@ -9064,15 +9065,15 @@ msgstr ""
"Произошла ошибка при проверке Ñертификата SSL вашего jabber Ñервера: %(error)s\n"
"Ð’Ñ‹ вÑÑ‘ ещё хотите подключитьÑÑ Ðº Ñтому Ñерверу?"
-#: ../src/gui_interface.py:1218
+#: ../src/gui_interface.py:1208
msgid "Ignore this error for this certificate."
msgstr "Игнорировать Ñту ошибку Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñертификата."
-#: ../src/gui_interface.py:1242
+#: ../src/gui_interface.py:1233
msgid "SSL certificate error"
msgstr "Ошибка SSL Ñертификата"
-#: ../src/gui_interface.py:1243
+#: ../src/gui_interface.py:1234
#, python-format
msgid ""
"It seems the SSL certificate of account %(account)s has changed or your connection is being hacked.\n"
@@ -9086,79 +9087,88 @@ msgstr ""
"Ðовый отпечаток: %(new)s\n"
"Ð’Ñ‹ вÑÑ‘ ещё хотите ÑоединитьÑÑ Ð¸ обновить отпечаток Ñертификата?"
-#: ../src/gui_interface.py:1278
-#: ../src/gui_interface.py:1318
-#: ../src/gui_interface.py:1360
+#: ../src/gui_interface.py:1273
+#: ../src/gui_interface.py:1317
+#: ../src/gui_interface.py:1359
msgid "Insecure connection"
msgstr "ÐебезопаÑное Ñоединение"
-#: ../src/gui_interface.py:1279
-msgid "You are about to connect to the server with an insecure connection. This means all your conversations will be exchanged unencrypted. Are you sure you want to do that?"
-msgstr "Ð’Ñ‹ хотите отправить пароль через небезопаÑное Ñоединение. Ð’Ñ‹ уверены? (УÑтановите PyOpenSSL, чтобы Ñтого не проиÑходило)."
+#: ../src/gui_interface.py:1274
+#, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an insecure connection. This means all your conversations will be exchanged unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"Ð’Ñ‹ хотите подключить учетную запиÑÑŒ %(account)s (%(server)s) через незащищенное Ñоединение. Ð’ÑÑ Ð²Ð°ÑˆÐ° перепиÑка не будет зашифрована. Ðтот тип Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ðµ рекомендуетÑÑ.\n"
+"Ð’Ñ‹ дейÑтвительно хотите Ñто Ñделать?"
-#: ../src/gui_interface.py:1282
-#: ../src/gui_interface.py:1322
-#: ../src/gui_interface.py:1363
+#: ../src/gui_interface.py:1280
+#: ../src/gui_interface.py:1321
+#: ../src/gui_interface.py:1362
msgid "Yes, I really want to connect insecurely"
msgstr "Да, Ñ Ð´ÐµÐ¹Ñтвительно хочу ÑоединитьÑÑ Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°Ñно"
-#: ../src/gui_interface.py:1319
+#: ../src/gui_interface.py:1281
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/gui_interface.py:1318
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/gui_interface.py:1361
+#: ../src/gui_interface.py:1360
msgid "You are about to send your password unencrypted on an insecure connection. Are you sure you want to do that?"
msgstr "Ð’Ñ‹ хотите отправить пароль через небезопаÑное Ñоединение. Ð’Ñ‹ уверены?"
#. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1867
-#: ../src/gui_interface.py:1890
+#: ../src/gui_interface.py:1869
+#: ../src/gui_interface.py:1892
msgid "Emoticons disabled"
msgstr "Смайлики выключены"
-#: ../src/gui_interface.py:1868
+#: ../src/gui_interface.py:1870
msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
msgstr "Тема Ñмайликов не найдена, они будут отключены."
-#: ../src/gui_interface.py:1891
+#: ../src/gui_interface.py:1893
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/gui_interface.py:1922
-#: ../src/roster_window.py:3735
+#: ../src/gui_interface.py:1937
+#: ../src/roster_window.py:3788
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/gui_interface.py:2316
+#: ../src/gui_interface.py:2324
msgid "Could not save your settings and preferences"
msgstr "Ðе могу Ñохранить ваши уÑтановки и наÑтройки"
-#: ../src/gui_interface.py:2861
+#: ../src/gui_interface.py:2874
msgid "Passphrase Required"
msgstr "ТребуетÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñ„Ñ€Ð°Ð·Ð°"
-#: ../src/gui_interface.py:2862
+#: ../src/gui_interface.py:2875
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Введите пароль Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° %(keyid)s (аккаунт %(account)s)."
-#: ../src/gui_interface.py:2876
+#: ../src/gui_interface.py:2889
msgid "GPG key expired"
msgstr "Срок дейÑÑ‚Ð²Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð° GPG иÑтёк"
-#: ../src/gui_interface.py:2877
+#: ../src/gui_interface.py:2890
#, python-format
msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
msgstr "Срок дейÑÑ‚Ð²Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ключа GPG иÑтёк, вы будете подключены к %s без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ OpenPGP."
#. ask again
-#: ../src/gui_interface.py:2886
+#: ../src/gui_interface.py:2899
msgid "Wrong Passphrase"
msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñ„Ñ€Ð°Ð·Ð°"
-#: ../src/gui_interface.py:2887
+#: ../src/gui_interface.py:2900
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Введите парольную фразу Ð´Ð»Ñ GPG еще раз или нажмите «Отмена»."
@@ -9166,50 +9176,50 @@ msgstr "Введите парольную фразу Ð´Ð»Ñ GPG еще раз и
msgid "_New Group Chat"
msgstr "В _новую комнату"
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:419
msgid "I would like to add you to my roster"
msgstr "Ð’Ñ‹ не против, еÑли Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑŽ Ð’Ð°Ñ Ðº Ñебе в роÑтер?"
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:116
msgid "Cannot find history logs database"
msgstr "Ðе могу найти базу данных иÑтории"
#. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:156
msgid "Contacts"
msgstr "Контакты"
#. holds time
-#: ../src/history_manager.py:167
-#: ../src/history_manager.py:207
+#: ../src/history_manager.py:169
+#: ../src/history_manager.py:213
#: ../src/history_window.py:98
msgid "Date"
msgstr "Дата"
#. holds nickname
-#: ../src/history_manager.py:173
-#: ../src/history_manager.py:225
+#: ../src/history_manager.py:176
+#: ../src/history_manager.py:232
msgid "Nickname"
msgstr "Ðик"
#. holds message
-#: ../src/history_manager.py:181
-#: ../src/history_manager.py:213
+#: ../src/history_manager.py:185
+#: ../src/history_manager.py:220
#: ../src/history_window.py:106
msgid "Message"
msgstr "Сообщение"
#. holds subject
-#: ../src/history_manager.py:188
-#: ../src/history_manager.py:219
+#: ../src/history_manager.py:193
+#: ../src/history_manager.py:226
msgid "Subject"
msgstr "Тема"
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:252
msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
msgstr "Ð’Ñ‹ хотите очиÑтить базу данных? (КРÐЙÐЕ ÐЕ РЕКОМЕÐДУЕТСЯ, ЕСЛИ GAJIM ЗÐПУЩЕÐ)"
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:254
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"
"\n"
@@ -9219,28 +9229,39 @@ msgstr ""
"\n"
"ЕÑли вы нажали ДÐ, пожалуйÑта подождите..."
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:259
+msgid "Database Cleanup"
+msgstr "ОчиÑтка базы данных"
+
+#: ../src/history_manager.py:477
msgid "Exporting History Logs..."
msgstr "ÐкÑпортирую иÑторию..."
-#: ../src/history_manager.py:536
+#: ../src/history_manager.py:554
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s в %(time)s Ñказал: %(message)s\n"
-#: ../src/history_manager.py:573
-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:592
+#, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Вы точно хотите удалить лог %(jid)s?"
+
+#: ../src/history_manager.py:596
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Вы точно хотите удалить логи выделенного контакта?"
-#: ../src/history_manager.py:577
-#: ../src/history_manager.py:612
+#: ../src/history_manager.py:598
+#: ../src/history_manager.py:637
msgid "This is an irreversible operation."
msgstr "Ðто Ð½ÐµÐ¾Ð±Ñ€Ð°Ñ‚Ð¸Ð¼Ð°Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ"
-#: ../src/history_manager.py:609
+#: ../src/history_manager.py:600
+#: ../src/history_manager.py:639
+msgid "Deletion Confirmation"
+msgstr "Подтверждение удалениÑ"
+
+#: ../src/history_manager.py:634
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Ð’Ñ‹ точно хотите удалить выделенное Ñообщение?"
@@ -9280,15 +9301,19 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÑтановлен в: %(status)s: %(status_msg)s"
msgid "Status is now: %(status)s"
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÑтановлен в: %(status)s"
-#: ../src/htmltextview.py:524
-#: ../src/htmltextview.py:534
+#: ../src/htmltextview.py:523
+#: ../src/htmltextview.py:533
msgid "Timeout loading image"
msgstr "Ðе могу загрузить изображение"
-#: ../src/htmltextview.py:544
+#: ../src/htmltextview.py:543
msgid "Image is too big"
msgstr "Изображение Ñлишком большое"
+#: ../src/htmltextview.py:576
+msgid "Loading"
+msgstr "Загрузка"
+
#: ../src/message_window.py:222
msgid "You are going to close several tabs"
msgstr "Ð’Ñ‹ ÑобираетеÑÑŒ закрыть неÑколько вкладок"
@@ -9297,19 +9322,19 @@ msgstr "Ð’Ñ‹ ÑобираетеÑÑŒ закрыть неÑколько вклад
msgid "Do you really want to close them all?"
msgstr "ДейÑтвительно закрыть их вÑех?"
-#: ../src/message_window.py:494
+#: ../src/message_window.py:497
msgid "Chats"
msgstr "Чаты"
-#: ../src/message_window.py:496
+#: ../src/message_window.py:499
msgid "Group Chats"
msgstr "Комнаты"
-#: ../src/message_window.py:498
+#: ../src/message_window.py:501
msgid "Private Chats"
msgstr "Личные беÑеды"
-#: ../src/message_window.py:504
+#: ../src/message_window.py:507
msgid "Messages"
msgstr "СообщениÑ"
@@ -9321,47 +9346,7 @@ msgstr "— ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ запиÑаны в лог"
msgid "- messages will not be logged"
msgstr "— ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð½Ðµ будут запиÑаны в лог"
-#: ../src/notify.py:234
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s менÑет ÑтатуÑ"
-
-#: ../src/notify.py:244
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s подключаетÑÑ"
-
-#: ../src/notify.py:252
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s отключаетÑÑ"
-
-#: ../src/notify.py:263
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Ðовое Ñообщение от %(nickname)s"
-
-#: ../src/notify.py:270
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Ðовое личное Ñообщение из комнаты %s"
-
-#: ../src/notify.py:272
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
-
-#: ../src/notify.py:275
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Ðовое Ñообщение от %(nickname)s"
-
-#: ../src/notify.py:281
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Ðовое Ñообщение от %(nickname)s"
-
-#: ../src/notify.py:538
+#: ../src/notify.py:322
msgid "Ignore"
msgstr "Игнорировать"
@@ -9369,98 +9354,98 @@ msgstr "Игнорировать"
msgid "Plugin"
msgstr "Модуль"
-#: ../src/plugins/gui.py:160
+#: ../src/plugins/gui.py:161
msgid "Plugin failed"
msgstr "Ðеудачный модуль"
-#: ../src/plugins/gui.py:204
+#: ../src/plugins/gui.py:205
msgid "Unable to properly remove the plugin"
msgstr "Ðевозможно правильно удалить модуль"
#. members not safe
-#: ../src/plugins/gui.py:212
-#: ../src/plugins/pluginmanager.py:495
-#: ../src/plugins/pluginmanager.py:503
+#: ../src/plugins/gui.py:213
+#: ../src/plugins/pluginmanager.py:516
+#: ../src/plugins/pluginmanager.py:524
msgid "Archive is malformed"
msgstr "Формат архива не поддерживаетÑÑ"
-#: ../src/plugins/gui.py:235
-#: ../src/plugins/gui.py:243
-#: ../src/plugins/pluginmanager.py:511
+#: ../src/plugins/gui.py:236
+#: ../src/plugins/gui.py:244
+#: ../src/plugins/pluginmanager.py:532
msgid "Plugin already exists"
msgstr "Модуль уже ÑущеÑтвует"
-#: ../src/plugins/gui.py:235
+#: ../src/plugins/gui.py:236
msgid "Overwrite?"
msgstr "ПерезапиÑать?"
-#: ../src/plugins/gui.py:264
+#: ../src/plugins/gui.py:265
msgid "Configuration"
msgstr "КонфигурациÑ"
#. it is not zip file
#. CRC error
-#: ../src/plugins/pluginmanager.py:481
-#: ../src/plugins/pluginmanager.py:487
+#: ../src/plugins/pluginmanager.py:502
+#: ../src/plugins/pluginmanager.py:508
msgid "Archive corrupted"
msgstr "Ðрхив поврежден"
-#: ../src/plugins/pluginmanager.py:483
+#: ../src/plugins/pluginmanager.py:504
msgid "Archive empty"
msgstr "Ðрхив пуÑÑ‚"
-#: ../src/profile_window.py:59
+#: ../src/profile_window.py:60
msgid "Retrieving profile..."
msgstr "Получаю данные..."
-#: ../src/profile_window.py:124
-#: ../src/roster_window.py:3092
+#: ../src/profile_window.py:125
+#: ../src/roster_window.py:3141
msgid "File is empty"
msgstr "ПуÑтой файл"
-#: ../src/profile_window.py:127
-#: ../src/roster_window.py:3095
+#: ../src/profile_window.py:128
+#: ../src/roster_window.py:3144
msgid "File does not exist"
msgstr "Файл не ÑущеÑтвует"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:141
-#: ../src/profile_window.py:157
-#: ../src/roster_window.py:3097
-#: ../src/roster_window.py:3108
+#: ../src/profile_window.py:142
+#: ../src/profile_window.py:158
+#: ../src/roster_window.py:3146
+#: ../src/roster_window.py:3157
msgid "Could not load image"
msgstr "Ðе могу загрузить изображение"
-#: ../src/profile_window.py:228
+#: ../src/profile_window.py:229
msgid "Wrong date format"
msgstr "Ðеверный формат даты"
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:230
msgid "Format of the date must be YYYY-MM-DD"
msgstr "Дата должна быть в формате: YYYY-MM-DD"
-#: ../src/profile_window.py:283
+#: ../src/profile_window.py:284
msgid "Information received"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð°"
-#: ../src/profile_window.py:361
+#: ../src/profile_window.py:362
msgid "Without a connection you can not publish your contact information."
msgstr "Ðеобходимо приÑоединитьÑÑ Ðº Ñерверу Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ информации"
-#: ../src/profile_window.py:374
+#: ../src/profile_window.py:375
msgid "Sending profile..."
msgstr "ОтправлÑÑŽ данные..."
-#: ../src/profile_window.py:393
+#: ../src/profile_window.py:394
msgid "Information NOT published"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÐЕ опубликована"
-#: ../src/profile_window.py:400
+#: ../src/profile_window.py:401
msgid "vCard publication failed"
msgstr "ÐŸÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ vCard не удалаÑÑŒ"
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:402
msgid "There was an error while publishing your personal information, try again later."
msgstr "При публикации вашей личной информации произошла ошибка, попробуйте позже."
@@ -9469,65 +9454,65 @@ msgstr "При публикации вашей личной информации
msgid "Merged accounts"
msgstr "Объединенные учетные запиÑи"
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1956
msgid "Authorization has been sent"
msgstr "Была отправлена авторизациÑ"
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1957
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Теперь «%s» будет знать о вашем ÑтатуÑе."
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:1980
msgid "Subscription request has been sent"
msgstr "Был отправлен Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° подпиÑку "
-#: ../src/roster_window.py:1983
+#: ../src/roster_window.py:1981
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "ЕÑли «%s» примет ваш запроÑ, вы будете знать его или её ÑтатуÑ"
-#: ../src/roster_window.py:1997
+#: ../src/roster_window.py:1995
msgid "Authorization has been removed"
msgstr "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð±Ñ‹Ð»Ð° удалена"
-#: ../src/roster_window.py:1998
+#: ../src/roster_window.py:1996
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Теперь «%s» вÑегда будет видеть Ð²Ð°Ñ Ð² оффлайне."
-#: ../src/roster_window.py:2025
+#: ../src/roster_window.py:2023
msgid "GPG is not usable"
msgstr "GPG иÑпользовать невозможно"
-#: ../src/roster_window.py:2026
+#: ../src/roster_window.py:2024
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Ð’Ñ‹ будете подключены к %s без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ OpenPGP."
-#: ../src/roster_window.py:2238
-#: ../src/roster_window.py:3665
+#: ../src/roster_window.py:2231
+#: ../src/roster_window.py:3718
msgid "You are participating in one or more group chats"
msgstr "Ð’Ñ‹ находитеÑÑŒ в одной или более комнатах"
-#: ../src/roster_window.py:2239
-#: ../src/roster_window.py:3666
+#: ../src/roster_window.py:2232
+#: ../src/roster_window.py:3719
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:2265
+#: ../src/roster_window.py:2258
msgid "desync'ed"
msgstr "не Ñинхронизировано"
-#: ../src/roster_window.py:2327
+#: ../src/roster_window.py:2324
msgid "Really quit Gajim?"
msgstr "Закрыть Gajim?"
-#: ../src/roster_window.py:2328
+#: ../src/roster_window.py:2325
msgid "Are you sure you want to quit Gajim?"
msgstr "Вы точно хотите закрыть Gajim?"
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2326
msgid "Always close Gajim"
msgstr "Ð’Ñегда закрывать Gajim"
@@ -9540,7 +9525,7 @@ msgid "If you quit now, the file(s) being transferred will be stopped. Do you st
msgstr "ЕÑли выйти ÑейчаÑ, передача файла оÑтановитÑÑ. Выйти?"
#: ../src/roster_window.py:2444
-#: ../src/roster_window.py:2811
+#: ../src/roster_window.py:2860
msgid "You have unread messages"
msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ непрочитанные ÑообщениÑ"
@@ -9548,109 +9533,109 @@ msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ непрочитанные ÑообщениÑ"
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:2812
+#: ../src/roster_window.py:2861
msgid "You must read them before removing this transport."
msgstr "ПроÑмотрите вÑе ожидающие ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ удалением транÑпорта."
-#: ../src/roster_window.py:2815
+#: ../src/roster_window.py:2864
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "ТранÑпорт «%s» будет удален"
-#: ../src/roster_window.py:2816
+#: ../src/roster_window.py:2865
msgid "You will no longer be able to send and receive messages from contacts using this transport."
msgstr "У Ð²Ð°Ñ Ñ‚ÐµÐ¿ÐµÑ€ÑŒ не будет возможноÑти приема и отправки ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð°Ð¼ через Ñтот транÑпорт."
-#: ../src/roster_window.py:2819
+#: ../src/roster_window.py:2868
msgid "Transports will be removed"
msgstr "ТранÑпорты будут удалены"
-#: ../src/roster_window.py:2824
+#: ../src/roster_window.py:2873
#, python-format
msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
msgstr "У Ð²Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ не будет возможноÑти приема и отправки Ñообщений через Ñти транÑпорты:%s."
-#: ../src/roster_window.py:2892
+#: ../src/roster_window.py:2941
msgid "You are about to block a contact. Are you sure you want to continue?"
msgstr "Вы точно хотите заблокировать контакт?"
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:2943
msgid "This contact will see you offline and you will not receive messages he will send you."
msgstr "Ðтот контакт будет видеть Ð²Ð°Ñ ÐºÐ°Ðº отключенного, а вы не будете получать от него ÑообщениÑ."
#. it's jid
-#: ../src/roster_window.py:2984
+#: ../src/roster_window.py:3033
msgid "Rename Contact"
msgstr "Переименовать контакт"
-#: ../src/roster_window.py:2985
+#: ../src/roster_window.py:3034
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Введите новый ник Ð´Ð»Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð° %s"
-#: ../src/roster_window.py:2992
+#: ../src/roster_window.py:3041
msgid "Rename Group"
msgstr "Переименовать группу"
-#: ../src/roster_window.py:2993
+#: ../src/roster_window.py:3042
#, python-format
msgid "Enter a new name for group %s"
msgstr "Введите новое название Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ %s"
-#: ../src/roster_window.py:3038
+#: ../src/roster_window.py:3087
msgid "Remove Group"
msgstr "Удалить группу"
-#: ../src/roster_window.py:3039
+#: ../src/roster_window.py:3088
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Ð’Ñ‹ точно хотите удалить группу %s из роÑтера?"
-#: ../src/roster_window.py:3040
+#: ../src/roster_window.py:3089
msgid "Also remove all contacts in this group from your roster"
msgstr "Удалить из роÑтера вÑе контакты в Ñтой группе"
-#: ../src/roster_window.py:3079
+#: ../src/roster_window.py:3128
msgid "Assign OpenPGP Key"
msgstr "Ðазначить ключ OpenPGP"
-#: ../src/roster_window.py:3080
+#: ../src/roster_window.py:3129
msgid "Select a key to apply to the contact"
msgstr "Выберите ключ, который будет применен к контакту"
-#: ../src/roster_window.py:3475
+#: ../src/roster_window.py:3528
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Контакт «%s» будет удален из вашего роÑтера"
-#: ../src/roster_window.py:3477
+#: ../src/roster_window.py:3530
#, python-format
msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
msgstr "Ð’Ñ‹ ÑобираетеÑÑŒ удалить «%(name)s» (%(jid)s) из вашего ÑпиÑка контактов.\n"
-#: ../src/roster_window.py:3482
+#: ../src/roster_window.py:3535
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:3488
+#: ../src/roster_window.py:3541
msgid "Do you want to continue?"
msgstr "Продолжить?"
-#: ../src/roster_window.py:3492
+#: ../src/roster_window.py:3545
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:3495
+#: ../src/roster_window.py:3548
msgid "I want this contact to know my status after removal"
msgstr "Я хочу, чтобы Ñтот контакт видел мой ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ð¾Ñле удалениÑ"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3499
+#: ../src/roster_window.py:3552
msgid "Contacts will be removed from your roster"
msgstr "Контакты будут удалены из вашего роÑтера"
-#: ../src/roster_window.py:3504
+#: ../src/roster_window.py:3557
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -9659,44 +9644,44 @@ msgstr ""
"Ð’Ñ‹ удалÑете Ñти контакты:%s.\n"
"Одновременно вы удалите и авторизацию, то еÑÑ‚ÑŒ они вÑегда будут видеть Ð²Ð°Ñ Ð² оффлайне."
-#: ../src/roster_window.py:3562
+#: ../src/roster_window.py:3615
msgid "You are about to send a custom status. Are you sure you want to continue?"
msgstr "Ð’Ñ‹ точно хотите поÑлать другой ÑтатуÑ?"
-#: ../src/roster_window.py:3564
+#: ../src/roster_window.py:3617
#, python-format
msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he or she will see your global status."
msgstr "Ðтот контакт будет временно видеть ваш ÑÑ‚Ð°Ñ‚ÑƒÑ ÐºÐ°Ðº %(status)s, но лишь пока вы не измените Ñвой глобальный ÑтатуÑ. Тогда Ñтому контакту Ñтанет виден глобальный ÑтатуÑ."
-#: ../src/roster_window.py:3583
+#: ../src/roster_window.py:3636
msgid "No account available"
msgstr "Ðет доÑтупной учетной запиÑи"
-#: ../src/roster_window.py:3584
+#: ../src/roster_window.py:3637
msgid "You must create an account before you can chat with other contacts."
msgstr "Ð”Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° беÑеды Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ людьми прежде необходимо Ñоздать учетную запиÑÑŒ."
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4290
msgid "Metacontacts storage not supported by your server"
msgstr "Сервер не умеет хранить метаконтакты"
-#: ../src/roster_window.py:4209
+#: ../src/roster_window.py:4292
msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
msgstr "Ваш Ñервер не умеет хранить данные о метаконтактах. Они будут утерÑны при Ñледующем подключении."
-#: ../src/roster_window.py:4301
+#: ../src/roster_window.py:4384
msgid "You are about to create a metacontact. Are you sure you want to continue?"
msgstr "Ð’Ñ‹ точно хотите Ñоздать метаконтакт?"
-#: ../src/roster_window.py:4303
+#: ../src/roster_window.py:4386
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:4424
+#: ../src/roster_window.py:4507
msgid "Invalid file URI:"
msgstr "Ðеверный файл:"
-#: ../src/roster_window.py:4436
+#: ../src/roster_window.py:4519
#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
@@ -9704,17 +9689,17 @@ msgstr[0] "Хотите отправить файл %s:"
msgstr[1] "Хотите отправить файлы %s:"
msgstr[2] "Хотите отправить файлы %s:"
-#: ../src/roster_window.py:4571
+#: ../src/roster_window.py:4654
#, python-format
msgid "Send %s to %s"
msgstr "Отправить %s контакту %s"
-#: ../src/roster_window.py:4582
+#: ../src/roster_window.py:4665
#, python-format
msgid "Make %s first contact"
msgstr "Сделать %s первым контактом"
-#: ../src/roster_window.py:4585
+#: ../src/roster_window.py:4668
#, python-format
msgid "Make %s and %s metacontacts"
msgstr "Обьединить %s и %s в метаконтакт"
@@ -9724,135 +9709,135 @@ msgstr "Обьединить %s и %s в метаконтакт"
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:5025
-#: ../src/roster_window.py:5079
-#: ../src/roster_window.py:5088
-#: ../src/statusicon.py:263
-#: ../src/statusicon.py:310
-#: ../src/statusicon.py:316
+#: ../src/roster_window.py:5108
+#: ../src/roster_window.py:5162
+#: ../src/roster_window.py:5171
+#: ../src/statusicon.py:264
+#: ../src/statusicon.py:311
+#: ../src/statusicon.py:317
#, python-format
msgid "using account %s"
msgstr "иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÑƒÑ‡ÐµÑ‚Ð½ÑƒÑŽ запиÑÑŒ %s"
#. add
-#: ../src/roster_window.py:5095
+#: ../src/roster_window.py:5178
#, python-format
msgid "to %s account"
msgstr "Ð´Ð»Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %s"
#. disco
-#: ../src/roster_window.py:5100
+#: ../src/roster_window.py:5183
#, python-format
msgid "using %s account"
msgstr "учетной запиÑи %s"
-#: ../src/roster_window.py:5139
-#: ../src/statusicon.py:326
+#: ../src/roster_window.py:5222
+#: ../src/statusicon.py:327
msgid "_Manage Bookmarks..."
msgstr "Управление _закладками..."
#. profile, avatar
-#: ../src/roster_window.py:5159
+#: ../src/roster_window.py:5242
#, python-format
msgid "of account %s"
msgstr "Ð´Ð»Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %s"
-#: ../src/roster_window.py:5200
+#: ../src/roster_window.py:5283
#, python-format
msgid "for account %s"
msgstr "Ð´Ð»Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ запиÑи %s"
-#: ../src/roster_window.py:5260
-#: ../src/roster_window.py:5365
+#: ../src/roster_window.py:5343
+#: ../src/roster_window.py:5451
msgid "_Change Status Message"
msgstr "_Изменить Ñообщение о ÑтатуÑе"
-#: ../src/roster_window.py:5293
+#: ../src/roster_window.py:5376
msgid "Publish Tune"
msgstr "Музыка"
-#: ../src/roster_window.py:5295
+#: ../src/roster_window.py:5378
msgid "Publish Location"
msgstr "ОтправлÑÑ‚ÑŒ МеÑтоположение"
-#: ../src/roster_window.py:5298
+#: ../src/roster_window.py:5381
msgid "Configure Services..."
msgstr "ÐаÑтроить СервиÑÑ‹..."
-#: ../src/roster_window.py:5443
+#: ../src/roster_window.py:5529
msgid "_Maximize All"
msgstr "_Развернуть вÑе"
-#: ../src/roster_window.py:5453
-#: ../src/roster_window.py:5626
+#: ../src/roster_window.py:5539
+#: ../src/roster_window.py:5712
msgid "Send Group M_essage"
msgstr "_Отправить Ñообщение группе"
-#: ../src/roster_window.py:5461
+#: ../src/roster_window.py:5547
msgid "To all users"
msgstr "Ð’Ñем пользователÑм"
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5551
msgid "To all online users"
msgstr "Ð’Ñем, кто подключён"
#. Manage Transport submenu
-#: ../src/roster_window.py:5646
+#: ../src/roster_window.py:5732
msgid "_Manage Contacts"
msgstr "_Управление контактами"
#. Edit Groups
-#: ../src/roster_window.py:5655
+#: ../src/roster_window.py:5741
msgid "Edit _Groups"
msgstr "Редактировать _группы"
#. Send single message
-#: ../src/roster_window.py:5710
+#: ../src/roster_window.py:5796
msgid "Send Single Message"
msgstr "Отправить одиночное Ñообщение"
#. Execute Command
-#: ../src/roster_window.py:5757
+#: ../src/roster_window.py:5843
msgid "Execute Command..."
msgstr "Выполнить команду..."
#. Manage Transport submenu
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5853
msgid "_Manage Transport"
msgstr "_Управление транÑпортом"
#. Modify Transport
-#: ../src/roster_window.py:5776
+#: ../src/roster_window.py:5862
msgid "_Modify Transport"
msgstr "_Изменить транÑпорт"
#. Rename
-#: ../src/roster_window.py:5786
+#: ../src/roster_window.py:5872
msgid "_Rename"
msgstr "П_ереименовать"
-#: ../src/roster_window.py:5846
+#: ../src/roster_window.py:5932
msgid "_Maximize"
msgstr "Развернут_ь"
-#: ../src/roster_window.py:5855
+#: ../src/roster_window.py:5941
msgid "_Reconnect"
msgstr "_ПереподÑоеденитÑÑ"
-#: ../src/roster_window.py:5862
+#: ../src/roster_window.py:5948
msgid "_Disconnect"
msgstr "_Выйти"
#. History manager
-#: ../src/roster_window.py:5951
+#: ../src/roster_window.py:6037
msgid "History Manager"
msgstr "Менеджер иÑтории"
-#: ../src/roster_window.py:5962
+#: ../src/roster_window.py:6048
msgid "_Join New Group Chat"
msgstr "_Войти в новую комнату"
-#: ../src/roster_window.py:6180
+#: ../src/roster_window.py:6267
msgid "Change Status Message..."
msgstr "Изменить Ñообщение о ÑтатуÑе..."
@@ -9871,25 +9856,19 @@ msgstr "Ошибка в принÑтой форме данных"
msgid "No result"
msgstr "Ðет результата"
-#: ../src/session.py:91
+#: ../src/session.py:99
msgid "Disk WriteError"
msgstr "Ошибка запиÑи на диÑк"
-#: ../src/session.py:203
-#, python-format
-msgid "Subject: %s"
-msgstr "Тема: %s"
-
-#: ../src/session.py:393
-#: ../src/session.py:437
+#: ../src/session.py:410
+#: ../src/session.py:469
msgid "Confirm these session options"
msgstr "Подтвердить данные наÑтройки ÑеанÑа"
-#: ../src/session.py:394
-#, python-format
+#: ../src/session.py:412
+#, fuzzy, python-format
msgid ""
-"The remote client wants '\n"
-" 'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
"\n"
"%s\n"
"\n"
@@ -9902,7 +9881,7 @@ msgstr ""
"\n"
"Приемлемы ли Ñти наÑтройки?"
-#: ../src/session.py:438
+#: ../src/session.py:471
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -9917,15 +9896,20 @@ msgstr ""
"\n"
"Продолжить Ñтот ÑеанÑ?"
-#: ../src/statusicon.py:227
+#: ../src/session.py:474
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "ИÑпользуетÑÑ Ð»Ð¸ Ð´Ð»Ñ Ñтого контакта OpenPGP?"
+
+#: ../src/statusicon.py:228
msgid "_Change Status Message..."
msgstr "_Изменить Ñообщение о ÑтатуÑе..."
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:342
msgid "Hide _Roster"
msgstr "Скрыть _роÑтер"
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:353
msgid "Hide this menu"
msgstr "Скрыть Ñто меню"
@@ -10069,6 +10053,10 @@ msgstr ""
"Ðтот ÑÐµÑ€Ð²Ð¸Ñ Ð½Ðµ может предоÑтавить подробную информацию о Ñебе. \n"
"Скорее вÑего, он уÑтарел или Ñломан"
+#: ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
+
#: ../src/vcard.py:285
msgid "?Client:Unknown"
msgstr "ÐеизвеÑтен"
@@ -10127,6 +10115,166 @@ msgstr "Ðет ожидающего запроÑа на подпиÑку."
msgid " resource with priority "
msgstr " реÑÑƒÑ€Ñ Ñ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼ "
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Jabber-клиент на GTK+"
+
+#~ msgid "Choose Client Cert"
+#~ msgstr "Выбрать Ñертификат"
+
+#~ msgid "The path to the client certificate and key in PKCS#12 format"
+#~ msgstr "Путь к Ñертификату и ключу в формате PKCS#12"
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " Ñ Ñтим контактом открытых окон/вкладок"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>ДейÑтвиÑ</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>УÑловиÑ</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Дополнительные дейÑтвиÑ"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Дополнительное управление уведомлениÑми"
+
+#~ msgid "All statuses"
+#~ msgstr "Ð’Ñе ÑтатуÑÑ‹"
+
+#~ msgid "Busy "
+#~ msgstr "ЗанÑÑ‚ "
+
+#~ msgid "Contact Change Status "
+#~ msgstr "Контакт изменил ÑтатуÑ"
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "Контакт отключилÑÑ"
+
+#~ msgid "Don't have "
+#~ msgstr "Ðет "
+
+#~ msgid "File Transfer Finished"
+#~ msgstr "Передача файлов заверешна"
+
+#~ msgid "File Transfer Request "
+#~ msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ файлов"
+
+#~ msgid "File Transfer Started "
+#~ msgstr "Передача файлов начата"
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "ПодÑветка ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² групповом чате"
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Получено Ñообщение в групповом чате"
+
+#~ msgid "Have "
+#~ msgstr "ЕÑÑ‚ÑŒ "
+
+#~ msgid "Launch a command"
+#~ msgstr "Выполнить команду"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Один или неÑколько Ñпециальных ÑтатуÑов..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Ð’ Ñети / Готов поболтать"
+
+#~ msgid "Play a sound"
+#~ msgstr "Проигрывать звук"
+
+#~ msgid "Receive a Message"
+#~ msgstr "Получить Ñообщение"
+
+#~ msgid "When "
+#~ msgstr "Когда "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Ðктивировать функцию оконного менеджера «UrgencyHint», чтобы окно чата "
+#~ "мигало на панели"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Отключить автоматичеÑкое открытие окна чата"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Отключить вÑе вÑплывающие окна"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Отключить звуки Ð´Ð»Ñ Ñтого ÑобытиÑ"
+
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Отключить показ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² облаÑти уведомлений"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Отключить показ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² роÑтере"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Сообщить Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ вÑплывающего окна"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Открыть окно чата Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¾Ð¼"
+
+#~ msgid "_Show event in notification area"
+#~ msgstr "_Показывать Ñобытие в облаÑти уведомлений"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Показывать Ñобытие в роÑтере"
+
+#~ msgid "and I "
+#~ msgstr "и у менÑ"
+
+#~ msgid "contact(s)"
+#~ msgstr "Контакты"
+
+#~ msgid "everybody"
+#~ msgstr "вÑе"
+
+#~ msgid "for "
+#~ msgstr "Ð´Ð»Ñ "
+
+#~ msgid "group(s)"
+#~ msgstr "Группы"
+
+#~ msgid "when I'm in"
+#~ msgstr "Когда Ñ Ð² "
+
+#~ msgid "Available"
+#~ msgstr "ДоÑтупен"
+
+#~ msgid "Descrition:"
+#~ msgstr "ОпиÑание: "
+
+#~ msgid "Advanced..."
+#~ msgstr "РаÑширенные..."
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Отправить одиночное _Ñообщение..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Ðватар:"
+
+#~ msgid "all or space separated status"
+#~ msgstr "вÑе или ÑтатуÑÑ‹, разделенные пробелом"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "«yes» (да), «no» (нет) или «both» (оба)"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "«yes» (да), «no» (нет) или «» (пуÑто)"
+
+#~ msgid "Condition"
+#~ msgstr "УÑловие"
+
+#~ msgid "when I am "
+#~ msgstr "когда Ñ "
+
+#~ msgid "Subject: %s"
+#~ msgstr "Тема: %s"
+
#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
#~ msgstr ""
#~ "один из: отключен, в Ñети, готов поболтать, отошел, недоÑтупен, не "
@@ -10813,9 +10961,6 @@ msgstr " реÑÑƒÑ€Ñ Ñ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼ "
#~ msgid "sleeping"
#~ msgstr "Сплю"
-#~ msgid "Accept"
-#~ msgstr "ПринÑÑ‚ÑŒ"
-
#~ msgid "Invitation Received"
#~ msgstr "Получено приглашение"
diff --git a/po/uk.po b/po/uk.po
index 7e08eee1235d9d4d7459703736cf93a91c977f74..6fb5d88f9f04968f38c5c72e1f2f762d1540bd2b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.0.1-2fa5ddcd1adf\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 16:14+0100\n"
-"PO-Revision-Date: 2011-03-06 10:45+0200\n"
+"POT-Creation-Date: 2011-10-22 10:57+0200\n"
+"PO-Revision-Date: 2011-10-19 12:08+0300\n"
"Last-Translator: Sergiy Yegorov <prapor@unixzone.org.ua>\n"
"Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
"Language: uk\n"
@@ -17,7 +17,7 @@ msgstr ""
"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"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"
#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
msgid "Join _Group Chat..."
@@ -27,7 +27,7 @@ msgstr "ПриєднатиÑÑŒ до _групової балачки"
msgid "_Add Contact..."
msgstr "_Додати контакт..."
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
msgid "_Discover Services"
msgstr "Ви_Ñвити Ñлужби"
@@ -119,12 +119,12 @@ msgstr "КеруваннÑ..."
#: ../data/gui/account_creation_wizard_window.ui.h:17
#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1295 ../src/config.py:1398 ../src/config.py:1709
-#: ../src/config.py:1714 ../src/config.py:2280 ../src/config.py:2359
-#: ../src/config.py:2372 ../src/config.py:3649 ../src/config.py:3724
-#: ../src/dialogs.py:312 ../src/dialogs.py:314 ../src/dialogs.py:520
-#: ../src/dialogs.py:533 ../src/roster_window.py:3047
-#: ../src/roster_window.py:3053 ../src/roster_window.py:3058
+#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703
+#: ../src/config.py:1708 ../src/config.py:2284 ../src/config.py:2363
+#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730
+#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
+#: ../src/dialogs.py:532 ../src/roster_window.py:3092
+#: ../src/roster_window.py:3098 ../src/roster_window.py:3103
msgid "None"
msgstr "Ðемає"
@@ -154,7 +154,7 @@ msgstr ""
"запиÑ."
#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
msgid "_Advanced"
msgstr "Д_одатково"
@@ -167,12 +167,12 @@ msgid "_Hostname:"
msgstr "Ðазва _вузла:"
#: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
+#: ../data/gui/accounts_window.ui.h:61
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
#: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/accounts_window.ui.h:63
#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "_Password:"
msgstr "_Password:"
@@ -235,10 +235,14 @@ msgid "C_onnect on Gajim startup"
msgstr "_З'єднуватиÑÑŒ піÑÐ»Ñ Ð·Ð°Ð¿ÑƒÑку Gajim"
#: ../data/gui/accounts_window.ui.h:13
+msgid "Certificate is e_ncrypted"
+msgstr "Сертифікат зашифровано"
+
+#: ../data/gui/accounts_window.ui.h:14
msgid "Chan_ge Password"
msgstr "_Змінити пароль"
-#: ../data/gui/accounts_window.ui.h:14
+#: ../data/gui/accounts_window.ui.h:15
msgid ""
"Check this so Gajim will ask you before sending your password over an "
"insecure connection."
@@ -246,10 +250,6 @@ msgstr ""
"Позначте цей пункт, щоб Gajim запитував Ð²Ð°Ñ Ð¿ÐµÑ€ÐµÐ´ надÑиланнÑм Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ‡ÐµÑ€ÐµÐ· "
"незахищеним з’єднаннÑм."
-#: ../data/gui/accounts_window.ui.h:15
-msgid "Choose Client Cert"
-msgstr "Оберіть клієнтÑький Ñертифікат"
-
#: ../data/gui/accounts_window.ui.h:16
msgid "Choose _Key..."
msgstr "Обрати _ключ..."
@@ -288,9 +288,9 @@ msgstr "Ім'Ñ:"
#. No configured account
#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:546 ../src/notify.py:569 ../src/notify.py:618
-#: ../src/notify.py:634
+#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160
+#: ../src/notify.py:318 ../src/notify.py:341 ../src/notify.py:391
+#: ../src/notify.py:407
msgid "Gajim"
msgstr "Gajim"
@@ -298,9 +298,9 @@ msgstr "Gajim"
#. FIXME: Ugly workaround.
#. Maybe we haven't been in any group (defaults to General)
#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:113 ../src/dialogs.py:125
-#: ../src/roster_window.py:2989 ../src/roster_window.py:5570
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56
+#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124
+#: ../src/roster_window.py:3034 ../src/roster_window.py:5652
msgid "General"
msgstr "Загальне"
@@ -360,8 +360,8 @@ msgid "Information about you, as stored in the server"
msgstr "ВідомоÑÑ‚Ñ– про ваÑ, Ñкі зберігаютьÑÑ Ð½Ð° Ñервері"
#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1832
-#: ../src/dialogs.py:838
+#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826
+#: ../src/dialogs.py:837
msgid "Jabber ID:"
msgstr "Jabber ID:"
@@ -374,8 +374,8 @@ msgstr "Прізвище:"
msgid "Mer_ge accounts"
msgstr "Об’є_днати облікові запиÑи"
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1805
-#: ../src/config.py:2373
+#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
+#: ../src/config.py:2377
msgid "No key selected"
msgstr "Ðе обрано жодного ключа"
@@ -402,7 +402,7 @@ msgid "Priority will change automatically according to your status."
msgstr "Пріоритет змінюватиметьÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ від вашого Ñтану."
#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5520
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602
msgid "Re_name"
msgstr "Пере_йменувати"
@@ -446,55 +446,51 @@ msgid "Synchronise contacts"
msgstr "Синхронізувати контакти"
#: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "ШлÑÑ… до клієнтÑького Ñертифікату та ключа у форматі PKCS#12"
-
-#: ../data/gui/accounts_window.ui.h:54
msgid "Use G_PG Agent"
msgstr "ВикориÑтовувати _агент GnuPG"
-#: ../data/gui/accounts_window.ui.h:55
+#: ../data/gui/accounts_window.ui.h:54
msgid "Use cust_om hostname/port"
msgstr "ВикориÑтовувати інші вузол/порт"
-#: ../data/gui/accounts_window.ui.h:56
+#: ../data/gui/accounts_window.ui.h:55
msgid "Use cust_om port:"
msgstr "ВикориÑтовувати інший порт:"
-#: ../data/gui/accounts_window.ui.h:57
+#: ../data/gui/accounts_window.ui.h:56
msgid "Use file transfer proxies"
msgstr "ВикориÑтовувати прокÑÑ– Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
-#: ../data/gui/accounts_window.ui.h:58
+#: ../data/gui/accounts_window.ui.h:57
msgid "_Client Cert File:"
msgstr "Файл клієнтÑького _Ñертифікату:"
-#: ../data/gui/accounts_window.ui.h:59
+#: ../data/gui/accounts_window.ui.h:58
msgid "_Edit Personal Information..."
msgstr "Редагувати оÑобиÑÑ‚Ñ– відомоÑÑ‚Ñ–..."
#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
+#: ../data/gui/accounts_window.ui.h:59 ../data/gui/xml_console_window.ui.h:11
msgid "_Enable"
msgstr "Увімкнути"
-#: ../data/gui/accounts_window.ui.h:61
+#: ../data/gui/accounts_window.ui.h:60
msgid "_Hostname: "
msgstr "Ðазва _вузла:"
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:62
msgid "_Manage..."
msgstr "КеруваннÑ..."
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:64
msgid "_Port: "
msgstr "_Порт:"
-#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/accounts_window.ui.h:65
msgid "_Warn before using an insecure connection"
msgstr "_Попереджати перед викориÑтаннÑм незахищеного з’єднаннÑ"
-#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/accounts_window.ui.h:66
msgid "_use HTTP__PROXY environment variable"
msgstr "викориÑтовувати змінну Ñередовища HTTP_PROXY"
@@ -510,7 +506,7 @@ msgstr "Д_озволити цьому контакту бачити мій ÑÑ‚
msgid "Add New Contact"
msgstr "Додати новий контакт"
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1341
+#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339
msgid "I would like to add you to my contact list."
msgstr "Я хочу додати Ð²Ð°Ñ Ð´Ð¾ мого ÑпиÑку контактів."
@@ -666,182 +662,6 @@ msgstr "_ÐдмініÑтратор"
msgid "_Send Server Message..."
msgstr "_ÐадіÑлати Ñерверне повідомленнÑ..."
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " вікно/закладка відкрите з цим контактом "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Дії</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Умови</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Звуки</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Додаткові дії"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Розширене ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑповіщеннÑми"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "УÑÑ– Ñтани"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Далеко"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "У Ñправах "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-msgid "Contact Change Status "
-msgstr "Зміна Ñтану контакту"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "Контакт від'єднано"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Ðе має "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "ПеренеÑÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ завершено"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "Запит на Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "Зупинка Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "Отримано Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Має "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Ðевидимка"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "ЗапуÑтити команду"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Дуже далеко"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "Один або більше оÑобливих Ñтанів..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Ð’ мережі / Вільний Ð´Ð»Ñ ÑпілкуваннÑ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Відтворити звук"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "Отримано повідомленнÑ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Якщо "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_ЗадіÑти UrgencyHint віконного менеджера, щоб змуÑити блимати позначку вікна "
-"балачки на панелі задач"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Вимкнути автоматичне Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð²Ñ–ÐºÐ½Ð° балачки"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Вимкнути Ñ–Ñнуючі виринаючі вікна"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Вимкнути Ñ–Ñнуючі звукові Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— події"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr "_Вимкнути Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð´Ñ–Ð¹ у зоні Ñповіщень"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Вимкнути події поÑви у реєÑтрі"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Повідомити мене виринаючим вікном"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Відкрити вікно балачки з кориÑтувачем"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in notification area"
-msgstr "_Показати події у зоні Ñповіщень"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Показати подію у реєÑтрі"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "Ñ– Ñ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "контакт(и)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "вÑÑ–"
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "Ð´Ð»Ñ "
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "груп(и)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "коли Ñ Ñƒ"
-
#: ../data/gui/archiving_preferences_window.ui.h:1
msgid "<i>Method Auto</i>"
msgstr "<i>Ðвтоматичний метод</i>"
@@ -904,8 +724,8 @@ msgstr "Заблоковані контакти"
#: ../data/gui/blocked_contacts_window.ui.h:2
#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5539
-#: ../src/roster_window.py:5666 ../src/roster_window.py:5799
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5621
+#: ../src/roster_window.py:5748 ../src/roster_window.py:5881
msgid "_Unblock"
msgstr "_Розблокувати"
@@ -966,7 +786,7 @@ msgid "Join _Group Chat"
msgstr "ПриєднатиÑÑŒ до _групової балачки"
#: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
+#: ../data/gui/contact_context_menu.ui.h:17
msgid "_Add to Roster..."
msgstr "_Додати до реєÑтру..."
@@ -992,8 +812,7 @@ msgstr "_Відкрити поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñƒ веб-переглÑдачі"
msgid "_Start Chat"
msgstr "_Почати балачку"
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4754
+#: ../data/gui/chat_control.ui.h:1
msgid "#"
msgstr "â„–"
@@ -1133,8 +952,9 @@ msgstr "Редагувати _групи..."
#. Invite to
#. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5475
-#: ../src/roster_window.py:5634
+#: ../data/gui/contact_context_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5557
+#: ../src/roster_window.py:5716
msgid "In_vite to"
msgstr "За_проÑити до"
@@ -1143,67 +963,67 @@ msgid "Invite _Contacts"
msgstr "ЗапроÑити _контакти"
#: ../data/gui/contact_context_menu.ui.h:8
+msgid "M_anage Contact"
+msgstr "К_ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¾Ð¼"
+
+#: ../data/gui/contact_context_menu.ui.h:9
msgid "Remo_ve"
msgstr "В_илучити"
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5485
-#: ../src/roster_window.py:5723
+#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5805
msgid "Send Cus_tom Status"
msgstr "ÐадіÑлати не_типовий Ñтан"
-#: ../data/gui/contact_context_menu.ui.h:10
+#: ../data/gui/contact_context_menu.ui.h:11 ../data/gui/roster_window.ui.h:10
msgid "Send Single _Message..."
msgstr "ÐадіÑлати окреме _повідомленнÑ..."
-#: ../data/gui/contact_context_menu.ui.h:11
+#: ../data/gui/contact_context_menu.ui.h:12
msgid "Send _File..."
msgstr "ÐадіÑлати _файл..."
-#: ../data/gui/contact_context_menu.ui.h:12
+#: ../data/gui/contact_context_menu.ui.h:13
msgid "Set Custom _Avatar..."
msgstr "Ð’Ñтановити _нетиповий аватар..."
-#: ../data/gui/contact_context_menu.ui.h:13
+#: ../data/gui/contact_context_menu.ui.h:14
msgid "Start _Chat"
msgstr "Почати _балачку"
-#: ../data/gui/contact_context_menu.ui.h:14
+#: ../data/gui/contact_context_menu.ui.h:15
msgid "Toggle End to End Encryption"
msgstr "Увімкнути або вимкнути наÑкрізне шифруваннÑ"
-#: ../data/gui/contact_context_menu.ui.h:15
+#: ../data/gui/contact_context_menu.ui.h:16
msgid "Toggle Open_PGP Encryption"
msgstr "Увімкнути або вимкнути Open_PGP-шифруваннÑ"
-#: ../data/gui/contact_context_menu.ui.h:17
+#: ../data/gui/contact_context_menu.ui.h:18
msgid "_Allow him/her to see my status"
msgstr "_Дозволити йому/їй бачити мій Ñтан"
-#: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5547
-#: ../src/roster_window.py:5672 ../src/roster_window.py:5802
+#: ../data/gui/contact_context_menu.ui.h:19
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5629
+#: ../src/roster_window.py:5754 ../src/roster_window.py:5884
msgid "_Block"
msgstr "_Заблокувати"
-#: ../data/gui/contact_context_menu.ui.h:19
+#: ../data/gui/contact_context_menu.ui.h:20
msgid "_Forbid him/her to see my status"
msgstr "_Заборонити йому/їй бачити мій Ñтан"
-#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/contact_context_menu.ui.h:21
#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5873
+#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
+#: ../src/roster_window.py:5955
msgid "_History"
msgstr "_Журнал"
-#: ../data/gui/contact_context_menu.ui.h:21
+#: ../data/gui/contact_context_menu.ui.h:22
msgid "_Ignore"
msgstr "_Ігнорувати"
-#: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "К_ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¾Ð¼"
-
#: ../data/gui/contact_context_menu.ui.h:23
msgid "_Rename..."
msgstr "Перей_менувати..."
@@ -1324,7 +1144,7 @@ msgstr "<b>Кольори вкладки Ñтану балачки</b>"
msgid "Account row"
msgstr "Стрічка облікового запиÑу"
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:996
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1042
msgid "Bold"
msgstr "Жирний"
@@ -1360,7 +1180,7 @@ msgstr "Стрічка групи"
msgid "Inactive"
msgstr "Ðеактивний"
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:997
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1043
msgid "Italic"
msgstr "КурÑив"
@@ -1424,47 +1244,51 @@ msgstr "_ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÑ–Ð¼Ð½Ð°Ñ‚Ð¾ÑŽ"
msgid "_Minimize on close"
msgstr "_Мінімізувати піÑÐ»Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ"
-#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+msgid "_Request Voice"
+msgstr "_Запит голоÑу"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
msgid "Mo_derator"
msgstr "Мо_дератор"
-#: ../data/gui/gc_occupants_menu.ui.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:3
msgid "Occupant Actions"
msgstr "Дії учаÑника"
-#: ../data/gui/gc_occupants_menu.ui.h:3
+#: ../data/gui/gc_occupants_menu.ui.h:4
msgid "Send _File"
msgstr "ÐадіÑлати _файл"
-#: ../data/gui/gc_occupants_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:5
msgid "_Add to Roster"
msgstr "_Додати до реєÑтру"
-#: ../data/gui/gc_occupants_menu.ui.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:6
msgid "_Admin"
msgstr "_ÐдмініÑтратор"
-#: ../data/gui/gc_occupants_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:7
msgid "_Ban"
msgstr "_Заблокувати"
-#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:10
msgid "_Kick"
msgstr "_Викинути"
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:11
msgid "_Member"
msgstr "_УчаÑник"
-#: ../data/gui/gc_occupants_menu.ui.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:12
msgid "_Owner"
msgstr "_ВлаÑник"
-#: ../data/gui/gc_occupants_menu.ui.h:12
+#: ../data/gui/gc_occupants_menu.ui.h:13
msgid "_Send Private Message"
msgstr "_ÐадіÑлати конфіденційне повідомленнÑ"
-#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:15
msgid "_Voice"
msgstr "_ГолоÑ"
@@ -1626,7 +1450,7 @@ msgstr "потік"
msgid "Bro_wse Rooms"
msgstr "_ПереглÑд кімнат"
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2285
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2328
msgid "Join Group Chat"
msgstr "ПриєднатиÑÑŒ до групової балачки"
@@ -1650,7 +1474,7 @@ msgstr "Ðещодавно:"
msgid "Room:"
msgstr "Кімната:"
-#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1822
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
msgid "Server:"
msgstr "Сервер:"
@@ -1778,34 +1602,26 @@ msgid "Authors:"
msgstr "Ðвтори:"
#: ../data/gui/plugins_window.ui.h:4
-msgid "Available"
-msgstr "ДоÑтупний"
-
-#: ../data/gui/plugins_window.ui.h:5
msgid "Configure"
msgstr "Ðалаштувати"
-#: ../data/gui/plugins_window.ui.h:6
+#: ../data/gui/plugins_window.ui.h:5
msgid "Description:"
msgstr "ОпиÑ: "
-#: ../data/gui/plugins_window.ui.h:7
-msgid "Descrition:"
-msgstr "ОпиÑ: "
-
-#: ../data/gui/plugins_window.ui.h:8
+#: ../data/gui/plugins_window.ui.h:6
msgid "Homepage:"
msgstr "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ñ Ñторінка:"
-#: ../data/gui/plugins_window.ui.h:9
-msgid "Install"
-msgstr "Ð’Ñтановити"
+#: ../data/gui/plugins_window.ui.h:7
+msgid "Install from zip"
+msgstr "Ð’Ñтановити з архіву zip"
-#: ../data/gui/plugins_window.ui.h:10
+#: ../data/gui/plugins_window.ui.h:8
msgid "Installed"
msgstr "Ð’Ñтановлено"
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:9
msgid ""
"Plug-in decription should be displayed here. This text will be erased during "
"PluginsWindow initialization."
@@ -1813,23 +1629,19 @@ msgstr ""
"Тут має бути показано Ð¾Ð¿Ð¸Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ°. Цей текÑÑ‚ буде видалено при "
"ініціалізації вікна додатків."
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:10
msgid "Plugins"
msgstr "Додатки"
-#: ../data/gui/plugins_window.ui.h:13
+#: ../data/gui/plugins_window.ui.h:11
msgid "Uninstall"
msgstr "Видалити"
-#: ../data/gui/plugins_window.ui.h:14
+#: ../data/gui/plugins_window.ui.h:12
msgid "Version:"
msgstr "ВерÑÑ–Ñ:"
-#: ../data/gui/plugins_window.ui.h:15
-msgid "button"
-msgstr "кнопка"
-
-#: ../data/gui/plugins_window.ui.h:16
+#: ../data/gui/plugins_window.ui.h:13
msgid "homepage url"
msgstr "адреÑа домашньої Ñторінки"
@@ -1898,6 +1710,10 @@ msgstr "<b>КонфіденційніÑÑ‚ÑŒ</b>"
msgid "<b>Roster Appearance</b>"
msgstr "<b>ВиглÑд реєÑтру</b>"
+#: ../data/gui/preferences_window.ui.h:17
+msgid "<b>Sounds</b>"
+msgstr "<b>Звуки</b>"
+
#: ../data/gui/preferences_window.ui.h:18
msgid "<b>Status Messages</b>"
msgstr "<b>ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан</b>"
@@ -1923,129 +1739,125 @@ msgid "Advanced"
msgstr "Додатково"
#: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Додатково..."
-
-#: ../data/gui/preferences_window.ui.h:25
msgid "All chat states"
msgstr "УÑÑ– Ñтани балачок"
-#: ../data/gui/preferences_window.ui.h:26
+#: ../data/gui/preferences_window.ui.h:25
msgid "Allow _OS information to be sent"
msgstr "Дозволити надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— про _операційну ÑиÑтему"
-#: ../data/gui/preferences_window.ui.h:27
+#: ../data/gui/preferences_window.ui.h:26
msgid "Allow my _idle time to be sent"
msgstr "Дозволити надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ‡Ð°Ñу бездіÑльноÑÑ‚Ñ–"
-#: ../data/gui/preferences_window.ui.h:28
+#: ../data/gui/preferences_window.ui.h:27
msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
msgstr ""
"Дозволити ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñƒ разі вÑтановленого Ñтану в_ідійшов/зайнÑтий/тощо"
-#: ../data/gui/preferences_window.ui.h:29
+#: ../data/gui/preferences_window.ui.h:28
msgid "Allow sound when I'm _busy"
msgstr "Дозволити звуки у Ñтані _зайнÑтий."
-#: ../data/gui/preferences_window.ui.h:30
+#: ../data/gui/preferences_window.ui.h:29
msgid "Always"
msgstr "Завжди"
-#: ../data/gui/preferences_window.ui.h:31
+#: ../data/gui/preferences_window.ui.h:30
msgid "Ask status message when I:"
msgstr "Запитувати щодо Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан, Ñкщо Ñ:"
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
msgid "Audio / Video"
msgstr "Ðудіо/Відео"
-#: ../data/gui/preferences_window.ui.h:33
+#: ../data/gui/preferences_window.ui.h:32
msgid "Audio input device"
msgstr "ПриÑтрій Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ"
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:33
msgid "Audio output device"
msgstr "ПриÑтрій Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð²ÑƒÐºÑƒ"
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:34
msgid "Chat message:"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸:"
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:35
msgid "Check on startup if Gajim is the _default Jabber client"
msgstr "ПеревірÑти при запуÑку, чи Ñ” Gajim _типовим клієнтом Jabber"
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:36
msgid "Composing only"
msgstr "Лише друк"
-#: ../data/gui/preferences_window.ui.h:38
+#: ../data/gui/preferences_window.ui.h:37
msgid "Configure color and font of the interface"
msgstr "Ðалаштувати шрифт та колір інтерфейÑу"
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:38
msgid "Contact's message:"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñƒ:"
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:39
msgid "Contact's nickname:"
msgstr "ПÑевдонім контакту:"
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:40
msgid "Custom"
msgstr "Ðетиповий"
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:41
msgid "Detached roster with chat grouped by account"
msgstr ""
"Відокремлений реєÑÑ‚Ñ€ з балачками згуртованими відповідно облікових запиÑів"
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:42
msgid "Detached roster with chat grouped by type"
msgstr "Відокремлений реєÑÑ‚Ñ€ з балачками згуртованими відповідно типу"
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:43
msgid "Detached roster with detached chats"
msgstr "Відокремлений реєÑÑ‚Ñ€ з окремими балачками"
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:44
msgid "Detached roster with single chat"
msgstr "Відокремлений реєÑÑ‚Ñ€ з єдиним вікном балачок"
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:674
+#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
+#: ../src/config.py:672
msgid "Disabled"
msgstr "Вимкнено"
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:46
msgid "Display _activity of contacts in roster"
msgstr "Показувати _занÑÑ‚Ñ‚Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñ–Ð² у реєÑтрі"
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:47
msgid "Display _extra email details"
msgstr "Показати _подробиці щодо Ñкриньки"
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:48
msgid "Display _location of contacts in roster"
msgstr "Показувати _Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñ–Ð² у реєÑтрі"
-#: ../data/gui/preferences_window.ui.h:50
+#: ../data/gui/preferences_window.ui.h:49
msgid "Display _tunes of contacts in roster"
msgstr "Показувати _музику контактів у реєÑтрі"
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:50
msgid "Display a_vatars of contacts in roster"
msgstr "Показувати _аватари контактів у реєÑтрі"
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:51
msgid "Display m_ood of contacts in roster"
msgstr "Показувати _наÑтрій контактів у реєÑтрі"
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:52
msgid "Display status _messages of contacts in roster"
msgstr "Показувати _Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан контактів з реєÑтру"
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:53
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 "
@@ -2055,7 +1867,7 @@ msgstr ""
"ви вели з контактом. Тут ви можете вказати Ñтани, Ñкі ви бажаєте бачити у "
"вікні розмови."
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:54
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 "
@@ -2065,7 +1877,7 @@ msgstr ""
"ÑпілкуваннÑм з контактом. Тут ви можете зазначити Ñтани, Ñкі ви бажаєте "
"надÑилати іншому учаÑнику балачки."
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:55
msgid ""
"Gajim will notify you via a popup window in the bottom right of the screen "
"about contacts that just signed out"
@@ -2073,11 +1885,11 @@ msgstr ""
"Gajim буде Ñповіщати Ð²Ð°Ñ Ð¿Ñ€Ð¾ вихід з мережі контактів за допомогою "
"контекÑтного вікна у нижній правій чаÑтині екрана"
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:57
msgid "Hide all buttons in chat windows"
msgstr "Сховати уÑÑ– кнопки у вікнах балачок"
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:58
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
@@ -2085,7 +1897,7 @@ msgstr ""
"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати, Ñку "
"операційну ÑиÑтему ви викориÑтовуєте"
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:59
msgid ""
"If checked, Gajim will also include information about the sender of the new "
"emails"
@@ -2093,14 +1905,14 @@ msgstr ""
"Якщо буде позначено цей пункт, Gajim буде також додавати інформацію про "
"авторів лиÑтів"
-#: ../data/gui/preferences_window.ui.h:61
+#: ../data/gui/preferences_window.ui.h:60
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr ""
"Якщо буде позначено цей пункт, Gajim буде змінювати Ñтан на «ВідÑутній», "
"Ñкщо комп’ютер не викориÑтовуватиметьÑÑ."
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:61
msgid ""
"If checked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
@@ -2108,7 +1920,7 @@ msgstr ""
"Якщо буде позначено цей пункт, Gajim змінюватиме Ñтан на «ÐедоÑтупний», Ñкщо "
"на комп’ютері не ÑпоÑтерігатиметьÑÑ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ñ– кориÑтувача довше, ніж"
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:62
msgid ""
"If checked, Gajim will display avatars of contacts in roster window and in "
"group chats"
@@ -2116,7 +1928,7 @@ msgstr ""
"Якщо буде позначено цей пункт, Gajim буде показувати аватари контактів у "
"вікні реєÑтру Ñ– групових балачках"
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:63
msgid ""
"If checked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
@@ -2124,35 +1936,35 @@ msgstr ""
"Якщо буде позначено цей пункт, Gajim буде показувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан "
"під ім'Ñм контакту у вікні реєÑтру Ñ– групових балачках"
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:64
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr ""
"Якщо буде позначено цей пункт, Gajim показуватиме рід занÑÑ‚ÑŒ контактів у "
"вікні реєÑтру"
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:65
msgid ""
"If checked, Gajim will display the location of contacts in the roster window"
msgstr ""
"Якщо буде позначено цей пункт, Gajim показуватиме Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñ–Ð² у "
"вікні реєÑтру"
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:66
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr ""
"Якщо буде позначено цей пункт, Gajim показуватиме наÑтрій контактів у вікні "
"реєÑтру"
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:67
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr ""
"Якщо буде позначено цей пункт, Gajim показуватиме музику, Ñку Ñлухають "
"контакти у вікні реєÑтру"
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:68
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 "
@@ -2163,7 +1975,7 @@ msgstr ""
"контекÑтного меню (ÐºÐ»Ð°Ñ†Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ð²Ð¾ÑŽ кнопкою миші), буде викориÑтано типову "
"мову Ð´Ð»Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñƒ або групової балачки."
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:69
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
"Use with caution, because it blocks all messages from any contact that is "
@@ -2174,7 +1986,7 @@ msgstr ""
"можливіÑÑ‚ÑŽ, оÑкільки Ñ—Ñ— за Ñ—Ñ— викориÑÑ‚Ð°Ð½Ð½Ñ Ð²ÑÑ– Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ контактів, "
"Ñких немає у реєÑтрі, буде заблоковано."
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:70
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 "
@@ -2185,7 +1997,7 @@ msgstr ""
"E2E, ваш Ñпіврозмовник має погодитиÑÑ Ð½Ð° Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ журналу, інакше "
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ буде запиÑано до журналу."
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:71
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
@@ -2193,7 +2005,7 @@ msgstr ""
"Якщо буде позначено цей пункт, Gajim показуватиме ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ нові лиÑти, "
"отримані поштовою Ñкринькою GMail"
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:72
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, "
@@ -2203,7 +2015,7 @@ msgstr ""
"протоколу піктограми Ñтанів. (Приклад: Ð´Ð»Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñ–Ð² MSN будуть викориÑтані "
"відповідні піктограми msn Ð´Ð»Ñ Ñтанів «в мережі», «відÑутній» тощо)"
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:73
msgid ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
@@ -2211,7 +2023,7 @@ msgstr ""
"Якщо буде позначено цей пункт, Gajim не запитуватиме про Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñтану. "
"Програма викориÑтовуватиме вказане типове повідомленнÑ."
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:74
msgid ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
"animated or static graphical emoticons"
@@ -2219,67 +2031,67 @@ msgstr ""
"Якщо цей пункт буде позначено, Gajim замінюватиме ascii-емоційки, наприклад, "
"':)' відповідними Ñтатичними або анімованими емоційками"
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:75
msgid "Last state"
msgstr "Попередній Ñтан: %"
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:76
msgid "Log _encrypted chat session"
msgstr "ЗапиÑувати до журналу _шифровані ÑеанÑи балачки"
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:77
msgid "Ma_ke message windows compact"
msgstr "У_щільнити ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ¾Ð½ повідомлень"
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:78
msgid "Ma_nage..."
msgstr "Ке_руваннÑ..."
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:79
msgid "Never"
msgstr "Ðіколи"
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:80
msgid "Notifications"
msgstr "СповіщеннÑ"
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:81
msgid "Notify me about contacts that sign _in"
msgstr "Сповіщати мене про в_хід контактів до мережі"
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:82
msgid "Notify me about contacts that sign _out"
msgstr "Сповіщати мене про в_ихід контактів з мережі"
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:83
msgid "Notify me about it"
msgstr "Сповіщати мене про це"
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:84
msgid "Notify on new _GMail email"
msgstr "Сповіщати про нові лиÑти _GMail"
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:85
msgid "Only when pending events"
msgstr "Лише події, що очікують уваги"
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:86
msgid "Personal Events"
msgstr "ОÑобиÑÑ‚Ñ– події"
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:87
msgid "Play _sounds"
msgstr "Відтворювати _звуки"
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:88
msgid "Pop it up"
msgstr "ПіднÑти це"
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:89
msgid "Preferences"
msgstr "Параметри"
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:90
msgid ""
"STUN server hostname. If none given, Gajim will try\n"
"to discover one from server."
@@ -2287,31 +2099,31 @@ msgstr ""
"Ð†Ð¼â€™Ñ Ñерверу STUN. Якщо нічого не вказано\n"
"Gajim Ñпробує отримати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð· Ñерверу."
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:92
msgid "STUN server:"
msgstr "Сервер STUN:"
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:93
msgid "Show notification area icon:"
msgstr "Показувати піктограму зони Ñповіщень"
-#: ../data/gui/preferences_window.ui.h:95
+#: ../data/gui/preferences_window.ui.h:94
msgid "Show only in roster"
msgstr "_Показати лише у реєÑтрі"
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:95
msgid "Sign _in"
msgstr "Уві_йти"
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:96
msgid "Sign _out"
msgstr "Вий_ти"
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:97
msgid "Single window for everything"
msgstr "Єдине вікно Ð´Ð»Ñ ÑƒÑього"
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:98
msgid ""
"Some messages may include rich content (formatting, colors etc). If checked, "
"Gajim will just display the raw message text."
@@ -2320,27 +2132,27 @@ msgstr ""
"текÑту, кольори тощо). Якщо буде позначено цей пункт, Gajim показуватиме "
"проÑтий текÑÑ‚ без форматуваннÑ."
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:99
msgid "Sort contacts by status"
msgstr "ВпорÑдкувати контакти за Ñтаном"
-#: ../data/gui/preferences_window.ui.h:101 ../src/config.py:400
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
msgid "Status"
msgstr "Стан"
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:101
msgid "Status _iconset:"
msgstr "Ðабір _піктограм Ñтану:"
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:102
msgid "Style"
msgstr "Стиль"
-#: ../data/gui/preferences_window.ui.h:104
+#: ../data/gui/preferences_window.ui.h:103
msgid "T_heme:"
msgstr "Т_ема:"
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:104
msgid ""
"The auto away status message. If empty, Gajim will not change the current "
"status message\n"
@@ -2350,7 +2162,7 @@ msgstr ""
"Ðвтоматичне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ відÑутніÑÑ‚ÑŒ. Якщо ви не вкажете текÑту "
"повідомленнÑ, Gajim не змінюватиме поточного Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан."
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:107
msgid ""
"The auto not available status message. If empty, Gajim will not change the "
"current status message\n"
@@ -2360,127 +2172,127 @@ msgstr ""
"Ðвтоматичне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ недоÑтупніÑÑ‚ÑŒ. Якщо ви не вкажете текÑту "
"повідомленнÑ, Gajim не змінюватиме поточного Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан."
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:110
msgid "Use _transports icons"
msgstr "ВикориÑтовувати піктограми _транÑпортів"
-#: ../data/gui/preferences_window.ui.h:112
+#: ../data/gui/preferences_window.ui.h:111
msgid "Use default applications"
msgstr "ВикориÑтовувати типові програми"
-#: ../data/gui/preferences_window.ui.h:113
+#: ../data/gui/preferences_window.ui.h:112
msgid "Use system _default"
msgstr "ВикориÑтовувати _типове Ð´Ð»Ñ ÑиÑтеми"
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:113
msgid "Video framerate"
msgstr "ЧаÑтота кадрів відео"
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:114
msgid "Video input device"
msgstr "ПриÑтрій Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ÐµÐ¾"
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:115
msgid "Video output device"
msgstr "ПриÑтрій Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ÐµÐ¾"
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:116
msgid "Video size"
msgstr "Розмір відео"
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:117
msgid "When new event is received:"
msgstr "Якщо отримано нову подію:"
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:118
msgid "Your message:"
msgstr "Ваше повідомленнÑ:"
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:119
msgid "Your nickname:"
msgstr "Ваш пÑевдонім:"
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:120
msgid "_Away after:"
msgstr "«_ВідÑутній» через:"
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:121
msgid "_Browser:"
msgstr "_Веб-переглÑдач:"
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:122
msgid "_Display chat state notifications:"
msgstr "_Показувати ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñтану балачки:"
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:123
msgid "_Emoticons:"
msgstr "_Емоційки:"
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:124
msgid "_File manager:"
msgstr "_Менеджер файлів:"
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:125
msgid "_Highlight misspelled words"
msgstr "_ВиділÑти Ñлова з помилками"
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:126
msgid "_Ignore events from contacts not in the roster"
msgstr "_Ігнорувати події від контактів поза реєÑтром"
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:127
msgid "_Ignore rich content in incoming messages"
msgstr "_Ігнорувати позначки Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñƒ вхідних повідомленнÑÑ…"
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:128
msgid "_Log status changes of contacts"
msgstr "_ЗапиÑувати зміни Ñтану контактів"
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:129
msgid "_Mail client:"
msgstr "_Поштовий клієнт:"
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:130
msgid "_Not available after:"
msgstr "«_Ðе доÑтупний» через:"
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:131
msgid "_Open..."
msgstr "_Відкрити..."
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:132
msgid "_Reset to Default Colors"
msgstr "В_ідновити типові кольори"
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:133
msgid "_Send chat state notifications:"
msgstr "_ÐадÑилати ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан балачки:"
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:134
msgid "_Show roster on startup:"
msgstr "_Показувати реєÑÑ‚Ñ€ при Ñтарті:з"
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:135
msgid "_Status message:"
msgstr "_ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан:"
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:136
msgid "_URL highlight:"
msgstr "Вид_Ñ–Ð»ÐµÐ½Ð½Ñ Ð°Ð´Ñ€ÐµÑ URL:"
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:137
msgid "_Window behavior:"
msgstr "Пов_едінка вікна:"
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:138
msgid "in _group chats"
msgstr "у _групових балачках"
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:139
msgid "in _roster"
msgstr "у _реєÑтрі"
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:140
msgid "minutes"
msgstr "хвилин"
@@ -2532,7 +2344,7 @@ msgstr "JabberID"
msgid "Order:"
msgstr "ПорÑдок:"
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3923
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3972
msgid "Privacy List"
msgstr "СпиÑок конфіденційноÑÑ‚Ñ–"
@@ -2601,108 +2413,108 @@ msgid "<b>Company:</b>"
msgstr "<b>КомпаніÑ:</b>"
#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:10
msgid "<b>Country:</b>"
msgstr "<b>Країна:</b>"
#: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/vcard_information_window.ui.h:11
msgid "<b>Department:</b>"
msgstr "<b>Відділ:</b>"
#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:12
msgid "<b>E-Mail:</b>"
msgstr "<b>ÐдреÑа ел. пошти:</b>"
#: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:13
msgid "<b>Extra Address:</b>"
msgstr "<b>Додаткова адреÑа:</b>"
#. Family Name
#: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:15
msgid "<b>Family:</b>"
msgstr "<b>Прізвище:</b>"
#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:16
msgid "<b>Full Name</b>"
msgstr "<b>Ð†Ð¼â€™Ñ Ð¿Ð¾Ð²Ð½Ñ–ÑÑ‚ÑŽ</b>"
#. Given Name
#: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:18
msgid "<b>Given:</b>"
msgstr "<b>Ім'Ñ:</b>"
#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:19
msgid "<b>Homepage:</b>"
msgstr "<b>Ð”Ð¾Ð¼Ð°ÑˆÐ½Ñ Ñторінка:</b>"
#. Middle Name
#: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:22
msgid "<b>Middle:</b>"
msgstr "<b>По батькові:</b>"
#: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:23
msgid "<b>Name:</b>"
msgstr "<b>Ім’Ñ:</b>"
#: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:24
msgid "<b>Nickname:</b>"
msgstr "<b>ПÑевдонім:</b>"
#: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:25
msgid "<b>Phone No.:</b>"
msgstr "<b>Ðомер телефону:</b>"
#: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:26
msgid "<b>Position:</b>"
msgstr "<b>ПоÑада:</b>"
#: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:27
msgid "<b>Postal Code:</b>"
msgstr "<b>Поштовий індекÑ:</b>"
#. Prefix in Name
#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:29
msgid "<b>Prefix:</b>"
msgstr "<b>ПрефікÑ:</b>"
#: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:31
msgid "<b>Role:</b>"
msgstr "<b>Роль:</b>"
#: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:32
msgid "<b>State:</b>"
msgstr "<b>ОблаÑÑ‚ÑŒ:</b>"
#: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:34
msgid "<b>Street:</b>"
msgstr "<b>ВулицÑ:</b>"
#. Suffix in Name
#: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:38
msgid "<b>Suffix:</b>"
msgstr "<b>СуфікÑ:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:42
msgid "About"
msgstr "ВідомоÑÑ‚Ñ–"
@@ -2711,12 +2523,12 @@ msgid "Click to set your avatar"
msgstr "ÐатиÑніть, щоб вÑтановити Ñвій аватар"
#: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:45
+#: ../data/gui/vcard_information_window.ui.h:46
msgid "Format: YYYY-MM-DD"
msgstr "Формат: РРРР-ММ-ДД"
#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:48
msgid "Personal Info"
msgstr "ОÑобиÑÑ‚Ñ– відомоÑÑ‚Ñ–"
@@ -2739,8 +2551,8 @@ msgstr "Вилучити обліковий Ð·Ð°Ð¿Ð¸Ñ Ð· Gajim та з _Ñер
#. Remove group
#. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5557
-#: ../src/roster_window.py:5682 ../src/roster_window.py:5812
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5639
+#: ../src/roster_window.py:5764 ../src/roster_window.py:5894
msgid "_Remove"
msgstr "В_илучити"
@@ -2794,52 +2606,48 @@ msgstr "Додатки"
msgid "Profile, A_vatar"
msgstr "Профіль, _аватар"
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
msgid "Show Only _Active Contacts"
msgstr "Показувати лише _активні контакти"
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:12
+msgid "Show T_rans_ports"
msgstr "Показувати транÑ_порти"
-#: ../data/gui/roster_window.ui.h:12
+#: ../data/gui/roster_window.ui.h:13
msgid "Show _Offline Contacts"
msgstr "Показувати _від’єднані контакти"
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
msgid "Show _Roster"
msgstr "Показати _реєÑÑ‚Ñ€"
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
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/gui/roster_window.ui.h:15
+#: ../data/gui/roster_window.ui.h:16
#: ../data/gui/subscription_request_window.ui.h:6
msgid "_Actions"
msgstr "_Дії"
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:18
msgid "_Contents"
msgstr "_ВміÑÑ‚"
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
+#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
msgid "_Edit"
msgstr "_Правка"
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
msgid "_FAQ"
msgstr "_ЧаП"
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:22
msgid "_Help"
msgstr "_Довідка"
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "_ÐадіÑлати окреме повідомленнÑ..."
-
#: ../data/gui/roster_window.ui.h:25
msgid "_View"
msgstr "П_ереглÑд"
@@ -2857,7 +2665,7 @@ msgid "_Add contact"
msgstr "Дод_ати контакт"
#. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5824
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5906
msgid "_Information"
msgstr "_ІнформаціÑ"
@@ -2977,55 +2785,55 @@ msgid "<b>Client:</b>"
msgstr "<b>Клієнт:</b>"
#: ../data/gui/vcard_information_window.ui.h:8
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>Ðалаштований аватар:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
msgid "<b>Contact time:</b>"
msgstr "<b>ОблаÑÑ‚ÑŒ:</b>"
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:20
msgid "<b>Jabber ID:</b>"
msgstr "<b>Ідентифікатор Jabber:</b>"
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:30
msgid "<b>Resource:</b>"
msgstr "<b>РеÑурÑ:</b>"
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:33
msgid "<b>Status:</b>"
msgstr "<b>Стан:</b>"
#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:36
msgid "<b>Subscription:</b>"
msgstr "<b>ПідпиÑка:</b>"
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:39
msgid "<b>System:</b>"
msgstr "<b>СиÑтема:</b>"
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>User avatar:</b>"
+msgstr "<b>Ðватар:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:43
msgid "Comments"
msgstr "Коментарі"
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
-msgstr "Ðалаштований аватар:"
-
-#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/vcard_information_window.ui.h:44
#: ../data/gui/zeroconf_information_window.ui.h:1
msgid "Contact"
msgstr "Контакт"
-#: ../data/gui/vcard_information_window.ui.h:44
+#: ../data/gui/vcard_information_window.ui.h:45
msgid "Contact Information"
msgstr "Контактна інформаціÑ"
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:47
msgid "More"
msgstr "Більше"
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "Ðватар кориÑтувача:"
-
#: ../data/gui/xml_console_window.ui.h:1
msgid "<b>Filter</b>"
msgstr "<b>Фільтр</b>"
@@ -3158,7 +2966,7 @@ msgstr "Ціле чиÑло"
msgid "Text"
msgstr "ТекÑÑ‚"
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1016
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1062
msgid "Color"
msgstr "Колір"
@@ -3196,204 +3004,203 @@ msgstr[2] "Ви отримали нові запиÑи (та %d не було п
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "English"
msgstr "ÐнглійÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Belarusian"
msgstr "БілоруÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Bulgarian"
msgstr "БолгарÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Breton"
msgstr "БретонÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Czech"
msgstr "ЧеÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "German"
msgstr "Ðімецька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Greek"
msgstr "Грецька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "British"
msgstr "БританÑька англійÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Esperanto"
msgstr "ЕÑперанто"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Spanish"
msgstr "ІÑпанÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Basque"
msgstr "БаÑкÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "French"
msgstr "Французька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Croatian"
msgstr "ХорватÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Italian"
msgstr "ІталійÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Norwegian (b)"
msgstr "Ðорвезька (b)"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Dutch"
msgstr "ÐідерландÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Norwegian"
msgstr "Ðорвезька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Polish"
msgstr "ПольÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Portuguese"
msgstr "ПортугальÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Brazilian Portuguese"
msgstr "БразильÑька португальÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Russian"
msgstr "РоÑійÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Serbian"
msgstr "СербÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Slovak"
msgstr "Словацька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Swedish"
msgstr "ШведÑька"
-#: ../src/chat_control.py:77
+#: ../src/chat_control.py:85
msgid "Chinese (Ch)"
msgstr "КитайÑька (Ch)"
-#: ../src/chat_control.py:218
+#: ../src/chat_control.py:228
msgid "Ping?"
msgstr "Гу?"
-#: ../src/chat_control.py:223
+#: ../src/chat_control.py:233
#, python-format
msgid "Pong! (%s s.)"
msgstr "Га! (%s s.)"
-#: ../src/chat_control.py:228
+#: ../src/chat_control.py:238
msgid "Error."
msgstr "Помилка."
-#: ../src/chat_control.py:550
+#: ../src/chat_control.py:574
msgid "Spelling language"
msgstr "Мова перевірки правопиÑу"
#. we are not connected
-#: ../src/chat_control.py:582 ../src/chat_control.py:791
+#: ../src/chat_control.py:606 ../src/chat_control.py:822
msgid "A connection is not available"
msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½ÐµÐ´Ð¾Ñтупне"
-#: ../src/chat_control.py:583 ../src/chat_control.py:792
+#: ../src/chat_control.py:607 ../src/chat_control.py:823
msgid "Your message can not be sent until you are connected."
msgstr "Ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ може бути відправлене до вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·'єднаннÑ."
-#: ../src/chat_control.py:998
+#: ../src/chat_control.py:1044
msgid "Underline"
msgstr "ПідкреÑлити"
-#: ../src/chat_control.py:999
+#: ../src/chat_control.py:1045
msgid "Strike"
msgstr "ПерекреÑлити"
-#: ../src/chat_control.py:1022
+#: ../src/chat_control.py:1068
msgid "Font"
msgstr "Шрифт"
-#: ../src/chat_control.py:1031
+#: ../src/chat_control.py:1077
msgid "Clear formating"
msgstr "ЗнÑти форматуваннÑ"
-#: ../src/chat_control.py:1109
+#: ../src/chat_control.py:1154
msgid "Really send file?"
msgstr "Справді надіÑлати файл?"
-#: ../src/chat_control.py:1110
+#: ../src/chat_control.py:1155
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr ""
"Якщо ви надішлете файл %s, він або вона дізнаютьÑÑ Ð¿Ñ€Ð¾ ваш Ñправжній "
"ідентифікатор Jabber."
-#: ../src/chat_control.py:1574 ../src/chat_control.py:2098
+#: ../src/chat_control.py:1623 ../src/chat_control.py:2135
msgid "GPG encryption enabled"
msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ GPG увімкнено"
-#: ../src/chat_control.py:1595 ../src/chat_control.py:1598
-#: ../src/features_window.py:107
+#: ../src/chat_control.py:1644 ../src/chat_control.py:1647
msgid "Requires python-farsight."
msgstr "Потрібен python-farsight."
#. Add to roster
-#: ../src/chat_control.py:1624 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1098 ../src/dialogs.py:2182
-#: ../src/dialogs.py:2211 ../src/gui_interface.py:497
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1646 ../src/roster_window.py:1648
-#: ../src/roster_window.py:1981 ../src/roster_window.py:3458
-#: ../src/roster_window.py:3485
+#: ../src/chat_control.py:1673 ../src/common/contacts.py:149
+#: ../src/common/contacts.py:270 ../src/common/helpers.py:60
+#: ../src/common/helpers.py:254 ../src/dialogs.py:1099 ../src/dialogs.py:2222
+#: ../src/dialogs.py:2251 ../src/gui_interface.py:467
+#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:404
+#: ../src/roster_window.py:1644 ../src/roster_window.py:1646
+#: ../src/roster_window.py:1979 ../src/roster_window.py:3507
+#: ../src/roster_window.py:3534
msgid "Not in Roster"
msgstr "Ðемає у реєÑтрі"
-#: ../src/chat_control.py:1654
+#: ../src/chat_control.py:1704
msgid "This contact does not support file transfer."
msgstr "Цей контакт не підтримує Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²."
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1707
msgid "You need to know the real JID of the contact to send him or her a file."
msgstr "Ви маєте знати Ñправжній JID контакту, щоб надÑилати йому чи їй файл."
-#: ../src/chat_control.py:1765
+#: ../src/chat_control.py:1814
#, python-format
msgid "%(type)s state : %(state)s, reason: %(reason)s"
msgstr "%(type)s Ñтан : %(state)s, причина: %(reason)s"
-#: ../src/chat_control.py:1957
+#: ../src/chat_control.py:2005
#, 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:2078 ../src/dialogs.py:5454
+#: ../src/chat_control.py:2115 ../src/dialogs.py:5033
msgid "No GPG key assigned"
msgstr "Ðемає ключа GPG"
-#: ../src/chat_control.py:2079
+#: ../src/chat_control.py:2116
msgid ""
"No GPG key is assigned to this contact. So you cannot encrypt messages with "
"GPG."
@@ -3401,50 +3208,50 @@ msgstr ""
"З цим контактом не пов’Ñзано жодного ключа GPG. Отже ви не зможете шифрувати "
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·Ð° допомогою GPG."
-#: ../src/chat_control.py:2088
+#: ../src/chat_control.py:2125
msgid "GPG encryption disabled"
msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ GPG вимкнено"
-#: ../src/chat_control.py:2114
+#: ../src/chat_control.py:2151
msgid "Session WILL be logged"
msgstr "Ð¡ÐµÐ°Ð½Ñ Ð‘Ð£Ð”Ð• запиÑано до журналу"
-#: ../src/chat_control.py:2116
+#: ../src/chat_control.py:2153
msgid "Session WILL NOT be logged"
msgstr "Ð¡ÐµÐ°Ð½Ñ ÐЕ БУДЕ запиÑано до журналу"
#. encryption %s active
-#: ../src/chat_control.py:2133
+#: ../src/chat_control.py:2170
msgid "is"
msgstr "Ñ”"
-#: ../src/chat_control.py:2133
+#: ../src/chat_control.py:2170
msgid "is NOT"
msgstr "ÐЕ Ñ”"
#. chat session %s be logged
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2172
msgid "will"
msgstr "буде"
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2172
msgid "will NOT"
msgstr "ÐЕ буде"
#. About encrypted chat session
-#: ../src/chat_control.py:2139
+#: ../src/chat_control.py:2176
msgid "and authenticated"
msgstr "і уповноваженим"
#. About encrypted chat session
-#: ../src/chat_control.py:2143
+#: ../src/chat_control.py:2180
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:2150
+#: ../src/chat_control.py:2187
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3453,31 +3260,31 @@ msgstr ""
"Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ %(type)s %(status)s активним %(authenticated)s.\n"
"Ваш ÑÐµÐ°Ð½Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸ %(logged)s запиÑано до журналу."
-#: ../src/chat_control.py:2293
+#: ../src/chat_control.py:2314
msgid "Session negotiation cancelled"
msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑеанÑу було ÑкаÑовано"
-#: ../src/chat_control.py:2303
+#: ../src/chat_control.py:2324
msgid "This session WILL be archived on server"
msgstr "Цей ÑÐµÐ°Ð½Ñ Ð‘Ð£Ð”Ð• збережена на Ñервері"
-#: ../src/chat_control.py:2305
+#: ../src/chat_control.py:2326
msgid "This session WILL NOT be archived on server"
msgstr "Цей ÑÐµÐ°Ð½Ñ ÐЕ БУДЕ збережено на Ñервері"
-#: ../src/chat_control.py:2314
+#: ../src/chat_control.py:2335
msgid "This session is encrypted"
msgstr "Цей ÑÐµÐ°Ð½Ñ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¾"
-#: ../src/chat_control.py:2317
+#: ../src/chat_control.py:2338
msgid " and WILL be logged"
msgstr " Ñ– БУДЕ запиÑано до журналу"
-#: ../src/chat_control.py:2319
+#: ../src/chat_control.py:2340
msgid " and WILL NOT be logged"
msgstr " Ñ– ÐЕ БУДЕ запиÑано до журналу"
-#: ../src/chat_control.py:2324
+#: ../src/chat_control.py:2345
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
@@ -3485,25 +3292,25 @@ msgstr ""
"ОÑобу віддаленого контакту не було перевірено. ÐатиÑніть кнопку з щитом, щоб "
"ознайомитиÑÑ Ð· подробицÑми."
-#: ../src/chat_control.py:2326
+#: ../src/chat_control.py:2347
msgid "E2E encryption disabled"
msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ E2E вимкнено"
-#: ../src/chat_control.py:2370 ../src/chat_control.py:2383
+#: ../src/chat_control.py:2394 ../src/chat_control.py:2407
msgid "The following message was NOT encrypted"
msgstr "ÐаÑтупне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐЕ було зашифровано"
-#: ../src/chat_control.py:2376
+#: ../src/chat_control.py:2400
msgid "The following message was encrypted"
msgstr "ÐаÑтупне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ зашифровано"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2658
+#: ../src/chat_control.py:2667
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "Ви щойно отримали нове Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ «%s»"
-#: ../src/chat_control.py:2659
+#: ../src/chat_control.py:2668
msgid ""
"If you close this tab and you have history disabled, this message will be "
"lost."
@@ -3511,15 +3318,15 @@ msgstr ""
"Якщо ви закриєте вкладку, а журнал було вимкнено, це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ "
"втрачено."
-#: ../src/chat_control.py:2826 ../src/common/connection_handlers_events.py:869
+#: ../src/chat_control.py:2835 ../src/common/connection_handlers_events.py:865
#: ../src/common/connection_handlers.py:945
-#: ../src/common/connection_handlers.py:1042
-#: ../src/common/connection_handlers.py:1698 ../src/common/connection.py:459
-#: ../src/common/logger.py:1126 ../src/gajim.py:200 ../src/session.py:93
+#: ../src/common/connection_handlers.py:1057
+#: ../src/common/connection_handlers.py:1718 ../src/common/connection.py:451
+#: ../src/common/logger.py:1127 ../src/gajim.py:207 ../src/session.py:100
msgid "Database Error"
msgstr "Помилка бази даних"
-#: ../src/chat_control.py:2827
+#: ../src/chat_control.py:2836
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3528,7 +3335,7 @@ msgstr ""
"Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл бази даних (%s). Спробуйте виправити або вилучити "
"його (вÑÑ– запиÑи журналу буде втрачено)."
-#: ../src/chat_control.py:3061 ../src/gui_interface.py:1042
+#: ../src/chat_control.py:3072 ../src/gui_interface.py:1032
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
@@ -3537,7 +3344,7 @@ msgstr ""
"Ðе вдалоÑÑ Ñ€Ð¾Ð·ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %s\n"
"Можливо, хтоÑÑŒ втрутивÑÑ Ñƒ ваше з’єднаннÑ."
-#: ../src/chat_control.py:3094
+#: ../src/chat_control.py:3105
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s тепер %(status)s"
@@ -3576,84 +3383,89 @@ msgstr "%s є каталогом, а має бути файлом"
msgid "creating %s directory"
msgstr "ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ %s"
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:85
msgid "Change status information"
msgstr "Змінити відомоÑÑ‚Ñ– про Ñтан"
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:100
msgid "Change status"
msgstr "Змінити Ñтан"
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:101
msgid "Set the presence type and description"
msgstr "Вказати тип приÑутноÑÑ‚Ñ– Ñ– опиÑ"
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:107
msgid "Free for chat"
msgstr "Вільний Ð´Ð»Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸"
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:108
msgid "Online"
msgstr "В мережі"
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:109 ../src/common/helpers.py:242
+#: ../src/tooltips.py:193
+msgid "Away"
+msgstr "Далеко"
+
+#: ../src/common/commands.py:110
msgid "Extended away"
msgstr "Ðе буде довго"
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:111
msgid "Do not disturb"
msgstr "Ðе турбувати"
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:112
msgid "Offline - disconnect"
msgstr "Поза мережею — від’єднаний"
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:117
msgid "Presence description:"
msgstr "ÐžÐ¿Ð¸Ñ Ñтану приÑутноÑÑ‚Ñ–:"
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:152 ../src/common/commands.py:320
msgid "The status has been changed."
msgstr "Стан було змінено."
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:184 ../src/common/commands.py:210
msgid "Leave Groupchats"
msgstr "Полишити групові балачки"
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:200
#, python-format
msgid "%(nickname)s on %(room_jid)s"
msgstr "%(nickname)s у %(room_jid)s"
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:204
msgid "You have not joined a groupchat."
msgstr "Ви не приєдналиÑÑ Ð´Ð¾ групової балачки."
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:211
msgid "Choose the groupchats you want to leave"
msgstr "Оберіть групові балачки, Ñкі ви бажаєте полишити"
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:817
-#: ../src/roster_window.py:1650 ../src/roster_window.py:1652
-#: ../src/roster_window.py:2504 ../src/roster_window.py:5442
+#: ../src/common/commands.py:215 ../src/common/contacts.py:128
+#: ../src/common/helpers.py:60 ../src/roster_window.py:817
+#: ../src/roster_window.py:1648 ../src/roster_window.py:1650
+#: ../src/roster_window.py:2512 ../src/roster_window.py:5524
msgid "Groupchats"
msgstr "Групові балачки"
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:256
msgid "You left the following groupchats:"
msgstr "Ви полишили такі групові балачки:"
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:268
msgid "Forward unread messages"
msgstr "ПереÑпрÑмувати непрочитані повідомленнÑ"
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:290
msgid "All unread messages have been forwarded."
msgstr "Ð’ÑÑ– непрочитані Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ переÑпрÑмовано."
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:298
msgid "Forward unread message then disconnect"
msgstr "ПереÑпрÑмувати непрочитані Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð° від’єднатиÑÑŒ"
@@ -3706,47 +3518,52 @@ msgstr ""
"Коли показувати піктограму у зоні Ñповіщень. Можливі варіанти ніколи "
"(never), при події (on_event) та завжди (always)."
-#: ../src/common/config.py:94
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+"Дозволити ховати вікно реєÑтру навіть Ñкщо піктограму ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½Ðµ задіÑно"
+
+#: ../src/common/config.py:95
msgid "Incoming nickname color."
msgstr "Колір вхідного пÑевдоніму"
-#: ../src/common/config.py:95
+#: ../src/common/config.py:96
msgid "Outgoing nickname color."
msgstr "Колір вихідного пÑевдоніма"
-#: ../src/common/config.py:96
+#: ../src/common/config.py:97
msgid "Incoming text color."
msgstr "Колір вхідного текÑту"
-#: ../src/common/config.py:97
+#: ../src/common/config.py:98
msgid "Outgoing text color."
msgstr "Колір вихідного текÑту"
-#: ../src/common/config.py:98
+#: ../src/common/config.py:99
msgid "Status message text color."
msgstr "Колір текÑту Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан."
-#: ../src/common/config.py:101
+#: ../src/common/config.py:102
msgid "Incoming nickname font."
msgstr "Шрифт вхідного пÑевдоніму"
-#: ../src/common/config.py:102
+#: ../src/common/config.py:103
msgid "Outgoing nickname font."
msgstr "Шрифт вихідного пÑевдоніма."
-#: ../src/common/config.py:103
+#: ../src/common/config.py:104
msgid "Incoming text font."
msgstr "Шрифт вхідного текÑту"
-#: ../src/common/config.py:104
+#: ../src/common/config.py:105
msgid "Outgoing text font."
msgstr "Шрифт вихідного текÑту"
-#: ../src/common/config.py:105
+#: ../src/common/config.py:106
msgid "Status message text font."
msgstr "Шрифт текÑту ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан."
-#: ../src/common/config.py:106
+#: ../src/common/config.py:107
msgid ""
"List (space separated) of rows (accounts and groups) that are collapsed."
msgstr ""
@@ -3754,17 +3571,17 @@ msgstr ""
"згорнуто."
#. sorted alphanum
-#: ../src/common/config.py:107 ../src/common/config.py:508
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:2631
+#: ../src/common/config.py:108 ../src/common/config.py:497
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:492
+#: ../src/common/optparser.py:526 ../src/gui_interface.py:2634
msgid "default"
msgstr "типовий"
-#: ../src/common/config.py:113
+#: ../src/common/config.py:114
msgid "Language used by speller"
msgstr "Мова, Ñку викориÑтовуватиме інÑтрумент перевірки правопиÑу"
-#: ../src/common/config.py:114
+#: ../src/common/config.py:115
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3774,7 +3591,7 @@ msgstr ""
"'sometimes' — виводити Ñ‡Ð°Ñ ÐºÐ¾Ð¶Ð½Ñ– print_ichat_every_foo_minutes хвилин.\n"
"'never' — ніколи не виводити чаÑ."
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
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. "
@@ -3785,18 +3602,18 @@ msgstr ""
"найточніше Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу, 4 — найменш точне. Цей параметр буде "
"викориÑтано, лише Ñкщо параметр print_time має Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ 'sometimes'."
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "Вважати пари Ñимволів * / _ Ñимволами форматуваннÑ."
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
"Якщо має Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«True», не вилучати */_ . Ðаприклад, Ñ€Ñдок *abc* "
"вважатиметьÑÑ Ñ€Ñдком з напівжирним шрифтом піÑÐ»Ñ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡Ð¾Ðº * *."
-#: ../src/common/config.py:122
+#: ../src/common/config.py:123
msgid ""
"Uses ReStructured text markup to send HTML, plus ascii formatting if "
"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3807,7 +3624,7 @@ msgstr ""
"http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Ñкщо "
"бажаєте кориÑтуватиÑÑ Ð½Ð¸Ð¼Ð¸, вÑтановіть docutils)"
-#: ../src/common/config.py:131
+#: ../src/common/config.py:132
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -3815,7 +3632,7 @@ msgstr ""
"Символ, Ñкий буде додано піÑÐ»Ñ Ð¿Ñевдоніма, Ñкщо ви викориÑтовуєте "
"автоматичне Ð´Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð¿Ñевдоніма (tab) у груповій балачці."
-#: ../src/common/config.py:132
+#: ../src/common/config.py:133
msgid ""
"Character to propose to add after desired nickname when desired nickname is "
"used by someone else in group chat."
@@ -3823,7 +3640,15 @@ msgstr ""
"Символ, Ñкий буде запропоновано додати піÑÐ»Ñ Ð±Ð°Ð¶Ð°Ð½Ð¾Ð³Ð¾ пÑевдоніма, Ñкщо "
"пÑевдонім буде викориÑтано кимоÑÑŒ з групової балачки."
-#: ../src/common/config.py:160
+#: ../src/common/config.py:151
+msgid ""
+"If true, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+"Якщо увімкнено, Gajim буде зберігати Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ Ð²Ñ–ÐºÐ½Ð° ховаючи реєÑÑ‚Ñ€ та "
+"відновлювати при його показі."
+
+#: ../src/common/config.py:162
msgid ""
"This option let you customize timestamp that is printed in conversation. For "
"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3834,26 +3659,26 @@ msgstr ""
"\"[година:хвилина] \". Див. документацію з python щодо strftime, щоб "
"дізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ: http://docs.python.org/lib/module-time.html"
-#: ../src/common/config.py:161
+#: ../src/common/config.py:163
msgid "Characters that are printed before the nickname in conversations"
msgstr "Символи, Ñкі буде показано перед пÑевдонімами під Ñ‡Ð°Ñ ÑпілкуваннÑ"
-#: ../src/common/config.py:162
+#: ../src/common/config.py:164
msgid "Characters that are printed after the nickname in conversations"
msgstr "Символи, Ñкі буде показано піÑÐ»Ñ Ð¿Ñевдонімів під Ñ‡Ð°Ñ ÑпілкуваннÑ"
-#: ../src/common/config.py:165
+#: ../src/common/config.py:167
msgid ""
"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
msgstr ""
"Вкажить команду Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸ отриманні нової пошти, наприклад: /usr/bin/"
"getmail -q"
-#: ../src/common/config.py:167
+#: ../src/common/config.py:169
msgid "Add * and [n] in roster title?"
msgstr "Додати * Ñ– [n] у заголовок реєÑтру?"
-#: ../src/common/config.py:168
+#: ../src/common/config.py:170
msgid ""
"How many lines to remember from previous conversation when a chat tab/window "
"is reopened."
@@ -3861,22 +3686,29 @@ msgstr ""
"КількіÑÑ‚ÑŒ Ñ€Ñдків теÑту, Ñкі Ñлід запам’Ñтати з попереднього ÑÐ¿Ñ–Ð»ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ "
"показу під Ñ‡Ð°Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ð³Ð¾ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ або вікна балачки."
-#: ../src/common/config.py:169
+#: ../src/common/config.py:171
msgid "How many minutes should last lines from previous conversation last."
msgstr ""
"Проміжок чаÑу у хвилинах, протÑгом Ñкого Ñлід зберігати Ñ€Ñдки попередньої "
"розмови"
-#: ../src/common/config.py:170
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:172
+msgid ""
+"How many lines to request to server when entering a groupchat. -1 means no "
+"limit"
msgstr ""
-"Як багато робити запитів до Ñервера при під’єднанні до групової балачки."
+"Як багато робити запитів до Ñервера при під’єднанні до групової балачки. -1 "
+"означає без обмежень"
-#: ../src/common/config.py:171
-msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "За Ñкільки хвилин запитувати журнал, при вході у групову балачку."
+#: ../src/common/config.py:173
+msgid ""
+"How many minutes back to request logs when a entering a groupchat. -1 means "
+"no limit"
+msgstr ""
+"За Ñкільки хвилин запитувати журнал, при вході у групову балачку. -1 означає "
+"без обмеженнÑ"
-#: ../src/common/config.py:172
+#: ../src/common/config.py:174
msgid ""
"How many seconds to wait before trying to autorejoin to a conference you are "
"being disconnected from. Set to 0 to disable autorejoining."
@@ -3885,14 +3717,14 @@ msgstr ""
"конференції від Ñкої Ð²Ð°Ñ Ð±ÑƒÐ»Ð¾ від’єднано. Ð’Ñтановіть 0 Ð´Ð»Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ "
"автоматичного перепід’єднаннÑ."
-#: ../src/common/config.py:173
+#: ../src/common/config.py:175
msgid ""
"Should autorejoin be activated when we are being kicked from a conference?"
msgstr ""
"Чи має бути активним автоматичне повторне Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñƒ випадку Ñкщо Ð²Ð°Ñ "
"викинули з конференції?"
-#: ../src/common/config.py:174
+#: ../src/common/config.py:176
msgid ""
"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
"Client default behaviour)."
@@ -3900,11 +3732,11 @@ msgstr ""
"ÐадÑилати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·Ð° Ctrl+Enter, а за допомогою Enter розривати Ñ€Ñдок "
"(типова поведінка клієнта Mirabilis ICQ)."
-#: ../src/common/config.py:176
+#: ../src/common/config.py:178
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "КількіÑÑ‚ÑŒ Ñ€Ñдків, Ñкі Ñлід зберігати Ð´Ð»Ñ Ctrl+Стрілка_вгору."
-#: ../src/common/config.py:179
+#: ../src/common/config.py:181
#, python-format
msgid ""
"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3913,13 +3745,13 @@ msgstr ""
"Ðбо нетипова адреÑа url з підрÑдком %s, де %s — Ñлово або фраза, або "
"'WIKTIONARY' (це означає, що Ñлід викориÑтовувати Ñлужбу wiktionary)."
-#: ../src/common/config.py:182
+#: ../src/common/config.py:184
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr ""
"Якщо позначено цей пункт, Gajim можна віддалено керувати за допомогою gajim-"
"remote."
-#: ../src/common/config.py:183
+#: ../src/common/config.py:185
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 "
@@ -3931,14 +3763,14 @@ msgstr ""
"параметра listen_to_network_manager рівне «False» Ñ– вони ÑинхронізуютьÑÑ Ð· "
"загальним Ñтаном) згідно до Ñтану мережевого з’єднаннÑ."
-#: ../src/common/config.py:184
+#: ../src/common/config.py:186
msgid ""
"Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr ""
"ÐадÑилати ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан балачки. Може мати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ all, "
"composing_only, disabled."
-#: ../src/common/config.py:185
+#: ../src/common/config.py:187
msgid ""
"Displayed chat state notifications in chat windows. Can be one of all, "
"composing_only, disabled."
@@ -3946,7 +3778,7 @@ msgstr ""
"Тип Ñповіщень про Ñтан балачки, Ñкі буде показано у вікнах балачки. Може "
"мати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ all, composing_only, disabled."
-#: ../src/common/config.py:187
+#: ../src/common/config.py:189
msgid ""
"When not printing time for every message (print_time==sometimes), print it "
"every x minutes."
@@ -3954,11 +3786,11 @@ msgstr ""
"Якщо не вказано, що програма має виводити Ñ‡Ð°Ñ Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ з повідомлень "
"(print_time==sometimes), виводити Ñ‡Ð°Ñ ÐºÐ¾Ð¶Ð½Ñ– x хвилин."
-#: ../src/common/config.py:188
+#: ../src/common/config.py:190
msgid "Ask before closing a group chat tab/window."
msgstr "Запитувати перед закриттÑм вкладки або вікна групової балачки."
-#: ../src/common/config.py:189
+#: ../src/common/config.py:191
msgid ""
"Always ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3967,7 +3799,7 @@ msgstr ""
"балачки, Ñку вказано у цьому відокремленому пробілами ÑпиÑку jid групових "
"балачок."
-#: ../src/common/config.py:190
+#: ../src/common/config.py:192
msgid ""
"Never ask before closing group chat tab/window in this space separated list "
"of group chat jids."
@@ -3976,7 +3808,7 @@ msgstr ""
"балачки, Ñку вказано у цьому відокремленому пробілами ÑпиÑку jid групових "
"балачок."
-#: ../src/common/config.py:191
+#: ../src/common/config.py:193
msgid ""
"Ask before closing tabbed chat window if there are control that can loose "
"data (chat, private chat, groupchat that will not be minimized)"
@@ -3985,7 +3817,7 @@ msgstr ""
"до втрати даних (діалог, приватний діалог, групова розмова що не може бути "
"мінімізована)."
-#: ../src/common/config.py:194
+#: ../src/common/config.py:196
msgid ""
"Comma separated list of hosts that we send, in addition of local interfaces, "
"for File Transfer in case of address translation/port forwarding."
@@ -3994,27 +3826,27 @@ msgstr ""
"інтерфейÑів, Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² у випадку транÑлÑції Ð°Ð´Ñ€ÐµÑ Ð°Ð±Ð¾ "
"переÑпрÑÐ¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ€Ñ‚Ñ–Ð²."
-#: ../src/common/config.py:196
+#: ../src/common/config.py:198
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "Згідно до Ñтандарту IEC: кіБ = 1024 байтам, кБ = 1000 байтам."
-#: ../src/common/config.py:198
+#: ../src/common/config.py:200
msgid "Notify of events in the notification area."
msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ події у зоні Ñповіщень."
-#: ../src/common/config.py:204
+#: ../src/common/config.py:206
msgid "Show tab when only one conversation?"
msgstr "Показувати вкладку за умови єдиної беÑіди?"
-#: ../src/common/config.py:205
+#: ../src/common/config.py:207
msgid "Show tabbed notebook border in chat windows?"
msgstr "Показувати бічну панель з вкладками у вікнах балачки?"
-#: ../src/common/config.py:206
+#: ../src/common/config.py:208
msgid "Show close button in tab?"
msgstr "Показувати кнопку Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð½Ð° вкладці?"
-#: ../src/common/config.py:207
+#: ../src/common/config.py:209
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 "
@@ -4027,19 +3859,19 @@ msgstr ""
"Більші Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð²Ð¸Ñ‰ÑƒÑŽÑ‚ÑŒ безпеку, але програма витрачатиме більше чаÑу на "
"Ñ—Ñ… обчиÑÐ»ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð·Ð°Ð¿ÑƒÑку ÑеанÑу."
-#: ../src/common/config.py:216
+#: ../src/common/config.py:218
msgid "Preview new messages in notification popup?"
msgstr ""
"ЗдійÑнювати попередній переглÑд нових повідомлень у виринаючому Ñповіщенні?"
-#: ../src/common/config.py:221
+#: ../src/common/config.py:223
msgid ""
"A semicolon-separated list of words that will be highlighted in group chats."
msgstr ""
"СпиÑок відокремлених крапкою з комою Ñлів, Ñкі буде виділено у групових "
"балачках."
-#: ../src/common/config.py:222
+#: ../src/common/config.py:224
msgid ""
"If True, quits Gajim when X button of Window Manager is clicked. This "
"setting is taken into account only if notification icon is used."
@@ -4048,14 +3880,14 @@ msgstr ""
"кнопки з позначкою «X» у менеджері вікон. Цей параметр братиметьÑÑ Ð´Ð¾ уваги, "
"лише Ñкщо викориÑтовуєтьÑÑ Ð¿Ñ–ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼Ð° лотка."
-#: ../src/common/config.py:223
+#: ../src/common/config.py:225
msgid ""
"If True, Gajim will check if it's the default jabber client on each startup."
msgstr ""
"Якщо має Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«True», Gajim перевірÑтиме, чи Ñ” програма типовим клієнтом "
"jabber під Ñ‡Ð°Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ запуÑку програми."
-#: ../src/common/config.py:224
+#: ../src/common/config.py:226
msgid ""
"If True, Gajim will display an icon on each tab containing unread messages. "
"Depending on the theme, this icon may be animated."
@@ -4064,7 +3896,7 @@ msgstr ""
"вкладок, на Ñкій міÑÑ‚ÑÑ‚ÑŒÑÑ Ð½ÐµÐ¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð½Ñ– повідомленнÑ. Залежно від обраної "
"вами теми, піктограму може бути анімовано."
-#: ../src/common/config.py:225
+#: ../src/common/config.py:227
msgid ""
"If True, Gajim will display the status message, if not empty, for every "
"contact under the contact name in roster window."
@@ -4073,11 +3905,11 @@ msgstr ""
"про Ñтан, Ñкщо це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ буде порожнім, Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ з контактів під "
"іменем контакту у вікні реєÑтру."
-#: ../src/common/config.py:231
+#: ../src/common/config.py:233
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr "Визначає позицію аватару у реєÑтрі. Можливі значеннÑ: left Ñ– right"
-#: ../src/common/config.py:232
+#: ../src/common/config.py:234
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."
@@ -4086,7 +3918,7 @@ msgstr ""
"запиÑів контактів, чий аватар не було отримано під Ñ‡Ð°Ñ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾Ð³Ð¾ ÑеанÑу, "
"або контактів, чиї аватари вважатимутьÑÑ Ð·Ð°Ñтарілими."
-#: ../src/common/config.py:233
+#: ../src/common/config.py:235
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."
@@ -4095,7 +3927,7 @@ msgstr ""
"Ñ€Ñдок Ñтану у балачках, коли контакт змінює Ñвій Ñтан Ñ–/або Ñвоє "
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан."
-#: ../src/common/config.py:234
+#: ../src/common/config.py:236
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 "
@@ -4110,30 +3942,34 @@ msgstr ""
"до того, що Gajim виводитиме лише Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ те, що «такий-то увійшов "
"або полишив групову балачку»."
-#: ../src/common/config.py:236
+#: ../src/common/config.py:238
+msgid "Log XHTML messages instead of plain text messages."
+msgstr "Зберігати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñк XHTML заміÑÑ‚ÑŒ звичайного текÑту."
+
+#: ../src/common/config.py:239
msgid "Background color of contacts when they just signed in."
msgstr "Колір контактів, Ñкі тільки-но увійшли до мережі."
-#: ../src/common/config.py:237
+#: ../src/common/config.py:240
msgid "Background color of contacts when they just signed out."
msgstr "Колір контактів, Ñкі тільки-но вийшли з мережі."
-#: ../src/common/config.py:239
+#: ../src/common/config.py:242
msgid ""
"If True, restored messages will use a smaller font than the default one."
msgstr ""
"Якщо цей параметр матиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«True», відновлені Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ "
"показано меншим ніж типовий шрифтом."
-#: ../src/common/config.py:240
+#: ../src/common/config.py:243
msgid "Don't show avatar for the transport itself."
msgstr "Ðе показувати аватар транÑпорту."
-#: ../src/common/config.py:241
+#: ../src/common/config.py:244
msgid "Don't show roster in the system taskbar."
msgstr "Ðе показувати реєÑÑ‚Ñ€ на ÑиÑтемній панелі задач."
-#: ../src/common/config.py:242
+#: ../src/common/config.py:245
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 "
@@ -4143,7 +3979,7 @@ msgstr ""
"GTK+ Ñ– PyGTK не Ñтаріші за 2.8, у разі наÑвноÑÑ‚Ñ– подій у черзі позначка "
"вікна програми почне блимати (типова поведінка у більшоÑÑ‚Ñ– менеджерів вікон)."
-#: ../src/common/config.py:244
+#: ../src/common/config.py:247
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 "
@@ -4154,7 +3990,7 @@ msgstr ""
"«False», щоб вимкнути надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¾Ð¼Ð¾Ñтей sha до Ñервера групової балачки."
#. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:250
msgid ""
"Controls the window where new messages are placed.\n"
"'always' - All messages are sent to a single window.\n"
@@ -4175,7 +4011,7 @@ msgstr ""
"'pertype' — Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ розподілено за типом (наприклад, проÑÑ‚Ñ– Ñ– "
"групові балачки) між окремими вікнами."
-#: ../src/common/config.py:248
+#: ../src/common/config.py:251
msgid ""
"Show roster on startup.\n"
"'always' - Always show roster.\n"
@@ -4187,35 +4023,35 @@ msgstr ""
"'never' - Ðіколи не показувати реєÑÑ‚Ñ€.\n"
"'last_state' - Відновити оÑтанній Ñтан реєÑтру.ртÑик"
-#: ../src/common/config.py:249
+#: ../src/common/config.py:252
msgid "If False, you will no longer see the avatar in the chat window."
msgstr ""
"Якщо цей параметр матиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«False», ви не бачитимете аватарів у вікні "
"балачки."
-#: ../src/common/config.py:250
+#: ../src/common/config.py:253
msgid "If True, pressing the escape key closes a tab/window."
msgstr ""
"Якщо цей параметр матиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«True», натиÑÐºÐ°Ð½Ð½Ñ ÐºÐ»Ð°Ð²Ñ–ÑˆÑ– escape "
"закриватиме вкладку або вікно програми."
-#: ../src/common/config.py:251
+#: ../src/common/config.py:254
msgid "Hides the buttons in chat windows."
msgstr "Ховає кнопки у вікнах балачки."
-#: ../src/common/config.py:252
+#: ../src/common/config.py:255
msgid "Hides the banner in a group chat window"
msgstr "Приховує Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ñƒ вікні групової балачки"
-#: ../src/common/config.py:253
+#: ../src/common/config.py:256
msgid "Hides the banner in two persons chat window"
msgstr "Ховає Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ñƒ вікні балачки між двома оÑобами"
-#: ../src/common/config.py:254
+#: ../src/common/config.py:257
msgid "Hides the group chat occupants list in group chat window."
msgstr "Ховає ÑпиÑок учаÑників групової балачки у вікні групової балачки."
-#: ../src/common/config.py:255
+#: ../src/common/config.py:258
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."
@@ -4223,16 +4059,16 @@ msgstr ""
"У балачках, показувати пÑевдонім на початку Ñ€Ñдка повідомленнÑ, лише Ñкщо це "
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ тої Ñамої оÑоби, Ñкою було надіÑлано попереднє повідомленнÑ."
-#: ../src/common/config.py:256
+#: ../src/common/config.py:259
msgid "Indentation when using merge consecutive nickname."
msgstr ""
"ВідÑтуп за викориÑÑ‚Ð°Ð½Ð½Ñ Ð¾Ð±â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ð¾Ñлідовних повідомлень від однієї оÑоби."
-#: ../src/common/config.py:257
+#: ../src/common/config.py:260
msgid "Smooth scroll message in conversation window"
msgstr "Плавне Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ у вікні балачки"
-#: ../src/common/config.py:258
+#: ../src/common/config.py:261
msgid ""
"List of colors, separated by \":\", that will be used to color nicknames in "
"group chats."
@@ -4240,13 +4076,13 @@ msgstr ""
"СпиÑок кольорів, відокремлених Ñимволом «:», Ñкі буде викориÑтано Ð´Ð»Ñ "
"Ñ€Ð¾Ð·Ñ„Ð°Ñ€Ð±Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñевдонімів у групових балачках."
-#: ../src/common/config.py:259
+#: ../src/common/config.py:262
msgid "Ctrl-Tab go to next composing tab when none is unread."
msgstr ""
"Ctrl-Tab переводить до наÑтупної вкладки ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ, Ñкщо немає "
"непрочитаних."
-#: ../src/common/config.py:260
+#: ../src/common/config.py:263
msgid ""
"Should we show the confirm metacontacts creation dialog or not? Empty string "
"means we never show the dialog."
@@ -4254,7 +4090,7 @@ msgstr ""
"Чи Ñлід показувати діалогове вікно Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¼ÐµÑ‚Ð°ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñ–Ð²? "
"Порожній Ñ€Ñдок вказуватиме на те, що це діалогове вікно не Ñлід показувати."
-#: ../src/common/config.py:261
+#: ../src/common/config.py:264
msgid ""
"Should we show the confirm block contact dialog or not? Empty string means "
"we never show the dialog."
@@ -4262,7 +4098,7 @@ msgstr ""
"Чи Ñлід показувати діалогове вікно Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñ–Ð²? "
"Порожній Ñ€Ñдок вказуватиме на те, що це діалогове вікно не Ñлід показувати."
-#: ../src/common/config.py:262
+#: ../src/common/config.py:265
msgid ""
"Should we show the confirm custom status dialog or not? Empty string means "
"we never show the dialog."
@@ -4271,7 +4107,7 @@ msgstr ""
"ÑтатуÑів? Порожній Ñ€Ñдок вказуватиме на те, що це діалогове вікно не Ñлід "
"показувати."
-#: ../src/common/config.py:263
+#: ../src/common/config.py:266
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 "
@@ -4282,7 +4118,7 @@ msgstr ""
"облікового запиÑу. БУДЬТЕ ОБЕРЕЖÐІ за умови входу з від’ємним пріоритетом: у "
"такому разі ви ÐЕ отримуватимете повідомлень від вашого Ñервера."
-#: ../src/common/config.py:264
+#: ../src/common/config.py:267
msgid ""
"If True, Gajim will use Gnome Keyring (if available) to store account "
"passwords."
@@ -4290,7 +4126,7 @@ msgstr ""
"Якщо цей параметр матиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«True», Gajim викориÑтовуватиме Gnome "
"Keyring (за його наÑвноÑÑ‚Ñ–) Ð´Ð»Ñ Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ– облікових запиÑів."
-#: ../src/common/config.py:265
+#: ../src/common/config.py:268
msgid ""
"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
"account passwords."
@@ -4299,7 +4135,7 @@ msgstr ""
"торбинок KDE (Ñкщо kwalletcli доÑтупний) Ð´Ð»Ñ Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ–Ð² облікових "
"запиÑів."
-#: ../src/common/config.py:266
+#: ../src/common/config.py:269
msgid ""
"If True, Gajim will show number of online and total contacts in account and "
"group rows."
@@ -4308,7 +4144,7 @@ msgstr ""
"контактів у мережі Ñ– загальну кількіÑÑ‚ÑŒ контактів у Ñ€Ñдках облікових запиÑів "
"і груп."
-#: ../src/common/config.py:267
+#: ../src/common/config.py:270
msgid ""
"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
"as if they were of this type"
@@ -4317,7 +4153,7 @@ msgstr ""
"непорожнє значеннÑ, вважати вÑÑ– вхідні Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñми вказано "
"типу"
-#: ../src/common/config.py:268
+#: ../src/common/config.py:271
msgid ""
"If True, Gajim will scroll and select the contact who sent you the last "
"message, if chat window is not already opened."
@@ -4326,7 +4162,7 @@ msgstr ""
"у ньому контакт, Ñким вам було надіÑлано оÑтаннє повідомленнÑ, Ñкщо вікно "
"балачки ще не було відкрито."
-#: ../src/common/config.py:269
+#: ../src/common/config.py:272
msgid ""
"If True, Gajim will convert string between $$ and $$ to an image using dvips "
"and convert before insterting it in chat window."
@@ -4335,11 +4171,11 @@ msgstr ""
"позначками $$ Ñ– $$ на Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð° допомогою dvips піÑÐ»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¹Ð¾Ð³Ð¾ "
"на формулу, Ñ– показуватиме Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñƒ вікні балачки."
-#: ../src/common/config.py:270
+#: ../src/common/config.py:273
msgid "Time of inactivity needed before the change status window closes down."
msgstr "Ð§Ð°Ñ Ð²Ñ–Ð´ÑутноÑÑ‚Ñ– активноÑÑ‚Ñ– потрібний Ð´Ð»Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð²Ñ–ÐºÐ½Ð° зміни Ñтану."
-#: ../src/common/config.py:271
+#: ../src/common/config.py:274
msgid ""
"Maximum number of lines that are printed in conversations. Oldest lines are "
"cleared."
@@ -4347,7 +4183,7 @@ msgstr ""
"МакÑимальна кількіÑÑ‚ÑŒ Ñ€Ñдків, Ñкі буде показано протÑгом ÑпілкуваннÑ. "
"ЗаÑтарілі Ñ€Ñдки понад вказане чиÑло вилучатимутьÑÑ."
-#: ../src/common/config.py:272
+#: ../src/common/config.py:275
msgid ""
"If True, notification windows from notification-daemon will be attached to "
"notification icon."
@@ -4356,13 +4192,13 @@ msgstr ""
"Ñлужби ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ (notification-daemon) буде приєднано до піктограми у "
"ÑиÑтемному лотку."
-#: ../src/common/config.py:273
+#: ../src/common/config.py:276
msgid "Choose interval between 2 checks of idleness."
msgstr ""
"Оберіть інтервал між двома поÑлідовними перевірками на відÑутніÑÑ‚ÑŒ "
"активноÑÑ‚Ñ–."
-#: ../src/common/config.py:274
+#: ../src/common/config.py:277
msgid ""
"Change the value to change the size of latex formulas displayed. The higher "
"is larger."
@@ -4370,7 +4206,7 @@ msgstr ""
"За допомогою цього параметра можна регулювати розмір формул latex. Більші "
"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð°ÑŽÑ‚ÑŒ більшим Ñимволам формул."
-#: ../src/common/config.py:275
+#: ../src/common/config.py:278
msgid ""
"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
"uri. (mailto and xmpp are handled separately)"
@@ -4378,7 +4214,7 @@ msgstr ""
"Чинні Ñхеми uri. «Справжніми» uri вважатимутьÑÑ Ð»Ð¸ÑˆÐµ Ñхеми вказані у ÑпиÑку. "
"(mailto Ñ– xmpp оброблÑÑŽÑ‚ÑŒÑÑ Ð¾ÐºÑ€ÐµÐ¼Ð¾)"
-#: ../src/common/config.py:276
+#: ../src/common/config.py:279
msgid ""
"Ask offline status message to all offline contacts when connection to an "
"accoutn is established. WARNING: This causes a lot of requests to be sent!"
@@ -4386,13 +4222,13 @@ msgstr ""
"Запит повідомлень відÑутноÑÑ‚Ñ– до уÑих відключених контактів при поÑві з ними "
"зв’Ñзку. УВÐГÐ: це призведе до відÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð²ÐµÐ»Ð¸ÐºÐ¾Ñ— кількоÑÑ‚Ñ– запитів."
-#: ../src/common/config.py:277
+#: ../src/common/config.py:280
msgid "If True, completion in groupchats will be like a shell auto-completion"
msgstr ""
"Якщо ІÑтино, Ð´Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñƒ групових балачках будуть Ñхожі на Ð°Ð²Ñ‚Ð¾Ð´Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ "
"командної оболонки."
-#: ../src/common/config.py:278
+#: ../src/common/config.py:281
msgid ""
"When is self contact row displayed. Can be \"always\", \"when_other_resource"
"\" or \"never\""
@@ -4400,17 +4236,17 @@ msgstr ""
"Коли показувати Ð·Ð°Ð¿Ð¸Ñ Ð²Ð»Ð°Ñного контакту. Може бути \"завжди\", "
"\"коли_інший_реÑурÑ\" або \"ніколи\""
-#: ../src/common/config.py:283
+#: ../src/common/config.py:286
msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
msgstr ""
"Опціонально виправлÑти чаÑтоту кадрів вихідного відео Jingle. Приклад: 10/1 "
"або 25/2"
-#: ../src/common/config.py:284
+#: ../src/common/config.py:287
msgid "Optionally resize jingle output video. Example: 320x240"
msgstr "Опціонально змінювати розмір вихідного відео Jingle. Приклад: 320х240"
-#: ../src/common/config.py:287
+#: ../src/common/config.py:290
msgid ""
"If True, Gajim will try to use a STUN server when using jingle. The one in "
"\"stun_server\" option, or the one given by the jabber server."
@@ -4419,11 +4255,11 @@ msgstr ""
"викориÑтано Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñƒ \"stun_server\", або отримане з Ñерверу "
"Jabber."
-#: ../src/common/config.py:288
+#: ../src/common/config.py:291
msgid "STUN server to use when using jingle"
msgstr "Сервер STUN Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð· Jingle"
-#: ../src/common/config.py:289
+#: ../src/common/config.py:292
msgid ""
"If True, Gajim will show affiliation of groupchat occupants by adding a "
"colored square to the status icon"
@@ -4431,7 +4267,7 @@ msgstr ""
"Якщо увімкнено, Gajim покаже членÑтво учаÑників балачки додаваннÑм "
"кольорового квадрату до піктограми Ñтану."
-#: ../src/common/config.py:302
+#: ../src/common/config.py:306
msgid ""
"Priority will change automatically according to your status. Priorities are "
"defined in autopriority_* options."
@@ -4439,7 +4275,7 @@ msgstr ""
"Пріоритет автоматично змінюватиметьÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ від вашого Ñтану. Пріоритети "
"визначаютьÑÑ Ð·Ð° допомогою параметрів autopriority_*."
-#: ../src/common/config.py:310
+#: ../src/common/config.py:314
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"
@@ -4448,38 +4284,38 @@ msgstr ""
"значеннÑ: online, chat, away, xa, dnd, invisible. ЗÐУВÐЖЕÐÐЯ: цей параметр "
"викориÑтовуватиметьÑÑ, лише Ñкщо вимкнено параметр restore_last_status"
-#: ../src/common/config.py:311
+#: ../src/common/config.py:315
msgid "If enabled, restore the last status that was used."
msgstr "Якщо увімкнено, відновлювати попередній викориÑтаний Ñтан."
-#: ../src/common/config.py:313
+#: ../src/common/config.py:317
msgid ""
"If True, Contacts requesting authorization will be automatically accepted."
msgstr "Якщо ІÑтино, уÑÑ– запити авторизації буде автоматично задоволено."
-#: ../src/common/config.py:314
+#: ../src/common/config.py:318
msgid ""
"If False, this account will be disabled and will not appear in roster window."
msgstr ""
"Якщо цей параметр матиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«False», обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ´Ðµ вимкнено та "
"не буде відображатиÑÑŒ у вікні реєÑтру."
-#: ../src/common/config.py:317
+#: ../src/common/config.py:321
msgid ""
"If disabled, don't sign presences with GPG key, even if GPG is configured."
msgstr ""
"Якщо вимкнено, не підпиÑувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ приÑутніÑÑ‚ÑŒ ключем GPG, "
"навіть Ñкщо GPG налаштовано Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтаннÑ."
-#: ../src/common/config.py:319
+#: ../src/common/config.py:323
msgid "Enable ESessions encryption for this account."
msgstr "Увімкнути ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ ESession Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ облікового запиÑу."
-#: ../src/common/config.py:320
+#: ../src/common/config.py:324
msgid "Should Gajim automatically start an encrypted session when possible?"
msgstr "Чи має Gajim автоматично починати ÑÐµÐ°Ð½Ñ Ð· шифруваннÑм за можливоÑÑ‚Ñ–?"
-#: ../src/common/config.py:321
+#: ../src/common/config.py:325
msgid ""
"Ordered list (space separated) of connection type to try. Can contain tls, "
"ssl or plain"
@@ -4487,39 +4323,56 @@ msgstr ""
"ВпорÑдкований ÑпиÑок відокремлених комами типів з’єднаннÑ, Ñкі має "
"Ñпробувати програма. Можливі значеннÑ: tls, ssl Ñ– plain"
-#: ../src/common/config.py:322
+#: ../src/common/config.py:326
msgid ""
"Show a warning dialog before sending password on an plaintext connection."
msgstr ""
"Показувати діалогове вікно попередженнÑ, перш ніж надÑилати пароль "
"нешифрованим з’єднаннÑм."
-#: ../src/common/config.py:323
+#: ../src/common/config.py:327
msgid "Show a warning dialog before using standard SSL library."
msgstr ""
"Показувати діалогове вікно попередженнÑ, перш ніж кориÑтуватиÑÑ Ñтандартною "
"бібліотекою SSL."
-#: ../src/common/config.py:324
+#: ../src/common/config.py:328
msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
msgstr ""
"Показувати діалогове вікно попередженнÑ, перш ніж надÑилати відкритий пароль "
-"незашифрованим з’єднаннÑм."
+"незашифрованим з'єднаннÑм."
-#: ../src/common/config.py:326
+#: ../src/common/config.py:330
msgid "Space separated list of ssl errors to ignore."
msgstr "Відокремлений пробілами ÑпиÑок помилок ssl, Ñкі Ñлід ігнорувати."
-#: ../src/common/config.py:335
+#: ../src/common/config.py:336
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+"Ідентифікатори JID розділені пробілами, Ð´Ð»Ñ Ñких ви не бажаєте зберігати "
+"журнали. Ви можете також додати назву облікового запиÑу Ð´Ð»Ñ Ñкого не буде "
+"веÑтиÑÑŒ журналюваннÑ."
+
+#: ../src/common/config.py:337
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+"Розділений пробілами перелік ідентифікаторів JID Ð´Ð»Ñ Ñких ви згодні не "
+"зберігати запиÑи Ñкщо вони цього не хочуть."
+
+#: ../src/common/config.py:340
msgid "Whitespace sent after inactivity"
msgstr "ÐадÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŒÐ¾Ð³Ð¾ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ñ–."
-#: ../src/common/config.py:336
+#: ../src/common/config.py:341
msgid "XMPP ping sent after inactivity"
msgstr "ÐадÑÐ¸Ð»Ð°Ð½Ð½Ñ XMPP ехо піÑÐ»Ñ Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ñ–."
-#: ../src/common/config.py:340
+#: ../src/common/config.py:345
msgid ""
"How many seconds to wait for the answer of ping alive packet before we try "
"to reconnect."
@@ -4529,11 +4382,11 @@ msgstr ""
"з’єднаннÑ."
#. yes, no, ask
-#: ../src/common/config.py:344
+#: ../src/common/config.py:349
msgid "Jabberd2 workaround"
msgstr "Обхідний прийом Ð´Ð»Ñ Jabberd2"
-#: ../src/common/config.py:347
+#: ../src/common/config.py:352
msgid ""
"If checked, Gajim will use your IP and proxies defined in "
"file_transfer_proxies option for file transfer."
@@ -4542,26 +4395,26 @@ msgstr ""
"прокÑÑ– Ñервери, Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ file_transfer_proxies, Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ "
"файлів."
-#: ../src/common/config.py:361
+#: ../src/common/config.py:366
msgid "Answer to receipt requests"
msgstr "Відповідати на запити щодо Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ"
-#: ../src/common/config.py:362
+#: ../src/common/config.py:367
msgid "Sent receipt requests"
msgstr "ÐадіÑлані запити на Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ"
-#: ../src/common/config.py:371
+#: ../src/common/config.py:376
msgid ""
"Allow Gajim to send information about the operating system you are running."
msgstr ""
"Дозволити Gajim надÑилати інформацію, Ñку операційну ÑиÑтему ви "
"викориÑтовуєте"
-#: ../src/common/config.py:372
+#: ../src/common/config.py:377
msgid "Allow Gajim to send your local time."
msgstr "ДозволÑтии Gajim надÑилати ваш локальний чаÑд"
-#: ../src/common/config.py:373
+#: ../src/common/config.py:378
msgid ""
"When negotiating an encrypted session, should Gajim assume you want your "
"messages to be logged?"
@@ -4569,19 +4422,19 @@ msgstr ""
"Під Ñ‡Ð°Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑеанÑу з шифруваннÑм, чи Ñлід Gajim припуÑкати, що ви "
"бажаєте веÑти Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ?"
-#: ../src/common/config.py:376
+#: ../src/common/config.py:381
msgid "Message that is sent to contacts you want to add"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ‰Ð¾ буде надіÑлано контакту Ñкий ви бажаєте додати"
-#: ../src/common/config.py:377
+#: ../src/common/config.py:382
msgid "Last time we syncronized with logs from server."
msgstr "ОÑтанній раз коли було Ñинхронізовано журнали з Ñервером"
-#: ../src/common/config.py:439
+#: ../src/common/config.py:444
msgid "Is OpenPGP enabled for this contact?"
msgstr "Чи увімкнено OpenPGP Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ контакту?"
-#: ../src/common/config.py:440
+#: ../src/common/config.py:445
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
@@ -4589,25 +4442,11 @@ msgstr ""
"Чи має Gajim за можливоÑÑ‚Ñ– автоматично запуÑкати шифрований ÑÐµÐ°Ð½Ñ "
"ÑÐ¿Ñ–Ð»ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð· цим контактом?"
-#: ../src/common/config.py:441 ../src/common/config.py:444
+#: ../src/common/config.py:446 ../src/common/config.py:449
msgid "Language for which we want to check misspelled words"
msgstr "Мова, згідно правил Ñкої відбуватиметьÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ° правопиÑу Ñлів"
-#: ../src/common/config.py:450
-msgid "all or space separated status"
-msgstr "all або відокремлені пробілами Ñтани"
-
-#: ../src/common/config.py:451
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no' або 'both'"
-
-#: ../src/common/config.py:452 ../src/common/config.py:454
-#: ../src/common/config.py:455 ../src/common/config.py:458
-#: ../src/common/config.py:459
-msgid "'yes', 'no' or ''"
-msgstr "'так', 'ні' або ''"
-
-#: ../src/common/config.py:463
+#: ../src/common/config.py:452
msgid ""
"State whether plugins should be activated on exit (this is saved on Gajim "
"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -4617,83 +4456,83 @@ msgstr ""
"виході з Gajim). Ð¦Ñ Ð¾Ð¿Ñ†Ñ–Ñ ÐЕ ПОВИÐÐРбути викориÑтана Ð´Ð»Ñ (де)активації "
"додатків. ВикориÑтовуйте Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ графічний Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ ÐºÐ¾Ñ€Ð¸Ñтувача."
-#: ../src/common/config.py:468 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
msgid "Sleeping"
msgstr "Сплю"
-#: ../src/common/config.py:469
+#: ../src/common/config.py:458
msgid "Back soon"
msgstr "Скоро повернуÑÑ"
-#: ../src/common/config.py:469
+#: ../src/common/config.py:458
msgid "Back in some minutes."
msgstr "ПовернуÑÑ Ð·Ð° декілька хвилин."
-#: ../src/common/config.py:470 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
msgid "Eating"
msgstr "Їм"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:459
msgid "I'm eating, so leave me a message."
msgstr "Зараз їм, залиште повідомленнÑ, переглÑну пізніше."
-#: ../src/common/config.py:471
+#: ../src/common/config.py:460
msgid "Movie"
msgstr "Відео"
-#: ../src/common/config.py:471
+#: ../src/common/config.py:460
msgid "I'm watching a movie."
msgstr "Я дивлюÑÑ Ð²Ñ–Ð´ÐµÐ¾."
-#: ../src/common/config.py:472 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
msgid "Working"
msgstr "Працюю"
-#: ../src/common/config.py:472
+#: ../src/common/config.py:461
msgid "I'm working."
msgstr "Я працюю."
-#: ../src/common/config.py:473
+#: ../src/common/config.py:462
msgid "Phone"
msgstr "Телефон"
-#: ../src/common/config.py:473
+#: ../src/common/config.py:462
msgid "I'm on the phone."
msgstr "Я розмовлÑÑŽ телефоном."
-#: ../src/common/config.py:474
+#: ../src/common/config.py:463
msgid "Out"
msgstr "Відійшов(шла)"
-#: ../src/common/config.py:474
+#: ../src/common/config.py:463
msgid "I'm out enjoying life."
msgstr "Я наÑолоджуюÑÑ Ð¶Ð¸Ñ‚Ñ‚Ñм."
-#: ../src/common/config.py:485
+#: ../src/common/config.py:474
msgid "I'm available."
msgstr "Я — доÑтупний (доÑтупна) Ð´Ð»Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸."
-#: ../src/common/config.py:486
+#: ../src/common/config.py:475
msgid "I'm free for chat."
msgstr "Я — вільний (вільна) Ð´Ð»Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸."
-#: ../src/common/config.py:487 ../src/config.py:1615
+#: ../src/common/config.py:476 ../src/config.py:1609
msgid "Be right back."
msgstr "Скоро повернуÑÑ."
-#: ../src/common/config.py:488
+#: ../src/common/config.py:477
msgid "I'm not available."
msgstr "Я — недоÑтупний (недоÑтупна) Ð´Ð»Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸."
-#: ../src/common/config.py:489
+#: ../src/common/config.py:478
msgid "Do not disturb."
msgstr "Ðе турбувати."
-#: ../src/common/config.py:490 ../src/common/config.py:491
+#: ../src/common/config.py:479 ../src/common/config.py:480
msgid "Bye!"
msgstr "Пока!"
-#: ../src/common/config.py:501
+#: ../src/common/config.py:490
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."
@@ -4702,27 +4541,27 @@ msgstr ""
"зі Ñлів, вказаних за допомогою параметра muc_highlight_words, або Ñкщо "
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки міÑтить ваш пÑевдонім."
-#: ../src/common/config.py:502
+#: ../src/common/config.py:491
msgid "Sound to play when any MUC message arrives."
msgstr "Звук, Ñкий буде відтворено за поÑви Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки."
-#: ../src/common/config.py:511 ../src/common/optparser.py:308
+#: ../src/common/config.py:500 ../src/common/optparser.py:310
msgid "green"
msgstr "зелений"
-#: ../src/common/config.py:515 ../src/common/optparser.py:294
+#: ../src/common/config.py:504 ../src/common/optparser.py:296
msgid "grocery"
msgstr "овочевий"
-#: ../src/common/config.py:519
+#: ../src/common/config.py:508
msgid "human"
msgstr "тілеÑний"
-#: ../src/common/config.py:523
+#: ../src/common/config.py:512
msgid "marine"
msgstr "морÑький"
-#: ../src/common/connection_handlers_events.py:353
+#: ../src/common/connection_handlers_events.py:345
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4732,25 +4571,25 @@ msgstr ""
"СкориÑтайтеÑÑ Ñ–Ð½Ñтрументами Ð´Ð»Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÑ”Ñтром, наприклад, http://jru."
"jabberstudio.org/ Ð´Ð»Ñ Ð¹Ð¾Ð³Ð¾ вилученнÑ"
-#: ../src/common/connection_handlers_events.py:782
+#: ../src/common/connection_handlers_events.py:777
#, python-format
msgid "unsubscribe request from %s"
msgstr "запит на ÑкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñки від %s"
-#: ../src/common/connection_handlers_events.py:866
+#: ../src/common/connection_handlers_events.py:862
#: ../src/common/connection_handlers.py:339
#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1040
-#: ../src/common/connection_handlers.py:1696 ../src/common/connection.py:456
-#: ../src/common/logger.py:1124 ../src/gajim.py:382
+#: ../src/common/connection_handlers.py:1055
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:448
+#: ../src/common/logger.py:1125 ../src/gajim.py:389
msgid "Disk Write Error"
msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби запиÑу на диÑк"
-#: ../src/common/connection_handlers_events.py:870
+#: ../src/common/connection_handlers_events.py:866
#: ../src/common/connection_handlers.py:946
-#: ../src/common/connection_handlers.py:1043
-#: ../src/common/connection_handlers.py:1699 ../src/common/connection.py:460
-#: ../src/common/logger.py:1127 ../src/gajim.py:201 ../src/session.py:94
+#: ../src/common/connection_handlers.py:1058
+#: ../src/common/connection_handlers.py:1719 ../src/common/connection.py:452
+#: ../src/common/logger.py:1128 ../src/gajim.py:208 ../src/session.py:101
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4762,76 +4601,118 @@ msgstr ""
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:891
+#: ../src/common/connection_handlers_events.py:887
msgid "Room has been destroyed"
msgstr "Кімнату було знищено"
-#: ../src/common/connection_handlers_events.py:899
+#: ../src/common/connection_handlers_events.py:895
#, python-format
msgid "You can join this room instead: %s"
msgstr "Ви можете приєднатиÑÑ Ð·Ð°Ð¼Ñ–ÑÑ‚ÑŒ цієї кімнати до %s"
-#: ../src/common/connection_handlers_events.py:972
-#: ../src/common/connection.py:258 ../src/config.py:2108 ../src/config.py:2117
-#: ../src/config.py:2185 ../src/config.py:3613 ../src/dataforms_widget.py:623
-#: ../src/dialogs.py:3036
+#: ../src/common/connection_handlers_events.py:968
+#: ../src/common/connection.py:259 ../src/config.py:2106 ../src/config.py:2115
+#: ../src/config.py:2183 ../src/config.py:3619 ../src/dataforms_widget.py:623
+#: ../src/dialogs.py:3085
msgid "Invalid Jabber ID"
msgstr "Ðекоректний ідентифікатор Jabber"
-#: ../src/common/connection_handlers_events.py:973
+#: ../src/common/connection_handlers_events.py:969
msgid "A message from a non-valid JID arrived, it has been ignored."
msgstr ""
"Ðадійшло Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ некоректного JID, це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ "
"проігноровано."
-#: ../src/common/connection_handlers_events.py:1421
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1006
+#: ../src/gui_interface.py:415 ../src/gui_interface.py:429
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "помилка під Ñ‡Ð°Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1423
#, python-format
msgid "Unknown SSL error: %d"
msgstr "Ðевідома помилка SSL: %d"
-#. single message
-#: ../src/common/connection_handlers_events.py:1936 ../src/dialogs.py:2728
-#: ../src/notify.py:262 ../src/notify.py:495
+#: ../src/common/connection_handlers_events.py:1951 ../src/dialogs.py:2772
+#: ../src/notify.py:267
msgid "New Single Message"
msgstr "Створити окреме повідомленнÑ"
-#: ../src/common/connection_handlers_events.py:1938 ../src/notify.py:264
+#: ../src/common/connection_handlers_events.py:1953
#, python-format
msgid "New Single Message from %(nickname)s"
msgstr "Ðове окреме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %(nickname)s"
-#. private message
-#: ../src/common/connection_handlers_events.py:1941 ../src/dialogs.py:2729
-#: ../src/notify.py:268 ../src/notify.py:496
+#: ../src/common/connection_handlers_events.py:1957 ../src/dialogs.py:2773
+#: ../src/notify.py:268
msgid "New Private Message"
msgstr "Ðове конфіденційне повідомленнÑ"
-#: ../src/common/connection_handlers_events.py:1943 ../src/notify.py:271
+#: ../src/common/connection_handlers_events.py:1959
#, python-format
msgid "New Private Message from group chat %s"
msgstr "Ðове конфіденційне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· групової балачки %s"
-#: ../src/common/connection_handlers_events.py:1946 ../src/notify.py:273
+#: ../src/common/connection_handlers_events.py:1962
#, python-format
msgid "%(nickname)s: %(message)s"
msgstr "%(nickname)s: %(message)s"
-#: ../src/common/connection_handlers_events.py:1949 ../src/notify.py:276
+#: ../src/common/connection_handlers_events.py:1965
#, python-format
msgid "Messaged by %(nickname)s"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлано від імені %(nickname)s"
-#. chat message
-#: ../src/common/connection_handlers_events.py:1952 ../src/dialogs.py:2728
-#: ../src/notify.py:280 ../src/notify.py:495
+#: ../src/common/connection_handlers_events.py:1969 ../src/dialogs.py:2772
+#: ../src/notify.py:267
msgid "New Message"
msgstr "Ðове повідомленнÑ"
-#: ../src/common/connection_handlers_events.py:1954 ../src/notify.py:282
+#: ../src/common/connection_handlers_events.py:1971
#, python-format
msgid "New Message from %(nickname)s"
msgstr "Ðове Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %(nickname)s"
+#: ../src/common/connection_handlers_events.py:2100
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s змінив Ñтан"
+
+#: ../src/common/connection_handlers_events.py:2102
+#: ../src/groupchat_control.py:205 ../src/groupchat_control.py:1766
+#: ../src/history_window.py:447
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s тепер %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2107 ../src/dialogs.py:2784
+#: ../src/notify.py:281
+msgid "Contact Changed Status"
+msgstr "Зміна контактом Ñтану"
+
+#: ../src/common/connection_handlers_events.py:2109
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s в мережі"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2114 ../src/dialogs.py:2768
+#: ../src/notify.py:263
+msgid "Contact Signed In"
+msgstr "Контакт увійшов до мережі"
+
+#: ../src/common/connection_handlers_events.py:2116
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s вийшов з мережі"
+
+#: ../src/common/connection_handlers_events.py:2121 ../src/dialogs.py:2770
+#: ../src/notify.py:265
+msgid "Contact Signed Out"
+msgstr "Контакт вийшов з мережі"
+
#: ../src/common/connection_handlers.py:95
#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
msgid "Unable to load idle module"
@@ -4864,16 +4745,16 @@ msgid ""
msgstr ""
"РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð· агентом %(agent)s невдала через помилку %(error)s: %(error_msg)s"
-#: ../src/common/connection_handlers.py:564 ../src/common/connection.py:1511
+#: ../src/common/connection_handlers.py:573 ../src/common/connection.py:1546
msgid "Invisibility not supported"
msgstr "ÐевидиміÑÑ‚ÑŒ не підтримуєтьÑÑ"
-#: ../src/common/connection_handlers.py:565 ../src/common/connection.py:1512
+#: ../src/common/connection_handlers.py:574 ../src/common/connection.py:1547
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Обліковий Ð·Ð°Ð¿Ð¸Ñ %s не підтримує невидимоÑÑ‚Ñ–."
-#: ../src/common/connection_handlers.py:1741
+#: ../src/common/connection_handlers.py:1761
msgid "I would like to add you to my roster."
msgstr "Я хочу додати Ð²Ð°Ñ Ð´Ð¾ Ñвого реєÑтру."
@@ -5005,16 +4886,16 @@ msgstr "До Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ»ÑŽÑ‡Ð° не належить підпи
msgid "Application verification failure"
msgstr "Помилка під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ програми"
-#: ../src/common/connection.py:259 ../src/dialogs.py:3037
+#: ../src/common/connection.py:260 ../src/dialogs.py:3086
#, 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:281
+#: ../src/common/connection.py:282
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "Ðе підпиÑано Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ приÑутніÑÑ‚ÑŒ, ключа також не призначено."
-#: ../src/common/connection.py:284
+#: ../src/common/connection.py:285
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
msgstr ""
@@ -5026,7 +4907,7 @@ msgstr ""
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[Це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ *зашифровано* (див. :XEP:`27`]"
-#: ../src/common/connection.py:446
+#: ../src/common/connection.py:435
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -5035,18 +4916,18 @@ msgstr ""
"Тема: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:831
+#: ../src/common/connection.py:845
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· обліковим запиÑом «%s» було втрачено"
-#: ../src/common/connection.py:832
+#: ../src/common/connection.py:846
msgid "Reconnect manually."
msgstr "Виконати повторне Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ."
#. it's a new account
#. wrong answer
-#: ../src/common/connection.py:843
+#: ../src/common/connection.py:857
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr ""
@@ -5054,60 +4935,60 @@ msgstr ""
"реєÑтрації: %(error)s"
#. requested config has changed since first connection
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:899
#, python-format
msgid "Server %s provided a different registration form"
msgstr "Ðа Ñервері %s передбачено іншу форму реєÑтрації"
#. wrong answer
-#: ../src/common/connection.py:901
+#: ../src/common/connection.py:915
msgid "Invalid answer"
msgstr "Ðекоректна відповідь"
-#: ../src/common/connection.py:902
+#: ../src/common/connection.py:916
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr ""
"ТранÑпорт %(name)s надіÑлав помилкову відповідь на запит щодо реєÑтрації: "
"%(error)s"
-#: ../src/common/connection.py:1190 ../src/common/connection.py:1323
-#: ../src/common/connection.py:1906
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/connection.py:1224 ../src/common/connection.py:1358
+#: ../src/common/connection.py:1972
+#: ../src/common/zeroconf/connection_zeroconf.py:204
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Ðе вдалоÑÑ Ð·â€™Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð· «%s»"
-#: ../src/common/connection.py:1191 ../src/gui_interface.py:554
+#: ../src/common/connection.py:1225 ../src/gui_interface.py:524
msgid "Check your connection or try again later."
msgstr "Перевірте ваше з’єднаннÑ, а потім повторіть Ñпробу."
-#: ../src/common/connection.py:1196
+#: ../src/common/connection.py:1230
#, python-format
msgid "Server replied: %s"
msgstr "Збережено за адреÑою: %s"
-#: ../src/common/connection.py:1209
+#: ../src/common/connection.py:1243
msgid "Connection to proxy failed"
msgstr "Спроба вÑтановити з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· прокÑÑ–-Ñервером завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
-#: ../src/common/connection.py:1241 ../src/common/connection.py:1302
+#: ../src/common/connection.py:1275 ../src/common/connection.py:1337
#, python-format
msgid "Could not connect to account %s"
msgstr "Ðе вдалоÑÑ Ð·â€™Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð· обліковим запиÑом %s"
-#: ../src/common/connection.py:1242 ../src/common/connection.py:1303
+#: ../src/common/connection.py:1276 ../src/common/connection.py:1338
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr ""
"Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· обліковим запиÑом було втрачено %s. Повторна Ñпроба з’єднаннÑ."
-#: ../src/common/connection.py:1267
+#: ../src/common/connection.py:1301
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "ДоÑтовірніÑÑ‚ÑŒ Ñертифіката %s знаходитьÑÑ Ð¿Ñ–Ð´ питаннÑм."
-#: ../src/common/connection.py:1270
+#: ../src/common/connection.py:1304
#, python-format
msgid ""
"\n"
@@ -5116,7 +4997,7 @@ msgstr ""
"\n"
"Помилка SSL: <b>%s</b>"
-#: ../src/common/connection.py:1272
+#: ../src/common/connection.py:1306
#, python-format
msgid ""
"\n"
@@ -5125,24 +5006,24 @@ msgstr ""
"\n"
"Ðевідома помилка SSL: %d"
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1359
msgid "Check your connection or try again later"
msgstr "Перевірте ваше Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ повторіть Ñпробу пізніше"
-#: ../src/common/connection.py:1358
+#: ../src/common/connection.py:1393
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Спроба Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ Ð·Ð° допомогою «%s» завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
-#: ../src/common/connection.py:1360
+#: ../src/common/connection.py:1395
msgid "Please check your login and password for correctness."
msgstr "Будь лаÑка, перевірте, чи правильно вказано Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ñ– пароль."
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1468
msgid "Error while removing privacy list"
msgstr "Помилка під Ñ‡Ð°Ñ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ ÑпиÑку конфіденційноÑÑ‚Ñ–"
-#: ../src/common/connection.py:1434
+#: ../src/common/connection.py:1469
#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5152,44 +5033,44 @@ msgstr ""
"у одному з реÑурÑів, з Ñким з’єднано ваш клієнт. Вимкніть цей реÑÑƒÑ€Ñ Ñ– "
"повторіть Ñпробу."
-#: ../src/common/connection.py:1773
+#: ../src/common/connection.py:1839
#, python-format
msgid "Sent contact: \"%s\" (%s)"
msgstr "Відправлений контакт: \"%s\" (%s)"
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1842
msgid "Sent contacts:"
msgstr "ÐадіÑлати контакти:"
-#: ../src/common/connection.py:1923 ../src/common/connection.py:1946
+#: ../src/common/connection.py:1989 ../src/common/connection.py:2012
msgid "Not fetched because of invisible status"
msgstr "Ðе отримано через Ñтан невидимоÑÑ‚Ñ–"
-#: ../src/common/connection.py:2470
+#: ../src/common/connection.py:2543
msgid "Unregister failed"
msgstr "Спроба ÑкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÑ”Ñтрації завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
-#: ../src/common/connection.py:2471
+#: ../src/common/connection.py:2544
#, python-format
msgid "Unregistration with server %(server)s failed: %(error)s"
msgstr ""
"Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ€ÐµÑ”Ñтрації з Ñерверу %(server)s не вдалоÑÑ Ñ‡ÐµÑ€ÐµÐ· помилку: %(error)s"
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:497
+#: ../src/common/contacts.py:126 ../src/common/helpers.py:60
+#: ../src/gui_interface.py:467
msgid "Observers"
msgstr "СпоÑтерігачі"
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
+#: ../src/common/contacts.py:130 ../src/common/contacts.py:358
+#: ../src/common/helpers.py:60 ../src/disco.py:120 ../src/disco.py:121
#: ../src/disco.py:1517 ../src/roster_window.py:856
-#: ../src/roster_window.py:1556 ../src/roster_window.py:1642
-#: ../src/roster_window.py:1644 ../src/roster_window.py:1806
-#: ../src/roster_window.py:2482
+#: ../src/roster_window.py:1552 ../src/roster_window.py:1640
+#: ../src/roster_window.py:1642 ../src/roster_window.py:1804
+#: ../src/roster_window.py:2480
msgid "Transports"
msgstr "ТранÑпорти"
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:366
msgid "Not in roster"
msgstr "Ðемає у реєÑтрі"
@@ -5225,7 +5106,7 @@ msgstr ""
"Служба недоÑтупна: Gajim не запущено або вÑтановлено Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«False» Ð´Ð»Ñ "
"параметра remote_control"
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
msgid "D-Bus is not present on this machine or python module is missing"
msgstr "У цій ÑиÑтемі немає D-Bus або відÑутній потрібний модуль python"
@@ -5410,222 +5291,230 @@ msgstr "Кінець тижнÑ"
msgid "Weekend!"
msgstr "Вихідні!"
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:151
msgid "Username must be between 1 and 1023 chars"
msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача повинно бути від 1 до 1023 Ñимволів"
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:156
msgid "Invalid character in username."
msgstr "Ðекоректний Ñимвол у імені кориÑтувача."
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
msgid "Server must be between 1 and 1023 chars"
msgstr "Сервер має бути від 1 до 1023 Ñимволів"
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:167
msgid "Invalid character in hostname."
msgstr "Ðекоректний Ñимвол у назві вузла."
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
msgid "Server address required."
msgstr "Слід вказати адреÑу Ñервера."
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
msgid "Resource must be between 1 and 1023 chars"
msgstr "РеÑÑƒÑ€Ñ Ð¼Ð°Ñ” бути від 1 до 1023 Ñимволів"
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:178
msgid "Invalid character in resource."
msgstr "Ðекоректний Ñимвол у назві реÑурÑу."
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
msgid "_Busy"
msgstr "_ЗайнÑтий"
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:220 ../src/tooltips.py:195
msgid "Busy"
msgstr "ЗайнÑтий"
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
msgid "_Not Available"
msgstr "_Ðе доÑтупний"
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+msgid "Not Available"
+msgstr "Дуже далеко"
+
+#: ../src/common/helpers.py:228
msgid "_Free for Chat"
msgstr "_Вільний Ð´Ð»Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸"
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:230 ../src/tooltips.py:191
msgid "Free for Chat"
msgstr "Вільний Ð´Ð»Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸"
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:233
msgid "?user status:_Available"
msgstr "?Ñтан кориÑтувача:_ДоÑтупний"
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:235 ../src/tooltips.py:189
msgid "?user status:Available"
msgstr "?Ñтан кориÑтувача:ДоÑтупний"
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
msgid "Connecting"
msgstr "ВиконуєтьÑÑ Ð·'єднаннÑ"
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
msgid "A_way"
msgstr "В_ідійшов"
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:245
msgid "_Offline"
msgstr "_Поза мережею"
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:247 ../src/tooltips.py:199
msgid "Offline"
msgstr "Поза мережею"
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:250
msgid "_Invisible"
msgstr "_Ðевидимий"
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:252
+msgid "Invisible"
+msgstr "Ðевидимка"
+
+#: ../src/common/helpers.py:256
msgid "?contact has status:Unknown"
msgstr "?Ñтан контакту:Ðевідомий"
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:258
msgid "?contact has status:Has errors"
msgstr "?Ñтан контакту:З помилками"
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:263
msgid "?Subscription we already have:None"
msgstr "?ПідпиÑка Ñку ми вже маємо:Жодної"
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:265
msgid "To"
msgstr "До"
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
msgid "From"
msgstr "Від"
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
msgid "Both"
msgstr "Обидва"
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:277
msgid "?Ask (for Subscription):None"
msgstr "?Запит (на підпиÑку):Ðемає"
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:279
msgid "Subscribe"
msgstr "ПідпиÑатиÑÑ"
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
msgid "?Group Chat Contact Role:None"
msgstr "?Роль у груповій балачці:Ðемає"
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
msgid "Moderators"
msgstr "Модератори"
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
msgid "Moderator"
msgstr "Модератор"
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:296
msgid "Participants"
msgstr "УчаÑники"
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:298
msgid "Participant"
msgstr "УчаÑник"
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:301
msgid "Visitors"
msgstr "Відвідувачі"
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:303
msgid "Visitor"
msgstr "Відвідувач"
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:309 ../src/tooltips.py:210
msgid "?Group Chat Contact Affiliation:None"
msgstr "?ЧленÑтво контакту у груповій балачці:Жодного"
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:311 ../src/tooltips.py:216
msgid "Owner"
msgstr "ВлаÑник"
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:313 ../src/tooltips.py:214
msgid "Administrator"
msgstr "ÐдмініÑтратор"
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:315 ../src/tooltips.py:212
msgid "Member"
msgstr "УчаÑник"
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:354
msgid "is paying attention to the conversation"
msgstr "ÑпілкуєтьÑÑ"
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:356
msgid "is doing something else"
msgstr "робить щоÑÑŒ інше"
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
msgid "is composing a message..."
msgstr "пише повідомленнÑ..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:361
msgid "paused composing a message"
msgstr "призупинив (призупинила) ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ"
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:363
msgid "has closed the chat window or tab"
msgstr "закрив (закрила) вікно або вкладку балачки"
#. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:628
#, python-format
msgid "%s GiB"
msgstr "%s ГіБ"
#. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:631
#, python-format
msgid "%s GB"
msgstr "%s ГБ"
#. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:635
#, python-format
msgid "%s MiB"
msgstr "%s МіБ"
#. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:638
#, python-format
msgid "%s MB"
msgstr "%s МБ"
#. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:642
#, python-format
msgid "%s KiB"
msgstr "%s кіБ"
#. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:645
#, python-format
msgid "%s KB"
msgstr "%s кБ"
#. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:648
#, python-format
msgid "%s B"
msgstr "%s Б"
-#: ../src/common/helpers.py:1110 ../src/common/helpers.py:1117
+#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
@@ -5633,22 +5522,22 @@ msgstr[0] "у черзі %d повідомленнÑ"
msgstr[1] "у черзі %d повідомленнÑ"
msgstr[2] "у черзі %d повідомлень"
-#: ../src/common/helpers.py:1123
+#: ../src/common/helpers.py:1112
#, python-format
msgid " from room %s"
msgstr " з кімнати %s"
-#: ../src/common/helpers.py:1126 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
#, python-format
msgid " from user %s"
msgstr " від кориÑтувача %s"
-#: ../src/common/helpers.py:1128
+#: ../src/common/helpers.py:1117
#, python-format
msgid " from %s"
msgstr " від %s"
-#: ../src/common/helpers.py:1135 ../src/common/helpers.py:1141
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
@@ -5656,12 +5545,12 @@ msgstr[0] "у черзі %d подіÑ"
msgstr[1] "у черзі %d події"
msgstr[2] "у черзі %d подій"
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1162
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
-#: ../src/common/helpers.py:1343
+#: ../src/common/helpers.py:1341
msgid "Hello, I am $name."
msgstr "Привіт, Ñ $name."
@@ -5714,7 +5603,7 @@ msgstr "аудіо вихід"
msgid "video input"
msgstr "відео вхід"
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:390
msgid "video output"
msgstr "відео вихід"
@@ -5728,59 +5617,66 @@ msgstr "Помилка під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Â«%(command)s»: %(error
msgid "%s is not a valid loglevel"
msgstr "%s не Ñ” коректним рівнем журналюваннÑ"
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:39
msgid " Default device"
msgstr "Типовий приÑтрій"
#. Test src
-#: ../src/common/multimedia_helpers.py:57
+#: ../src/common/multimedia_helpers.py:60
msgid "Audio test"
msgstr "ТеÑÑ‚ аудіо"
#. Auto src
#. Auto sink
#. Auto src
-#: ../src/common/multimedia_helpers.py:60
-#: ../src/common/multimedia_helpers.py:73
-#: ../src/common/multimedia_helpers.py:86
-#: ../src/common/multimedia_helpers.py:103
+#: ../src/common/multimedia_helpers.py:63
+#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:111
msgid "Autodetect"
msgstr "ÐвтовизначеннÑ"
#. Alsa src
#. Alsa sink
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:75
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:81
#, python-format
msgid "ALSA: %s"
msgstr "ALSA: %s"
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:83
+#, python-format
+msgid "Pulse: %s"
+msgstr "ПульÑ: %s"
+
#. Fake sink
#. Fake video output
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:105
msgid "Fake audio output"
msgstr "Фальшивий вихід аудіо"
#. Test src
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:90
msgid "Video test"
msgstr "ТеÑÑ‚ відео"
#. V4L2 src
-#: ../src/common/multimedia_helpers.py:88
+#: ../src/common/multimedia_helpers.py:95
#, python-format
msgid "V4L2: %s"
msgstr "V4L2: %s"
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:108
#, python-format
msgid "X Window System (X11/XShm/Xv): %s"
msgstr "СиÑтема X Window (X11/XShm/Xv): %s"
#. ximagesink
-#: ../src/common/multimedia_helpers.py:102
+#: ../src/common/multimedia_helpers.py:110
msgid "X Window System (without Xv)"
msgstr "СиÑтема X Window (без Xv)"
@@ -5790,11 +5686,11 @@ msgstr "СиÑтема X Window (без Xv)"
msgid "error: cannot open %s for reading"
msgstr "помилка: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ"
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
msgid "cyan"
msgstr "блакитний"
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:385
msgid "migrating logs database to indices"
msgstr "перехід від бази даних журналів до покажчика"
@@ -6466,7 +6362,7 @@ msgstr ""
"Можливо, запущено інший екземплÑÑ€ Gajim. ÐŸÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° буде ÑкаÑовано."
#. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:424
msgid ""
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
@@ -6474,11 +6370,11 @@ msgstr ""
"[Це чаÑтина шифрованого ÑеанÑу. Якщо ви бачите це повідомленнÑ, ÑталаÑÑ "
"ÑкаÑÑŒ помилка.]"
-#: ../src/common/zeroconf/connection_zeroconf.py:188
+#: ../src/common/zeroconf/connection_zeroconf.py:192
msgid "Avahi error"
msgstr "Помилка Avahi"
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/zeroconf/connection_zeroconf.py:193
#, python-format
msgid ""
"%s\n"
@@ -6487,44 +6383,46 @@ msgstr ""
"%s\n"
"Обмін локальними повідомленнÑми може працювати з помилками."
-#: ../src/common/zeroconf/connection_zeroconf.py:201
+#: ../src/common/zeroconf/connection_zeroconf.py:205
msgid "Please check if Avahi or Bonjour is installed."
msgstr "Будь лаÑка, переконайтеÑÑ, що вÑтановлено Avahi або Bonjour."
-#: ../src/common/zeroconf/connection_zeroconf.py:211
#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:219
msgid "Could not start local service"
msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити локальну Ñлужбу"
-#: ../src/common/zeroconf/connection_zeroconf.py:212
+#: ../src/common/zeroconf/connection_zeroconf.py:216
#, python-format
msgid "Unable to bind to port %d."
msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¸Ð²â€™ÑзатиÑÑ Ð´Ð¾ порту %d."
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-#: ../src/common/zeroconf/connection_zeroconf.py:300
-#: ../src/common/zeroconf/connection_zeroconf.py:313
-#: ../src/common/zeroconf/connection_zeroconf.py:329
+#: ../src/common/zeroconf/connection_zeroconf.py:220
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
msgid "Please check if avahi-daemon is running."
msgstr "Будь лаÑка, переконайтеÑÑ, що запущено фонову Ñлужбу avahi."
-#: ../src/common/zeroconf/connection_zeroconf.py:299
-#: ../src/common/zeroconf/connection_zeroconf.py:312
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:303
+#: ../src/common/zeroconf/connection_zeroconf.py:316
+#: ../src/common/zeroconf/connection_zeroconf.py:332
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ñтан облікового запиÑу «%s»"
-#: ../src/common/zeroconf/connection_zeroconf.py:347
+#: ../src/common/zeroconf/connection_zeroconf.py:351
+#: ../src/common/zeroconf/connection_zeroconf.py:390
msgid "Your message could not be sent."
msgstr "Ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ надіÑлати."
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:404
msgid "Contact is offline. Your message could not be sent."
msgstr ""
"Контакт перебуває поза мережею. Ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ може бути надіÑлано."
-#: ../src/common/zeroconf/connection_zeroconf.py:387
+#: ../src/common/zeroconf/connection_zeroconf.py:431
msgid ""
"Connection to host could not be established: Timeout while sending data."
msgstr ""
@@ -6545,16 +6443,16 @@ msgstr "Типове повідомленнÑ"
msgid "Enabled"
msgstr "Увімкнено"
-#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3110
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3115
msgid "Default"
msgstr "Типовий"
-#: ../src/config.py:748 ../src/dialogs.py:1491
+#: ../src/config.py:746 ../src/dialogs.py:1493
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Словники Ð´Ð»Ñ Ð¼Ð¾Ð²Ð¸ %s не доÑтупні"
-#: ../src/config.py:749
+#: ../src/config.py:747
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -6563,76 +6461,76 @@ msgstr ""
"Ви маєте вÑтановити Ñловники %s Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ орфографії, або "
"обрати іншу мову через параметр speller_language."
-#: ../src/config.py:1229
+#: ../src/config.py:1223
msgid "status message title"
msgstr "заголовок Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан"
-#: ../src/config.py:1229
+#: ../src/config.py:1223
msgid "status message text"
msgstr "текÑÑ‚ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан"
#. Name column
-#: ../src/config.py:1529 ../src/dialogs.py:2486 ../src/dialogs.py:2553
-#: ../src/dialogs.py:3339 ../src/disco.py:886 ../src/disco.py:1744
+#: ../src/config.py:1523 ../src/dialogs.py:2529 ../src/dialogs.py:2596
+#: ../src/dialogs.py:3388 ../src/disco.py:886 ../src/disco.py:1744
#: ../src/disco.py:2046 ../src/history_window.py:90
msgid "Name"
msgstr "Ðазва"
-#: ../src/config.py:1624
+#: ../src/config.py:1618
msgid "Relogin now?"
msgstr "Повторно увійти зараз?"
-#: ../src/config.py:1625
+#: ../src/config.py:1619
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr ""
"Якщо ви бажаєте, щоб вÑÑ– зміни негайно набули чинноÑÑ‚Ñ–, вам Ñлід вийти з "
"облікового запиÑу, а потім знову туди увійти."
-#: ../src/config.py:1779 ../src/config.py:1908
+#: ../src/config.py:1773 ../src/config.py:1906
msgid "OpenPGP is not usable on this computer"
msgstr "Ðа цьому комп'ютері OpenPGP не придатне Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтаннÑ"
-#: ../src/config.py:1948 ../src/config.py:1995
+#: ../src/config.py:1946 ../src/config.py:1993
msgid "Unread events"
msgstr "Ðепрочитані події"
-#: ../src/config.py:1949
+#: ../src/config.py:1947
msgid "Read all pending events before removing this account."
msgstr ""
"Перш ніж вилучати цей обліковий запиÑ, прочитайте уÑÑ– Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· черги "
"подій."
-#: ../src/config.py:1978
+#: ../src/config.py:1976
#, python-format
msgid "You have opened chat in account %s"
msgstr "Ви розпочали балачку за допомогою облікового запиÑу %s"
-#: ../src/config.py:1979
+#: ../src/config.py:1977
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr ""
"Ð’ÑÑ– вікна балачок Ñ– групових балачок буде закрито. Бажаєте продовжити "
"процедуру виходу?"
-#: ../src/config.py:1991 ../src/config.py:2526 ../src/config.py:2562
+#: ../src/config.py:1989 ../src/config.py:2531 ../src/config.py:2567
msgid "You are currently connected to the server"
msgstr "Зараз ваш клієнт з’єднано з Ñервером"
-#: ../src/config.py:1992
+#: ../src/config.py:1990
msgid "To change the account name, you must be disconnected."
msgstr ""
"Ð”Ð»Ñ Ð·Ð¼Ñ–Ð½Ð¸ назви облікового запиÑу вам Ñлід від’єднати клієнт від Ñервера."
-#: ../src/config.py:1996
+#: ../src/config.py:1994
msgid "To change the account name, you must read all pending events."
msgstr ""
"Ð”Ð»Ñ Ð·Ð¼Ñ–Ð½Ð¸ назви облікового запиÑу вам Ñлід прочитати уÑÑ– Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· "
"черги подій."
-#: ../src/config.py:2002
+#: ../src/config.py:2000
msgid "Account Name Already Used"
msgstr "Така назва облікового запиÑу вже викориÑтовуєтьÑÑ"
-#: ../src/config.py:2003
+#: ../src/config.py:2001
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
@@ -6640,148 +6538,148 @@ msgstr ""
"Ви вже Ñтворили обліковий Ð·Ð°Ð¿Ð¸Ñ Ð· такою назвою. Будь лаÑка, оберіть іншу "
"назву."
-#: ../src/config.py:2007 ../src/config.py:2011
+#: ../src/config.py:2005 ../src/config.py:2009
msgid "Invalid account name"
msgstr "Ðекоректна назва облікового запиÑу"
-#: ../src/config.py:2008
+#: ../src/config.py:2006
msgid "Account name cannot be empty."
msgstr "Ðазва облікового запиÑу не може бути порожньою."
-#: ../src/config.py:2012
+#: ../src/config.py:2010
msgid "Account name cannot contain spaces."
msgstr "Ðазва облікового запиÑу не може міÑтити пробіли."
-#: ../src/config.py:2089
+#: ../src/config.py:2087
msgid "Rename Account"
msgstr "Перейменувати запиÑ"
-#: ../src/config.py:2090
+#: ../src/config.py:2088
#, python-format
msgid "Enter a new name for account %s"
msgstr "Введіть нову назву Ð´Ð»Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу %s"
-#: ../src/config.py:2118
+#: ../src/config.py:2116
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Ідентифікатор Jabber Ñлід вказувати Ñк «кориÑтувач@назва.Ñервера»."
-#: ../src/config.py:2335 ../src/config.py:3659
+#: ../src/config.py:2339 ../src/config.py:3665
msgid "Invalid entry"
msgstr "Ðекоректний запиÑ"
-#: ../src/config.py:2336 ../src/config.py:3660
+#: ../src/config.py:2340 ../src/config.py:3666
msgid "Custom port must be a port number."
msgstr "Ðетиповий порти Ñлід вказувати у виглÑді номера."
-#: ../src/config.py:2357
+#: ../src/config.py:2361
msgid "Failed to get secret keys"
msgstr "Спроба Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸Ñ… ключів завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
-#: ../src/config.py:2358
+#: ../src/config.py:2362
msgid "There is no OpenPGP secret key available."
msgstr "Ðемає доÑтупних закритих ключів OpenPGP."
-#: ../src/config.py:2392
+#: ../src/config.py:2396
msgid "OpenPGP Key Selection"
msgstr "Вибір ключа OpenPGP"
-#: ../src/config.py:2393
+#: ../src/config.py:2397
msgid "Choose your OpenPGP key"
msgstr "Оберіть Ñвій ключ OpenPGP"
-#: ../src/config.py:2400
+#: ../src/config.py:2404
msgid "No such account available"
msgstr "Вказаний обліковий Ð·Ð°Ð¿Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупний"
-#: ../src/config.py:2401
+#: ../src/config.py:2405
msgid "You must create your account before editing your personal information."
msgstr ""
"Вам Ñлід Ñтворити обліковий запиÑ, перш ніж розпочати Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¸Ñ… "
"оÑобиÑтих відомоÑтей."
-#: ../src/config.py:2408 ../src/dialogs.py:2241 ../src/dialogs.py:2475
-#: ../src/dialogs.py:2662 ../src/disco.py:515 ../src/profile_window.py:360
+#: ../src/config.py:2412 ../src/dialogs.py:2281 ../src/dialogs.py:2518
+#: ../src/dialogs.py:2706 ../src/disco.py:515 ../src/profile_window.py:361
msgid "You are not connected to the server"
msgstr "Ваш комп’ютер не з’єднано з Ñервером"
-#: ../src/config.py:2409
+#: ../src/config.py:2413
msgid "Without a connection, you can not edit your personal information."
msgstr "Без Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ð¸ не зможете редагувати ваші оÑобиÑÑ‚Ñ– відомоÑÑ‚Ñ–."
-#: ../src/config.py:2413
+#: ../src/config.py:2417
msgid "Your server doesn't support Vcard"
msgstr "Ваш Ñервер не підтримує Vcard"
-#: ../src/config.py:2414
+#: ../src/config.py:2418
msgid "Your server can't save your personal information."
msgstr "Ваш Ñервер не може зберігати ваші оÑобиÑÑ‚Ñ– відомоÑÑ‚Ñ–."
-#: ../src/config.py:2527 ../src/config.py:2563
+#: ../src/config.py:2532 ../src/config.py:2568
msgid "To disable the account, you must be disconnected."
msgstr ""
"Ð”Ð»Ñ Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу вам Ñлід від’єднати клієнт від Ñервера."
-#: ../src/config.py:2532
+#: ../src/config.py:2537
msgid "Account Local already exists."
msgstr "Обліковий Ð·Ð°Ð¿Ð¸Ñ Local вже Ñ–Ñнує."
-#: ../src/config.py:2533
+#: ../src/config.py:2538
msgid "Please rename or remove it before enabling link-local messaging."
msgstr ""
"Будь лаÑка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
"повідомленнÑ."
-#: ../src/config.py:2690
+#: ../src/config.py:2695
#, python-format
msgid "Edit %s"
msgstr "Редагувати %s"
-#: ../src/config.py:2692
+#: ../src/config.py:2697
#, python-format
msgid "Register to %s"
msgstr "ЗареєÑтруватиÑÑ Ð½Ð° %s"
#. list at the beginning
-#: ../src/config.py:2728
+#: ../src/config.py:2733
msgid "Ban List"
msgstr "СпиÑок заборон"
-#: ../src/config.py:2729
+#: ../src/config.py:2734
msgid "Member List"
msgstr "СпиÑок учаÑників"
-#: ../src/config.py:2729
+#: ../src/config.py:2734
msgid "Owner List"
msgstr "СпиÑок влаÑників"
-#: ../src/config.py:2730
+#: ../src/config.py:2735
msgid "Administrator List"
msgstr "СпиÑок адмініÑтраторів"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2794 ../src/disco.py:893 ../src/history_manager.py:201
+#: ../src/config.py:2799 ../src/disco.py:893 ../src/history_manager.py:207
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2804
+#: ../src/config.py:2809
msgid "Reason"
msgstr "ПідÑтава"
-#: ../src/config.py:2811
+#: ../src/config.py:2816
msgid "Nick"
msgstr "ПрізвиÑько"
-#: ../src/config.py:2817
+#: ../src/config.py:2822
msgid "Role"
msgstr "Роль"
-#: ../src/config.py:2844
+#: ../src/config.py:2849
msgid "Banning..."
msgstr "БлокуваннÑ..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2846
+#: ../src/config.py:2851
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -6789,11 +6687,11 @@ msgstr ""
"<b>Кого ви бажаєте заблокувати?</b>\n"
"\n"
-#: ../src/config.py:2848
+#: ../src/config.py:2853
msgid "Adding Member..."
msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ ÑƒÑ‡Ð°Ñника..."
-#: ../src/config.py:2849
+#: ../src/config.py:2854
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -6801,11 +6699,11 @@ msgstr ""
"<b>Кому ви бажаєте надати можливіÑÑ‚ÑŒ учаÑÑ‚Ñ–?</b>\n"
"\n"
-#: ../src/config.py:2851
+#: ../src/config.py:2856
msgid "Adding Owner..."
msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð²Ð»Ð°Ñника..."
-#: ../src/config.py:2852
+#: ../src/config.py:2857
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -6813,11 +6711,11 @@ msgstr ""
"<b>Кого ви бажаєте зробити влаÑником?</b>\n"
"\n"
-#: ../src/config.py:2854
+#: ../src/config.py:2859
msgid "Adding Administrator..."
msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–Ñтратора..."
-#: ../src/config.py:2855
+#: ../src/config.py:2860
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -6825,7 +6723,7 @@ msgstr ""
"<b>Кого ви бажаєте зробити адмініÑтратором?</b>\n"
"\n"
-#: ../src/config.py:2856
+#: ../src/config.py:2861
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -6841,108 +6739,108 @@ msgstr ""
"4. домен (пошук лише домену: запиÑів кориÑтувач@домен,\n"
"домен/реÑÑƒÑ€Ñ Ð°Ð±Ð¾ адреÑи, що міÑтить піддомен)."
-#: ../src/config.py:2957
+#: ../src/config.py:2962
#, python-format
msgid "Removing %s account"
msgstr "Ð’Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу %s"
-#: ../src/config.py:2972
+#: ../src/config.py:2977
msgid "Account is disabled"
msgstr "Обліковий Ð·Ð°Ð¿Ð¸Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾"
-#: ../src/config.py:2973
+#: ../src/config.py:2978
msgid "To unregister from a server, account must be enabled."
msgstr "Щоб знÑти реєÑтрацію з Ñерверу, обліковий Ð·Ð°Ð¿Ð¸Ñ Ð¼Ð°Ñ” бути активним."
-#: ../src/config.py:2986 ../src/gui_interface.py:264
-#: ../src/gui_interface.py:713
+#: ../src/config.py:2991 ../src/gui_interface.py:278
+#: ../src/gui_interface.py:696
msgid "Password Required"
msgstr "Слід ввеÑти пароль"
-#: ../src/config.py:2987 ../src/gui_interface.py:693
+#: ../src/config.py:2992 ../src/gui_interface.py:676
#, python-format
msgid "Enter your password for account %s"
msgstr "Введіть ваш пароль Ð´Ð»Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу %s"
-#: ../src/config.py:2988 ../src/gui_interface.py:713
+#: ../src/config.py:2993 ../src/gui_interface.py:696
msgid "Save password"
msgstr "Зберегти пароль"
-#: ../src/config.py:2998
+#: ../src/config.py:3003
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Обліковий Ð·Ð°Ð¿Ð¸Ñ Â«%s» з’єднано з Ñервером"
-#: ../src/config.py:2999
+#: ../src/config.py:3004
msgid "If you remove it, the connection will be lost."
msgstr "Якщо ви вилучите його, Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ розірвано."
-#: ../src/config.py:3013
+#: ../src/config.py:3018
#, python-format
msgid "Connection to server %s failed"
msgstr "Спроба вÑтановити з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Ñервером %s завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
-#: ../src/config.py:3014
+#: ../src/config.py:3019
msgid "What would you like to do?"
msgstr "Що ви хочете зробити?"
-#: ../src/config.py:3015
+#: ../src/config.py:3020
msgid "Remove only from Gajim"
msgstr "Вилучити _лише з Gajim"
-#: ../src/config.py:3016
+#: ../src/config.py:3021
msgid "Don't remove anything. I'll try again later"
msgstr "Ðе видалÑти нічого. Я Ñпробую пізніше ще раз."
-#: ../src/config.py:3110
+#: ../src/config.py:3115
msgid "?print_status:All"
msgstr "Ð’ÑÑ–"
-#: ../src/config.py:3111
+#: ../src/config.py:3116
msgid "Enter and leave only"
msgstr "Лише вхід і вихід"
-#: ../src/config.py:3112
+#: ../src/config.py:3117
msgid "?print_status:None"
msgstr "Жодного"
-#: ../src/config.py:3184
+#: ../src/config.py:3189
msgid "New Group Chat"
msgstr "Створити групову балачку"
-#: ../src/config.py:3217
+#: ../src/config.py:3222
msgid "This bookmark has invalid data"
msgstr "У цій закладці міÑÑ‚ÑÑ‚ÑŒÑÑ Ð½ÐµÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ñ– дані"
-#: ../src/config.py:3218
+#: ../src/config.py:3223
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr "Будь лаÑка, заповніть Ð¿Ð¾Ð»Ñ Ñервера Ñ– кімнати або вилучіть цю закладку."
#. invalid char
-#: ../src/config.py:3343 ../src/dialogs.py:2038
+#: ../src/config.py:3348 ../src/dialogs.py:2070
msgid "Invalid nickname"
msgstr "Ðекоректний пÑевдонім"
-#: ../src/config.py:3344 ../src/config.py:3355 ../src/config.py:3364
-#: ../src/config.py:3375 ../src/config.py:3383
+#: ../src/config.py:3349 ../src/config.py:3360 ../src/config.py:3369
+#: ../src/config.py:3380 ../src/config.py:3388
msgid "Character not allowed"
msgstr "Заборонений Ñимвол"
-#: ../src/config.py:3355 ../src/config.py:3363 ../src/config.py:3375
-#: ../src/config.py:3635
+#: ../src/config.py:3360 ../src/config.py:3368 ../src/config.py:3380
+#: ../src/config.py:3641
msgid "Invalid server"
msgstr "Ðекоректний Ñервер"
-#: ../src/config.py:3382
+#: ../src/config.py:3387
msgid "Invalid room"
msgstr "Ðекоректна кімната"
-#: ../src/config.py:3551
+#: ../src/config.py:3557
msgid "Account has been added successfully"
msgstr "Обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ»Ð¾ уÑпішно додано"
-#: ../src/config.py:3552 ../src/config.py:3558
+#: ../src/config.py:3558 ../src/config.py:3564
msgid ""
"You can set advanced account options by pressing the Advanced button, or "
"later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6952,35 +6850,35 @@ msgstr ""
"«Додатково». Пізніше ви можете виконати Ñ‚Ñ– Ñамі дії з Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð±Ð¾Ñ€Ð¾Ð¼ "
"пункту «Облікові запиÑи» у меню «Правка» головного вікна програми."
-#: ../src/config.py:3557
+#: ../src/config.py:3563
msgid "Your new account has been created successfully"
msgstr "Ваш новий обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ»Ð¾ уÑпішно Ñтворено"
-#: ../src/config.py:3596
+#: ../src/config.py:3602
msgid "Invalid username"
msgstr "Ðекоректне Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
-#: ../src/config.py:3598
+#: ../src/config.py:3604
msgid "You must provide a username to configure this account."
msgstr ""
"Щоб налаштувати цей обліковий запиÑ, вам Ñлід вказати Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача."
-#: ../src/config.py:3636
+#: ../src/config.py:3642
msgid "Please provide a server on which you want to register."
msgstr ""
"Будь лаÑка, вкажіть назву Ñервера, на Ñкому ви бажаєте зареєÑтруватиÑÑ."
-#: ../src/config.py:3692 ../src/gui_interface.py:1184
+#: ../src/config.py:3698 ../src/gui_interface.py:1174
msgid "Certificate Already in File"
msgstr "Сертифікат вже наÑвний у файлі"
-#: ../src/config.py:3693 ../src/gui_interface.py:1185
+#: ../src/config.py:3699 ../src/gui_interface.py:1175
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr ""
"Цей Ñертифікат вже Ñ–Ñнує у файлі %s, програма не буде додавати його ще раз."
-#: ../src/config.py:3770
+#: ../src/config.py:3786
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6995,7 +6893,7 @@ msgstr ""
"Помилка SSL: %(error)s\n"
"Ви вÑе ще бажаєте з’єднатиÑÑ Ð· цим Ñервером?"
-#: ../src/config.py:3776 ../src/gui_interface.py:1213
+#: ../src/config.py:3792 ../src/gui_interface.py:1203
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -7006,73 +6904,73 @@ msgstr ""
"Відбиток SHA1 Ñертифіката:\n"
"%s"
-#: ../src/config.py:3808 ../src/config.py:3842
+#: ../src/config.py:3824 ../src/config.py:3858
msgid "An error occurred during account creation"
msgstr "Під Ñ‡Ð°Ñ Ñпроби ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°"
-#: ../src/config.py:3907
+#: ../src/config.py:3923
msgid "Account name is in use"
msgstr "Цю назву облікового запиÑу вже викориÑтано"
-#: ../src/config.py:3908
+#: ../src/config.py:3924
msgid "You already have an account using this name."
msgstr "У Ð²Ð°Ñ Ð²Ð¶Ðµ Ñ” обліковий Ð·Ð°Ð¿Ð¸Ñ Ð· такою назвою."
-#: ../src/config.py:4037
+#: ../src/config.py:4054
msgid "PEP node was not removed"
msgstr "Вузол Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан було вилучено"
-#: ../src/config.py:4038
+#: ../src/config.py:4055
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "Вузол Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан %(node)s було вилучено: %(message)s"
-#: ../src/config.py:4066
+#: ../src/config.py:4083
#, python-format
msgid "Configure %s"
msgstr "Ðалаштувати %s"
-#: ../src/config.py:4082 ../src/plugins/gui.py:73
+#: ../src/config.py:4099 ../src/plugins/gui.py:73
msgid "Active"
msgstr "Ðктивний"
-#: ../src/config.py:4090
+#: ../src/config.py:4107
msgid "Event"
msgstr "ПодіÑ"
-#: ../src/config.py:4125
+#: ../src/config.py:4142
msgid "First Message Received"
msgstr "Перше отримане повідомленнÑ"
-#: ../src/config.py:4126
+#: ../src/config.py:4143
msgid "Next Message Received Focused"
msgstr "Ð¤Ð¾ÐºÑƒÑ Ð½Ð° наÑтупне отримане повідомленнÑ"
-#: ../src/config.py:4128
+#: ../src/config.py:4145
msgid "Next Message Received Unfocused"
msgstr "ЗнÑÑ‚Ñ‚Ñ Ñ„Ð¾ÐºÑƒÑу з наÑтупного отриманого повідомленнÑ"
-#: ../src/config.py:4129
+#: ../src/config.py:4146
msgid "Contact Connected"
msgstr "Контакт з'єднано"
-#: ../src/config.py:4130
+#: ../src/config.py:4147
msgid "Contact Disconnected"
msgstr "Контакт від'єднано"
-#: ../src/config.py:4131
+#: ../src/config.py:4148
msgid "Message Sent"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлано"
-#: ../src/config.py:4132
+#: ../src/config.py:4149
msgid "Group Chat Message Highlight"
msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки"
-#: ../src/config.py:4133
+#: ../src/config.py:4150
msgid "Group Chat Message Received"
msgstr "Отримано Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки"
-#: ../src/config.py:4134
+#: ../src/config.py:4151
msgid "GMail Email Received"
msgstr "Отримано електронного лиÑта GMail "
@@ -7131,7 +7029,7 @@ msgid "Open as _Link"
msgstr "Відкрити Ñк _поÑиланнÑ"
#. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1311
+#: ../src/conversation_textview.py:1319
#, python-format
msgid "Yesterday"
msgid_plural "%(nb_days)i days ago"
@@ -7140,7 +7038,7 @@ msgstr[1] "%(nb_days)i днi тому"
msgstr[2] "%(nb_days)i днiв тому"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1360 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1368 ../src/history_window.py:480
#, python-format
msgid "Subject: %s\n"
msgstr "Тема: %s\n"
@@ -7177,157 +7075,157 @@ msgstr "new@jabber.id"
msgid "new%d@jabber.id"
msgstr "new%d@jabber.id"
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:81
#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "Ðазва контакту: <i>%s</i>"
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:83
#, python-format
msgid "Jabber ID: <i>%s</i>"
msgstr "Jabber ID: <i>%s</i>"
-#: ../src/dialogs.py:198
+#: ../src/dialogs.py:197
msgid "Group"
msgstr "Група"
-#: ../src/dialogs.py:205
+#: ../src/dialogs.py:204
msgid "In the group"
msgstr "У групі"
-#: ../src/dialogs.py:296
+#: ../src/dialogs.py:295
msgid "KeyID"
msgstr "KeyID"
-#: ../src/dialogs.py:301
+#: ../src/dialogs.py:300
msgid "Contact name"
msgstr "Ім'Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñƒ"
-#: ../src/dialogs.py:476
+#: ../src/dialogs.py:475
msgid "Set Mood"
msgstr "Ð’Ñтановити наÑтрій"
-#: ../src/dialogs.py:596
+#: ../src/dialogs.py:595
#, python-format
msgid "%s Status Message"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан %s"
-#: ../src/dialogs.py:610
+#: ../src/dialogs.py:609
msgid "Status Message"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан"
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:800
msgid "Overwrite Status Message?"
msgstr "ПерезапиÑати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан?"
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:801
msgid ""
"This name is already used. Do you want to overwrite this status message?"
msgstr ""
"Цю назву вже було викориÑтано. Бажаєте перезапиÑати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан?"
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:809
msgid "Save as Preset Status Message"
msgstr "Зберегти Ñк Ñтандартне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан"
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:810
msgid "Please type a name for this status message"
msgstr "Будь лаÑка, введіть назву цього Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан"
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:838
msgid "AIM Address:"
msgstr "ÐдреÑа AIM:"
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:839
msgid "GG Number:"
msgstr "Ðомер GG:"
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:840
msgid "ICQ Number:"
msgstr "Ðомер ICQ:"
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:841
msgid "MSN Address:"
msgstr "ÐдреÑа MSN:"
-#: ../src/dialogs.py:843
+#: ../src/dialogs.py:842
msgid "Yahoo! Address:"
msgstr "ÐдреÑа Yahoo!:"
-#: ../src/dialogs.py:880
+#: ../src/dialogs.py:879
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr ""
"Будь лаÑка, вкажіть дані контакту, Ñкий ви бажаєте додати до облікового "
"запиÑу %s"
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:882
msgid "Please fill in the data of the contact you want to add"
msgstr "Будь лаÑка, вкажіть дані контакту, Ñкий ви бажаєте додати"
-#: ../src/dialogs.py:1073 ../src/dialogs.py:1079 ../src/dialogs.py:1084
-#: ../src/dialogs.py:3572
+#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
+#: ../src/dialogs.py:3621
msgid "Invalid User ID"
msgstr "Ðекоректний ідентифікатор кориÑтувача"
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1081
msgid "The user ID must not contain a resource."
msgstr "У ідентифікаторі кориÑтувача не повинно міÑтитиÑÑ Ð½Ð°Ð·Ð²Ð¸ реÑурÑу."
-#: ../src/dialogs.py:1085
+#: ../src/dialogs.py:1086
msgid "You cannot add yourself to your roster."
msgstr "Ви не можете додавати Ñебе ж до реєÑтру."
-#: ../src/dialogs.py:1099
+#: ../src/dialogs.py:1100
msgid "Contact already in roster"
msgstr "Цей контакт вже Ñ” у реєÑтрі"
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1101
msgid "This contact is already listed in your roster."
msgstr "Цей контакт уже Ñ” у вашому реєÑтрі."
-#: ../src/dialogs.py:1152 ../src/dialogs.py:1186
+#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
msgid "User ID:"
msgstr "Ідентифікатор:"
-#: ../src/dialogs.py:1271
-msgid "A GTK+ jabber client"
-msgstr "Клієнт Jabber на GTK+"
+#: ../src/dialogs.py:1273
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "Jabber/XMPP клієнт, що базуєтьÑÑ Ð½Ð° GTK+"
-#: ../src/dialogs.py:1272
+#: ../src/dialogs.py:1274
msgid "GTK+ Version:"
msgstr "ВерÑÑ–Ñ GTK+:"
-#: ../src/dialogs.py:1273
+#: ../src/dialogs.py:1275
msgid "PyGTK Version:"
msgstr "ВерÑÑ–Ñ PyGTK:"
-#: ../src/dialogs.py:1283
+#: ../src/dialogs.py:1285
msgid "Current Developers:"
msgstr "Поточні розробники:"
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1287
msgid "Past Developers:"
msgstr "Колишні розробники:"
-#: ../src/dialogs.py:1291
+#: ../src/dialogs.py:1293
msgid "THANKS:"
msgstr "ПОДЯКИ:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1297
+#: ../src/dialogs.py:1299
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:1309
+#: ../src/dialogs.py:1311
msgid "translator-credits"
msgstr "Сергій Єгоров <prapor@unixzone.org.ua> Юрій Чорноіван (0.12)"
-#: ../src/dialogs.py:1492
+#: ../src/dialogs.py:1494
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -7340,116 +7238,116 @@ msgstr ""
"\n"
"МожливіÑÑ‚ÑŒ підÑÐ²Ñ–Ñ‡ÑƒÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ напиÑаних Ñлів буде поки що вимкнено"
-#: ../src/dialogs.py:1840
+#: ../src/dialogs.py:1872
msgid "_Resume"
msgstr "_Продовжити"
-#: ../src/dialogs.py:1848
+#: ../src/dialogs.py:1880
msgid "Re_place"
msgstr "За_мінити"
-#: ../src/dialogs.py:2039 ../src/dialogs.py:2426
+#: ../src/dialogs.py:2071 ../src/dialogs.py:2470
msgid "The nickname has not allowed characters."
msgstr "У пÑевдонімі Ñ” недозволені Ñимволи."
-#: ../src/dialogs.py:2157
+#: ../src/dialogs.py:2189
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "Запит на підпиÑку до облікового запиÑу %(account)s від %(jid)s"
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2192
#, python-format
msgid "Subscription request from %s"
msgstr "Запит на підпиÑку від %s"
-#: ../src/dialogs.py:2236 ../src/gui_interface.py:1915
+#: ../src/dialogs.py:2276 ../src/gui_interface.py:1925
#, python-format
msgid "You are already in group chat %s"
msgstr "Ви вже берете учаÑÑ‚ÑŒ у груповій балачці %s"
-#: ../src/dialogs.py:2242
+#: ../src/dialogs.py:2282
msgid "You can not join a group chat unless you are connected."
msgstr ""
"Вам Ñлід з’єднати ваш обліковий запиÑ, щоб взÑти учаÑÑ‚ÑŒ у груповій балачці."
-#: ../src/dialogs.py:2283
+#: ../src/dialogs.py:2326
#, python-format
msgid "Join Group Chat with account %s"
msgstr "ПриєднатиÑÑ Ð´Ð¾ групової балачки з облікового запиÑу %s"
-#: ../src/dialogs.py:2413
+#: ../src/dialogs.py:2457
msgid "Invalid Account"
msgstr "Ðекоректний обліковий запиÑ"
-#: ../src/dialogs.py:2414
+#: ../src/dialogs.py:2458
msgid ""
"You have to choose an account from which you want to join the groupchat."
msgstr ""
"Ви маєте обрати обліковий запиÑ, з Ñкого ви бажаєте приєднатиÑÑŒ до групової "
"балачки."
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2469
msgid "Invalid Nickname"
msgstr "Ðекоректний пÑевдонім"
-#: ../src/dialogs.py:2430 ../src/dialogs.py:2436
-#: ../src/groupchat_control.py:2036
+#: ../src/dialogs.py:2474 ../src/dialogs.py:2480
+#: ../src/groupchat_control.py:2090
msgid "Invalid group chat Jabber ID"
msgstr "Ðекоректний ідентифікатор Jabber групової балачки"
-#: ../src/dialogs.py:2431
+#: ../src/dialogs.py:2475
msgid "Please enter the group chat Jabber ID as room@server."
msgstr ""
"Будь лаÑка, вкажіть Jabber ID групової балачки у виглÑді кімната@Ñервер."
-#: ../src/dialogs.py:2437 ../src/groupchat_control.py:2037
+#: ../src/dialogs.py:2481 ../src/groupchat_control.py:2091
msgid "The group chat Jabber ID has not allowed characters."
msgstr ""
"У ідентифікаторі Jabber групової балачки міÑÑ‚ÑÑ‚ÑŒÑÑ Ð½ÐµÐ´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ñ– Ñимволи."
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2486 ../src/gui_interface.py:1907
msgid "This is not a group chat"
msgstr "Це не групова балачка"
-#: ../src/dialogs.py:2445
+#: ../src/dialogs.py:2487 ../src/gui_interface.py:1908
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s не є назвою групової балачки."
-#: ../src/dialogs.py:2476
+#: ../src/dialogs.py:2519
msgid "Without a connection, you can not synchronise your contacts."
msgstr ""
"Ð”Ð»Ñ Ñинхронізації ваших контактів потрібно вÑтановити Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ "
"запиÑу з Ñервером."
-#: ../src/dialogs.py:2489
+#: ../src/dialogs.py:2532
msgid "Server"
msgstr "Сервер"
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2568
msgid "This account is not connected to the server"
msgstr "Цей обліковий Ð·Ð°Ð¿Ð¸Ñ Ð½Ðµ з’єднано з Ñервером"
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2569
msgid "You cannot synchronize with an account unless it is connected."
msgstr ""
"МожливіÑÑ‚ÑŽ Ñинхронізації можна ÑкориÑтатиÑÑ, лише Ñкщо обліковий Ð·Ð°Ð¿Ð¸Ñ "
"з’єднано з Ñервером."
-#: ../src/dialogs.py:2551
+#: ../src/dialogs.py:2594
msgid "Synchronise"
msgstr "Синхронізувати"
-#: ../src/dialogs.py:2612
+#: ../src/dialogs.py:2655
#, python-format
msgid "Start Chat with account %s"
msgstr "Почати балачку з облікового запиÑу %s"
-#: ../src/dialogs.py:2614
+#: ../src/dialogs.py:2657
msgid "Start Chat"
msgstr "Почати балачку"
-#: ../src/dialogs.py:2615
+#: ../src/dialogs.py:2658
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
@@ -7458,150 +7356,137 @@ msgstr ""
"бажаєте надіÑлати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ð»Ð°Ñ‡ÐºÐ¸:"
#. if offline or connecting
-#: ../src/dialogs.py:2641 ../src/dialogs.py:3022 ../src/dialogs.py:3252
+#: ../src/dialogs.py:2685 ../src/dialogs.py:3066 ../src/dialogs.py:3301
msgid "Connection not available"
msgstr "Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½ÐµÐ´Ð¾Ñтупне"
-#: ../src/dialogs.py:2642 ../src/dialogs.py:3023 ../src/dialogs.py:3253
+#: ../src/dialogs.py:2686 ../src/dialogs.py:3067 ../src/dialogs.py:3302
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Будь лаÑка, переконайтеÑÑ, що клієнт з’єднано з «%s»."
-#: ../src/dialogs.py:2651 ../src/dialogs.py:2654
+#: ../src/dialogs.py:2695 ../src/dialogs.py:2698
msgid "Invalid JID"
msgstr "Ðекоректний JID"
-#: ../src/dialogs.py:2654
+#: ../src/dialogs.py:2698
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Ðе вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ «%s»."
-#: ../src/dialogs.py:2663
+#: ../src/dialogs.py:2707
msgid "Without a connection, you can not change your password."
msgstr "До вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ð¸ не зможете змінити ваш пароль."
-#: ../src/dialogs.py:2682
+#: ../src/dialogs.py:2726
msgid "Invalid password"
msgstr "Ðекоректний пароль"
-#: ../src/dialogs.py:2682
+#: ../src/dialogs.py:2726
msgid "You must enter a password."
msgstr "Вам Ñлід ввеÑти пароль."
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2730
msgid "Passwords do not match"
msgstr "Паролі не збігаютьÑÑ"
-#: ../src/dialogs.py:2687
+#: ../src/dialogs.py:2731
msgid "The passwords typed in both fields must be identical."
msgstr "Паролі, введені у обидва полÑ, мають бути тотожними."
-#. default value
-#: ../src/dialogs.py:2724 ../src/notify.py:250 ../src/notify.py:491
-msgid "Contact Signed In"
-msgstr "Контакт увійшов до мережі"
-
-#: ../src/dialogs.py:2726 ../src/notify.py:258 ../src/notify.py:493
-msgid "Contact Signed Out"
-msgstr "Контакт вийшов з мережі"
-
-#: ../src/dialogs.py:2729 ../src/gui_interface.py:823 ../src/notify.py:505
+#: ../src/dialogs.py:2773 ../src/gui_interface.py:813 ../src/notify.py:277
msgid "New E-mail"
msgstr "Ðове Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— пошти"
-#: ../src/dialogs.py:2731 ../src/gui_interface.py:878 ../src/notify.py:498
+#: ../src/dialogs.py:2775 ../src/gui_interface.py:868 ../src/notify.py:270
msgid "File Transfer Request"
msgstr "Запит на Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
-#: ../src/dialogs.py:2733 ../src/gui_interface.py:785
-#: ../src/gui_interface.py:849 ../src/notify.py:500
+#: ../src/dialogs.py:2777 ../src/gui_interface.py:775
+#: ../src/gui_interface.py:839 ../src/notify.py:272
msgid "File Transfer Error"
msgstr "Помилка під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
-#: ../src/dialogs.py:2735 ../src/gui_interface.py:924
-#: ../src/gui_interface.py:947 ../src/gui_interface.py:964
-#: ../src/notify.py:502
+#: ../src/dialogs.py:2779 ../src/gui_interface.py:914
+#: ../src/gui_interface.py:937 ../src/gui_interface.py:954
+#: ../src/notify.py:274
msgid "File Transfer Completed"
msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
-#: ../src/dialogs.py:2736 ../src/gui_interface.py:927 ../src/notify.py:503
+#: ../src/dialogs.py:2780 ../src/gui_interface.py:917 ../src/notify.py:275
msgid "File Transfer Stopped"
msgstr "Зупинка Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
-#: ../src/dialogs.py:2738 ../src/gui_interface.py:639 ../src/notify.py:507
+#: ../src/dialogs.py:2782 ../src/gui_interface.py:609 ../src/notify.py:279
msgid "Groupchat Invitation"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ Ð´Ð¾ групової балачки"
-#: ../src/dialogs.py:2740 ../src/notify.py:242 ../src/notify.py:509
-msgid "Contact Changed Status"
-msgstr "Зміна контактом Ñтану"
-
-#: ../src/dialogs.py:2941
+#: ../src/dialogs.py:2985
#, python-format
msgid "Single Message using account %s"
msgstr "Окреме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· викориÑтаннÑм облікового запиÑу %s"
-#: ../src/dialogs.py:2943
+#: ../src/dialogs.py:2987
#, python-format
msgid "Single Message in account %s"
msgstr "Окреме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу %s"
-#: ../src/dialogs.py:2945
+#: ../src/dialogs.py:2989
msgid "Single Message"
msgstr "Окреме повідомленнÑ"
#. prepare UI for Sending
-#: ../src/dialogs.py:2948
+#: ../src/dialogs.py:2992
#, python-format
msgid "Send %s"
msgstr "ÐадіÑлати %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2971
+#: ../src/dialogs.py:3015
#, python-format
msgid "Received %s"
msgstr "Отримано %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2994
+#: ../src/dialogs.py:3038
#, 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:3073
+#: ../src/dialogs.py:3122
#, python-format
msgid "RE: %s"
msgstr "Відповідь: %s"
-#: ../src/dialogs.py:3074
+#: ../src/dialogs.py:3123
#, python-format
msgid "%s wrote:\n"
msgstr "%s напиÑав(-ла):\n"
-#: ../src/dialogs.py:3133
+#: ../src/dialogs.py:3182
#, python-format
msgid "XML Console for %s"
msgstr "КонÑоль XML Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:3135
+#: ../src/dialogs.py:3184
msgid "XML Console"
msgstr "КонÑоль XML"
#. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3331
msgid "add"
msgstr "додати"
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3331
msgid "modify"
msgstr "змінити"
-#: ../src/dialogs.py:3283
+#: ../src/dialogs.py:3332
msgid "remove"
msgstr "вилучити"
-#: ../src/dialogs.py:3312
+#: ../src/dialogs.py:3361
#, python-format
msgid ""
"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7610,190 +7495,182 @@ msgstr ""
"<b>%(jid)s</b> бажає <b>%(action)s</b> кілька контактів у вашому реєÑтрі."
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3328 ../src/dialogs.py:3374
+#: ../src/dialogs.py:3377 ../src/dialogs.py:3423
msgid "Add"
msgstr "Додати"
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3330 ../src/dialogs.py:3405
+#: ../src/dialogs.py:3379 ../src/dialogs.py:3454
msgid "Modify"
msgstr "Змінити"
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3332 ../src/dialogs.py:3429
+#: ../src/dialogs.py:3381 ../src/dialogs.py:3478
msgid "Delete"
msgstr "Вилучити"
-#: ../src/dialogs.py:3336
+#: ../src/dialogs.py:3385
msgid "Jabber ID"
msgstr "Jabber ID:"
-#: ../src/dialogs.py:3342
+#: ../src/dialogs.py:3391
msgid "Groups"
msgstr "Групи"
#. it is selected
#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3450
+#: ../src/dialogs.py:3499
#, python-format
msgid "%s suggested me to add you in my roster."
msgstr "%s підказав мені додати Ð²Ð°Ñ Ð´Ð¾ мого реєÑтру."
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:3513
#, python-format
msgid "Added %s contacts"
msgstr "Додано %s контактів"
-#: ../src/dialogs.py:3501
+#: ../src/dialogs.py:3550
#, python-format
msgid "Removed %s contacts"
msgstr "Вилучено %s контактів"
-#: ../src/dialogs.py:3541 ../src/dialogs.py:3718
+#: ../src/dialogs.py:3590 ../src/dialogs.py:3767
#, python-format
msgid "Archiving Preferences for %s"
msgstr "ÐÑ€Ñ…Ñ–Ð²Ð°Ñ†Ñ–Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:3581
+#: ../src/dialogs.py:3630
msgid "Invalid expire value"
msgstr "Ðекоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð°ÑтаріваннÑ"
-#: ../src/dialogs.py:3582
+#: ../src/dialogs.py:3631
msgid "Expire must be a valid positive integer."
msgstr "Ð§Ð°Ñ Ð·Ð°ÑÑ‚Ð°Ñ€Ñ–Ð²Ð°Ð½Ð½Ñ Ð¼Ð°Ñ” бути дійÑним додатним цілим чиÑлом."
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3678
msgid "There is an error with the form"
msgstr "Це помилка з формою"
-#: ../src/dialogs.py:3849
+#: ../src/dialogs.py:3898
msgid "There is an error"
msgstr "Це помилка"
-#: ../src/dialogs.py:3917
+#: ../src/dialogs.py:3966
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "СпиÑки конфіденційноÑÑ‚Ñ– <b><i>%s</i></b>"
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:3970
#, python-format
msgid "Privacy List for %s"
msgstr "СпиÑки приватноÑÑ‚Ñ– Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:3988
+#: ../src/dialogs.py:4037
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr ""
"ПорÑдок: %(order)s, діÑ: %(action)s, тип: %(type)s, значеннÑ: %(value)s"
-#: ../src/dialogs.py:3993
+#: ../src/dialogs.py:4042
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "ПорÑдок: %(order)s, діÑ: %(action)s"
-#: ../src/dialogs.py:4044
+#: ../src/dialogs.py:4093
msgid "<b>Edit a rule</b>"
msgstr "<b>Редагувати правило</b>"
-#: ../src/dialogs.py:4155
+#: ../src/dialogs.py:4204
msgid "<b>Add a rule</b>"
msgstr "<b>Додати правило</b>"
-#: ../src/dialogs.py:4254
+#: ../src/dialogs.py:4303
#, python-format
msgid "Privacy Lists for %s"
msgstr "СпиÑки приватноÑÑ‚Ñ– Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:4256
+#: ../src/dialogs.py:4305
msgid "Privacy Lists"
msgstr "СпиÑки конфіденційноÑÑ‚Ñ–"
-#: ../src/dialogs.py:4345
+#: ../src/dialogs.py:4394
msgid "Invalid List Name"
msgstr "Ðекоректна назва ÑпиÑку"
-#: ../src/dialogs.py:4346
+#: ../src/dialogs.py:4395
msgid "You must enter a name to create a privacy list."
msgstr "Ð”Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑпиÑку конфіденційноÑÑ‚Ñ– вам Ñлід ввеÑти його назву."
-#: ../src/dialogs.py:4378
+#: ../src/dialogs.py:4427
msgid "You are invited to a groupchat"
msgstr "Ð’Ð°Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð¾ до групової балачки"
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4430
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact запроÑив Ð²Ð°Ñ Ð´Ð¾ учаÑÑ‚Ñ– у обговоренні"
-#: ../src/dialogs.py:4383
+#: ../src/dialogs.py:4432
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact запроÑив Ð²Ð°Ñ Ð´Ð¾ групової балачки %(room_jid)s"
-#: ../src/dialogs.py:4391
+#: ../src/dialogs.py:4440
#, python-format
msgid "Comment: %s"
msgstr "Коментар: %s"
-#: ../src/dialogs.py:4393
+#: ../src/dialogs.py:4442
msgid "Do you want to accept the invitation?"
msgstr "Чи бажаєте ви прийнÑти це запрошеннÑ?"
-#: ../src/dialogs.py:4455
+#: ../src/dialogs.py:4504
msgid "Choose Client Cert #PCKS12"
msgstr "Оберіть клієнтÑький Ñертифікат PCKS#12"
-#: ../src/dialogs.py:4465 ../src/dialogs.py:4507 ../src/dialogs.py:4563
-#: ../src/dialogs.py:4651
+#: ../src/dialogs.py:4514 ../src/dialogs.py:4556 ../src/dialogs.py:4612
+#: ../src/dialogs.py:4700
msgid "All files"
msgstr "Ð’ÑÑ– файли"
-#: ../src/dialogs.py:4470
+#: ../src/dialogs.py:4519
msgid "PKCS12 Files"
msgstr "Файли PKCS12"
-#: ../src/dialogs.py:4497
+#: ../src/dialogs.py:4546
msgid "Choose Sound"
msgstr "Обрати звук"
-#: ../src/dialogs.py:4512
+#: ../src/dialogs.py:4561
msgid "Wav Sounds"
msgstr "Звуки wav"
-#: ../src/dialogs.py:4550
+#: ../src/dialogs.py:4599
msgid "Choose Image"
msgstr "Вибрати зображеннÑ"
-#: ../src/dialogs.py:4568
+#: ../src/dialogs.py:4617
msgid "Images"
msgstr "ЗображеннÑ"
-#: ../src/dialogs.py:4638
+#: ../src/dialogs.py:4687
msgid "Choose Archive"
msgstr "Вибрати архів"
-#: ../src/dialogs.py:4656
+#: ../src/dialogs.py:4705
msgid "Zip files"
msgstr "Файли ZIP"
-#: ../src/dialogs.py:4682
+#: ../src/dialogs.py:4731
#, python-format
msgid "When %s becomes:"
msgstr "Якщо %s Ñтане рівним:"
-#: ../src/dialogs.py:4684
+#: ../src/dialogs.py:4733
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¾Ñобливого ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s"
-#: ../src/dialogs.py:4760
-msgid "Condition"
-msgstr "Умова"
-
-#: ../src/dialogs.py:4880
-msgid "when I am "
-msgstr "Ñкщо Ñ "
-
-#: ../src/dialogs.py:5374
+#: ../src/dialogs.py:4953
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7804,19 +7681,19 @@ msgstr ""
"\n"
"Коротким Ñ€Ñдком Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ (SAS) цього ÑеанÑу Ñ” <b>%(sas)s</b>."
-#: ../src/dialogs.py:5377
+#: ../src/dialogs.py:4956
msgid "You have already verified this contact's identity."
msgstr "Ви вже перевірÑли оÑобу контакту."
-#: ../src/dialogs.py:5383 ../src/dialogs.py:5467
+#: ../src/dialogs.py:4962 ../src/dialogs.py:5046
msgid "Contact's identity verified"
msgstr "ОÑобу контакту перевірено"
-#: ../src/dialogs.py:5389
+#: ../src/dialogs.py:4968
msgid "Verify again..."
msgstr "Повторити перевірку..."
-#: ../src/dialogs.py:5394
+#: ../src/dialogs.py:4973
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 "
@@ -7826,19 +7703,19 @@ msgstr ""
"бажана оÑоба, Ñ– що Ñ†Ñ Ð»Ð¸ÑˆÐµ Ñ†Ñ Ð¾Ñоба матиме змогу надÑилати вам повідомленнÑ, "
"вам Ñлід підтвердити Ñ—Ñ… ідентичніÑÑ‚ÑŒ натиÑканнÑм кнопки, розташованої нижче."
-#: ../src/dialogs.py:5397 ../src/dialogs.py:5448 ../src/dialogs.py:5461
+#: ../src/dialogs.py:4976 ../src/dialogs.py:5027 ../src/dialogs.py:5040
msgid "Contact's identity NOT verified"
msgstr "ОÑобу контакту ÐЕ перевірено"
-#: ../src/dialogs.py:5402
+#: ../src/dialogs.py:4981
msgid "Verify..."
msgstr "Перевірити..."
-#: ../src/dialogs.py:5413
+#: ../src/dialogs.py:4992
msgid "Have you verified the contact's identity?"
msgstr "Чи перевірили ви оÑобу контакту?"
-#: ../src/dialogs.py:5414
+#: ../src/dialogs.py:4993
#, python-format
msgid ""
"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7853,24 +7730,24 @@ msgstr ""
"\n"
"Коротким Ñ€Ñдком Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ Ñƒ цьому ÑеанÑÑ– буде <b>%(sas)s</b>."
-#: ../src/dialogs.py:5415
+#: ../src/dialogs.py:4994
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "Ви зв’ÑзалиÑÑ Ð· контактом Ñ– перевірили SAS?"
-#: ../src/dialogs.py:5449
+#: ../src/dialogs.py:5028
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
msgstr ""
"Ключ контакту (%s) <b>не збігаєтьÑÑ</b> з ключем, призначеним Ð´Ð»Ñ Ð½ÑŒÐ¾Ð³Ð¾ у "
"Gajim."
-#: ../src/dialogs.py:5455
+#: ../src/dialogs.py:5034
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr ""
"З цим контактом не пов’Ñзано жодних ключів GPG. Отже ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ "
"буде неможливим."
-#: ../src/dialogs.py:5462
+#: ../src/dialogs.py:5041
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."
@@ -7879,7 +7756,7 @@ msgstr ""
"b>, отже Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ <b>не може</b> бути зашифрованим. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб "
"вÑтановити надійніÑÑ‚ÑŒ цього ключа, ÑкориÑтайтеÑÑŒ вашим клієнтом GPG."
-#: ../src/dialogs.py:5468
+#: ../src/dialogs.py:5047
msgid ""
"GPG Key is assigned to this contact, and you trust his key, so messages will "
"be encrypted."
@@ -7887,19 +7764,19 @@ msgstr ""
"З цим контактом пов’Ñзано ключ GPG, ви вважаєте цей ключ надійним, отже "
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ зашифровано."
-#: ../src/dialogs.py:5533
+#: ../src/dialogs.py:5112
msgid "an audio and video"
msgstr "аудіо та відео"
-#: ../src/dialogs.py:5535
+#: ../src/dialogs.py:5114
msgid "an audio"
msgstr "аудіо"
-#: ../src/dialogs.py:5537
+#: ../src/dialogs.py:5116
msgid "a video"
msgstr "відео"
-#: ../src/dialogs.py:5541
+#: ../src/dialogs.py:5120
#, python-format
msgid ""
"%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7908,6 +7785,54 @@ msgstr ""
"%(contact)s бажають розпочати %(type)s розмову з вами. Ви бажаєте відповіÑти "
"на запит?"
+#: ../src/dialogs.py:5188
+#, python-format
+msgid "Certificate for account %s"
+msgstr "Сертифікат до облікового запиÑу %s"
+
+#: ../src/dialogs.py:5188
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+"<b>Видано кому:</b>\n"
+"Загальне назва (CN): %(scn)s\n"
+"ÐžÑ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ (O): %(sorg)s\n"
+"Підрозділ (OU): %(sou)s\n"
+"Серійний номер: %(sn)s\n"
+"\n"
+"<b>Видано ким:</b>\n"
+"Загальна назва (CN): %(icn)s\n"
+"ÐžÑ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ (O): %(iorg)s\n"
+"Підрозділ (OU): %(iou)s\n"
+"\n"
+"<b>ДійÑне:</b>\n"
+"Видано: %(io)s\n"
+"Діє до: %(eo)s\n"
+"\n"
+"<b>Відбито:</b>\n"
+"SHA1 Відбиток: %(sha1)s"
+
+#: ../src/dialogs.py:5222 ../src/dialogs.py:5239
+msgid "View cert..."
+msgstr "ПереглÑд Ñертифікату..."
+
#: ../src/disco.py:119
msgid "Others"
msgstr "Інші"
@@ -7996,20 +7921,20 @@ msgstr "ОпиÑ"
msgid "Id"
msgstr "Ідентифікатор"
-#: ../src/disco.py:1835 ../src/gui_interface.py:2440
+#: ../src/disco.py:1835 ../src/gui_interface.py:2443
msgid "Bookmark already set"
msgstr "Закладку вже вÑтановлено"
-#: ../src/disco.py:1836 ../src/gui_interface.py:2441
+#: ../src/disco.py:1836 ../src/gui_interface.py:2444
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Закладка на груповій балачці «%s» вже Ñ–Ñнує."
-#: ../src/disco.py:1845 ../src/gui_interface.py:2455
+#: ../src/disco.py:1845 ../src/gui_interface.py:2458
msgid "Bookmark has been added successfully"
msgstr "Закладку було уÑпішно додано"
-#: ../src/disco.py:1846 ../src/gui_interface.py:2456
+#: ../src/disco.py:1846 ../src/gui_interface.py:2459
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr ""
"Керувати вашими закладками можна за допомогою меню дій у вашому реєÑтрі."
@@ -8034,149 +7959,150 @@ msgstr "_ПідпиÑатиÑÑ"
msgid "_Unsubscribe"
msgstr "_СкаÑувати підпиÑку"
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
-msgstr "Помилка Ñертифіката SSL"
-
#: ../src/features_window.py:50
+msgid "SSL certificate validation"
+msgstr "Перевірка Ñертифіката SSL"
+
+#: ../src/features_window.py:51
msgid ""
"A library used to validate server certificates to ensure a secure connection."
msgstr ""
"Бібліотека, призначена Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ Ñертифікатів Ñервера, Ñкі забезпечують "
"безпеку з’єднаннÑ."
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:52 ../src/features_window.py:53
msgid "Requires python-pyopenssl."
msgstr "Потрібен python-pyopenssl."
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
msgid "Bonjour / Zeroconf"
msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
msgid "Serverless chatting with autodetected clients in a local network."
msgstr ""
"Балачка, Ð´Ð»Ñ Ñкої не потрібен Ñервер, з автоматичним виÑвленнÑм клієнтів у "
"локальній мережі."
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
msgid "Requires python-avahi."
msgstr "Потрібен python-avahi."
-#: ../src/features_window.py:56
+#: ../src/features_window.py:57
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:57
+#: ../src/features_window.py:58
msgid "Command line"
msgstr "Командний Ñ€Ñдок"
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
msgid "A script to control Gajim via commandline."
msgstr "Сценарій Ð´Ð»Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Gajim за допомогою командного Ñ€Ñдка."
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
msgid "Requires python-dbus."
msgstr "Потрібен python-dbus."
-#: ../src/features_window.py:60 ../src/features_window.py:68
-#: ../src/features_window.py:72 ../src/features_window.py:76
-#: ../src/features_window.py:84 ../src/features_window.py:88
-#: ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:85 ../src/features_window.py:89
+#: ../src/features_window.py:109 ../src/features_window.py:113
+#: ../src/features_window.py:117
msgid "Feature not available under Windows."
msgstr "Цією можливіÑÑ‚ÑŽ не можна ÑкориÑтатиÑÑ Ñƒ Windows."
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
msgid "OpenGPG message encryption"
msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· OpenPGP"
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
msgid "Encrypting chat messages with gpg keys."
msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ балачки за допомогою ключів gpg."
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
msgstr "Вимагає gpg та python-gnupg (http://code.google.com/p/python-gnupg/)."
-#: ../src/features_window.py:64
+#: ../src/features_window.py:65
msgid "Requires gpg.exe in PATH."
msgstr "Вимагає gpg.exe у PATHзмфньфМ"
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
msgid "Network-manager"
msgstr "network-manager"
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
msgid "Autodetection of network status."
msgstr "Ðвтоматичне Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñтану мережі."
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
msgid "Requires gnome-network-manager and python-dbus."
msgstr "Потрібні gnome-network-manager і python-dbus."
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
msgid "Session Management"
msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑеанÑами"
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
msgid "Gajim session is stored on logout and restored on login."
msgstr ""
"Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ ÑеанÑу Gajim під Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ у ÑиÑтемі Ñ– Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ "
"ÑеанÑу піÑÐ»Ñ Ð²Ñ…Ð¾Ð´Ñƒ до ÑиÑтеми."
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
msgid "Requires python-gnome2."
msgstr "Потрібен python-gnome2."
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
msgid "Password encryption"
msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ–Ð²"
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
msgid "Passwords can be stored securely and not just in plaintext."
msgstr "Можна зберігати паролі безпечно, не лише Ñк звичайний текÑÑ‚."
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
msgstr "Потрібні gnome-keyring і python-gnome2-desktop, або kwalletcli."
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
msgid "SRV"
msgstr "SRV"
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
msgid "Ability to connect to servers which are using SRV records."
msgstr "МожливіÑÑ‚ÑŒ Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Ñерверами, Ñкі викориÑтовують запиÑи SRV."
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
msgid "Requires dnsutils."
msgstr "Потребує dnsutils."
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
msgid "Requires nslookup to use SRV records."
msgstr "Ð”Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ SRV-запиÑів потрібен nslookup."
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
msgid "Spell Checker"
msgstr "Перевірка правопиÑу"
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
msgid "Spellchecking of composed messages."
msgstr "Перевірка правопиÑу повідомлень, Ñкі ви Ñтворюєте."
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
msgid "Requires libgtkspell."
msgstr "Потрібна бібліотека libgtkspell."
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
msgid "Notification"
msgstr "СповіщеннÑ"
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
msgid "Passive popups notifying for new events."
msgstr "КонтекÑтні виринаючі вікна Ð´Ð»Ñ Ð½Ð¾Ð²Ð¸Ñ… подій."
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
msgid ""
"Requires python-notify or instead python-dbus in conjunction with "
"notification-daemon."
@@ -8184,33 +8110,33 @@ msgstr ""
"Потрібен пакунок python-notify або його замінник: python-dbus разом з "
"фоновою Ñлужбою ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ (notification-daemon)."
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
msgid "Automatic status"
msgstr "Узгодити зі Ñтаном"
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
msgid "Ability to measure idle time, in order to set auto status."
msgstr ""
"МожливіÑÑ‚ÑŒ Ð²Ð¸Ð¼Ñ–Ñ€ÑŽÐ²Ð°Ð½Ð½Ñ Ñ‡Ð°Ñу відÑутноÑÑ‚Ñ– активноÑÑ‚Ñ– Ð´Ð»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ "
"автоматичного Ñтану."
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
msgid "Requires libxss library."
msgstr "Потрібна бібліотека libxss."
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
msgid "Requires python2.5."
msgstr "Потрібен python2.5."
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
msgid "LaTeX"
msgstr "LaTeX"
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
msgid "Transform LaTeX expressions between $$ $$."
msgstr "ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð²Ð¸Ñ€Ð°Ð·Ñ–Ð² LaTeX, обмежених позначками $$."
-#: ../src/features_window.py:95
+#: ../src/features_window.py:96
msgid ""
"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
"'use_latex' to True in the Advanced Configuration Editor."
@@ -8219,7 +8145,7 @@ msgstr ""
"Ñлід вказати Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «use_latex» Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«True» у Редакторі "
"додаткових налаштувань."
-#: ../src/features_window.py:96
+#: ../src/features_window.py:97
msgid ""
"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
"You have to set 'use_latex' to True in the Advanced Configuration Editor."
@@ -8228,23 +8154,23 @@ msgstr ""
"у MikTeX). Вам також Ñлід вÑтановити Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «use_latex» Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ "
"«True» у Редакторі додаткових налаштувань."
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
msgid "End to End message encryption"
msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Â«ÐšÑ–Ð½ÐµÑ†ÑŒ до КінцÑ» (E2E)"
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
msgid "Encrypting chat messages."
msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ балачки."
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:100 ../src/features_window.py:101
msgid "Requires python-crypto."
msgstr "Потрібен пакунок python-crypto."
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
msgid "RST Generator"
msgstr "ІнÑтрумент ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ RST"
-#: ../src/features_window.py:102
+#: ../src/features_window.py:103
msgid ""
"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
@@ -8252,19 +8178,48 @@ msgstr ""
"Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ XHTML з коду RST (див. http://docutils.sourceforge.net/docs/ref/"
"rst/restructuredtext.html)."
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:104 ../src/features_window.py:105
msgid "Requires python-docutils."
msgstr "Потрібні python-docutils."
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
msgid "Ability to start audio and video chat."
msgstr "МожливіÑÑ‚ÑŒ розпочати аудіо та відео розмову."
+#: ../src/features_window.py:108
+msgid "Requires python-farsight and gstreamer-plugins-bad."
+msgstr "Потрібні python-farsight та gstreamer-plugins-bad."
+
+#: ../src/features_window.py:110
+msgid "UPnP-IGD"
+msgstr "UPnP-IGD"
+
+#: ../src/features_window.py:111
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+"МожливіÑÑ‚ÑŒ запиту до маршрутизатора Ð´Ð»Ñ Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ€Ñ‚Ñƒ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²."
+
+#: ../src/features_window.py:112
+msgid "Requires python-gupnp-igd."
+msgstr "Потрібен python-gupnp-igd."
+
+#: ../src/features_window.py:114
+msgid "UPower"
+msgstr "UPower"
+
#: ../src/features_window.py:115
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr "МожливіÑÑ‚ÑŒ правильно від’єднуватиÑÑŒ перед приÑиплÑннÑм комп’ютера"
+
+#: ../src/features_window.py:116
+msgid "Requires upower and python-dbus."
+msgstr "Потребує upower та python-dbus."
+
+#: ../src/features_window.py:124
msgid "?features:Available"
msgstr "?features:ДоÑтупний"
-#: ../src/features_window.py:122
+#: ../src/features_window.py:131
msgid "Feature"
msgstr "МожливіÑÑ‚ÑŒ"
@@ -8293,7 +8248,7 @@ msgstr "Розмір: %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:523
+#: ../src/history_manager.py:541
msgid "You"
msgstr "Ви"
@@ -8374,34 +8329,34 @@ msgstr "ОпиÑ: %s"
msgid "%s wants to send you a file:"
msgstr "%s бажає надіÑлати вам файл:"
-#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:879
+#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñати Ñ–Ñнуючий файл «%s»"
-#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:880
+#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
msgid ""
"A file with this name already exists and you do not have permission to "
"overwrite it."
msgstr ""
"Файл з такою назвою вже Ñ–Ñнує, у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” дозволів Ð´Ð»Ñ Ð¹Ð¾Ð³Ð¾ перезапиÑу."
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
msgid "This file already exists"
msgstr "Файл з такою назвою вже Ñ–Ñнує."
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
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:379 ../src/gtkgui_helpers.py:891
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:862
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð´Ð¾ каталогу «%s» неможливий"
-#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:892
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
msgid "You do not have permission to create files in this directory."
msgstr "Ваш кориÑтувач не має права на ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² у цьому каталозі."
@@ -8449,39 +8404,39 @@ msgstr "Відправник:"
msgid "Pause"
msgstr "Призупинити"
-#: ../src/gajim.py:183
+#: ../src/gajim.py:190
msgid "Gajim needs X server to run. Quiting..."
msgstr "Ð”Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ Gajim потрібен запущений Ñервер X. Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸..."
-#: ../src/gajim.py:185
+#: ../src/gajim.py:192
#, python-format
msgid "importing PyGTK failed: %s"
msgstr "імпорт PyGTK не вдавÑÑ: %s"
-#: ../src/gajim.py:227
+#: ../src/gajim.py:234
msgid "Gajim needs PyGTK 2.16 or above"
msgstr "Ð”Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ Gajim потрібен PyGTK 2.16 або новіша верÑÑ–Ñ"
-#: ../src/gajim.py:228
+#: ../src/gajim.py:235
msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
msgstr ""
"Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑку Gajim потрібен PyGTK 2.16 або новіша верÑÑ–Ñ. Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸..."
-#: ../src/gajim.py:230
+#: ../src/gajim.py:237
msgid "Gajim needs GTK 2.16 or above"
msgstr "Ð”Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ Gajim потрібна бібліотека GTK 2.16 або новіша верÑÑ–Ñ"
-#: ../src/gajim.py:231
+#: ../src/gajim.py:238
msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
msgstr ""
"Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑку Gajim потрібна бібліотека GTK 2.16 або новіша верÑÑ–Ñ. Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ "
"роботи..."
-#: ../src/gajim.py:240
+#: ../src/gajim.py:247
msgid "Gajim needs pywin32 to run"
msgstr "Ð”Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ Gajim потрібен pywin32"
-#: ../src/gajim.py:241
+#: ../src/gajim.py:248
#, python-format
msgid ""
"Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8491,11 +8446,11 @@ msgstr ""
"Звантажити цю програму можна за адреÑою %s"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:357
+#: ../src/gajim.py:364
msgid "Gajim is already running"
msgstr "Gajim вже запущено"
-#: ../src/gajim.py:358
+#: ../src/gajim.py:365
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -8882,7 +8837,7 @@ msgstr "Показує або ховає вікно ipython"
msgid "Missing argument \"contact_jid\""
msgstr "Пропущено аргумент «contact_jid»"
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:349
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -8891,16 +8846,16 @@ msgstr ""
"«%s» немає у реєÑтрі.\n"
"Будь лаÑка, вкажіть обліковий Ð·Ð°Ð¿Ð¸Ñ Ð´Ð»Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ повідомленнÑ."
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:352
msgid "You have no active account"
msgstr "У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” жодного задіÑного облікового запиÑу"
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:405
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr ""
"ЗдаєтьÑÑ, Gajim не запущено. Отже ви не зможете ÑкориÑтатиÑÑ gajim-remote."
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote.py:432
#, python-format
msgid ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8909,16 +8864,16 @@ msgstr ""
"ВикориÑтаннÑ: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:436
msgid "Arguments:"
msgstr "Ðргументи:"
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:440
#, python-format
msgid "%s not found"
msgstr "%s не знайдено"
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote.py:446
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -8927,7 +8882,7 @@ msgstr ""
"ВикориÑтаннÑ: %s команда [аргументи]\n"
"Можливі команди:\n"
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:515
#, python-format
msgid ""
"Too many arguments. \n"
@@ -8936,7 +8891,7 @@ msgstr ""
"Забагато аргументів. \n"
"Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ"
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:520
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8945,11 +8900,11 @@ msgstr ""
"Ðе було вказано аргумент \"%(arg)s\". \n"
"Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ"
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:539
msgid "No uri given"
msgstr "Ðе надано універÑальний ідентифікатор реÑурÑу"
-#: ../src/gajim-remote.py:540
+#: ../src/gajim-remote.py:541
msgid "Wrong uri"
msgstr "Помилкова адреÑа uri"
@@ -8978,214 +8933,208 @@ msgstr "Ви не можете вилучати вашої поточної те
msgid "Please first choose another for your current theme."
msgstr "Будь лаÑка, Ñпершу змініть тему на іншу."
-#: ../src/groupchat_control.py:175 ../src/groupchat_control.py:1511
+#: ../src/groupchat_control.py:179 ../src/groupchat_control.py:1568
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s тепер Ñтає %(new_nick)s"
-#: ../src/groupchat_control.py:201 ../src/groupchat_control.py:1709
-#: ../src/history_window.py:447 ../src/notify.py:237
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s тепер %(status)s"
-
-#: ../src/groupchat_control.py:229
+#: ../src/groupchat_control.py:233
msgid "Sending private message failed"
msgstr "Спроба надÑÐ¸Ð»Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð´ÐµÐ½Ñ†Ñ–Ð¹Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð·Ð½Ð°Ð»Ð° невдачі"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:231
+#: ../src/groupchat_control.py:235
#, 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:539
+#: ../src/groupchat_control.py:563
msgid "Insert Nickname"
msgstr "Ð’Ñтавити пÑевдонім"
-#: ../src/groupchat_control.py:724
+#: ../src/groupchat_control.py:746
msgid "Conversation with "
msgstr "Ð¡Ð¿Ñ–Ð»ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·"
-#: ../src/groupchat_control.py:726
+#: ../src/groupchat_control.py:748
msgid "Continued conversation"
msgstr "Ð¡Ð¿Ñ–Ð»ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð· продовженнÑм"
-#: ../src/groupchat_control.py:1194
+#: ../src/groupchat_control.py:1225
#, python-format
msgid "%(nick)s has set the subject to %(subject)s"
msgstr "%(nick)s вÑтановив тему %(subject)s"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1212 ../src/groupchat_control.py:1454
+#: ../src/groupchat_control.py:1243 ../src/groupchat_control.py:1510
msgid "Any occupant is allowed to see your full JID"
msgstr "Ð’ÑÑ– учаÑники можуть бачити ваш JID повніÑÑ‚ÑŽ"
-#: ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1246
msgid "Room now shows unavailable member"
msgstr "Тепер у кімнаті буде показано недоÑтупних поÑтійних учаÑників"
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1248
msgid "room now does not show unavailable members"
msgstr "тепер у кімнаті не можна буде бачити недоÑтупних поÑтійних учаÑників"
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1250
msgid "A non-privacy-related room configuration change has occurred"
msgstr "СталаÑÑ Ð·Ð¼Ñ–Ð½Ð° налаштувань кімнати, не пов’Ñзана з конфіденційніÑÑ‚ÑŽ"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1254
msgid "Room logging is now enabled"
msgstr "Тепер увімкнено Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ кімнати"
-#: ../src/groupchat_control.py:1225
+#: ../src/groupchat_control.py:1256
msgid "Room logging is now disabled"
msgstr "Тепер Ð·Ð°Ð¿Ð¸Ñ ÐºÑ–Ð¼Ð½Ð°Ñ‚Ð¸ вимкнено"
-#: ../src/groupchat_control.py:1227
+#: ../src/groupchat_control.py:1258
msgid "Room is now non-anonymous"
msgstr "Тепер у кімнаті вимкнено анонімніÑÑ‚ÑŒ"
-#: ../src/groupchat_control.py:1230
+#: ../src/groupchat_control.py:1261
msgid "Room is now semi-anonymous"
msgstr "Тепер у кімнаті увімкнено напіванонімніÑÑ‚ÑŒ"
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1264
msgid "Room is now fully-anonymous"
msgstr "Тепер у кімнаті увімкнено анонімніÑÑ‚ÑŒ"
#. Can be a message (see handle_event_gc_config_change in
#. gajim.py)
-#: ../src/groupchat_control.py:1458
+#: ../src/groupchat_control.py:1515
msgid "Room logging is enabled"
msgstr "Увімкнено Ð·Ð°Ð¿Ð¸Ñ ÐºÑ–Ð¼Ð½Ð°Ñ‚Ð¸"
-#: ../src/groupchat_control.py:1460
+#: ../src/groupchat_control.py:1517
msgid "A new room has been created"
msgstr "Було Ñтворено нову кімнату"
-#: ../src/groupchat_control.py:1463
+#: ../src/groupchat_control.py:1520
msgid "The server has assigned or modified your roomnick"
msgstr "Сервер призначив вам пÑевдонім у кімнаті або змінив цей пÑевдонім"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1469
+#: ../src/groupchat_control.py:1526
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s було викинуто: %(reason)s"
-#: ../src/groupchat_control.py:1472
+#: ../src/groupchat_control.py:1529
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s було викинуто %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1538
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s було заблоковано: %(reason)s"
-#: ../src/groupchat_control.py:1484
+#: ../src/groupchat_control.py:1541
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:1495 ../src/groupchat_control.py:1599
+#: ../src/groupchat_control.py:1552 ../src/groupchat_control.py:1656
#, python-format
msgid "You are now known as %s"
msgstr "Ви тепер відомі Ñк %s"
-#: ../src/groupchat_control.py:1553 ../src/groupchat_control.py:1558
-#: ../src/groupchat_control.py:1564
+#: ../src/groupchat_control.py:1610 ../src/groupchat_control.py:1615
+#: ../src/groupchat_control.py:1621
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
-#: ../src/groupchat_control.py:1555
+#: ../src/groupchat_control.py:1612
msgid "affiliation changed"
msgstr "змінено міÑце роботи"
-#: ../src/groupchat_control.py:1560
+#: ../src/groupchat_control.py:1617
msgid "room configuration changed to members-only"
msgstr "Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÑ–Ð¼Ð½Ð°Ñ‚Ð¸ змінено на «лише Ð´Ð»Ñ Ð¿Ð¾Ñтійних учаÑників»"
-#: ../src/groupchat_control.py:1566
+#: ../src/groupchat_control.py:1623
msgid "system shutdown"
msgstr "Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ ÑиÑтеми"
-#: ../src/groupchat_control.py:1649
+#: ../src/groupchat_control.py:1706
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
msgstr ""
"** ÐалежніÑÑ‚ÑŒ %(nick)s було вÑтановлено у Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %(affiliation)s %(actor)s"
-#: ../src/groupchat_control.py:1653
+#: ../src/groupchat_control.py:1710
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr "** ÐалежніÑÑ‚ÑŒ of %(nick)s було вÑтановлено у Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %(affiliation)s"
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1725
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
msgstr "** Роль %(nick)s було вÑтановлено у Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %(role)s %(actor)s"
-#: ../src/groupchat_control.py:1672
+#: ../src/groupchat_control.py:1729
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
msgstr "** Роль %(nick)s було вÑтановлено у Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %(role)s"
-#: ../src/groupchat_control.py:1702
+#: ../src/groupchat_control.py:1759
#, python-format
msgid "%s has left"
msgstr "%s вийшов"
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1764
#, python-format
msgid "%s has joined the group chat"
msgstr "%s приєднавÑÑ Ð´Ð¾ групової балачки"
-#: ../src/groupchat_control.py:1963
+#: ../src/groupchat_control.py:2017
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "Ви Ñправді бажаєте полишити групову балачку «%s»?"
-#: ../src/groupchat_control.py:1965
+#: ../src/groupchat_control.py:2019
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr "Якщо ви закриєте це вікно, Ð²Ð°Ñ Ð±ÑƒÐ´Ðµ від’єднано від групової балачки."
-#: ../src/groupchat_control.py:1969 ../src/gui_interface.py:685
-#: ../src/gui_interface.py:1283 ../src/gui_interface.py:1323
-#: ../src/gui_interface.py:1364 ../src/message_window.py:224
-#: ../src/roster_window.py:2897 ../src/roster_window.py:3568
-#: ../src/roster_window.py:4307
+#: ../src/groupchat_control.py:2023 ../src/gui_interface.py:668
+#: ../src/gui_interface.py:1277 ../src/gui_interface.py:1317
+#: ../src/gui_interface.py:1358 ../src/message_window.py:224
+#: ../src/roster_window.py:2942 ../src/roster_window.py:3617
+#: ../src/roster_window.py:4386
msgid "_Do not ask me again"
msgstr "Більше _не питати мене"
-#: ../src/groupchat_control.py:2003
+#: ../src/groupchat_control.py:2057
msgid "Changing Subject"
msgstr "Зміна теми"
-#: ../src/groupchat_control.py:2004
+#: ../src/groupchat_control.py:2058
msgid "Please specify the new subject:"
msgstr "Будь лаÑка, вкажіть нову тему:"
-#: ../src/groupchat_control.py:2011
+#: ../src/groupchat_control.py:2065
msgid "Changing Nickname"
msgstr "Зміна пÑевдоніма"
-#: ../src/groupchat_control.py:2012
+#: ../src/groupchat_control.py:2066
msgid "Please specify the new nickname you want to use:"
msgstr "Будь лаÑка, вкажіть новий пÑевдонім, Ñким ви бажаєте ÑкориÑтатиÑÑ:"
#. Ask for a reason
-#: ../src/groupchat_control.py:2043
+#: ../src/groupchat_control.py:2097
#, python-format
msgid "Destroying %s"
msgstr "Ð—Ð½Ð¸Ñ‰ÐµÐ½Ð½Ñ %s"
-#: ../src/groupchat_control.py:2044
+#: ../src/groupchat_control.py:2098
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
@@ -9193,22 +9142,22 @@ msgstr ""
"Ви маєте намір знищити цю кімнату.\n"
"Ðижче ви можете вказати причину цього рішеннÑ:"
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2100
msgid "You may also enter an alternate venue:"
msgstr "Ви також можете вказати альтернативне міÑце зуÑтрічі:"
#. ask for reason
-#: ../src/groupchat_control.py:2235
+#: ../src/groupchat_control.py:2295
#, python-format
msgid "Kicking %s"
msgstr "Ð’Ð¸ÐºÐ¸Ð´Ð°Ð½Ð½Ñ %s"
-#: ../src/groupchat_control.py:2236 ../src/groupchat_control.py:2563
+#: ../src/groupchat_control.py:2296 ../src/groupchat_control.py:2628
msgid "You may specify a reason below:"
msgstr "Ðижче ви можете зазначити причину:"
#. ask for reason
-#: ../src/groupchat_control.py:2562
+#: ../src/groupchat_control.py:2627
#, python-format
msgid "Banning %s"
msgstr "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ %s"
@@ -9238,56 +9187,56 @@ msgstr "Подробиці"
msgid "Error: cannot open %s for reading"
msgstr "Помилка: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ"
-#: ../src/gtkgui_helpers.py:377
+#: ../src/gtkgui_helpers.py:348
msgid "Error reading file:"
msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби прочитати файл:"
-#: ../src/gtkgui_helpers.py:380
+#: ../src/gtkgui_helpers.py:351
msgid "Error parsing file:"
msgstr "Помилка під Ñ‡Ð°Ñ Ð¾Ð±Ñ€Ð¾Ð±ÐºÐ¸ файла:"
#. do not traceback (could be a permission problem)
#. we talk about a file here
-#: ../src/gtkgui_helpers.py:421
+#: ../src/gtkgui_helpers.py:392
#, python-format
msgid "Could not write to %s. Session Management support will not work"
msgstr ""
"Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ %s. Підтримка ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑеанÑами не працюватиме"
#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:795
+#: ../src/gtkgui_helpers.py:766
msgid "Gajim is not the default Jabber client"
msgstr "Gajim не є типовим клієнтом Jabber"
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:767
msgid "Would you like to make Gajim the default Jabber client?"
msgstr "Чи бажаєте ви зробити Gajim типовим клієнтом Jabber?"
-#: ../src/gtkgui_helpers.py:797
+#: ../src/gtkgui_helpers.py:768
msgid "Always check to see if Gajim is the default Jabber client on startup"
msgstr "Завжди перевірÑти, чи Ñ” Gajim типовим клієнтом Jabber, під Ñ‡Ð°Ñ Ð·Ð°Ð¿ÑƒÑку"
-#: ../src/gtkgui_helpers.py:864
+#: ../src/gtkgui_helpers.py:835
msgid "Extension not supported"
msgstr "Додаток не підтримуєтьÑÑ"
-#: ../src/gtkgui_helpers.py:865
+#: ../src/gtkgui_helpers.py:836
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
msgstr ""
"Ð—Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ може бути збережено у форматі %(type)s. Зберегти Ñк "
"%(new_filename)s?"
-#: ../src/gtkgui_helpers.py:901
+#: ../src/gtkgui_helpers.py:872
msgid "Save Image as..."
msgstr "Зберегти Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñк..."
#. we are banned
#. group chat does not exist
-#: ../src/gui_interface.py:126 ../src/gui_interface.py:276
-#: ../src/gui_interface.py:285 ../src/gui_interface.py:290
-#: ../src/gui_interface.py:293 ../src/gui_interface.py:296
-#: ../src/gui_interface.py:301
+#: ../src/gui_interface.py:126 ../src/gui_interface.py:290
+#: ../src/gui_interface.py:299 ../src/gui_interface.py:305
+#: ../src/gui_interface.py:308 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:316
msgid "Unable to join group chat"
msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ групової балачки"
@@ -9320,77 +9269,71 @@ msgstr "Чи приймаєте ви запит щодо облікового з
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) ÑƒÐ¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ %(url)s (ідентифікатор: %(id)s)"
-#: ../src/gui_interface.py:195 ../src/notify.py:511
+#: ../src/gui_interface.py:195 ../src/notify.py:283
msgid "Connection Failed"
msgstr "Спроба Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
-#: ../src/gui_interface.py:265
+#: ../src/gui_interface.py:279
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr ""
"Ð”Ð»Ñ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ кімнати %s потрібен пароль. Будь лаÑка, введіть його."
-#: ../src/gui_interface.py:277
+#: ../src/gui_interface.py:291
#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "МакÑимальна кількіÑÑ‚ÑŒ кориÑтувачів %s вже доÑÑгнута."
+msgid "Maximum number of users for <b>%s</b> has been reached"
+msgstr "МакÑимальна кількіÑÑ‚ÑŒ кориÑтувачів <b>%s</b> вже доÑÑгнута."
-#: ../src/gui_interface.py:286
+#: ../src/gui_interface.py:300
#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Ð’Ð°Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð»Ð¸ у груповій балачці %s."
+msgid "You are banned from group chat <b>%s</b>."
+msgstr "Ð’Ð°Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð»Ð¸ у груповій балачці <b>%s</b>."
-#: ../src/gui_interface.py:291
+#: ../src/gui_interface.py:306
#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Групової балачки %s не Ñ–Ñнує."
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "Групової балачки <b>%s</b> не Ñ–Ñнує."
-#: ../src/gui_interface.py:294
+#: ../src/gui_interface.py:309
msgid "Group chat creation is restricted."
msgstr "МожливіÑÑ‚ÑŒ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¸Ñ… балачок обмежено."
-#: ../src/gui_interface.py:297
+#: ../src/gui_interface.py:312
#, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
msgstr ""
-"Ð”Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки %s Ñлід викориÑтовувати пÑевдонім, під Ñким ви "
+"Ð”Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки <b>%s</b> Ñлід викориÑтовувати пÑевдонім, під Ñким ви "
"зареєÑтрувалиÑÑ."
-#: ../src/gui_interface.py:302
+#: ../src/gui_interface.py:317
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "Ð’Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” у ÑпиÑку поÑтійних учаÑників групової балачки %s."
-#: ../src/gui_interface.py:433 ../src/gui_interface.py:437
+#: ../src/gui_interface.py:400 ../src/gui_interface.py:404
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Помилка %(code)s: %(msg)s"
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:448 ../src/gui_interface.py:462
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "помилка під Ñ‡Ð°Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ %(message)s ( %(error)s )"
-
-#: ../src/gui_interface.py:486 ../src/notify.py:513
+#: ../src/gui_interface.py:456 ../src/notify.py:285
msgid "Subscription request"
msgstr "Запит на підпиÑку"
-#: ../src/gui_interface.py:511
+#: ../src/gui_interface.py:481
msgid "Authorization accepted"
msgstr "Ð£Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ð¹Ð½Ñто"
-#: ../src/gui_interface.py:512
+#: ../src/gui_interface.py:482
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "Контакт «%s» уповноважив Ð²Ð°Ñ Ð½Ð° переглÑд Ñвого Ñтану."
-#: ../src/gui_interface.py:520
+#: ../src/gui_interface.py:490
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Контакт «%s» вилучив вашу підпиÑку"
-#: ../src/gui_interface.py:521
+#: ../src/gui_interface.py:491
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -9398,16 +9341,16 @@ msgstr ""
"Цей контакт завжди буде показано зі Ñтаном «поза мережею».\n"
"Бажаєте вилучити контакт з вашого ÑпиÑку контактів?"
-#: ../src/gui_interface.py:542 ../src/notify.py:515
+#: ../src/gui_interface.py:512 ../src/notify.py:287
msgid "Unsubscribed"
msgstr "_ÐепідпиÑаний"
-#: ../src/gui_interface.py:553
+#: ../src/gui_interface.py:523
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Зв’Ñзок з «%s» вÑтановити не вдалоÑÑ"
-#: ../src/gui_interface.py:651
+#: ../src/gui_interface.py:621
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
@@ -9415,23 +9358,32 @@ msgstr ""
"Ви налаштували Gajim на викориÑÑ‚Ð°Ð½Ð½Ñ Ð°Ð³ÐµÐ½Ñ‚Ð° GPG, але агент GPG не запущено "
"або цей агент повернув помилковий пароль.\n"
-#: ../src/gui_interface.py:653 ../src/gui_interface.py:661
+#: ../src/gui_interface.py:623 ../src/gui_interface.py:631
msgid "You are currently connected without your OpenPGP key."
msgstr "Ви виконали Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð±ÐµÐ· вашого ключа OpenPGP."
-#: ../src/gui_interface.py:655
+#: ../src/gui_interface.py:625
msgid "Your passphrase is incorrect"
msgstr "Ваш пароль не є коректним"
-#: ../src/gui_interface.py:660
+#: ../src/gui_interface.py:630
msgid "OpenGPG Passphrase Incorrect"
msgstr "Ваш OpenPGP пароль не є коректним"
-#: ../src/gui_interface.py:683
+#: ../src/gui_interface.py:643
+msgid "Certificate Passphrase Required"
+msgstr "Потрібна кодова фраза Ð´Ð»Ñ Ñертифікату"
+
+#: ../src/gui_interface.py:644
+#, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Введіть пароль ключа GPG Ð´Ð»Ñ Ñертифікату від облікового запиÑу %s"
+
+#: ../src/gui_interface.py:666
msgid "GPG key not trusted"
msgstr "GPG непридатне Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтаннÑ"
-#: ../src/gui_interface.py:683
+#: ../src/gui_interface.py:666
msgid ""
"The GPG key used to encrypt this chat is not trusted. Do you really want to "
"encrypt this message?"
@@ -9439,20 +9391,20 @@ msgstr ""
"З цим контактом не пов’Ñзано жодних ключів GPG. Отже ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ "
"буде неможливим."
-#: ../src/gui_interface.py:696
+#: ../src/gui_interface.py:679
msgid ""
-"Gnome Keyring is installed but not correctly started "
-"(environment variable probably not correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
msgstr ""
-"Gnome Keyring вÑтановлено, але не запущено належним чином "
-"(ймовірно, змінну Ñередовища вказано неправильно)"
+"Gnome Keyring вÑтановлено, але не запущено належним чином (ймовірно, змінну "
+"Ñередовища вказано неправильно)"
-#: ../src/gui_interface.py:796
+#: ../src/gui_interface.py:786
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "Ðові Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñƒ %(gmail_mail_address)s"
-#: ../src/gui_interface.py:798
+#: ../src/gui_interface.py:788
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
@@ -9460,7 +9412,7 @@ msgstr[0] "Отримано %d новий лиÑÑ‚"
msgstr[1] "Отримано %d нових лиÑти"
msgstr[2] "Отримано %d нових лиÑтів"
-#: ../src/gui_interface.py:811
+#: ../src/gui_interface.py:801
#, python-format
msgid ""
"\n"
@@ -9475,60 +9427,60 @@ msgstr ""
"Тема: %(subject)s\n"
"%(snippet)s"
-#: ../src/gui_interface.py:876
+#: ../src/gui_interface.py:866
#, python-format
msgid "%s wants to send you a file."
msgstr "%s бажає надіÑлати вам файл."
-#: ../src/gui_interface.py:913 ../src/roster_window.py:1893
+#: ../src/gui_interface.py:903 ../src/roster_window.py:1891
msgid "Remote contact stopped transfer"
msgstr "Віддалений контакт зупинив Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ"
-#: ../src/gui_interface.py:916 ../src/roster_window.py:1895
+#: ../src/gui_interface.py:906 ../src/roster_window.py:1893
msgid "Error opening file"
msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби прочитати файл"
-#: ../src/gui_interface.py:948
+#: ../src/gui_interface.py:938
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "Ви уÑпішно отримали %(filename)s від %(name)s."
#. ft stopped
-#: ../src/gui_interface.py:952
+#: ../src/gui_interface.py:942
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "ÐŸÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»ÑƒÂ·%(filename)s·від·%(name)s·зупинено."
-#: ../src/gui_interface.py:965
+#: ../src/gui_interface.py:955
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "Ви уÑпішно надіÑлали %(filename)s до %(name)s."
#. ft stopped
-#: ../src/gui_interface.py:969
+#: ../src/gui_interface.py:959
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "ÐадÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ %(filename)s до %(name)s зупинено"
-#: ../src/gui_interface.py:1044
+#: ../src/gui_interface.py:1034
msgid "Unable to decrypt message"
msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ повідомленнÑ"
-#: ../src/gui_interface.py:1056
+#: ../src/gui_interface.py:1046
msgid "Username Conflict"
msgstr "Конфлікт імен кориÑтувачів"
-#: ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1047
msgid "Please type a new username for your local account"
msgstr ""
"Будь лаÑка, введіть нове ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ локального облікового "
"запиÑу"
-#: ../src/gui_interface.py:1072
+#: ../src/gui_interface.py:1062
msgid "Resource Conflict"
msgstr "Конфлікт реÑурÑів"
-#: ../src/gui_interface.py:1073
+#: ../src/gui_interface.py:1063
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
@@ -9537,20 +9489,20 @@ msgstr ""
"лаÑка, вкажіть інший реÑурÑ"
#. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1118
+#: ../src/gui_interface.py:1108
#, python-format
msgid "%s wants to start a voice chat."
msgstr "%s бажає розпочати голоÑову розмову."
-#: ../src/gui_interface.py:1121
+#: ../src/gui_interface.py:1111
msgid "Voice Chat Request"
msgstr "Запит на голоÑову розмову"
-#: ../src/gui_interface.py:1208
+#: ../src/gui_interface.py:1198
msgid "Error verifying SSL certificate"
msgstr "Помилка під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ Ñертифіката SSL"
-#: ../src/gui_interface.py:1209
+#: ../src/gui_interface.py:1199
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: "
@@ -9561,15 +9513,15 @@ msgstr ""
"помилка: %(error)s\n"
"Ви вÑе ще маєте намір з’єднатиÑÑ Ð· Ñервером?"
-#: ../src/gui_interface.py:1218
+#: ../src/gui_interface.py:1208
msgid "Ignore this error for this certificate."
msgstr "Ігнорувати цю помилку Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñертифіката."
-#: ../src/gui_interface.py:1242
+#: ../src/gui_interface.py:1233
msgid "SSL certificate error"
msgstr "Помилка Ñертифіката SSL"
-#: ../src/gui_interface.py:1243
+#: ../src/gui_interface.py:1234
#, python-format
msgid ""
"It seems the SSL certificate of account %(account)s has changed or your "
@@ -9586,26 +9538,28 @@ msgstr ""
"\n"
"Ви вÑе ще маєте намір з’єднатиÑÑ Ñ– оновити відбиток Ñертифіката?"
-#: ../src/gui_interface.py:1278 ../src/gui_interface.py:1318
-#: ../src/gui_interface.py:1360
+#: ../src/gui_interface.py:1270 ../src/gui_interface.py:1312
+#: ../src/gui_interface.py:1354
msgid "Insecure connection"
msgstr "Ðебезпечне з’єднаннÑ"
-#: ../src/gui_interface.py:1279
+#: ../src/gui_interface.py:1271
+#, python-format
msgid ""
-"You are about to connect to the server with an insecure connection. This "
-"means all your conversations will be exchanged unencrypted. Are you sure you "
-"want to do that?"
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. Are you sure you want to do that?"
msgstr ""
-"Ви маєте намір надіÑлати з’єднатиÑÑŒ незахищеним з’єднаннÑм. ВеÑÑŒ ваш обмін "
-"повідомленнÑми буде незашифрованим. Виконати надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð·Ð°Ñ€Ð°Ð·?"
+"Ви маєте намір надіÑлати з’єднатиÑÑŒ з обліковим запиÑом %(account)s "
+"(%(server)s) через незахищене з’єднаннÑ. ВеÑÑŒ ваш обмін повідомленнÑми буде "
+"незашифрованим. Ви Ñправді бажаєте це зробити?"
-#: ../src/gui_interface.py:1282 ../src/gui_interface.py:1322
-#: ../src/gui_interface.py:1363
+#: ../src/gui_interface.py:1276 ../src/gui_interface.py:1316
+#: ../src/gui_interface.py:1357
msgid "Yes, I really want to connect insecurely"
msgstr "Так, Ñ Ñправді бажаю знехтувати безпекою"
-#: ../src/gui_interface.py:1319
+#: ../src/gui_interface.py:1313
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?"
@@ -9614,7 +9568,7 @@ msgstr ""
"безпеку з’єднаннÑ, вам Ñлід вÑтановити PyOpenSSL. Виконати надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ "
"зараз?"
-#: ../src/gui_interface.py:1361
+#: ../src/gui_interface.py:1355
msgid ""
"You are about to send your password unencrypted on an insecure connection. "
"Are you sure you want to do that?"
@@ -9623,17 +9577,17 @@ msgstr ""
"виглÑді. Виконати надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ?"
#. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1867 ../src/gui_interface.py:1890
+#: ../src/gui_interface.py:1864 ../src/gui_interface.py:1887
msgid "Emoticons disabled"
msgstr "Емоційки вимкнено"
-#: ../src/gui_interface.py:1868
+#: ../src/gui_interface.py:1865
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
-#: ../src/gui_interface.py:1891
+#: ../src/gui_interface.py:1888
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 "
@@ -9643,40 +9597,40 @@ msgstr ""
"формат файла emoticons.py. Докладніше про новий формат можна дізнатиÑÑ Ð·Ð° "
"адреÑою http://trac.gajim.org/wiki/Emoticons."
-#: ../src/gui_interface.py:1922 ../src/roster_window.py:3735
+#: ../src/gui_interface.py:1932 ../src/roster_window.py:3784
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/gui_interface.py:2316
+#: ../src/gui_interface.py:2319
msgid "Could not save your settings and preferences"
msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ ваші Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ– параметри"
-#: ../src/gui_interface.py:2861
+#: ../src/gui_interface.py:2869
msgid "Passphrase Required"
msgstr "Слід вказати пароль"
-#: ../src/gui_interface.py:2862
+#: ../src/gui_interface.py:2870
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Введіть пароль ключа GPG Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° %(keyid)s (account %(account)s)."
-#: ../src/gui_interface.py:2876
+#: ../src/gui_interface.py:2884
msgid "GPG key expired"
msgstr "Ðемає ключа GPG"
-#: ../src/gui_interface.py:2877
+#: ../src/gui_interface.py:2885
#, python-format
msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
msgstr "Ваш ключ GPG заÑтарів. Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· %s буде вÑтановлено без OpenPGP."
#. ask again
-#: ../src/gui_interface.py:2886
+#: ../src/gui_interface.py:2894
msgid "Wrong Passphrase"
msgstr "Вказано помилковий пароль"
-#: ../src/gui_interface.py:2887
+#: ../src/gui_interface.py:2895
msgid "Please retype your GPG passphrase or press Cancel."
msgstr ""
"Будь лаÑка, введіть ще раз Ñвій пароль GPG або натиÑніть кнопку «СкаÑувати»."
@@ -9685,42 +9639,42 @@ msgstr ""
msgid "_New Group Chat"
msgstr "_Створити групову балачку"
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:419
msgid "I would like to add you to my roster"
msgstr "Я хочу додати Ð²Ð°Ñ Ð´Ð¾ Ñвого реєÑтру"
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:116
msgid "Cannot find history logs database"
msgstr "Ðе можу знайти базу даних журналу"
#. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:156
msgid "Contacts"
msgstr "Контакти"
#. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_manager.py:169 ../src/history_manager.py:213
#: ../src/history_window.py:98
msgid "Date"
msgstr "Дата"
#. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:176 ../src/history_manager.py:232
msgid "Nickname"
msgstr "ПÑевдонім"
#. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_manager.py:185 ../src/history_manager.py:220
#: ../src/history_window.py:106
msgid "Message"
msgstr "ПовідомленнÑ"
#. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:193 ../src/history_manager.py:226
msgid "Subject"
msgstr "Тема"
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:252
msgid ""
"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
"RUNNING)"
@@ -9728,7 +9682,7 @@ msgstr ""
"Бажаєте Ñпорожнити базу даних? (ÐÐПОЛЕГЛИВО ÐЕ РЕКОМЕÐДУЄМО ЦЬОГО РОБИТИ, "
"ЯКЩО ЗÐПУЩЕÐО GAJIM)"
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:254
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 "
@@ -9743,27 +9697,37 @@ msgstr ""
"\n"
"Якщо ви натиÑнете кнопку «ТÐК», вам доведетьÑÑ Ð·Ð°Ñ‡ÐµÐºÐ°Ñ‚Ð¸..."
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:259
+msgid "Database Cleanup"
+msgstr "ÐžÑ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð±Ð°Ð·Ð¸ даних"
+
+#: ../src/history_manager.py:477
msgid "Exporting History Logs..."
msgstr "ЕкÑпорт журналів..."
-#: ../src/history_manager.py:536
+#: ../src/history_manager.py:554
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s %(time)s повідомив: %(message)s\n"
-#: ../src/history_manager.py:573
-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:592
+#, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Ви Ñправді бажаєте вилучити журнальні запиÑи %(jid)s?"
+
+#: ../src/history_manager.py:596
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Ви Ñправді бажаєте вилучити журнали Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… контактів?"
-#: ../src/history_manager.py:577 ../src/history_manager.py:612
+#: ../src/history_manager.py:598 ../src/history_manager.py:637
msgid "This is an irreversible operation."
msgstr "ÐаÑлідки цієї дії Ñ” незворотними."
-#: ../src/history_manager.py:609
+#: ../src/history_manager.py:600 ../src/history_manager.py:639
+msgid "Deletion Confirmation"
+msgstr "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ"
+
+#: ../src/history_manager.py:634
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Ви Ñправді бажаєте вилучити виділене повідомленнÑ?"
@@ -9803,14 +9767,18 @@ msgstr "Поточний Ñтан: %(status)s: %(status_msg)s"
msgid "Status is now: %(status)s"
msgstr "Поточний Ñтан: %(status)s"
-#: ../src/htmltextview.py:524 ../src/htmltextview.py:534
+#: ../src/htmltextview.py:523 ../src/htmltextview.py:533
msgid "Timeout loading image"
msgstr "ÐŸÐµÑ€ÐµÐ²Ð¸Ñ‰ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ"
-#: ../src/htmltextview.py:544
+#: ../src/htmltextview.py:543
msgid "Image is too big"
msgstr "Ð—Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñ” завеликим"
+#: ../src/htmltextview.py:576
+msgid "Loading"
+msgstr "ЗавантаженнÑ"
+
#: ../src/message_window.py:222
msgid "You are going to close several tabs"
msgstr "Ви збираєтеÑÑŒ закрити кілька вкладок"
@@ -9819,19 +9787,19 @@ msgstr "Ви збираєтеÑÑŒ закрити кілька вкладок"
msgid "Do you really want to close them all?"
msgstr "Ви Ñправді бажаєте закритити Ñ—Ñ… уÑÑ–?"
-#: ../src/message_window.py:494
+#: ../src/message_window.py:497
msgid "Chats"
msgstr "Балачки"
-#: ../src/message_window.py:496
+#: ../src/message_window.py:499
msgid "Group Chats"
msgstr "Групові балачки"
-#: ../src/message_window.py:498
+#: ../src/message_window.py:501
msgid "Private Chats"
msgstr "Конфіденційні балачки"
-#: ../src/message_window.py:504
+#: ../src/message_window.py:507
msgid "Messages"
msgstr "ПовідомленнÑ"
@@ -9843,22 +9811,7 @@ msgstr "- веÑтиметьÑÑ Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ"
msgid "- messages will not be logged"
msgstr "- не веÑтиметьÑÑ Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ"
-#: ../src/notify.py:235
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s змінив Ñтан"
-
-#: ../src/notify.py:245
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s в мережі"
-
-#: ../src/notify.py:253
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s вийшов з мережі"
-
-#: ../src/notify.py:554
+#: ../src/notify.py:326
msgid "Ignore"
msgstr "_Ігнорувати"
@@ -9866,93 +9819,93 @@ msgstr "_Ігнорувати"
msgid "Plugin"
msgstr "Додатки"
-#: ../src/plugins/gui.py:160
+#: ../src/plugins/gui.py:161
msgid "Plugin failed"
msgstr "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ° невдалаДодаток"
-#: ../src/plugins/gui.py:204
+#: ../src/plugins/gui.py:205
msgid "Unable to properly remove the plugin"
msgstr "Ðе вдаєтьÑÑ ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¾ вилучити додаток лм"
#. members not safe
-#: ../src/plugins/gui.py:212 ../src/plugins/pluginmanager.py:495
-#: ../src/plugins/pluginmanager.py:503
+#: ../src/plugins/gui.py:213 ../src/plugins/pluginmanager.py:508
+#: ../src/plugins/pluginmanager.py:516
msgid "Archive is malformed"
msgstr "Ðрхів пошкоджений"
-#: ../src/plugins/gui.py:235 ../src/plugins/gui.py:243
-#: ../src/plugins/pluginmanager.py:511
+#: ../src/plugins/gui.py:236 ../src/plugins/gui.py:244
+#: ../src/plugins/pluginmanager.py:524
msgid "Plugin already exists"
msgstr "Додаток вже вÑтановлено"
-#: ../src/plugins/gui.py:235
+#: ../src/plugins/gui.py:236
msgid "Overwrite?"
msgstr "ПерезапиÑати?"
-#: ../src/plugins/gui.py:264
+#: ../src/plugins/gui.py:265
msgid "Configuration"
msgstr "ÐалаштуваннÑ"
#. it is not zip file
#. CRC error
-#: ../src/plugins/pluginmanager.py:481 ../src/plugins/pluginmanager.py:487
+#: ../src/plugins/pluginmanager.py:494 ../src/plugins/pluginmanager.py:500
msgid "Archive corrupted"
msgstr "Ðрхів пошкоджено"
-#: ../src/plugins/pluginmanager.py:483
+#: ../src/plugins/pluginmanager.py:496
msgid "Archive empty"
msgstr "Ðрхів порожній "
-#: ../src/profile_window.py:59
+#: ../src/profile_window.py:60
msgid "Retrieving profile..."
msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ..."
-#: ../src/profile_window.py:124 ../src/roster_window.py:3092
+#: ../src/profile_window.py:125 ../src/roster_window.py:3137
msgid "File is empty"
msgstr "Файл порожній"
-#: ../src/profile_window.py:127 ../src/roster_window.py:3095
+#: ../src/profile_window.py:128 ../src/roster_window.py:3140
msgid "File does not exist"
msgstr "Файла не Ñ–Ñнує"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:141 ../src/profile_window.py:157
-#: ../src/roster_window.py:3097 ../src/roster_window.py:3108
+#: ../src/profile_window.py:142 ../src/profile_window.py:158
+#: ../src/roster_window.py:3142 ../src/roster_window.py:3153
msgid "Could not load image"
msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ зображеннÑ"
-#: ../src/profile_window.py:228
+#: ../src/profile_window.py:229
msgid "Wrong date format"
msgstr "Ðевірний формат дати"
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:230
msgid "Format of the date must be YYYY-MM-DD"
msgstr "Формат має бути РРРР-ММ-ДД"
-#: ../src/profile_window.py:283
+#: ../src/profile_window.py:284
msgid "Information received"
msgstr "Отримано відомоÑÑ‚Ñ–"
-#: ../src/profile_window.py:361
+#: ../src/profile_window.py:362
msgid "Without a connection you can not publish your contact information."
msgstr ""
"Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб оприлюднити відомоÑÑ‚Ñ– щодо контакту з вами, вам Ñлід "
"вÑтановити з’єднаннÑ."
-#: ../src/profile_window.py:374
+#: ../src/profile_window.py:375
msgid "Sending profile..."
msgstr "ÐадÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ..."
-#: ../src/profile_window.py:393
+#: ../src/profile_window.py:394
msgid "Information NOT published"
msgstr "ВідомоÑÑ‚Ñ– ÐЕ оприлюднено"
-#: ../src/profile_window.py:400
+#: ../src/profile_window.py:401
msgid "vCard publication failed"
msgstr "Спроба Ð¾Ð¿Ñ€Ð¸Ð»ÑŽÐ´Ð½ÐµÐ½Ð½Ñ vCard зазнала невдачі"
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:402
msgid ""
"There was an error while publishing your personal information, try again "
"later."
@@ -9963,47 +9916,47 @@ msgstr ""
msgid "Merged accounts"
msgstr "Об’єднані облікові запиÑи"
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1956
msgid "Authorization has been sent"
msgstr "Було надіÑлано уповноваженнÑ"
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1957
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Тепер «%s» буде відомий ваш Ñтан."
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:1980
msgid "Subscription request has been sent"
msgstr "Було надіÑлано запит на підпиÑку"
-#: ../src/roster_window.py:1983
+#: ../src/roster_window.py:1981
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеÑÑ Ð¿Ñ€Ð¾ його або Ñ—Ñ— Ñтан."
-#: ../src/roster_window.py:1997
+#: ../src/roster_window.py:1995
msgid "Authorization has been removed"
msgstr "Ð£Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ вилучено"
-#: ../src/roster_window.py:1998
+#: ../src/roster_window.py:1996
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Тепер «%s» завжди бачитиме Ð²Ð°Ñ Ñк «поза мережею»."
-#: ../src/roster_window.py:2025
+#: ../src/roster_window.py:2023
msgid "GPG is not usable"
msgstr "GPG непридатне Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтаннÑ"
-#: ../src/roster_window.py:2026
+#: ../src/roster_window.py:2024
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· %s буде вÑтановлено без OpenPGP."
-#: ../src/roster_window.py:2238 ../src/roster_window.py:3665
+#: ../src/roster_window.py:2231 ../src/roster_window.py:3714
msgid "You are participating in one or more group chats"
msgstr "Ви берете учаÑÑ‚ÑŒ у одній або декількох групових балачках"
-#: ../src/roster_window.py:2239 ../src/roster_window.py:3666
+#: ../src/roster_window.py:2232 ../src/roster_window.py:3715
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -10011,27 +9964,27 @@ msgstr ""
"Зміна Ñтану на «невидимий» призведе до вашого виходу з наведених групових "
"балачок. Ви Ñправді бажаєте змінити Ñтан на «невидимий»?"
-#: ../src/roster_window.py:2265
+#: ../src/roster_window.py:2258
msgid "desync'ed"
msgstr "розÑинхронізаціÑ"
-#: ../src/roster_window.py:2327
+#: ../src/roster_window.py:2324
msgid "Really quit Gajim?"
msgstr "Справді вийти з Gajim?"
-#: ../src/roster_window.py:2328
+#: ../src/roster_window.py:2325
msgid "Are you sure you want to quit Gajim?"
msgstr "Ви Ñправді бажаєте вийти з Gajim?"
-#: ../src/roster_window.py:2329
+#: ../src/roster_window.py:2326
msgid "Always close Gajim"
msgstr "Завжди закривати Gajim"
-#: ../src/roster_window.py:2412
+#: ../src/roster_window.py:2410
msgid "You have running file transfers"
msgstr "Ви маєте активні перенеÑÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
-#: ../src/roster_window.py:2413
+#: ../src/roster_window.py:2411
msgid ""
"If you quit now, the file(s) being transferred will be stopped. Do you still "
"want to quit?"
@@ -10039,11 +9992,11 @@ msgstr ""
"Якщо ви вийдете зараз, уÑÑ– передачі файлів буде зупинено. Ви вÑе ще бажаєте "
"вийти?"
-#: ../src/roster_window.py:2444 ../src/roster_window.py:2811
+#: ../src/roster_window.py:2442 ../src/roster_window.py:2856
msgid "You have unread messages"
msgstr "У Ð²Ð°Ñ Ñ” непрочитані повідомленнÑ"
-#: ../src/roster_window.py:2445
+#: ../src/roster_window.py:2443
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
@@ -10051,16 +10004,16 @@ msgstr ""
"ДоÑтуп Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ буде можливим, лише Ñкщо ви увімкнули журнал, "
"а контакт наÑвний у вашому реєÑтрі."
-#: ../src/roster_window.py:2812
+#: ../src/roster_window.py:2857
msgid "You must read them before removing this transport."
msgstr "Вам Ñлід прочитати Ñ—Ñ…, перш ніж вилучати цей транÑпорт."
-#: ../src/roster_window.py:2815
+#: ../src/roster_window.py:2860
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "ТранÑпорт \"%s\" буде вилучено"
-#: ../src/roster_window.py:2816
+#: ../src/roster_window.py:2861
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
@@ -10068,11 +10021,11 @@ msgstr ""
"Ви більше не зможете надÑилати Ñ– отримувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ контактів за "
"допомогою цього транÑпорту."
-#: ../src/roster_window.py:2819
+#: ../src/roster_window.py:2864
msgid "Transports will be removed"
msgstr "ТранÑпорти буде вилучено"
-#: ../src/roster_window.py:2824
+#: ../src/roster_window.py:2869
#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
@@ -10081,11 +10034,11 @@ msgstr ""
"Ви більше не зможете надÑилати Ñ– отримувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ контактів за "
"допомогою цих транÑпортів: %s"
-#: ../src/roster_window.py:2892
+#: ../src/roster_window.py:2937
msgid "You are about to block a contact. Are you sure you want to continue?"
msgstr "Ви маєте намір Ñтворити метаконтакт. Ви Ñправді цього бажаєте?"
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:2939
msgid ""
"This contact will see you offline and you will not receive messages he will "
"send you."
@@ -10094,56 +10047,56 @@ msgstr ""
"від нього повідомлень."
#. it's jid
-#: ../src/roster_window.py:2984
+#: ../src/roster_window.py:3029
msgid "Rename Contact"
msgstr "Перейменувати контакт"
-#: ../src/roster_window.py:2985
+#: ../src/roster_window.py:3030
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Введіть новий пÑевдонім Ð´Ð»Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñƒ %s"
-#: ../src/roster_window.py:2992
+#: ../src/roster_window.py:3037
msgid "Rename Group"
msgstr "Перейменувати групу"
-#: ../src/roster_window.py:2993
+#: ../src/roster_window.py:3038
#, python-format
msgid "Enter a new name for group %s"
msgstr "Введіть нову назву Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¸ %s"
-#: ../src/roster_window.py:3038
+#: ../src/roster_window.py:3083
msgid "Remove Group"
msgstr "Вилучити групу"
-#: ../src/roster_window.py:3039
+#: ../src/roster_window.py:3084
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Бажаєте вилучити групу %s з реєÑтру?"
-#: ../src/roster_window.py:3040
+#: ../src/roster_window.py:3085
msgid "Also remove all contacts in this group from your roster"
msgstr "Крім того, вилучити вÑÑ– контакти з цієї групи з вашого реєÑтру"
-#: ../src/roster_window.py:3079
+#: ../src/roster_window.py:3124
msgid "Assign OpenPGP Key"
msgstr "Призначити ключ OpenPGP"
-#: ../src/roster_window.py:3080
+#: ../src/roster_window.py:3125
msgid "Select a key to apply to the contact"
msgstr "Оберіть ключ Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð· цим контактом"
-#: ../src/roster_window.py:3475
+#: ../src/roster_window.py:3524
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Контакт «%s» буде вилучено з вашого реєÑтру"
-#: ../src/roster_window.py:3477
+#: ../src/roster_window.py:3526
#, python-format
msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
msgstr "Ви збираєтеÑÑŒ вилучити \"%(name)s\" (%(jid)s) з вашого реєÑтру.\n"
-#: ../src/roster_window.py:3482
+#: ../src/roster_window.py:3531
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -10152,11 +10105,11 @@ msgstr ""
"вона не зможуть визначати, коли ви перебуватимете у мережі."
#. Contact is not in roster
-#: ../src/roster_window.py:3488
+#: ../src/roster_window.py:3537
msgid "Do you want to continue?"
msgstr "Бажаєте продовжити Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ—?"
-#: ../src/roster_window.py:3492
+#: ../src/roster_window.py:3541
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -10164,16 +10117,16 @@ msgstr ""
"Ð’Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ контакту призведе до Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ ÑƒÐ¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ, отже він або "
"вона не зможуть визначати, коли ви перебуватимете у мережі."
-#: ../src/roster_window.py:3495
+#: ../src/roster_window.py:3544
msgid "I want this contact to know my status after removal"
msgstr "Я хочу, щоб цей контакт знав про мій Ñтан піÑÐ»Ñ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3499
+#: ../src/roster_window.py:3548
msgid "Contacts will be removed from your roster"
msgstr "Контакти буде вилучено з вашого реєÑтру"
-#: ../src/roster_window.py:3504
+#: ../src/roster_window.py:3553
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -10183,12 +10136,12 @@ msgstr ""
"призведе до Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ ÑƒÐ¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ, отже Ð´Ð»Ñ Ð½Ð¸Ñ… ви завжди залишатиметеÑÑ "
"поза мережею."
-#: ../src/roster_window.py:3562
+#: ../src/roster_window.py:3611
msgid ""
"You are about to send a custom status. Are you sure you want to continue?"
msgstr "Ви маєте намір надіÑлати оÑобливий ÑтатуÑ. Ви Ñправді цього бажаєте?"
-#: ../src/roster_window.py:3564
+#: ../src/roster_window.py:3613
#, python-format
msgid ""
"This contact will temporarily see you as %(status)s, but only until you "
@@ -10197,21 +10150,21 @@ msgstr ""
"Цей контакт тимчаÑово бачитиме Ð²Ð°Ñ Ñк %(status)s, но лише до зміни вашого "
"ÑтатуÑу. Потім він бачитиме ваш глобальний ÑтатуÑ."
-#: ../src/roster_window.py:3583
+#: ../src/roster_window.py:3632
msgid "No account available"
msgstr "Ðемає жодного облікового запиÑу"
-#: ../src/roster_window.py:3584
+#: ../src/roster_window.py:3633
msgid "You must create an account before you can chat with other contacts."
msgstr ""
"Перш ніж ви зможете розпочати балачку з контактами, вам Ñлід Ñтворити "
"обліковий запиÑ."
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4286
msgid "Metacontacts storage not supported by your server"
msgstr "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð¼ÐµÑ‚Ð°ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñ–Ð² не підтримуєтьÑÑ Ð²Ð°ÑˆÐ¸Ð¼ Ñервером"
-#: ../src/roster_window.py:4209
+#: ../src/roster_window.py:4288
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
@@ -10219,12 +10172,12 @@ msgstr ""
"Ваш Ñервер не підтримує Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¾Ð¼Ð¾Ñтей щодо метаконтактів. Отже ці "
"відомоÑÑ‚Ñ– не буде збережено до наÑтупного з’єднаннÑ."
-#: ../src/roster_window.py:4301
+#: ../src/roster_window.py:4380
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr "Ви маєте намір Ñтворити метаконтакт. Ви Ñправді цього бажаєте?"
-#: ../src/roster_window.py:4303
+#: ../src/roster_window.py:4382
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 "
@@ -10234,11 +10187,11 @@ msgstr ""
"ÑпиÑку. Загалом кажучи, метаконтакти викориÑтовуютьÑÑ, Ñкщо вашим контактом "
"Ñ” оÑоба з декількома обліковими запиÑами або транÑпортами Jabber."
-#: ../src/roster_window.py:4424
+#: ../src/roster_window.py:4503
msgid "Invalid file URI:"
msgstr "Ðекоректна адреÑа файла:"
-#: ../src/roster_window.py:4436
+#: ../src/roster_window.py:4515
#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
@@ -10246,17 +10199,17 @@ msgstr[0] "Ви Ñправді бажаєте надіÑлати цей файл
msgstr[1] "Ви Ñправді бажаєте надіÑлати ці файли до %s:"
msgstr[2] "Ви Ñправді бажаєте надіÑлати ці файли до %s:"
-#: ../src/roster_window.py:4571
+#: ../src/roster_window.py:4650
#, python-format
msgid "Send %s to %s"
msgstr "ÐадіÑлати %s до %s"
-#: ../src/roster_window.py:4582
+#: ../src/roster_window.py:4661
#, python-format
msgid "Make %s first contact"
msgstr "Зробити %s першим контактом."
-#: ../src/roster_window.py:4585
+#: ../src/roster_window.py:4664
#, python-format
msgid "Make %s and %s metacontacts"
msgstr "Робить %s та %s метаконтактом."
@@ -10266,129 +10219,129 @@ msgstr "Робить %s та %s метаконтактом."
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:5025 ../src/roster_window.py:5079
-#: ../src/roster_window.py:5088 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5104 ../src/roster_window.py:5158
+#: ../src/roster_window.py:5167 ../src/statusicon.py:264
+#: ../src/statusicon.py:311 ../src/statusicon.py:317
#, python-format
msgid "using account %s"
msgstr "з облікового запиÑу %s"
#. add
-#: ../src/roster_window.py:5095
+#: ../src/roster_window.py:5174
#, python-format
msgid "to %s account"
msgstr "до облікового запиÑу %s"
#. disco
-#: ../src/roster_window.py:5100
+#: ../src/roster_window.py:5179
#, python-format
msgid "using %s account"
msgstr "з облікового запиÑу %s"
-#: ../src/roster_window.py:5139 ../src/statusicon.py:326
+#: ../src/roster_window.py:5218 ../src/statusicon.py:327
msgid "_Manage Bookmarks..."
msgstr "_ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ°Ð¼Ð¸..."
#. profile, avatar
-#: ../src/roster_window.py:5159
+#: ../src/roster_window.py:5238
#, python-format
msgid "of account %s"
msgstr "облікового запиÑу %s"
-#: ../src/roster_window.py:5200
+#: ../src/roster_window.py:5279
#, python-format
msgid "for account %s"
msgstr "до облікового запиÑу %s"
-#: ../src/roster_window.py:5260 ../src/roster_window.py:5365
+#: ../src/roster_window.py:5339 ../src/roster_window.py:5447
msgid "_Change Status Message"
msgstr "_Змінити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан"
-#: ../src/roster_window.py:5293
+#: ../src/roster_window.py:5372
msgid "Publish Tune"
msgstr "Оприлюднити музику"
-#: ../src/roster_window.py:5295
+#: ../src/roster_window.py:5374
msgid "Publish Location"
msgstr "Оприлюднити положеннÑ"
-#: ../src/roster_window.py:5298
+#: ../src/roster_window.py:5377
msgid "Configure Services..."
msgstr "Ðалаштувати Ñлужби..."
-#: ../src/roster_window.py:5443
+#: ../src/roster_window.py:5525
msgid "_Maximize All"
msgstr "_МакÑимізувати вÑÑ–"
-#: ../src/roster_window.py:5453 ../src/roster_window.py:5626
+#: ../src/roster_window.py:5535 ../src/roster_window.py:5708
msgid "Send Group M_essage"
msgstr "ÐадіÑлати групове п_овідомленнÑ"
-#: ../src/roster_window.py:5461
+#: ../src/roster_window.py:5543
msgid "To all users"
msgstr "УÑім кориÑтувачам"
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5547
msgid "To all online users"
msgstr "УÑім кориÑтувачам на зв'Ñзку"
#. Manage Transport submenu
-#: ../src/roster_window.py:5646
+#: ../src/roster_window.py:5728
msgid "_Manage Contacts"
msgstr "_ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð°Ð¼Ð¸"
#. Edit Groups
-#: ../src/roster_window.py:5655
+#: ../src/roster_window.py:5737
msgid "Edit _Groups"
msgstr "Редагувати _групи"
#. Send single message
-#: ../src/roster_window.py:5710
+#: ../src/roster_window.py:5792
msgid "Send Single Message"
msgstr "ÐадіÑлати окреме повідомленнÑ"
#. Execute Command
-#: ../src/roster_window.py:5757
+#: ../src/roster_window.py:5839
msgid "Execute Command..."
msgstr "Виконати команду..."
#. Manage Transport submenu
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5849
msgid "_Manage Transport"
msgstr "_ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ñ€Ð°Ð½Ñпортом"
#. Modify Transport
-#: ../src/roster_window.py:5776
+#: ../src/roster_window.py:5858
msgid "_Modify Transport"
msgstr "_Змінити транÑпорт"
#. Rename
-#: ../src/roster_window.py:5786
+#: ../src/roster_window.py:5868
msgid "_Rename"
msgstr "Пере_йменувати"
-#: ../src/roster_window.py:5846
+#: ../src/roster_window.py:5928
msgid "_Maximize"
msgstr "_МакÑимізувати"
-#: ../src/roster_window.py:5855
+#: ../src/roster_window.py:5937
msgid "_Reconnect"
msgstr "_Перез’єднати"
-#: ../src/roster_window.py:5862
+#: ../src/roster_window.py:5944
msgid "_Disconnect"
msgstr "_Роз'єднати"
#. History manager
-#: ../src/roster_window.py:5951
+#: ../src/roster_window.py:6033
msgid "History Manager"
msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð¾Ð¼"
-#: ../src/roster_window.py:5962
+#: ../src/roster_window.py:6044
msgid "_Join New Group Chat"
msgstr "_ПриєднатиÑÑŒ до нової групової балачки"
-#: ../src/roster_window.py:6180
+#: ../src/roster_window.py:6263
msgid "Change Status Message..."
msgstr "Змінити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан..."
@@ -10405,37 +10358,30 @@ msgstr "Помилка у отриманих даних"
msgid "No result"
msgstr "Результату немає"
-#: ../src/session.py:91
+#: ../src/session.py:98
msgid "Disk WriteError"
msgstr "Помилка під Ñ‡Ð°Ñ Ð·Ð°Ð¿Ð¸Ñу на диÑк"
-#: ../src/session.py:195
-#, python-format
-msgid "Subject: %s"
-msgstr "Тема: %s"
-
-#: ../src/session.py:386 ../src/session.py:430
+#: ../src/session.py:407 ../src/session.py:466
msgid "Confirm these session options"
msgstr "Підтвердити параметри цих ÑеанÑів"
-#: ../src/session.py:387
+#: ../src/session.py:409
#, python-format
msgid ""
-"The remote client wants '\n"
-" 'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
"\n"
"%s\n"
"\n"
"Are these options acceptable?"
msgstr ""
-"Віддалений клієнт бажає '\n"
-"\t'розпочати ÑÐµÐ°Ð½Ñ Ð· такими можливоÑÑ‚Ñми:\n"
+"Віддалений клієнт бажає розпочати ÑÐµÐ°Ð½Ñ Ð· такими можливоÑÑ‚Ñми:\n"
"\n"
"%s\n"
"\n"
-"\tЧи вÑÑ– вказані параметри Ñ” прийнÑтними?"
+"Чи вÑÑ– вказані параметри Ñ” прийнÑтними?"
-#: ../src/session.py:431
+#: ../src/session.py:468
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -10450,15 +10396,19 @@ msgstr ""
"\n"
"Продовжити цей ÑеанÑ?"
-#: ../src/statusicon.py:227
+#: ../src/session.py:471
+msgid "Always accept for this contact"
+msgstr "Завжди приймати цей контакт"
+
+#: ../src/statusicon.py:228
msgid "_Change Status Message..."
msgstr "_Змінити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñтан..."
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:342
msgid "Hide _Roster"
msgstr "Сховати реєÑÑ‚Ñ€"
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:353
msgid "Hide this menu"
msgstr "Сховати це меню"
@@ -10597,6 +10547,10 @@ msgstr ""
"Ð¦Ñ Ñлужба не може надÑилати у відповідь докладні відомоÑÑ‚Ñ–.\n"
"Причиною Ñ” заÑтаріліÑÑ‚ÑŒ або пошкодженіÑÑ‚ÑŒ Ñлужби"
+#: ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr "Комп’ютер приÑиплÑєтьÑÑ"
+
#: ../src/vcard.py:285
msgid "?Client:Unknown"
msgstr "?Клієнт:Ðевідомий"
@@ -10664,6 +10618,178 @@ msgstr "У черзі немає запитів на підпиÑку."
msgid " resource with priority "
msgstr " пріоритетний реÑурÑ"
+#~ msgid "File transfer"
+#~ msgstr "ПеренеÑÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
+
+#~ msgid "Size"
+#~ msgstr "Розмір"
+
+#~ msgid "_Accept"
+#~ msgstr "_ПрийнÑти"
+
+#~ msgid "Choose Client Cert"
+#~ msgstr "Оберіть клієнтÑький Ñертифікат"
+
+#~ msgid "The path to the client certificate and key in PKCS#12 format"
+#~ msgstr "ШлÑÑ… до клієнтÑького Ñертифікату та ключа у форматі PKCS#12"
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " вікно/закладка відкрите з цим контактом "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Дії</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Умови</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Додаткові дії"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Розширене ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑповіщеннÑми"
+
+#~ msgid "All statuses"
+#~ msgstr "УÑÑ– Ñтани"
+
+#~ msgid "Busy "
+#~ msgstr "У Ñправах "
+
+#~ msgid "Contact Change Status "
+#~ msgstr "Зміна Ñтану контакту"
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "Контакт від'єднано"
+
+#~ msgid "Don't have "
+#~ msgstr "Ðе має "
+
+#~ msgid "File Transfer Finished"
+#~ msgstr "ПеренеÑÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ завершено"
+
+#~ msgid "File Transfer Request "
+#~ msgstr "Запит на Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
+
+#~ msgid "File Transfer Started "
+#~ msgstr "Зупинка Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки"
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Отримано Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¾Ð²Ð¾Ñ— балачки"
+
+#~ msgid "Have "
+#~ msgstr "Має "
+
+#~ msgid "Launch a command"
+#~ msgstr "ЗапуÑтити команду"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "Один або більше оÑобливих Ñтанів..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Ð’ мережі / Вільний Ð´Ð»Ñ ÑпілкуваннÑ"
+
+#~ msgid "Play a sound"
+#~ msgstr "Відтворити звук"
+
+#~ msgid "Receive a Message"
+#~ msgstr "Отримано повідомленнÑ"
+
+#~ msgid "When "
+#~ msgstr "Якщо "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_ЗадіÑти UrgencyHint віконного менеджера, щоб змуÑити блимати позначку "
+#~ "вікна балачки на панелі задач"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Вимкнути автоматичне Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð²Ñ–ÐºÐ½Ð° балачки"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Вимкнути Ñ–Ñнуючі виринаючі вікна"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Вимкнути Ñ–Ñнуючі звукові Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— події"
+
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Вимкнути Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð´Ñ–Ð¹ у зоні Ñповіщень"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Вимкнути події поÑви у реєÑтрі"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Повідомити мене виринаючим вікном"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Відкрити вікно балачки з кориÑтувачем"
+
+#~ msgid "_Show event in notification area"
+#~ msgstr "_Показати події у зоні Ñповіщень"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Показати подію у реєÑтрі"
+
+#~ msgid "and I "
+#~ msgstr "Ñ– Ñ "
+
+#~ msgid "contact(s)"
+#~ msgstr "контакт(и)"
+
+#~ msgid "everybody"
+#~ msgstr "вÑÑ–"
+
+#~ msgid "for "
+#~ msgstr "Ð´Ð»Ñ "
+
+#~ msgid "group(s)"
+#~ msgstr "груп(и)"
+
+#~ msgid "when I'm in"
+#~ msgstr "коли Ñ Ñƒ"
+
+#~ msgid "Available"
+#~ msgstr "ДоÑтупний"
+
+#~ msgid "Descrition:"
+#~ msgstr "ОпиÑ: "
+
+#~ msgid "button"
+#~ msgstr "кнопка"
+
+#~ msgid "Advanced..."
+#~ msgstr "Додатково..."
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_ÐадіÑлати окреме повідомленнÑ..."
+
+#~ msgid "User avatar:"
+#~ msgstr "Ðватар кориÑтувача:"
+
+#~ msgid "all or space separated status"
+#~ msgstr "all або відокремлені пробілами Ñтани"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no' або 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'так', 'ні' або ''"
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "Клієнт Jabber на GTK+"
+
+#~ msgid "Condition"
+#~ msgstr "Умова"
+
+#~ msgid "when I am "
+#~ msgstr "Ñкщо Ñ "
+
+#~ msgid "Subject: %s"
+#~ msgstr "Тема: %s"
+
#~ msgid "Requires gpg and python-GnuPGInterface."
#~ msgstr "Потрібні gpg і python-GnuPGInterface."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4f53053fe3f62a80fefe1162b460dda40e0be38c..9a60f248447947bf806a4d804d7e308e41028c6d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,19 +4,14 @@
# wwld <wwld@radio.lzusiyu.org>, 2005.
# kangkang <kanger@gamil.com>, 2005.
# Guanhao Yin <yinguanhao@gmail.com>, 2010.
-# Wei-Lun Chao <chaoweilun@gmail.com>, 2010.
-#
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
+# Wei-Lun Chao <chaoweilun@gmail.com>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: gajim \n"
+"Project-Id-Version: gajim 0.15a1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:53+0800\n"
-"PO-Revision-Date: 2010-11-04 23:10+0800\n"
+"POT-Creation-Date: 2011-09-08 08:26+0200\n"
+"PO-Revision-Date: 2011-09-07 23:11+0800\n"
"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
"Language: zh_TW\n"
@@ -33,7 +28,7 @@ msgstr "åŠ å…¥èŠå¤©å®¤(_G)…"
msgid "_Add Contact..."
msgstr "åŠ å…¥è¯çµ¡äºº(_A)…"
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
msgid "_Discover Services"
msgstr "探索æœå‹™(_D)"
@@ -64,15 +59,17 @@ msgstr "狀態(_S)"
#: ../data/gui/account_creation_wizard_window.ui.h:1
msgid ""
-"<b>Connecting to server</b>\n\n"
+"<b>Connecting to server</b>\n"
+"\n"
"Please wait..."
msgstr ""
-"<b>æ£åœ¨é€£ç·šä¼ºæœå™¨</b>\n\n"
+"<b>æ£åœ¨é€£ç·šä¼ºæœå™¨</b>\n"
+"\n"
"è«‹ç‰å¾……"
#: ../data/gui/account_creation_wizard_window.ui.h:4
msgid "<b>Please choose one of the options below:</b>"
-msgstr "<b>è«‹é¸æ“‡ä¸€å€‹é¸é …</b>: "
+msgstr "<b>è«‹é¸æ“‡ä¸€å€‹é¸é …</b>:"
#: ../data/gui/account_creation_wizard_window.ui.h:5
msgid "<b>Please fill in the data for your existing account</b>"
@@ -121,18 +118,18 @@ msgstr "管ç†â€¦"
#: ../data/gui/account_creation_wizard_window.ui.h:17
#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3612 ../src/config.py:3687
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:517
-#: ../src/dialogs.py:530 ../src/roster_window.py:2967
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2978
+#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703
+#: ../src/config.py:1708 ../src/config.py:2284 ../src/config.py:2363
+#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730
+#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
+#: ../src/dialogs.py:532 ../src/roster_window.py:3092
+#: ../src/roster_window.py:3098 ../src/roster_window.py:3103
msgid "None"
msgstr "ç„¡"
#: ../data/gui/account_creation_wizard_window.ui.h:18
msgid "Prox_y:"
-msgstr "代ç†ä¼ºæœå™¨(_Y): "
+msgstr "代ç†ä¼ºæœå™¨(_Y):"
#: ../data/gui/account_creation_wizard_window.ui.h:19
#: ../data/gui/accounts_window.ui.h:48
@@ -156,7 +153,7 @@ msgstr ""
"Jabber 網路"
#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
msgid "_Advanced"
msgstr "進階(_A)"
@@ -166,25 +163,27 @@ msgstr "完æˆ(_F)"
#: ../data/gui/account_creation_wizard_window.ui.h:26
msgid "_Hostname:"
-msgstr "主機å稱(_H): "
+msgstr "主機å稱(_H):"
#: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
+#: ../data/gui/accounts_window.ui.h:61
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
#: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "_Password:"
-msgstr "密碼(_P): "
+msgstr "密碼(_P):"
#: ../data/gui/account_creation_wizard_window.ui.h:29
msgid "_Port:"
-msgstr "é€£æŽ¥åŸ (_P)"
+msgstr "é€£æŽ¥åŸ (_P):"
#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/manage_bookmarks_window.ui.h:9
msgid "_Server:"
-msgstr "伺æœå™¨(_S): "
+msgstr "伺æœå™¨(_S):"
#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
msgid "<b>Miscellaneous</b>"
@@ -235,16 +234,18 @@ msgid "C_onnect on Gajim startup"
msgstr "Gajim 啟動時連線(_O)"
#: ../data/gui/accounts_window.ui.h:13
-msgid "Chan_ge Password"
-msgstr "變更密碼(_G)"
+msgid "Certificate is e_ncrypted"
+msgstr "憑è‰å·²åŠ 密(_N)"
#: ../data/gui/accounts_window.ui.h:14
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "如果é¸å–，Gajim 在é€éŽä¸å®‰å…¨çš„網路連線傳é€å¯†ç¢¼å‰æœƒè©¢å•æ‚¨"
+msgid "Chan_ge Password"
+msgstr "變更密碼(_G)"
#: ../data/gui/accounts_window.ui.h:15
-msgid "Choose Client Cert"
-msgstr "é¸æ“‡å®¢æˆ¶ç«¯è‰æ›¸"
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr "如果é¸å–，Gajim 在é€éŽä¸å®‰å…¨çš„網路連線傳é€å¯†ç¢¼å‰æœƒè©¢å•æ‚¨"
#: ../data/gui/accounts_window.ui.h:16
msgid "Choose _Key..."
@@ -273,53 +274,67 @@ msgstr "連線"
#: ../data/gui/accounts_window.ui.h:22
#: ../data/gui/zeroconf_information_window.ui.h:2
msgid "E-Mail:"
-msgstr "E-Mail : "
+msgstr "E-Mail:"
#: ../data/gui/accounts_window.ui.h:23
#: ../data/gui/zeroconf_information_window.ui.h:3
msgid "First Name:"
-msgstr "å稱: "
+msgstr "å稱:"
#. No configured account
#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
+#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160
+#: ../src/notify.py:311 ../src/notify.py:334 ../src/notify.py:383
+#: ../src/notify.py:399
msgid "Gajim"
msgstr "Gajim"
#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2909 ../src/roster_window.py:5434
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56
+#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124
+#: ../src/roster_window.py:3034 ../src/roster_window.py:5652
msgid "General"
msgstr "一般"
#: ../data/gui/accounts_window.ui.h:26
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "如果é¸å–， Gajim 會廣æ’更多的 IPä½å€ï¼Œé€™ä½¿å¾—檔案傳輸æˆåŠŸçš„å¯èƒ½æ€§å¾—到æ高。"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"如果é¸å–， Gajim 會廣æ’更多的 IPä½å€ï¼Œé€™ä½¿å¾—檔案傳輸æˆåŠŸçš„å¯èƒ½æ€§å¾—到æ高。"
#: ../data/gui/accounts_window.ui.h:27
msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
msgstr "如果é¸å–，Gajim 會從一個 GPG agent (比如 Seahorse)得到密碼"
#: ../data/gui/accounts_window.ui.h:29
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
msgstr "如果é¸å–，Gajim 會傳é€è³‡æ–™å°åŒ…防æ¢é€¾æ™‚é€ æˆçš„連線ä¸æ–·"
#: ../data/gui/accounts_window.ui.h:30
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
msgstr "如果é¸å–，Gajim 會在啟動時自動使用本帳號連線 jabber 伺æœå™¨"
#: ../data/gui/accounts_window.ui.h:31
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "如果é¸å–，變更全域狀態(在è¯çµ¡äººæ¸…å–®è¦–çª—ä¸‹æ–¹æ ¸å–方塊ä¸èª¿ç¯€)就會相應地變更目å‰å¸³è™Ÿçš„狀態"
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"如果é¸å–，變更全域狀態(在è¯çµ¡äººæ¸…å–®è¦–çª—ä¸‹æ–¹æ ¸å–方塊ä¸èª¿ç¯€)就會相應地變更目å‰"
+"帳號的狀態"
#: ../data/gui/accounts_window.ui.h:32
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"
@@ -330,22 +345,22 @@ msgid "Information about you, as stored in the server"
msgstr "伺æœå™¨ä¸å„²å˜çš„關於您的資訊"
#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:833
+#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826
+#: ../src/dialogs.py:837
msgid "Jabber ID:"
msgstr "Jabber ID"
#: ../data/gui/accounts_window.ui.h:36
#: ../data/gui/zeroconf_information_window.ui.h:5
msgid "Last Name:"
-msgstr "姓: "
+msgstr "姓:"
#: ../data/gui/accounts_window.ui.h:37
msgid "Mer_ge accounts"
msgstr "åˆä½µå¸³è™Ÿ(_G)"
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
+#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
+#: ../src/config.py:2377
msgid "No key selected"
msgstr "沒有é¸æ“‡å¯†é‘°"
@@ -358,7 +373,10 @@ msgid "Priori_ty:"
msgstr "優先ç‰ç´š(_T):"
#: ../data/gui/accounts_window.ui.h:42
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
+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 ""
"優先ç‰ç´šæ˜¯ç•¶å¤šå€‹å®¢æˆ¶ç«¯ä½¿ç”¨åŒä¸€å¸³è™Ÿé€£ç·šåˆ°ä¼ºæœå™¨æ™‚，伺æœå™¨æ±ºå®šäº‹ä»¶å›žæ‡‰å°\n"
"åƒçš„ä¾æ“šã€‚優先ç‰ç´šæœ€é«˜çš„客戶端將得到事件回應"
@@ -368,16 +386,21 @@ msgid "Priority will change automatically according to your status."
msgstr "優先ç‰ç´šå°‡æ ¹æ“šæ‚¨çš„狀態自動轉æ›ã€‚"
#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5384
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602
msgid "Re_name"
msgstr "é‡æ–°å‘½å(_N)"
#: ../data/gui/accounts_window.ui.h:45
msgid "Resour_ce:"
-msgstr "資æº(_C): "
+msgstr "資æº(_C):"
#: ../data/gui/accounts_window.ui.h:46
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
+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 ""
"資æºè¢«å‚³é€çµ¦ä¼ºæœå™¨ä»¥å°‡ç”¨ä¸åŒå®¢æˆ¶ç«¯ç™»å…¥çš„åŒä¸€å¸³è™Ÿå€åˆ†ç‚ºå…©å€‹æˆ–更多部分(å–\n"
"決於登入的客戶端的數目)。比如，您å¯ä»¥åˆ©ç”¨\"家åº\"å’Œ\"工作\"兩個資æºåŒæ™‚\n"
@@ -405,61 +428,57 @@ msgid "Synchronise contacts"
msgstr "åŒæ¥è¯çµ¡äºº"
#: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "客戶端è‰æ›¸è·¯å¾‘(PKCS#12 æ ¼å¼)"
-
-#: ../data/gui/accounts_window.ui.h:54
msgid "Use G_PG Agent"
msgstr "使用 G_PG Agent"
-#: ../data/gui/accounts_window.ui.h:55
+#: ../data/gui/accounts_window.ui.h:54
msgid "Use cust_om hostname/port"
msgstr "使用自訂主機å稱/é€£æŽ¥åŸ è™Ÿç¢¼"
-#: ../data/gui/accounts_window.ui.h:56
+#: ../data/gui/accounts_window.ui.h:55
msgid "Use cust_om port:"
-msgstr "ä½¿ç”¨è‡ªè¨‚é€£æŽ¥åŸ è™Ÿç¢¼: "
+msgstr "ä½¿ç”¨è‡ªè¨‚é€£æŽ¥åŸ è™Ÿç¢¼:"
-#: ../data/gui/accounts_window.ui.h:57
+#: ../data/gui/accounts_window.ui.h:56
msgid "Use file transfer proxies"
msgstr "使用檔案傳輸代ç†ä¼ºæœå™¨"
-#: ../data/gui/accounts_window.ui.h:58
+#: ../data/gui/accounts_window.ui.h:57
msgid "_Client Cert File:"
msgstr "客戶端è‰æ›¸æª”案(_C)"
-#: ../data/gui/accounts_window.ui.h:59
+#: ../data/gui/accounts_window.ui.h:58
msgid "_Edit Personal Information..."
msgstr "編輯個人資訊…"
#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
+#: ../data/gui/accounts_window.ui.h:59 ../data/gui/xml_console_window.ui.h:11
msgid "_Enable"
msgstr "啟用(_E)"
-#: ../data/gui/accounts_window.ui.h:61
+#: ../data/gui/accounts_window.ui.h:60
msgid "_Hostname: "
msgstr "主機å稱(_H): "
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:62
msgid "_Manage..."
msgstr "管ç†â€¦"
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:64
msgid "_Port: "
msgstr "é€£æŽ¥åŸ è™Ÿç¢¼(_P): "
-#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/accounts_window.ui.h:65
msgid "_Warn before using an insecure connection"
msgstr "在使用ä¸å®‰å…¨çš„連線之å‰è¦å‘Š(_W)"
-#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/accounts_window.ui.h:66
msgid "_use HTTP__PROXY environment variable"
msgstr "使用 HTTP__PROXY 環境變數(_U)"
#: ../data/gui/add_new_contact_window.ui.h:1
msgid "A_ccount:"
-msgstr "帳號(_C): "
+msgstr "帳號(_C):"
#: ../data/gui/add_new_contact_window.ui.h:2
msgid "A_llow this contact to view my status"
@@ -494,19 +513,20 @@ msgstr ""
#: ../data/gui/add_new_contact_window.ui.h:11
msgid "_Group:"
-msgstr "群組(_G): "
+msgstr "群組(_G):"
#: ../data/gui/add_new_contact_window.ui.h:12
+#: ../data/gui/manage_bookmarks_window.ui.h:7
msgid "_Nickname:"
-msgstr "暱稱(_N): "
+msgstr "暱稱(_N):"
#: ../data/gui/add_new_contact_window.ui.h:13
msgid "_Protocol:"
-msgstr "å”定(_P): "
+msgstr "å”定(_P):"
#: ../data/gui/add_new_contact_window.ui.h:14
msgid "_Register"
-msgstr "註冊(_G): "
+msgstr "註冊(_G):"
#: ../data/gui/add_new_contact_window.ui.h:15
msgid "_Save subscription message"
@@ -518,7 +538,7 @@ msgstr "使用者 ID(_U):"
#: ../data/gui/adhoc_commands_window.ui.h:1
msgid "<b>An error has occurred:</b>"
-msgstr "<b>發生了一個錯誤: </b>"
+msgstr "<b>發生了一個錯誤:</b>"
#: ../data/gui/adhoc_commands_window.ui.h:2
msgid "<b>Choose command to execute:</b>"
@@ -563,7 +583,7 @@ msgstr "<b>æè¿°</b>"
#: ../data/gui/advanced_configuration_window.ui.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/gui/advanced_configuration_window.ui.h:3
msgid "Advanced Configuration Editor"
@@ -571,7 +591,7 @@ msgstr "進階è¨å®šç·¨è¼¯å™¨"
#: ../data/gui/advanced_configuration_window.ui.h:4
msgid "Filter:"
-msgstr "éŽæ¿¾å™¨: "
+msgstr "éŽæ¿¾å™¨:"
#: ../data/gui/advanced_menuitem_menu.ui.h:1
msgid "Delete MOTD"
@@ -621,179 +641,6 @@ msgstr "管ç†å“¡(_A)"
msgid "_Send Server Message..."
msgstr "傳é€ä¼ºæœå™¨è¨Šæ¯(_S)…"
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "與æ¤è¯çµ¡äººèŠå¤©æ™‚開啟的視窗/標籤"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>動作</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>æ¢ä»¶</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>è²éŸ³</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "進階動作"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "é€²éšŽé€šçŸ¥æŽ§åˆ¶é …è¨å®š"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "所有狀態"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "離開"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "忙碌"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-msgid "Contact Change Status "
-msgstr "è¯çµ¡äººè®Šæ›´äº†ç‹€æ…‹"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "è¯çµ¡äººå·²ä¸æ–·é€£ç·š"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "沒有"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "檔案傳輸完畢"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "檔案傳輸請求"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "檔案傳輸開始"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "多人èŠå¤©è¨Šæ¯é«˜äº®åº¦é¡¯ç¤º"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "收到多人èŠå¤©è¨Šæ¯"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "有"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "隱身"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "執行命令"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "離開很久了"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "一或多個指定的狀態…"
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "線上/和我èŠå¤©å§"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "æ’放è²éŸ³"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "收到一æ¢è¨Šæ¯"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "當"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "啟用視窗管ç†å™¨äº‹ä»¶æ示使工作列的èŠå¤©è¦–窗閃çˆ(_A)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "åœç”¨è‡ªå‹•é–‹å•ŸèŠå¤©è¦–窗(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "åœç”¨ç¾æœ‰çš„彈出視窗(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "åœç”¨ç¾æœ‰çš„æ¤äº‹ä»¶çš„è²éŸ³(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr "åœç”¨åœ¨é€šçŸ¥å€åŸŸä¸é¡¯ç¤ºäº‹ä»¶(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "åœç”¨åœ¨è¯çµ¡äººæ¸…å–®ä¸é¡¯ç¤ºäº‹ä»¶(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "使用彈出視窗通知(_I)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "與使用者開啟èŠå¤©è¦–窗(_O)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in notification area"
-msgstr "在通知å€åŸŸä¸é¡¯ç¤ºäº‹ä»¶(_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "在è¯çµ¡äººæ¸…å–®ä¸é¡¯ç¤ºäº‹ä»¶(_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "與我"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "è¯çµ¡äºº"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "æ¯å€‹äºº"
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "為"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "群組"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "當我在"
-
#: ../data/gui/archiving_preferences_window.ui.h:1
msgid "<i>Method Auto</i>"
msgstr "<i>Method Auto</i>"
@@ -856,14 +703,14 @@ msgstr "被阻斷的è¯çµ¡äºº"
#: ../data/gui/blocked_contacts_window.ui.h:2
#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5403
-#: ../src/roster_window.py:5531 ../src/roster_window.py:5664
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5621
+#: ../src/roster_window.py:5748 ../src/roster_window.py:5881
msgid "_Unblock"
msgstr "解除阻斷(_U)"
#: ../data/gui/change_activity_dialog.ui.h:1
msgid "<b>Message:</b> "
-msgstr "<b>訊æ¯: </b>"
+msgstr "<b>訊æ¯:</b>"
#: ../data/gui/change_activity_dialog.ui.h:2
msgid "Set Activity"
@@ -875,11 +722,11 @@ msgstr "è¨å®šæ´»å‹•"
#: ../data/gui/change_mood_dialog.ui.h:1
msgid "<b>Message:</b>"
-msgstr "<b>訊æ¯: </b>"
+msgstr "<b>訊æ¯:</b>"
#: ../data/gui/change_mood_dialog.ui.h:2
msgid "<b>Mood:</b>"
-msgstr "<b>心情: </b>"
+msgstr "<b>心情:</b>"
#: ../data/gui/change_password_dialog.ui.h:1
msgid "Change Password"
@@ -887,7 +734,7 @@ msgstr "變更密碼"
#: ../data/gui/change_password_dialog.ui.h:2
msgid "Enter it again for confirmation:"
-msgstr "å†æ¬¡è¼¸å…¥ä»¥ç¢ºèª: "
+msgstr "å†æ¬¡è¼¸å…¥ä»¥ç¢ºèª:"
#: ../data/gui/change_password_dialog.ui.h:3
msgid "Enter new password:"
@@ -899,15 +746,15 @@ msgstr "<b>輸入新的狀態訊æ¯</b>"
#: ../data/gui/change_status_message_dialog.ui.h:2
msgid "Activity:"
-msgstr "活動: "
+msgstr "活動:"
#: ../data/gui/change_status_message_dialog.ui.h:3
msgid "Mood:"
-msgstr "心情: "
+msgstr "心情:"
#: ../data/gui/change_status_message_dialog.ui.h:4
msgid "Preset messages:"
-msgstr "é è¨çš„訊æ¯: "
+msgstr "é è¨çš„訊æ¯:"
#: ../data/gui/change_status_message_dialog.ui.h:5
msgid "Save as Preset..."
@@ -944,8 +791,7 @@ msgstr "在ç€è¦½å™¨ä¸é–‹å•Ÿé€£çµ(_O)"
msgid "_Start Chat"
msgstr "開始èŠå¤©(_S)"
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4598
+#: ../data/gui/chat_control.ui.h:1
msgid "#"
msgstr "#"
@@ -1031,7 +877,7 @@ msgstr "切æ›è¦–訊作æ¥éšŽæ®µ"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:275
msgid "_Send"
msgstr "傳é€(_S)"
@@ -1085,8 +931,9 @@ msgstr "編輯群組(_G)…"
#. Invite to
#. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5499
+#: ../data/gui/contact_context_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5557
+#: ../src/roster_window.py:5716
msgid "In_vite to"
msgstr "邀請到(_V)"
@@ -1098,12 +945,12 @@ msgstr "邀請è¯çµ¡äºº(_C)"
msgid "Remo_ve"
msgstr "移除(_R)"
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5349
-#: ../src/roster_window.py:5588
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5805
msgid "Send Cus_tom Status"
msgstr "傳é€å€‹æ€§åŒ–狀態(_T)"
-#: ../data/gui/contact_context_menu.ui.h:10
+#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
msgid "Send Single _Message..."
msgstr "傳é€å–®æ¢è¨Šæ¯(_M)…"
@@ -1132,8 +979,8 @@ msgid "_Allow him/her to see my status"
msgstr "å…許他/她檢視我的狀態(_A)"
#: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5411
-#: ../src/roster_window.py:5537 ../src/roster_window.py:5667
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5629
+#: ../src/roster_window.py:5754 ../src/roster_window.py:5884
msgid "_Block"
msgstr "阻斷(_B)"
@@ -1143,8 +990,8 @@ msgstr "ç¦æ¢ä»–/她檢視我的狀態(_F)"
#: ../data/gui/contact_context_menu.ui.h:20
#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5738
+#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
+#: ../src/roster_window.py:5955
msgid "_History"
msgstr "命令æ·ç¨‹(_H)"
@@ -1237,7 +1084,9 @@ msgid "Shows a list of file transfers between you and others"
msgstr "顯示您與他人進行的傳輸檔案清單"
#: ../data/gui/filetransfers.ui.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
msgstr ""
"該作æ¥æœƒå¾žæ¸…å–®ä¸ç§»é™¤å–®ä¸€æª”案傳輸。如果傳輸æ£åœ¨é€²è¡Œï¼Œå®ƒå°‡å…ˆè¢«çµ‚æ¢ï¼Œè€Œå¾Œ\n"
"被移除"
@@ -1246,7 +1095,7 @@ msgstr ""
msgid "When a file transfer is complete show a popup notification"
msgstr "當檔案傳輸完æˆæ™‚彈出æ示"
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
+#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
msgid "_Continue"
msgstr "繼續(_C)"
@@ -1274,7 +1123,7 @@ msgstr "<b>å„èŠå¤©ç‹€æ…‹ä¸‹æ¨™ç±¤é¡è‰²</b>"
msgid "Account row"
msgstr "帳號"
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:956
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1030
msgid "Bold"
msgstr "ç²—é«”"
@@ -1292,7 +1141,7 @@ msgstr "è¯çµ¡äºº"
#: ../data/gui/gajim_themes_window.ui.h:7
msgid "Font style:"
-msgstr "å—åž‹é¢¨æ ¼: "
+msgstr "å—åž‹é¢¨æ ¼:"
#: ../data/gui/gajim_themes_window.ui.h:8
msgid "Gajim Themes Customization"
@@ -1310,7 +1159,7 @@ msgstr "群組"
msgid "Inactive"
msgstr "未活動的"
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:957
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1031
msgid "Italic"
msgstr "斜體"
@@ -1336,11 +1185,11 @@ msgstr "æš«åœç·¨è¼¯"
#: ../data/gui/gajim_themes_window.ui.h:18
msgid "Text _color:"
-msgstr "æ–‡å—é¡è‰²(_C): "
+msgstr "æ–‡å—é¡è‰²(_C):"
#: ../data/gui/gajim_themes_window.ui.h:19
msgid "Text _font:"
-msgstr "æ–‡å—å—åž‹(_F): "
+msgstr "æ–‡å—å—åž‹(_F):"
#: ../data/gui/gajim_themes_window.ui.h:20
msgid "_Background:"
@@ -1374,47 +1223,51 @@ msgstr "管ç†èŠå¤©å®¤(_M)"
msgid "_Minimize on close"
msgstr "關閉時最å°åŒ–視窗"
-#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+msgid "_Request Voice"
+msgstr "è¦æ±‚語音(_R)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
msgid "Mo_derator"
msgstr "仲è£äºº(_D)"
-#: ../data/gui/gc_occupants_menu.ui.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:3
msgid "Occupant Actions"
msgstr "室å‹å‹•ä½œ"
-#: ../data/gui/gc_occupants_menu.ui.h:3
+#: ../data/gui/gc_occupants_menu.ui.h:4
msgid "Send _File"
msgstr "傳é€æª”案(_F)"
-#: ../data/gui/gc_occupants_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:5
msgid "_Add to Roster"
msgstr "åŠ å…¥è‡³è¯çµ¡äººæ¸…å–®(_A)"
-#: ../data/gui/gc_occupants_menu.ui.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:6
msgid "_Admin"
msgstr "管ç†(_A)"
-#: ../data/gui/gc_occupants_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:7
msgid "_Ban"
msgstr "å°ç¦(_B)"
-#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:10
msgid "_Kick"
msgstr "踢除(_K)"
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:11
msgid "_Member"
msgstr "æˆå“¡(_M)"
-#: ../data/gui/gc_occupants_menu.ui.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:12
msgid "_Owner"
msgstr "所有人(_O)"
-#: ../data/gui/gc_occupants_menu.ui.h:12
+#: ../data/gui/gc_occupants_menu.ui.h:13
msgid "_Send Private Message"
msgstr "傳é€ç§äººèŠå¤©è¨Šæ¯(_S)"
-#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:15
msgid "_Voice"
msgstr "語音(_V)"
@@ -1437,19 +1290,20 @@ msgstr "建立新訊æ¯"
#: ../data/gui/groups_post_window.ui.h:2
#: ../data/gui/single_message_window.ui.h:2
msgid "From:"
-msgstr "從: "
+msgstr "從:"
#: ../data/gui/groups_post_window.ui.h:3
#: ../data/gui/single_message_window.ui.h:7
msgid "Subject:"
-msgstr "主題: "
+msgstr "主題:"
#: ../data/gui/history_manager.ui.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"
+"<b>è¦å‘Š:</b>\n"
"如果您è¦é€²è¡Œå¤§é‡çš„åˆªé™¤ï¼Œè«‹ç¢ºèª Gajim ä¸å†åŸ·è¡Œã€‚\n"
"一般而言，如果您æ£åœ¨èˆ‡æŸå€‹è¯çµ¡äººèŠå¤©ï¼Œè«‹ä¸è¦åˆªé™¤èˆ‡ä»–çš„èŠå¤©è¨˜éŒ„。"
@@ -1457,29 +1311,29 @@ msgstr ""
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
msgstr "<big><b>æ¡è¿Žä½¿ç”¨ Gajim 命令æ·ç¨‹è¨˜éŒ„管ç†å™¨</b></big>"
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3226
-#: ../src/dialogs.py:3323
-msgid "Delete"
-msgstr "刪除"
-
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:4
msgid "Export"
msgstr "匯出"
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:5
msgid "Gajim History Logs Manager"
msgstr "Gajim 命令æ·ç¨‹è¨˜éŒ„管ç†å™¨"
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:6
msgid ""
-"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."
+"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."
msgstr ""
-"這個命令æ·ç¨‹è¨˜éŒ„管ç†å™¨ä¸¦éžç‚ºäº†ç€è¦½å‘½ä»¤æ·ç¨‹è¨˜éŒ„而è¨è¨ˆã€‚如果您需è¦ç€è¦½å‘½ä»¤æ·ç¨‹è¨˜éŒ„，請使用命令æ·ç¨‹è¦–窗。\n\n"
-"使用這個程å¼ä¾†åˆªé™¤æˆ–匯出命令æ·ç¨‹è¨˜éŒ„。您å¯ä»¥åœ¨å·¦å´é€²è¡Œé¸æ“‡ä¸”/或在下方進行æœå°‹ã€‚"
+"這個命令æ·ç¨‹è¨˜éŒ„管ç†å™¨ä¸¦éžç‚ºäº†ç€è¦½å‘½ä»¤æ·ç¨‹è¨˜éŒ„而è¨è¨ˆã€‚如果您需è¦ç€è¦½å‘½ä»¤æ·ç¨‹"
+"記錄，請使用命令æ·ç¨‹è¦–窗。\n"
+"\n"
+"使用這個程å¼ä¾†åˆªé™¤æˆ–匯出命令æ·ç¨‹è¨˜éŒ„。您å¯ä»¥åœ¨å·¦å´é€²è¡Œé¸æ“‡ä¸”/或在下方進行æœ"
+"尋。"
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:9
msgid "_Search Database"
msgstr "æœå°‹è³‡æ–™åº«(_S)"
@@ -1501,7 +1355,7 @@ msgstr "多人èŠå¤©å‘½ä»¤æ·ç¨‹"
#: ../data/gui/history_window.ui.h:5
msgid "Search:"
-msgstr "æœå°‹: "
+msgstr "æœå°‹:"
#: ../data/gui/history_window.ui.h:6
#: ../data/gui/zeroconf_information_window.ui.h:10
@@ -1533,13 +1387,11 @@ msgid "forbid"
msgstr "forbid"
#: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:229
msgid "jid"
msgstr "jid"
#: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
@@ -1574,7 +1426,7 @@ msgstr "stream"
msgid "Bro_wse Rooms"
msgstr "Bro_wse Rooms"
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2198
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2328
msgid "Join Group Chat"
msgstr "åŠ å…¥å¤šäººèŠå¤©"
@@ -1583,41 +1435,37 @@ msgid "Join this room _automatically when I connect"
msgstr "ç•¶æˆ‘é€£ç·šå¾Œè‡ªå‹•åŠ å…¥æ¤èŠå¤©å®¤(_A)"
#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
msgid "Nickname:"
-msgstr "暱稱: "
+msgstr "暱稱:"
#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
msgid "Password:"
-msgstr "密碼: "
+msgstr "密碼:"
#: ../data/gui/join_groupchat_window.ui.h:7
msgid "Recently:"
-msgstr "最近: "
+msgstr "最近:"
#: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
msgid "Room:"
-msgstr "èŠå¤©å®¤: "
+msgstr "èŠå¤©å®¤:"
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
msgid "Server:"
-msgstr "伺æœå™¨: "
+msgstr "伺æœå™¨:"
#: ../data/gui/join_groupchat_window.ui.h:10
msgid "_Bookmark this room"
msgstr "將本èŠå¤©å®¤åŠ 入書籤(_B)"
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
#: ../src/disco.py:1804
msgid "_Join"
msgstr "åŠ å…¥(_J)"
#: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "è‡ªå‹•åŠ å…¥"
+msgid "A_uto join"
+msgstr "自動è¯çµ(_U)"
#: ../data/gui/manage_bookmarks_window.ui.h:2
msgid "If checked, Gajim will join this group chat on startup"
@@ -1628,16 +1476,20 @@ msgid "Manage Bookmarks"
msgstr "書籤管ç†"
#: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "è‡ªå‹•åŠ å…¥æ™‚æœ€å°åŒ–"
+msgid "Minimi_ze on Auto Join"
+msgstr "自動è¯çµæ™‚縮到最å°(_Z)"
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
-msgstr "顯示狀態: "
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "Pr_int status:"
+msgstr "å°å‡ºç‹€æ…‹(_I):"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "Roo_m:"
+msgstr "èŠå¤©å®¤(_M):"
#: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "標題: "
+msgid "_Title:"
+msgstr "標題(_T):"
#: ../data/gui/manage_pep_services_window.ui.h:1
msgid "PEP Service Configuration"
@@ -1673,11 +1525,11 @@ msgstr "密碼(_W)"
#: ../data/gui/manage_proxies_window.ui.h:7
msgid "Proxy _Host:"
-msgstr "代ç†ä¼ºæœå™¨ä½å€(_H): "
+msgstr "代ç†ä¼ºæœå™¨ä½å€(_H):"
#: ../data/gui/manage_proxies_window.ui.h:8
msgid "Proxy _Port:"
-msgstr "代ç†ä¼ºæœå™¨é€£æŽ¥åŸ (_P): "
+msgstr "代ç†ä¼ºæœå™¨é€£æŽ¥åŸ (_P):"
#: ../data/gui/manage_proxies_window.ui.h:9
msgid "SOCKS5"
@@ -1697,15 +1549,15 @@ msgstr "_BOSH URL:"
#: ../data/gui/manage_proxies_window.ui.h:13
msgid "_Name:"
-msgstr "å稱(_N): "
+msgstr "å稱(_N):"
#: ../data/gui/manage_proxies_window.ui.h:14
msgid "_Type:"
-msgstr "é¡žåž‹(_T): "
+msgstr "é¡žåž‹(_T):"
#: ../data/gui/manage_proxies_window.ui.h:15
msgid "_Username:"
-msgstr "使用者å稱(_U): "
+msgstr "使用者å稱(_U):"
#: ../data/gui/passphrase_dialog.ui.h:1
msgid "Passphrase"
@@ -1721,53 +1573,47 @@ msgstr "<empty>"
#: ../data/gui/plugins_window.ui.h:3
msgid "Authors:"
-msgstr "作者: "
+msgstr "作者:"
#: ../data/gui/plugins_window.ui.h:4
-msgid "Available"
-msgstr "線上"
-
-#: ../data/gui/plugins_window.ui.h:5
msgid "Configure"
msgstr "é…ç½®"
+#: ../data/gui/plugins_window.ui.h:5
+msgid "Description:"
+msgstr "æè¿°:"
+
#: ../data/gui/plugins_window.ui.h:6
-msgid "Descrition:"
-msgstr "æè¿°: "
+msgid "Homepage:"
+msgstr "首é :"
#: ../data/gui/plugins_window.ui.h:7
-msgid "Homepage:"
-msgstr "首é : "
+msgid "Install from zip"
+msgstr "從 zip 檔安è£"
#: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
-msgstr "安è£"
-
-#: ../data/gui/plugins_window.ui.h:9
msgid "Installed"
msgstr "已安è£"
-#: ../data/gui/plugins_window.ui.h:10
-msgid "Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization."
+#: ../data/gui/plugins_window.ui.h:9
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
msgstr "外掛程å¼çš„æ述會被顯示在這裡。這些文å—在外掛程å¼è¦–窗åˆå§‹åŒ–時將被去除"
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:10
msgid "Plugins"
msgstr "外掛程å¼"
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:11
msgid "Uninstall"
msgstr "å¸è¼‰"
-#: ../data/gui/plugins_window.ui.h:13
+#: ../data/gui/plugins_window.ui.h:12
msgid "Version:"
-msgstr "版本: "
+msgstr "版本:"
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr "按鈕"
-
-#: ../data/gui/plugins_window.ui.h:15
+#: ../data/gui/plugins_window.ui.h:13
msgid "homepage url"
msgstr "首é 連çµ"
@@ -1836,6 +1682,10 @@ msgstr "<b>éš±ç§ç–ç•¥</b>"
msgid "<b>Roster Appearance</b>"
msgstr "<b>è¯çµ¡äººæ¸…單外觀</b>"
+#: ../data/gui/preferences_window.ui.h:17
+msgid "<b>Sounds</b>"
+msgstr "<b>è²éŸ³</b>"
+
#: ../data/gui/preferences_window.ui.h:18
msgid "<b>Status Messages</b>"
msgstr "<b>狀態訊æ¯</b>"
@@ -1861,219 +1711,267 @@ msgid "Advanced"
msgstr "進階"
#: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "進階…"
-
-#: ../data/gui/preferences_window.ui.h:25
msgid "All chat states"
msgstr "所有èŠå¤©ç‹€æ…‹"
-#: ../data/gui/preferences_window.ui.h:26
+#: ../data/gui/preferences_window.ui.h:25
msgid "Allow _OS information to be sent"
msgstr "å…許傳é€é—œæ–¼ä½œæ¥ç³»çµ±çš„資訊(_O)"
-#: ../data/gui/preferences_window.ui.h:27
+#: ../data/gui/preferences_window.ui.h:26
msgid "Allow my _idle time to be sent"
msgstr "å…許傳é€é—œæ–¼é–’置時間的資訊(_I)"
-#: ../data/gui/preferences_window.ui.h:28
+#: ../data/gui/preferences_window.ui.h:27
msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
msgstr "å…許彈出æ示，當我離開/無法使用/å¿™/隱身(_A)"
-#: ../data/gui/preferences_window.ui.h:29
+#: ../data/gui/preferences_window.ui.h:28
msgid "Allow sound when I'm _busy"
msgstr "在我忙碌時å…許æ’放è²éŸ³(_B)"
-#: ../data/gui/preferences_window.ui.h:30
+#: ../data/gui/preferences_window.ui.h:29
msgid "Always"
msgstr "總是"
-#: ../data/gui/preferences_window.ui.h:31
+#: ../data/gui/preferences_window.ui.h:30
msgid "Ask status message when I:"
-msgstr "è©¢å•ç‹€æ…‹è¨Šæ¯ï¼Œç•¶æˆ‘: "
+msgstr "è©¢å•ç‹€æ…‹è¨Šæ¯ï¼Œç•¶æˆ‘:"
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
msgid "Audio / Video"
msgstr "音訊/視訊"
-#: ../data/gui/preferences_window.ui.h:33
+#: ../data/gui/preferences_window.ui.h:32
msgid "Audio input device"
msgstr "音訊輸入è£ç½®"
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:33
msgid "Audio output device"
msgstr "音訊輸出è£ç½®"
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:34
msgid "Chat message:"
-msgstr "èŠå¤©è¨Šæ¯: "
+msgstr "èŠå¤©è¨Šæ¯:"
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:35
msgid "Check on startup if Gajim is the _default Jabber client"
msgstr "在啟動是åµæ¸¬ Gajim 是å¦æ˜¯é è¨çš„ Jabber 客戶端程å¼"
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:36
msgid "Composing only"
msgstr "僅æ£åœ¨ç·¨è¼¯"
-#: ../data/gui/preferences_window.ui.h:38
+#: ../data/gui/preferences_window.ui.h:37
msgid "Configure color and font of the interface"
msgstr "é…置介é¢é¡è‰²èˆ‡å—åž‹"
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:38
msgid "Contact's message:"
-msgstr "è¯çµ¡äººè¨Šæ¯: "
+msgstr "è¯çµ¡äººè¨Šæ¯:"
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:39
msgid "Contact's nickname:"
msgstr "è¯çµ¡äººæš±ç¨±"
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:40
msgid "Custom"
msgstr "自訂"
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:41
msgid "Detached roster with chat grouped by account"
msgstr "èŠå¤©è¦–窗與è¯çµ¡äººæ¸…單分離，ä¾æ“šå¸³è™Ÿåˆ†çµ„"
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:42
msgid "Detached roster with chat grouped by type"
msgstr "èŠå¤©è¦–窗與è¯çµ¡äººæ¸…單分離，ä¾æ“šé¡žåž‹åˆ†çµ„"
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:43
msgid "Detached roster with detached chats"
msgstr "èŠå¤©è¦–窗與è¯çµ¡äººæ¸…單分離，且互相分離"
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:44
msgid "Detached roster with single chat"
msgstr "單一èŠå¤©è¦–窗，與è¯çµ¡äººæ¸…單分離"
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
+#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
+#: ../src/config.py:672
msgid "Disabled"
msgstr "åœç”¨"
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:46
msgid "Display _activity of contacts in roster"
msgstr "在è¯çµ¡äººæ¸…å–®ä¸é¡¯ç¤ºè¯çµ¡äººçš„活動(_A)"
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:47
msgid "Display _extra email details"
msgstr "顯示é¡å¤–的郵件資訊(_E)"
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:48
msgid "Display _location of contacts in roster"
msgstr "在è¯çµ¡äººæ¸…å–®ä¸é¡¯ç¤ºè¯çµ¡äººçš„ä½ç½®è³‡è¨Š(_L)"
-#: ../data/gui/preferences_window.ui.h:50
+#: ../data/gui/preferences_window.ui.h:49
msgid "Display _tunes of contacts in roster"
msgstr "在è¯çµ¡äººæ¸…å–®ä¸é¡¯ç¤ºè¯çµ¡äººæ£åœ¨æ’放音樂的資訊(_T)"
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:50
msgid "Display a_vatars of contacts in roster"
msgstr "在è¯çµ¡äººæ¸…單顯示ä¸è¯çµ¡äººçš„é åƒ(_V)"
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:51
msgid "Display m_ood of contacts in roster"
msgstr "在è¯çµ¡äººæ¸…å–®ä¸é¡¯ç¤ºè¯çµ¡äººçš„心情(_O)"
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:52
msgid "Display status _messages of contacts in roster"
msgstr "在è¯çµ¡äººæ¸…å–®ä¸é¡¯ç¤ºè¯çµ¡äººçš„狀態資訊(_M)"
-#: ../data/gui/preferences_window.ui.h:54
-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."
+#: ../data/gui/preferences_window.ui.h:53
+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 å¯ä»¥æ”¶ç™¼æ‚¨èˆ‡è¯çµ¡äººæ£åœ¨é€²è¡Œå°è©±çš„相關資訊。æ¤è™•æ‚¨å¯ä»¥æŒ‡å®šæ‚¨æƒ³åœ¨èŠå¤©\n"
"視窗ä¸é¡¯ç¤ºçš„èŠå¤©ç‹€æ…‹è³‡è¨Šã€‚"
-#: ../data/gui/preferences_window.ui.h:55
-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 å¯ä»¥æ”¶ç™¼æ‚¨èˆ‡è¯çµ¡äººæ£åœ¨é€²è¡Œå°è©±çš„相關資訊。æ¤è™•æ‚¨å¯ä»¥æŒ‡å®šè¦ç™¼çµ¦ç¬¬ä¸‰æ–¹çš„èŠå¤©ç‹€æ…‹è³‡è¨Šã€‚"
+#: ../data/gui/preferences_window.ui.h:54
+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 å¯ä»¥æ”¶ç™¼æ‚¨èˆ‡è¯çµ¡äººæ£åœ¨é€²è¡Œå°è©±çš„相關資訊。æ¤è™•æ‚¨å¯ä»¥æŒ‡å®šè¦ç™¼çµ¦ç¬¬ä¸‰æ–¹çš„"
+"èŠå¤©ç‹€æ…‹è³‡è¨Šã€‚"
-#: ../data/gui/preferences_window.ui.h:56
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
+#: ../data/gui/preferences_window.ui.h:55
+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/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:57
msgid "Hide all buttons in chat windows"
msgstr "在èŠå¤©è¦–窗ä¸éš±è—所有按鈕"
-#: ../data/gui/preferences_window.ui.h:59
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
+#: ../data/gui/preferences_window.ui.h:58
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
msgstr "如果é¸å–，Gajim 會å…許他人åµæ¸¬åˆ°æ‚¨æ‰€ä½¿ç”¨çš„作æ¥ç³»çµ±"
-#: ../data/gui/preferences_window.ui.h:60
-msgid "If checked, Gajim will also include information about the sender of the new emails"
+#: ../data/gui/preferences_window.ui.h:59
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
msgstr "如果é¸å–，Gajim å°‡åŒæ™‚包å«æ–°é›»å郵件傳é€è€…的資訊"
-#: ../data/gui/preferences_window.ui.h:61
-msgid "If checked, Gajim will change status to Away when the computer is unused."
+#: ../data/gui/preferences_window.ui.h:60
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
msgstr "如果é¸å–，Gajim 在電腦閒置時會將您的狀態è¨å®šç‚ºé›¢é–‹ã€‚"
-#: ../data/gui/preferences_window.ui.h:62
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
+#: ../data/gui/preferences_window.ui.h:61
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
msgstr "如果é¸å–，Gajim 會在電腦閒置更長時間後將您的狀態è¨å®šç‚ºé›¢é–‹å¾ˆä¹…了。"
+#: ../data/gui/preferences_window.ui.h:62
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"如果é¸å–，Gajim 會在è¯çµ¡äººæ¸…單和多人èŠå¤©è¦–窗ä¸é¡¯ç¤ºè¯çµ¡äººæ¸…å–®ä¸çš„è¯çµ¡äººç´°ç¯€"
+
#: ../data/gui/preferences_window.ui.h:63
-msgid "If checked, Gajim will display avatars of contacts 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/gui/preferences_window.ui.h:64
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "如果é¸å–，Gajim 會在è¯çµ¡äººæ¸…單和多人èŠå¤©è¦–窗ä¸è¯çµ¡äººå稱下方顯示è¯çµ¡äººç‹€æ…‹è¨Šæ¯"
-
-#: ../data/gui/preferences_window.ui.h:65
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
msgstr "如果é¸å–，Gajim 會在è¯çµ¡äººæ¸…單視窗ä¸é¡¯ç¤ºè¯çµ¡äººçš„活動。"
-#: ../data/gui/preferences_window.ui.h:66
-msgid "If checked, Gajim will display the location of contacts in the roster window"
+#: ../data/gui/preferences_window.ui.h:65
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
msgstr "如果é¸å–，Gajim 會在è¯çµ¡äººæ¸…單視窗ä¸é¡¯ç¤ºè¯çµ¡äººçš„ä½ç½®ã€‚"
-#: ../data/gui/preferences_window.ui.h:67
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
+#: ../data/gui/preferences_window.ui.h:66
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
msgstr "如果é¸å–，Gajim 會在è¯çµ¡äººæ¸…單視窗ä¸é¡¯ç¤ºè¯çµ¡äººçš„心情。"
-#: ../data/gui/preferences_window.ui.h:68
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
+#: ../data/gui/preferences_window.ui.h:67
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr "如果é¸å–，Gajim 會在è¯çµ¡äººæ¸…單視窗ä¸é¡¯ç¤ºè¯çµ¡äººæ£åœ¨æ’放的音樂。"
-#: ../data/gui/preferences_window.ui.h:69
-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."
+#: ../data/gui/preferences_window.ui.h:68
+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 會在èŠå¤©è¦–窗ä¸å°‡ç·¨è¼¯æ¡†ä¸çš„拼寫錯誤高亮度顯示。如果沒有通\n"
"éŽåœ¨ç·¨è¼¯æ¡†é»žæ“Šå³éµçš„æ–¹å¼æ˜Žç¢ºè¨å®šèªžè¨€ï¼Œè¯çµ¡äººæˆ–èŠå¤©å®¤çš„é è¨èªžè¨€å°‡è¢«\n"
"使用。"
-#: ../data/gui/preferences_window.ui.h:70
-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 "如果é¸å–，Gajim 會忽略未èªè‰çš„è¯çµ¡äººå¼•ç™¼çš„äº‹ä»¶ã€‚è«‹è¬¹æ…Žä½¿ç”¨ï¼Œå› ç‚ºé€™å°‡é˜»æ–·æ‰€æœ‰ä¸åœ¨è¯çµ¡äººæ¸…å–®ä¸çš„è¯çµ¡äººç™¼ä¾†çš„訊æ¯ã€‚"
+#: ../data/gui/preferences_window.ui.h:69
+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 ""
+"如果é¸å–，Gajim 會忽略未èªè‰çš„è¯çµ¡äººå¼•ç™¼çš„äº‹ä»¶ã€‚è«‹è¬¹æ…Žä½¿ç”¨ï¼Œå› ç‚ºé€™å°‡é˜»æ–·æ‰€æœ‰"
+"ä¸åœ¨è¯çµ¡äººæ¸…å–®ä¸çš„è¯çµ¡äººç™¼ä¾†çš„訊æ¯ã€‚"
-#: ../data/gui/preferences_window.ui.h:71
-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."
+#: ../data/gui/preferences_window.ui.h:70
+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 åŠ å¯†æ™‚ï¼Œå¿…é ˆå°æ–¹åŒæ„\n"
"記錄，å¦å‰‡ Gajim ä¸æœƒè¨˜éŒ„。"
-#: ../data/gui/preferences_window.ui.h:72
-msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
+#: ../data/gui/preferences_window.ui.h:71
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
msgstr "如果é¸å–，Gajim 在 GMail 收到新的電å郵件是會顯示一個通知"
-#: ../data/gui/preferences_window.ui.h:73
-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...)"
+#: ../data/gui/preferences_window.ui.h:72
+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 è¯çµ¡äººæœƒä»¥åŒ\n"
"MSN 相åŒçš„圖示顯示線上，離開，忙，ç‰ç‰ç‹€æ…‹â€¦)"
-#: ../data/gui/preferences_window.ui.h:74
-msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
+#: ../data/gui/preferences_window.ui.h:73
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
msgstr "如果é¸å–，Gajim ä¸æœƒè©¢å•ç‹€æ…‹è¨Šæ¯ï¼Œè€Œä½¿ç”¨ç‰¹å®šçš„é è¨è¨Šæ¯ã€‚"
-#: ../data/gui/preferences_window.ui.h:75
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
+#: ../data/gui/preferences_window.ui.h:74
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
msgstr "如果ä¸åœç”¨ï¼ŒGajim 會用相å°çš„動態或éœæ…‹çš„圖形代替å—元表情，例如':)'"
+#: ../data/gui/preferences_window.ui.h:75
+msgid "Last state"
+msgstr "最後狀態"
+
#: ../data/gui/preferences_window.ui.h:76
msgid "Log _encrypted chat session"
msgstr "è¨˜éŒ„åŠ å¯†çš„ä½œæ¥éšŽæ®µ(_E)"
@@ -2138,11 +2036,11 @@ msgstr "STUN 伺æœå™¨çš„主機å稱。如果沒有給出，Gajim 會嘗試從
#: ../data/gui/preferences_window.ui.h:92
msgid "STUN server:"
-msgstr "STUN 伺æœå™¨: "
+msgstr "STUN 伺æœå™¨:"
#: ../data/gui/preferences_window.ui.h:93
msgid "Show notification area icon:"
-msgstr "在通知å€åŸŸé¡¯ç¤ºåœ–示: "
+msgstr "在通知å€åŸŸé¡¯ç¤ºåœ–示:"
#: ../data/gui/preferences_window.ui.h:94
msgid "Show only in roster"
@@ -2161,20 +2059,24 @@ msgid "Single window for everything"
msgstr "åªä½¿ç”¨å–®ä¸€è¦–窗"
#: ../data/gui/preferences_window.ui.h:98
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "一些訊æ¯æœƒåŒ…å«è±å¯Œçš„內容(ä¾‹å¦‚æ ¼å¼ï¼Œé¡è‰²ç‰)。如果é¸å–，Gajim 將顯示原本的訊æ¯å…§å®¹ã€‚"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"一些訊æ¯æœƒåŒ…å«è±å¯Œçš„內容(ä¾‹å¦‚æ ¼å¼ï¼Œé¡è‰²ç‰)。如果é¸å–，Gajim 將顯示原本的訊æ¯"
+"內容。"
#: ../data/gui/preferences_window.ui.h:99
msgid "Sort contacts by status"
msgstr "å°‡è¯çµ¡äººæŒ‰ç‹€æ…‹æŽ’åº"
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
msgid "Status"
msgstr "狀態"
#: ../data/gui/preferences_window.ui.h:101
msgid "Status _iconset:"
-msgstr "狀態圖示集(_I): "
+msgstr "狀態圖示集(_I):"
#: ../data/gui/preferences_window.ui.h:102
msgid "Style"
@@ -2186,7 +2088,8 @@ msgstr "主題:(_H)"
#: ../data/gui/preferences_window.ui.h:104
msgid ""
-"The auto away status message. If empty, Gajim will not change the current status message\n"
+"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 ""
@@ -2196,7 +2099,8 @@ msgstr ""
#: ../data/gui/preferences_window.ui.h:107
msgid ""
-"The auto not available status message. If empty, Gajim will not change the current status message\n"
+"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 ""
@@ -2234,31 +2138,31 @@ msgstr "視訊尺寸"
#: ../data/gui/preferences_window.ui.h:117
msgid "When new event is received:"
-msgstr "當收到新的事件: "
+msgstr "當收到新的事件:"
#: ../data/gui/preferences_window.ui.h:118
msgid "Your message:"
-msgstr "您的訊æ¯: "
+msgstr "您的訊æ¯:"
#: ../data/gui/preferences_window.ui.h:119
msgid "Your nickname:"
-msgstr "您的暱稱: "
+msgstr "您的暱稱:"
#: ../data/gui/preferences_window.ui.h:120
msgid "_Away after:"
-msgstr "在æ¤æ™‚間後è¨å®šç‹€æ…‹ç‚ºé›¢é–‹(_A): "
+msgstr "在æ¤æ™‚間後è¨å®šç‹€æ…‹ç‚ºé›¢é–‹(_A):"
#: ../data/gui/preferences_window.ui.h:121
msgid "_Browser:"
-msgstr "ç€è¦½å™¨(_B): "
+msgstr "ç€è¦½å™¨(_B):"
#: ../data/gui/preferences_window.ui.h:122
msgid "_Display chat state notifications:"
-msgstr "顯示èŠå¤©ç‹€æ…‹è³‡è¨Š(_D): "
+msgstr "顯示èŠå¤©ç‹€æ…‹è³‡è¨Š(_D):"
#: ../data/gui/preferences_window.ui.h:123
msgid "_Emoticons:"
-msgstr "表情(_E): "
+msgstr "表情(_E):"
#: ../data/gui/preferences_window.ui.h:124
msgid "_File manager:"
@@ -2282,11 +2186,11 @@ msgstr "記錄è¯çµ¡äººç‹€æ…‹è®ŠåŒ–(_L)"
#: ../data/gui/preferences_window.ui.h:129
msgid "_Mail client:"
-msgstr "郵件客戶端(_M): "
+msgstr "郵件客戶端(_M):"
#: ../data/gui/preferences_window.ui.h:130
msgid "_Not available after:"
-msgstr "在æ¤æ™‚間後è¨å®šç‹€æ…‹ç‚ºé›¢é–‹å¾ˆä¹…了(_N): "
+msgstr "在æ¤æ™‚間後è¨å®šç‹€æ…‹ç‚ºé›¢é–‹å¾ˆä¹…了(_N):"
#: ../data/gui/preferences_window.ui.h:131
msgid "_Open..."
@@ -2298,35 +2202,39 @@ msgstr "æ¢å¾©ç‚ºé è¨é¡è‰²è¨å®š(_R)"
#: ../data/gui/preferences_window.ui.h:133
msgid "_Send chat state notifications:"
-msgstr "傳é€èŠå¤©ç‹€æ…‹è³‡è¨Š(_S): "
+msgstr "傳é€èŠå¤©ç‹€æ…‹è³‡è¨Š(_S):"
#: ../data/gui/preferences_window.ui.h:134
+msgid "_Show roster on startup:"
+msgstr "啟動時顯示å冊(_S):"
+
+#: ../data/gui/preferences_window.ui.h:135
msgid "_Status message:"
msgstr "狀態訊æ¯:(_S)"
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:136
msgid "_URL highlight:"
-msgstr "URL 高亮度顯示: "
+msgstr "URL 高亮度顯示:"
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:137
msgid "_Window behavior:"
msgstr "視窗行為(_W)"
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:138
msgid "in _group chats"
msgstr "在多人èŠå¤©è¦–窗ä¸(_G)"
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:139
msgid "in _roster"
msgstr "在è¯çµ¡äººæ¸…å–®ä¸(_R)"
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:140
msgid "minutes"
msgstr "分é˜"
#: ../data/gui/privacy_lists_window.ui.h:1
msgid "Privacy Lists:"
-msgstr "éš±ç§ç–略清單: "
+msgstr "éš±ç§ç–略清單:"
#: ../data/gui/privacy_list_window.ui.h:1
msgid "<b>Add / Edit a rule</b>"
@@ -2372,7 +2280,7 @@ msgstr "JabberID"
msgid "Order:"
msgstr "Order:"
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3804
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3966
msgid "Privacy List"
msgstr "éš±ç§ç–略清單"
@@ -2423,126 +2331,126 @@ msgstr "<b>ä½å€</b>"
#: ../data/gui/profile_window.ui.h:2
msgid "<b>Avatar:</b>"
-msgstr "<b>é åƒ: </b>"
+msgstr "<b>é åƒ:</b>"
#: ../data/gui/profile_window.ui.h:3
#: ../data/gui/vcard_information_window.ui.h:4
msgid "<b>Birthday:</b>"
-msgstr "<b>生日: </b>"
+msgstr "<b>生日:</b>"
#: ../data/gui/profile_window.ui.h:4
#: ../data/gui/vcard_information_window.ui.h:5
msgid "<b>City:</b>"
-msgstr "<b>城市: </b>"
+msgstr "<b>城市:</b>"
#: ../data/gui/profile_window.ui.h:5
#: ../data/gui/vcard_information_window.ui.h:7
msgid "<b>Company:</b>"
-msgstr "<b>å…¬å¸: </b>"
+msgstr "<b>å…¬å¸:</b>"
#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:10
msgid "<b>Country:</b>"
-msgstr "<b>國家: </b>"
+msgstr "<b>國家:</b>"
#: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/vcard_information_window.ui.h:11
msgid "<b>Department:</b>"
-msgstr "<b>部門: </b>"
+msgstr "<b>部門:</b>"
#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:12
msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail: </b>"
+msgstr "<b>E-Mail:</b>"
#: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:13
msgid "<b>Extra Address:</b>"
-msgstr "<b>é™„åŠ ä½å€: </b>"
+msgstr "<b>é™„åŠ ä½å€:</b>"
#. Family Name
#: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:15
msgid "<b>Family:</b>"
-msgstr "姓: "
+msgstr "<b>姓:</b>"
#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:16
msgid "<b>Full Name</b>"
msgstr "<b>å…¨å稱</b>"
#. Given Name
#: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:18
msgid "<b>Given:</b>"
-msgstr "<b>å稱: </b>"
+msgstr "<b>å稱:</b>"
#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:19
msgid "<b>Homepage:</b>"
-msgstr "<b>首é : </b>"
+msgstr "<b>首é :</b>"
#. Middle Name
#: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:22
msgid "<b>Middle:</b>"
-msgstr "<b>ä¸é–“å稱: </b>"
+msgstr "<b>ä¸é–“å稱:</b>"
#: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:23
msgid "<b>Name:</b>"
-msgstr "<b>å稱: </b>"
+msgstr "<b>å稱:</b>"
#: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:24
msgid "<b>Nickname:</b>"
-msgstr "<b>暱稱: </b>"
+msgstr "<b>暱稱:</b>"
#: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:25
msgid "<b>Phone No.:</b>"
-msgstr "<b>電話號碼: </b>"
+msgstr "<b>電話號碼:</b>"
#: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:26
msgid "<b>Position:</b>"
-msgstr "<b>è·ä½: </b>"
+msgstr "<b>è·ä½:</b>"
#: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:27
msgid "<b>Postal Code:</b>"
-msgstr "<b>郵éžå€è™Ÿ: </b>"
+msgstr "<b>郵éžå€è™Ÿ:</b>"
#. Prefix in Name
#: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:29
msgid "<b>Prefix:</b>"
-msgstr "<b>å—首: </b>"
+msgstr "<b>å—首:</b>"
#: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:31
msgid "<b>Role:</b>"
-msgstr "<b>角色: </b>"
+msgstr "<b>角色:</b>"
#: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:32
msgid "<b>State:</b>"
-msgstr "<b>å·ž: </b>"
+msgstr "<b>å·ž:</b>"
#: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:34
msgid "<b>Street:</b>"
-msgstr "<b>è¡—é“: </b>"
+msgstr "<b>è¡—é“:</b>"
#. Suffix in Name
#: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:38
msgid "<b>Suffix:</b>"
-msgstr "<b>å—å°¾: </b>"
+msgstr "<b>å—å°¾:</b>"
#. "About" is the text of a tab of vcard window
#: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:42
msgid "About"
msgstr "關於"
@@ -2551,12 +2459,12 @@ msgid "Click to set your avatar"
msgstr "按一下以è¨å®šæ‚¨çš„é åƒ"
#: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:45
+#: ../data/gui/vcard_information_window.ui.h:46
msgid "Format: YYYY-MM-DD"
msgstr "æ ¼å¼: YYYY-MM-DD"
#: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:48
msgid "Personal Info"
msgstr "個人資訊"
@@ -2579,14 +2487,17 @@ msgstr "åŒæ™‚從 Gajim 和伺æœå™¨ç§»é™¤å¸³è™Ÿ(_S)"
#. Remove group
#. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5421
-#: ../src/roster_window.py:5547 ../src/roster_window.py:5677
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5639
+#: ../src/roster_window.py:5764 ../src/roster_window.py:5894
msgid "_Remove"
msgstr "移除(_R)"
#: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
-msgstr "<b>someone@somewhere.com</b> 希望您å‘您的è¯çµ¡äººæ¸…å–® <b>åŠ å…¥</b> 一些è¯çµ¡äººã€‚"
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
+msgstr ""
+"<b>someone@somewhere.com</b> 希望您å‘您的è¯çµ¡äººæ¸…å–® <b>åŠ å…¥</b> 一些è¯çµ¡äººã€‚"
#: ../data/gui/roster_item_exchange_window.ui.h:2
msgid "Message Body <currently unused, so it's hidden by default>"
@@ -2629,52 +2540,48 @@ msgstr "外掛程å¼(_L)"
msgid "Profile, A_vatar"
msgstr "å´å¯«ï¼Œé åƒ(V)"
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
msgid "Show Only _Active Contacts"
msgstr "åªé¡¯ç¤ºæ´»å‹•çš„è¯çµ¡äºº(_A)"
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
msgid "Show Trans_ports"
msgstr "顯示代ç†(_P)"
-#: ../data/gui/roster_window.ui.h:12
+#: ../data/gui/roster_window.ui.h:13
msgid "Show _Offline Contacts"
msgstr "顯示離線è¯çµ¡äºº"
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
msgid "Show _Roster"
msgstr "顯示è¯çµ¡äººæ¸…å–®(_R)"
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
msgid "_Accounts"
msgstr "帳號(_A)"
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/roster_window.ui.h:16
#: ../data/gui/subscription_request_window.ui.h:6
msgid "_Actions"
msgstr "動作(_A)"
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:18
msgid "_Contents"
msgstr "內容(_C)"
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
+#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
msgid "_FAQ"
msgstr "常見å•é¡Œ(_A)"
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:22
msgid "_Help"
msgstr "求助(_H)"
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "傳é€å–®æ¢è¨Šæ¯(_S)…"
-
#: ../data/gui/roster_window.ui.h:25
msgid "_View"
msgstr "檢視(_V)"
@@ -2692,11 +2599,11 @@ msgid "_Add contact"
msgstr "åŠ å…¥è¯çµ¡äºº(_C)"
#. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5689
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5906
msgid "_Information"
msgstr "資訊(_I)"
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
msgid "_Search"
msgstr "æœå°‹(_S)"
@@ -2734,7 +2641,7 @@ msgstr "傳é€è¨Šæ¯ä¸¦é—œé–‰è¦–窗"
#: ../data/gui/single_message_window.ui.h:8
msgid "To:"
-msgstr "到: "
+msgstr "到:"
#: ../data/gui/single_message_window.ui.h:9
msgid "_Reply"
@@ -2753,7 +2660,9 @@ msgid "Authorize contact so he or she can know when you're connected"
msgstr "å‘è¯çµ¡äººæŽˆæ¬Šå‰‡ä»–/她將知é“您是å¦ç·šä¸Š"
#: ../data/gui/subscription_request_window.ui.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/gui/subscription_request_window.ui.h:4
@@ -2799,62 +2708,62 @@ msgstr "多人èŠå¤©(_G)"
#. Given Name
#: ../data/gui/vcard_information_window.ui.h:3
msgid "<b>Ask:</b>"
-msgstr "<b>請求: </b>"
+msgstr "<b>請求:</b>"
#: ../data/gui/vcard_information_window.ui.h:6
msgid "<b>Client:</b>"
-msgstr "<b>客戶端: </b>"
+msgstr "<b>客戶端:</b>"
#: ../data/gui/vcard_information_window.ui.h:8
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>å·²è¨å®šé åƒ:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
msgid "<b>Contact time:</b>"
-msgstr "<b>è¯çµ¡äººæ™‚é–“: </b>"
+msgstr "<b>è¯çµ¡äººæ™‚é–“:</b>"
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:20
msgid "<b>Jabber ID:</b>"
-msgstr "<b>Jabber ID: </b>"
+msgstr "<b>Jabber ID:</b>"
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:30
msgid "<b>Resource:</b>"
-msgstr "<b>資æº: </b>"
+msgstr "<b>資æº:</b>"
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:33
msgid "<b>Status:</b>"
-msgstr "<b>狀態: </b>"
+msgstr "<b>狀態:</b>"
#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:36
msgid "<b>Subscription:</b>"
-msgstr "<b>èªè‰: </b>"
+msgstr "<b>èªè‰:</b>"
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:39
msgid "<b>System:</b>"
-msgstr "<b>系統: </b>"
+msgstr "<b>系統:</b>"
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>User avatar:</b>"
+msgstr "<b>使用者é åƒ:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:43
msgid "Comments"
msgstr "註釋"
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
-msgstr "è¨å®šé åƒ: "
-
-#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/vcard_information_window.ui.h:44
#: ../data/gui/zeroconf_information_window.ui.h:1
msgid "Contact"
msgstr "è¯çµ¡äºº"
-#: ../data/gui/vcard_information_window.ui.h:44
+#: ../data/gui/vcard_information_window.ui.h:45
msgid "Contact Information"
msgstr "è¯çµ¡äººè³‡è¨Š"
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:47
msgid "More"
msgstr "更多"
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "使用者é åƒ: "
-
#: ../data/gui/xml_console_window.ui.h:1
msgid "<b>Filter</b>"
msgstr "<b>éŽæ¿¾å™¨</b>"
@@ -2910,7 +2819,7 @@ msgstr "修改帳號(_M)…"
#: ../data/gui/zeroconf_information_window.ui.h:6
msgid "Local jid:"
-msgstr "本地 JID: "
+msgstr "本地 JID:"
#: ../data/gui/zeroconf_information_window.ui.h:7
msgid "Personal"
@@ -2918,11 +2827,11 @@ msgstr "個人"
#: ../data/gui/zeroconf_information_window.ui.h:8
msgid "Resource:"
-msgstr "資æº: "
+msgstr "資æº:"
#: ../data/gui/zeroconf_information_window.ui.h:9
msgid "Status:"
-msgstr "狀態: "
+msgstr "狀態:"
#: ../data/gajim.desktop.in.in.h:1
msgid "A GTK+ Jabber client"
@@ -2941,7 +2850,8 @@ msgid "Cancel confirmation"
msgstr "å–消確èª"
#: ../src/adhoc_commands.py:324
-msgid "You are in process of executing command. Do you really want to cancel it?"
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
msgstr "您æ£åœ¨åŸ·è¡Œä¸€å€‹å‘½ä»¤ã€‚確定è¦å–消嗎?"
#: ../src/adhoc_commands.py:370
@@ -2986,7 +2896,7 @@ msgstr "Integer"
msgid "Text"
msgstr "Text"
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:976
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1050
msgid "Color"
msgstr "Color"
@@ -3022,231 +2932,250 @@ msgstr[0] "您收到了新的事件 (還有 %d 個沒有顯示)"
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "English"
msgstr "英語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Belarusian"
msgstr "白俄語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Bulgarian"
msgstr "ä¿åŠ 利亞語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Breton"
msgstr "布列塔尼語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Czech"
msgstr "æ·å…‹èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "German"
msgstr "德語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Greek"
msgstr "希臘語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "British"
msgstr "英語(英國)"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Esperanto"
msgstr "世界語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Spanish"
msgstr "西ç牙語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Basque"
msgstr "巴斯克語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "French"
msgstr "法語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Croatian"
msgstr "克羅埃西亞語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Italian"
msgstr "義大利語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Norwegian (b)"
msgstr "挪å¨èªž (b)"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Dutch"
msgstr "è·è˜èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Norwegian"
msgstr "挪å¨èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Polish"
msgstr "æ³¢è˜èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Portuguese"
msgstr "è‘¡è„牙語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Brazilian Portuguese"
msgstr "巴西葡è„牙語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Russian"
msgstr "俄語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Serbian"
msgstr "塞爾ç¶äºžèªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Slovak"
msgstr "斯洛ä¼å…‹èªž"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Swedish"
msgstr "瑞典語"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:84
msgid "Chinese (Ch)"
msgstr "漢語"
-#: ../src/chat_control.py:510
+#: ../src/chat_control.py:227
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/chat_control.py:232
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/chat_control.py:237
+msgid "Error."
+msgstr "錯誤。"
+
+#: ../src/chat_control.py:562
msgid "Spelling language"
msgstr "拼寫語言"
#. we are not connected
-#: ../src/chat_control.py:542 ../src/chat_control.py:751
+#: ../src/chat_control.py:594 ../src/chat_control.py:810
msgid "A connection is not available"
msgstr "一個連線無法使用"
-#: ../src/chat_control.py:543 ../src/chat_control.py:752
+#: ../src/chat_control.py:595 ../src/chat_control.py:811
msgid "Your message can not be sent until you are connected."
msgstr "連線之後您的訊æ¯æ‰èƒ½å‚³é€"
-#: ../src/chat_control.py:958
+#: ../src/chat_control.py:1032
msgid "Underline"
msgstr "底線"
-#: ../src/chat_control.py:959
+#: ../src/chat_control.py:1033
msgid "Strike"
msgstr "劃去"
-#: ../src/chat_control.py:982
+#: ../src/chat_control.py:1056
msgid "Font"
msgstr "å—åž‹"
-#: ../src/chat_control.py:991
+#: ../src/chat_control.py:1065
msgid "Clear formating"
msgstr "æ¸…æ¥šæ ¼å¼"
-#: ../src/chat_control.py:1069
+#: ../src/chat_control.py:1142
msgid "Really send file?"
msgstr "確定è¦å‚³é€æª”案?"
-#: ../src/chat_control.py:1070
+#: ../src/chat_control.py:1143
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr "如果您想 %s 傳é€æª”案，他/她會ç²çŸ¥æ‚¨çš„真實 Jabber ID。"
-#: ../src/chat_control.py:1534 ../src/chat_control.py:2024
+#: ../src/chat_control.py:1623 ../src/chat_control.py:2135
msgid "GPG encryption enabled"
msgstr "GPG åŠ å¯†å·²å•Ÿç”¨"
+#: ../src/chat_control.py:1644 ../src/chat_control.py:1647
+msgid "Requires python-farsight."
+msgstr "éœ€è¦ python-farsight。"
+
#. Add to roster
-#: ../src/chat_control.py:1563 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1072 ../src/dialogs.py:2096
-#: ../src/dialogs.py:2125 ../src/gui_interface.py:530
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3366
-#: ../src/roster_window.py:3393
+#: ../src/chat_control.py:1673 ../src/common/contacts.py:149
+#: ../src/common/contacts.py:270 ../src/common/helpers.py:60
+#: ../src/common/helpers.py:254 ../src/dialogs.py:1099 ../src/dialogs.py:2222
+#: ../src/dialogs.py:2251 ../src/gui_interface.py:467
+#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:404
+#: ../src/roster_window.py:1644 ../src/roster_window.py:1646
+#: ../src/roster_window.py:1979 ../src/roster_window.py:3507
+#: ../src/roster_window.py:3534
msgid "Not in Roster"
msgstr "ä¸åœ¨è¯çµ¡äººæ¸…å–®ä¸"
-#: ../src/chat_control.py:1593
+#: ../src/chat_control.py:1704
msgid "This contact does not support file transfer."
msgstr "這個è¯çµ¡äººä¸æ”¯æ´æª”案傳輸"
-#: ../src/chat_control.py:1596
+#: ../src/chat_control.py:1707
msgid "You need to know the real JID of the contact to send him or her a file."
msgstr "您需è¦çŸ¥é“這個è¯çµ¡äººçš„真實 JID æ‰èƒ½å‘ä»–/她傳é€æª”案。"
-#: ../src/chat_control.py:1691
+#: ../src/chat_control.py:1814
#, python-format
msgid "%(type)s state : %(state)s, reason: %(reason)s"
msgstr "%(type)s 狀態: %(state)sï¼ŒåŽŸå› : %(reason)s"
-#: ../src/chat_control.py:1883
+#: ../src/chat_control.py:2005
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
msgstr "èŠå¤©å®¤ %(room_name)s çš„ %(nickname)s"
#. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:2004 ../src/dialogs.py:5280
+#: ../src/chat_control.py:2115 ../src/dialogs.py:5027
msgid "No GPG key assigned"
msgstr "沒有指定 GPG 密鑰"
-#: ../src/chat_control.py:2005
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
+#: ../src/chat_control.py:2116
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
msgstr "尚未為這個è¯çµ¡äººæŒ‡å®š GPG å¯†é‘°ã€‚å› æ¤æ‚¨ä¸èƒ½ç”¨ GPG åŠ å¯†è³‡è¨Šã€‚"
-#: ../src/chat_control.py:2014
+#: ../src/chat_control.py:2125
msgid "GPG encryption disabled"
msgstr "GPG åŠ å¯†å·²åœç”¨"
-#: ../src/chat_control.py:2040
+#: ../src/chat_control.py:2151
msgid "Session WILL be logged"
msgstr "作æ¥éšŽæ®µå°‡è¢«è¨˜éŒ„"
-#: ../src/chat_control.py:2042
+#: ../src/chat_control.py:2153
msgid "Session WILL NOT be logged"
msgstr "作æ¥éšŽæ®µå°‡ä¸æœƒè¢«è¨˜éŒ„"
#. encryption %s active
-#: ../src/chat_control.py:2059
+#: ../src/chat_control.py:2170
msgid "is"
msgstr "是"
-#: ../src/chat_control.py:2059
+#: ../src/chat_control.py:2170
msgid "is NOT"
msgstr "ä¸æ˜¯"
#. chat session %s be logged
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:2172
msgid "will"
msgstr "會"
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:2172
msgid "will NOT"
msgstr "ä¸æœƒ"
#. About encrypted chat session
-#: ../src/chat_control.py:2065
+#: ../src/chat_control.py:2176
msgid "and authenticated"
msgstr "且已被èªè‰"
#. About encrypted chat session
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2180
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:2076
+#: ../src/chat_control.py:2187
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3255,104 +3184,120 @@ msgstr ""
"%(type)s åŠ å¯† %(status)s 活動 %(authenticated)s。\n"
"您的èŠå¤©ä½œæ¥éšŽæ®µ %(logged)s 將被記錄。"
-#: ../src/chat_control.py:2219
+#: ../src/chat_control.py:2331
msgid "Session negotiation cancelled"
msgstr "作æ¥éšŽæ®µå”商已å–消"
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2341
msgid "This session WILL be archived on server"
msgstr "本次作æ¥éšŽæ®µå°‡åœ¨ä¼ºæœå™¨ä¸Šè¢«å˜æª”"
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2343
msgid "This session WILL NOT be archived on server"
msgstr "本次作æ¥éšŽæ®µå°‡ä¸æœƒåœ¨ä¼ºæœå™¨ä¸Šè¢«å˜æª”"
-#: ../src/chat_control.py:2240
+#: ../src/chat_control.py:2352
msgid "This session is encrypted"
msgstr "本次作æ¥éšŽæ®µå·²è¢«åŠ 密"
-#: ../src/chat_control.py:2243
+#: ../src/chat_control.py:2355
msgid " and WILL be logged"
msgstr "且會被記錄"
-#: ../src/chat_control.py:2245
+#: ../src/chat_control.py:2357
msgid " and WILL NOT be logged"
msgstr "且ä¸æœƒè¢«è¨˜éŒ„"
-#: ../src/chat_control.py:2250
-msgid "Remote contact's identity not verified. Click the shield button for more details."
+#: ../src/chat_control.py:2362
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
msgstr "é 端è¯çµ¡äººçš„身分未確èªã€‚點擊盾型按鈕檢視詳情。"
-#: ../src/chat_control.py:2252
+#: ../src/chat_control.py:2364
msgid "E2E encryption disabled"
msgstr "E2E åŠ å¯†è¢«åœç”¨"
-#: ../src/chat_control.py:2296 ../src/chat_control.py:2309
+#: ../src/chat_control.py:2408 ../src/chat_control.py:2421
msgid "The following message was NOT encrypted"
msgstr "下é¢çš„訊æ¯æ²’æœ‰è¢«åŠ å¯†"
-#: ../src/chat_control.py:2302
+#: ../src/chat_control.py:2414
msgid "The following message was encrypted"
msgstr "下é¢çš„訊æ¯æ˜¯åŠ 密的"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2580
+#: ../src/chat_control.py:2685
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "您剛剛收到一æ¢ä¾†è‡ª \"%s\" 的訊æ¯"
-#: ../src/chat_control.py:2581
-msgid "If you close this tab and you have history disabled, this message will be lost."
+#: ../src/chat_control.py:2686
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
msgstr "如果您關閉æ¤æ¨™ç±¤ä¸¦ä¸”åœç”¨äº†å‘½ä»¤æ·ç¨‹ï¼Œæ¤è¨Šæ¯æœƒä¸Ÿå¤±ã€‚"
-#: ../src/chat_control.py:2727 ../src/common/connection_handlers_events.py:807
-#: ../src/common/connection_handlers.py:1506
-#: ../src/common/connection_handlers.py:1625
-#: ../src/common/connection_handlers.py:1798 ../src/common/connection.py:454
-#: ../src/common/logger.py:1126 ../src/gajim.py:192 ../src/session.py:138
+#: ../src/chat_control.py:2853 ../src/common/connection_handlers_events.py:864
+#: ../src/common/connection_handlers.py:945
+#: ../src/common/connection_handlers.py:1055
+#: ../src/common/connection_handlers.py:1712 ../src/common/connection.py:451
+#: ../src/common/logger.py:1126 ../src/gajim.py:208 ../src/session.py:97
msgid "Database Error"
msgstr "資料庫錯誤"
-#: ../src/chat_control.py:2728
+#: ../src/chat_control.py:2854
+#, python-format
+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:3090 ../src/gui_interface.py:1032
#, 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 ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"無法解密來自 %s 的訊æ¯\n"
+"它å¯èƒ½è¢«ç¯¡æ”¹äº†ã€‚"
-#: ../src/chat_control.py:2976
+#: ../src/chat_control.py:3123
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s 的狀態是 %(status)s"
-#: ../src/common/check_paths.py:37
+#: ../src/common/check_paths.py:38
msgid "creating logs database"
msgstr "建立日誌資料庫"
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:86
msgid "creating cache database"
msgstr "建立快å–資料庫"
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
+#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
+#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
#, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s 是一個檔案但它應該是一個目錄"
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
msgid "Gajim will now exit"
msgstr "Gajim å³å°‡é›¢é–‹"
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
#, python-format
msgid "%s is a directory but should be a file"
msgstr "%s 是一個目錄但它應該是一個檔案"
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:352
#, python-format
msgid "creating %s directory"
msgstr "æ£åœ¨å»ºç«‹ %s 目錄"
@@ -3377,6 +3322,11 @@ msgstr "和我èŠå¤©å§"
msgid "Online"
msgstr "線上"
+#: ../src/common/commands.py:106 ../src/common/helpers.py:242
+#: ../src/tooltips.py:193
+msgid "Away"
+msgstr "離開"
+
#: ../src/common/commands.py:107
msgid "Extended away"
msgstr "離開很久了"
@@ -3391,7 +3341,7 @@ msgstr "離線 - 未連線"
#: ../src/common/commands.py:114
msgid "Presence description:"
-msgstr "狀態æè¿°: "
+msgstr "狀態æè¿°:"
#: ../src/common/commands.py:149 ../src/common/commands.py:317
msgid "The status has been changed."
@@ -3415,16 +3365,16 @@ msgid "Choose the groupchats you want to leave"
msgstr "é¸æ“‡æ‚¨æƒ³è¦é›¢é–‹çš„èŠå¤©å®¤"
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:817
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5306
+#: ../src/common/commands.py:212 ../src/common/contacts.py:128
+#: ../src/common/helpers.py:60 ../src/roster_window.py:817
+#: ../src/roster_window.py:1648 ../src/roster_window.py:1650
+#: ../src/roster_window.py:2512 ../src/roster_window.py:5524
msgid "Groupchats"
msgstr "多人èŠå¤©"
#: ../src/common/commands.py:253
msgid "You left the following groupchats:"
-msgstr "您離開了下列èŠå¤©å®¤: "
+msgstr "您離開了下列èŠå¤©å®¤:"
#: ../src/common/commands.py:265
msgid "Forward unread messages"
@@ -3438,102 +3388,108 @@ msgstr "所有未讀訊æ¯éƒ½å·²è¢«è½‰ç™¼ã€‚"
msgid "Forward unread message then disconnect"
msgstr " 轉發未讀訊æ¯ç„¶å¾Œä¸æ–·é€£ç·š"
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
msgid "Play sound when user is busy"
msgstr "在用於忙是æ’放è²éŸ³"
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
msgid "Use D-Bus and Notification-Daemon to show notifications"
msgstr "使用 D-Bus 和通知處ç†åºé¡¯ç¤ºé€šçŸ¥"
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
msgid "Show only online and free for chat contacts in roster."
msgstr "在è¯çµ¡äººæ¸…å–®ä¸åªé¡¯ç¤ºç·šä¸Šå’Œå’Œæˆ‘èŠå¤©å§çš„è¯çµ¡äººã€‚"
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
msgid "Time in minutes, after which your status changes to away."
msgstr "時間，以分é˜ç‚ºå–®ä½ã€‚在æ¤æ™‚間後將狀態變更為離開。"
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
msgid "$S (Away as a result of being idle more than $T min)"
msgstr "$S (é›¢é–‹ï¼Œå› ç‚ºé–’ç½®è¶…éŽäº†$T分é˜)"
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
msgid "$S will be replaced by current status message, $T by autoaway time."
msgstr "$S 會被目å‰çš„狀態訊æ¯æ›¿æ›ï¼Œ$T 會被自動離開的時間替æ›ã€‚"
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
msgid "Time in minutes, after which your status changes to not available."
msgstr "時間，以分é˜ç‚ºå–®ä½ã€‚在æ¤æ™‚間後將狀態變更為離開很久了。"
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
msgid "$S (Not available as a result of being idle more than $T min)"
msgstr "$S (é›¢é–‹å¾ˆä¹…äº†ï¼Œå› ç‚ºé–’ç½®è¶…éŽäº†$T分é˜)"
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
msgid "$S will be replaced by current status message, $T by autoxa time."
msgstr "$S 會被目å‰çš„狀態訊æ¯æ›¿æ›ï¼Œ$T 會被自動無法使用的時間替æ›ã€‚"
-#: ../src/common/config.py:88
-msgid "When to show notification area icon. Can be 'never', 'on_event', 'always'."
+#: ../src/common/config.py:89
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
msgstr "何時在通知å€åŸŸé¡¯ç¤ºåœ–示。å¯ä»¥æ˜¯'æ°¸é ä¸'，'當有未處ç†çš„事件時'，'總是'。"
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr "å³ä½¿ç³»çµ±åŒ£åœ–示未顯示，ä»ç„¶å…許隱è—å冊視窗。"
+
+#: ../src/common/config.py:95
msgid "Incoming nickname color."
msgstr "收到訊æ¯çš„暱稱é¡è‰²ã€‚"
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
msgid "Outgoing nickname color."
msgstr "發出訊æ¯çš„暱稱é¡è‰²ã€‚"
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
msgid "Incoming text color."
msgstr "收到訊æ¯çš„æ–‡å—é¡è‰²ã€‚"
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
msgid "Outgoing text color."
msgstr "發出訊æ¯çš„æ–‡å—é¡è‰²ã€‚"
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
msgid "Status message text color."
msgstr "狀態訊æ¯æ–‡å—é¡è‰²"
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
msgid "Incoming nickname font."
msgstr "收到訊æ¯çš„暱稱的å—型。"
-#: ../src/common/config.py:101
+#: ../src/common/config.py:103
msgid "Outgoing nickname font."
msgstr "發出訊æ¯çš„暱稱å—型。"
-#: ../src/common/config.py:102
+#: ../src/common/config.py:104
msgid "Incoming text font."
msgstr "收到訊æ¯çš„æ–‡å—å—型。"
-#: ../src/common/config.py:103
+#: ../src/common/config.py:105
msgid "Outgoing text font."
msgstr "發出訊æ¯çš„æ–‡å—å—型。"
-#: ../src/common/config.py:104
+#: ../src/common/config.py:106
msgid "Status message text font."
msgstr "狀態訊æ¯æ–‡å—å—型。"
-#: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
+#: ../src/common/config.py:107
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
msgstr "折疊的列(帳號和組)的清單(ç©ºæ ¼åˆ†éš”)。"
#. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3118
+#: ../src/common/config.py:108 ../src/common/config.py:496
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:492
+#: ../src/common/optparser.py:526 ../src/gui_interface.py:2634
msgid "default"
msgstr "é è¨"
-#: ../src/common/config.py:112
+#: ../src/common/config.py:114
msgid "Language used by speller"
msgstr "拼寫檢查的語言"
-#: ../src/common/config.py:113
+#: ../src/common/config.py:115
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3543,706 +3499,1004 @@ msgstr ""
"'有時' - 如 iChat é¢¨æ ¼æ¯éš”幾分é˜é¡¯ç¤ºæ™‚間。\n"
"'æ°¸é ä¸' - æ°¸é ä¸é¡¯ç¤ºæ™‚間。"
-#: ../src/common/config.py:114
-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 是最ä¸ç²¾ç¢ºçš„。åªåœ¨'有時'顯示時間時使用。"
+#: ../src/common/config.py:116
+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 是最ä¸ç²¾ç¢ºçš„。åªåœ¨'有時'顯示時間時使用。"
-#: ../src/common/config.py:117
+#: ../src/common/config.py:119
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "å°‡æˆå°å‡ºç¾çš„ * / _ 視為å¯èƒ½çš„æ ¼å¼æŽ§åˆ¶å—元。"
-#: ../src/common/config.py:118
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+#: ../src/common/config.py:120
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr "如果為真，則ä¸ç§»é™¤ */_。這樣 *abc* å°‡è¢«åŠ ç²—ä½† * * ä¸æœƒè¢«ç§»é™¤ã€‚"
-#: ../src/common/config.py:121
-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)"
+#: ../src/common/config.py:123
+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 ""
"使用é‡æ§‹çš„æ–‡å—æ¨™è¨˜å‚³é€ HTMLï¼Œä¸¦åŠ å…¥ ASCII æ ¼å¼æŽ§åˆ¶(如果é¸å–)。語法請åƒ\n"
"考http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (如果\n"
"您想使用æ¤åŠŸèƒ½ï¼Œè«‹å®‰è£ docutils)"
-#: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
+#: ../src/common/config.py:132
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
msgstr "當在多人èŠå¤©ä¸ä½¿ç”¨æš±ç¨±è£œå…¨(Tab)æ™‚åŠ åˆ°æš±ç¨±å¾Œçš„å—元。"
-#: ../src/common/config.py:131
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
+#: ../src/common/config.py:133
+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:159
-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"
+#: ../src/common/config.py:151
+msgid ""
+"If true, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr "如果為真，當隱è—å冊時 Gajim 將會儲å˜å冊ä½ç½®ï¼Œä¸¦æ–¼é¡¯ç¤ºå冊時還原。"
+
+#: ../src/common/config.py:162
+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] \" 會顯示為\n\"[å°æ™‚:分é˜]\"。請åƒè€ƒ Python doc 關於 strftime 的文件:\n"
+"這個é¸é …å…許您自訂å°è©±ä¸é¡¯ç¤ºçš„æ™‚é–“æˆ³è¨˜æ ¼å¼ã€‚比如，\"[%H:%M] \" 會顯示為\n"
+"\"[å°æ™‚:分é˜]\"。請åƒè€ƒ Python doc 關於 strftime 的文件:\n"
"http://docs.python.org/lib/module-time.html"
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
msgid "Characters that are printed before the nickname in conversations"
msgstr "在å°è©±ä¸é¡¯ç¤ºåœ¨æš±ç¨±å‰çš„å—å…ƒ"
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
msgid "Characters that are printed after the nickname in conversations"
msgstr "在å°è©±ä¸é¡¯ç¤ºåœ¨æš±ç¨±å¾Œçš„å—å…ƒ"
-#: ../src/common/config.py:164
-msgid "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+#: ../src/common/config.py:167
+msgid ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
msgstr "指定新電å郵件到é”時執行的命令，比如: /usr/bin/getmail -q"
-#: ../src/common/config.py:166
+#: ../src/common/config.py:169
msgid "Add * and [n] in roster title?"
msgstr "在è¯çµ¡äººæ¸…單標題ä¸åŠ å…¥ * å’Œ [n]?"
-#: ../src/common/config.py:167
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
+#: ../src/common/config.py:170
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
msgstr "èŠå¤©æ¨™ç±¤/視窗被é‡æ–°é–‹å•Ÿæ™‚顯示之å‰é€²è¡Œçš„å°è©±çš„最後多少列。"
-#: ../src/common/config.py:168
+#: ../src/common/config.py:171
msgid "How many minutes should last lines from previous conversation last."
msgstr "上次談話的最後幾列ä¿ç•™å¤šå°‘分é˜ã€‚"
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
-msgstr "ç•¶åŠ å…¥èŠå¤©å®¤æ™‚å‘伺æœå™¨è«‹æ±‚èŠå¤©è¨˜éŒ„的列數。"
+#: ../src/common/config.py:172
+msgid ""
+"How many lines to request to server when entering a groupchat. -1 means no "
+"limit"
+msgstr "ç•¶åŠ å…¥å¤šäººèŠå¤©æ™‚，å‘伺æœå™¨è«‹æ±‚èŠå¤©è¨˜éŒ„的列數。-1 表示無é™åˆ¶"
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "ç•¶åŠ å…¥èŠå¤©å®¤æ™‚請求多少分é˜ä»¥å…§çš„èŠå¤©è¨˜éŒ„。"
+#: ../src/common/config.py:173
+msgid ""
+"How many minutes back to request logs when a entering a groupchat. -1 means "
+"no limit"
+msgstr "ç•¶åŠ å…¥å¤šäººèŠå¤©æ™‚，å‘伺æœå™¨è«‹æ±‚多少分é˜ä»¥å…§çš„èŠå¤©è¨˜éŒ„。-1 表示無é™åˆ¶"
-#: ../src/common/config.py:171
-msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
+#: ../src/common/config.py:174
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
msgstr "自動é‡æ–°åŠ 入一個ä¸æ–·çš„èŠå¤©å®¤å‰ç‰å¾…多少秒。è¨ç‚º 0 以åœç”¨è‡ªå‹•é‡æ–°åŠ 入。"
-#: ../src/common/config.py:173
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
+#: ../src/common/config.py:175
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr "當我們從會è°ä¸è¢«è¸¢å‡ºæ™‚，是å¦æ‡‰è©²å•Ÿç”¨è‡ªå‹•é‡æ–°åŠ 入？"
+
+#: ../src/common/config.py:176
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
msgstr "用 Ctrl+Enter 傳é€è¨Šæ¯ï¼ŒEnter 開始新列(紫茉莉 ICQ 客戶端é è¨ä½œæ¥)。"
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
msgid "How many lines to store for Ctrl+KeyUP."
msgstr "為 Ctrl+KeyUP 儲å˜å¤šå°‘列。"
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
#, 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'以使用 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'以使用 wiktionary。"
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr "如果é¸å–，Gajim å¯ä»¥è¢« gajim-remote é 端控制。"
-#: ../src/common/config.py:182
-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."
+#: ../src/common/config.py:185
+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 信號並ä¾æ“šç¶²è·¯é€£ç·šç‹€æ…‹è®Šæ›´å¸³è™Ÿç‹€\n"
"æ…‹(如果它們沒有將 listen_to_network_manager è¨å®šç‚ºå‡è€Œä¸”它們被è¨å®šç‚ºèˆ‡\n"
"全域狀態åŒæ¥)。"
-#: ../src/common/config.py:183
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
+#: ../src/common/config.py:186
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
msgstr "傳é€èŠå¤©ç‹€æ…‹é€šçŸ¥ã€‚å¯ä»¥æ˜¯å…¨éƒ¨ï¼Œåƒ…æ£åœ¨ç·¨è¼¯ï¼Œåœç”¨ä¸çš„一個。"
-#: ../src/common/config.py:184
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
+#: ../src/common/config.py:187
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
msgstr "在èŠå¤©è¦–窗ä¸é¡¯ç¤ºèŠå¤©ç‹€æ…‹é€šçŸ¥ã€‚å¯ä»¥æ˜¯å…¨éƒ¨ï¼Œè¿‘æ£åœ¨ç·¨è¼¯ï¼Œåœç”¨ä¸çš„一個。"
-#: ../src/common/config.py:186
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
+#: ../src/common/config.py:189
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
msgstr "當ä¸æ˜¯æ¯æ¢è¨Šæ¯éƒ½é¡¯ç¤ºæ™‚é–“('有時'顯示時間)時，æ¯å¤šå°‘分é˜é¡¯ç¤ºæ™‚間。"
-#: ../src/common/config.py:187
+#: ../src/common/config.py:190
msgid "Ask before closing a group chat tab/window."
msgstr "關閉多人èŠå¤©æ¨™ç±¤/視窗å‰è©¢å•ã€‚"
-#: ../src/common/config.py:188
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
+#: ../src/common/config.py:191
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
msgstr "é—œé–‰é€™å€‹ç©ºæ ¼åˆ†éš”çš„æ¸…å–®ä¸çš„èŠå¤©å®¤çš„標籤/視窗å‰ç¸½æ˜¯è©¢å•ã€‚"
-#: ../src/common/config.py:189
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
+#: ../src/common/config.py:192
+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 "Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)"
+#: ../src/common/config.py:193
+msgid ""
+"Ask before closing tabbed chat window if there are control that can loose "
+"data (chat, private chat, groupchat that will not be minimized)"
msgstr ""
"如果有å¯èƒ½ä¸Ÿå¤±è³‡æ–™çš„æŽ§åˆ¶é …(ä¸æœƒè¢«æœ€å°åŒ–çš„èŠå¤©ï¼Œç§äººèŠå¤©ï¼Œå¤šäººèŠå¤©)，在關\n"
"閉有標籤的視窗å‰è©¢å•ã€‚"
-#: ../src/common/config.py:193
-msgid "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
+#: ../src/common/config.py:196
+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 ""
"逗號分割的清單。在有ä½å€ç¿»è¯/é€£æŽ¥åŸ è½‰ç™¼çš„æƒ…æ³ä¸‹ï¼Œé™¤äº†æœ¬åœ°ä»‹é¢ï¼Œé‚„å°‡å‘å…¶ä¸\n"
"的主機傳é€æª”案傳輸請求。"
-#: ../src/common/config.py:195
+#: ../src/common/config.py:198
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "IEC 標準è¦å®š 1 KiB = 1024 bytes(ä½å…ƒçµ„)，1 KB = 1000 bytes。"
-#: ../src/common/config.py:197
+#: ../src/common/config.py:200
msgid "Notify of events in the notification area."
msgstr "在通知å€åŸŸä¸æ示事件"
-#: ../src/common/config.py:203
+#: ../src/common/config.py:206
msgid "Show tab when only one conversation?"
msgstr "åªæœ‰ä¸€å€‹å°è©±æ™‚顯示標籤?"
-#: ../src/common/config.py:204
+#: ../src/common/config.py:207
msgid "Show tabbed notebook border in chat windows?"
msgstr "在èŠå¤©è¦–窗ä¸é¡¯ç¤ºæ¨™ç±¤çµ„的邊框。"
-#: ../src/common/config.py:205
+#: ../src/common/config.py:208
msgid "Show close button in tab?"
msgstr "在標籤上顯示關閉按鈕?"
-#: ../src/common/config.py:206
-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."
+#: ../src/common/config.py:209
+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 ""
"在 Diffie-Hellman ä¸ä½¿ç”¨çš„ modp 組，排在å‰é¢çš„優先使用，以逗號分隔。åˆ\n"
"法的組有 1，2，5，14，15，16，17 å’Œ 18。更高的數å—更安全，但在您開始會\n"
"話時需è¦æ›´é•·çš„時間計算"
-#: ../src/common/config.py:215
+#: ../src/common/config.py:218
msgid "Preview new messages in notification popup?"
msgstr "在彈出æ示ä¸é 覽訊æ¯?"
-#: ../src/common/config.py:220
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
+#: ../src/common/config.py:223
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
msgstr "用分號隔開的在多人èŠå¤©ä¸å°‡é«˜äº®åº¦é¡¯ç¤ºçš„å–®å—清單。"
-#: ../src/common/config.py:221
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if notification icon is used."
-msgstr "如果為真，按一下視窗管ç†å™¨çš„ X 按鈕會離開 Gajim。æ¤ä¸€è¨å®šåƒ…當啟用通知å€åŸŸåœ–示時會生效。"
+#: ../src/common/config.py:224
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if notification icon is used."
+msgstr ""
+"如果為真，按一下視窗管ç†å™¨çš„ X 按鈕會離開 Gajim。æ¤ä¸€è¨å®šåƒ…當啟用通知å€åŸŸåœ–示"
+"時會生效。"
-#: ../src/common/config.py:222
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
+#: ../src/common/config.py:225
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
msgstr "如果為真， Gajim 會在æ¯æ¬¡å•Ÿå‹•æ™‚åµæ¸¬å®ƒæ˜¯å¦æ˜¯é è¨çš„ jabber 客戶端。"
-#: ../src/common/config.py:223
-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:226
+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:224
-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
+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:230
+#: ../src/common/config.py:233
msgid "Define the position of the avatar in roster. Can be left or right"
msgstr "定義了在è¯çµ¡äººæ¸…å–®ä¸é åƒçš„顯示ä½ç½®ã€‚å¯ä»¥æ˜¯å·¦æˆ–å³"
-#: ../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: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:234
+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: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."
+#: ../src/common/config.py:235
+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 ""
-"å¯ä»¥æ˜¯\"ç„¡\"，\"全部\"或\"登入與登出\"。如果是\"ç„¡\"，當æˆå“¡è®Šæ›´ä»–/她的狀態或他\n"
+"如果為å‡ï¼ŒGajim å°‡ä¸æœƒåœ¨è¯çµ¡äººçš„狀態或狀態訊æ¯è®ŠåŒ–時在èŠå¤©è¦–窗ä¸é¡¯ç¤ºä¸€åˆ—æ"
+"示。"
+
+#: ../src/common/config.py:236
+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 ""
+"å¯ä»¥æ˜¯\"ç„¡\"，\"全部\"或\"登入與登出\"。如果是\"ç„¡\"，當æˆå“¡è®Šæ›´ä»–/她的狀態或"
+"ä»–\n"
"/她的狀態訊æ¯æ™‚，Gajim å°‡ä¸æœƒé¡¯ç¤ºä¸€åˆ—æ示。如果是\"全部\"，Gajim å°‡æ示所\n"
"有的狀態訊æ¯ã€‚如果是\"登入與登出\"，Gajim å°‡åªæ示èŠå¤©å®¤ä¸ä¸ç™»å…¥èˆ‡ç™»å‡º\n"
"訊æ¯ã€‚"
-#: ../src/common/config.py:235
+#: ../src/common/config.py:238
+msgid "Log XHTML messages instead of plain text messages."
+msgstr "記錄 XHTML 訊æ¯ä»¥ä»£æ›¿ç´”æ–‡å—訊æ¯ã€‚"
+
+#: ../src/common/config.py:239
msgid "Background color of contacts when they just signed in."
msgstr "當è¯çµ¡äººå‰›å‰›ç™»å…¥æ™‚的背景色。"
-#: ../src/common/config.py:236
+#: ../src/common/config.py:240
msgid "Background color of contacts when they just signed out."
msgstr "當è¯çµ¡äººå‰›å‰›ç™»å‡ºæ™‚的背景色。"
-#: ../src/common/config.py:238
-msgid "If True, restored messages will use a smaller font than the default one."
+#: ../src/common/config.py:242
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
msgstr "如果為真，æ¢å¾©é¡¯ç¤ºçš„訊æ¯å°‡ç”¨è¼ƒå°çš„å—型顯示。"
-#: ../src/common/config.py:239
+#: ../src/common/config.py:243
msgid "Don't show avatar for the transport itself."
msgstr "ä¸é¡¯ç¤ºä»£ç†æœ¬èº«çš„é åƒã€‚"
-#: ../src/common/config.py:240
+#: ../src/common/config.py:244
msgid "Don't show roster in the system taskbar."
msgstr "ä¸è¦å°‡è¯çµ¡äººæ¸…單視窗顯示在系統的工作列ä¸ã€‚"
-#: ../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."
+#: ../src/common/config.py:245
+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，當有未處ç†äº‹ä»¶æ™‚使窗\n"
"å£é–ƒçˆ(大部分視窗管ç†å™¨çš„é è¨å›žæ‡‰)"
-#: ../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 資訊。"
+#: ../src/common/config.py:247
+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:246
+#: ../src/common/config.py:250
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"
+"'always_with_roster' - 與 'always' 類似但所有訊æ¯åœ¨ä¸€å€‹å–®ç¨çš„視窗ä¸ï¼Œé€™å€‹è¦–窗"
+"ç¨ç«‹æ–¼è¯çµ¡äººæ¸…單視窗。\n"
"'never' - 所有訊æ¯éƒ½é–‹å•Ÿå–®ç¨çš„視窗。\n"
"'peracct' - æ¯å€‹å¸³è™Ÿçš„訊æ¯å‚³é€åˆ°ä¸€å€‹å–®ç¨çš„視窗。\n"
"'pertype' - æ¯ç¨®é¡žåž‹çš„è¨Šæ¯ (例如，èŠå¤© åŠ å¤šäººèŠå¤©) 傳é€åˆ°ä¸€å€‹å–®ç¨çš„視窗。"
-#: ../src/common/config.py:247
+#: ../src/common/config.py:251
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+"啟動時顯示å冊。\n"
+"「自動ã€- 自動顯示å冊。\n"
+"「永ä¸ã€- æ°¸ä¸é¡¯ç¤ºå冊。\n"
+"「last_stateã€- 還原最後狀態å冊。"
+
+#: ../src/common/config.py:252
msgid "If False, you will no longer see the avatar in the chat window."
msgstr "如果為å‡ï¼Œæ‚¨å°‡ä¸æœƒåœ¨è¦–窗ä¸çœ‹åˆ°é åƒã€‚"
-#: ../src/common/config.py:248
+#: ../src/common/config.py:253
msgid "If True, pressing the escape key closes a tab/window."
msgstr "如果為真，按 Escape éµå°‡é—œé–‰æ¨™ç±¤/視窗。"
-#: ../src/common/config.py:249
+#: ../src/common/config.py:254
msgid "Hides the buttons in chat windows."
msgstr "在èŠå¤©è¦–窗ä¸éš±è—按鈕。"
-#: ../src/common/config.py:250
+#: ../src/common/config.py:255
msgid "Hides the banner in a group chat window"
msgstr "在多人èŠå¤©è¦–窗ä¸éš±è—標語"
-#: ../src/common/config.py:251
+#: ../src/common/config.py:256
msgid "Hides the banner in two persons chat window"
msgstr "在雙人èŠå¤©è¦–窗ä¸éš±è—標語"
-#: ../src/common/config.py:252
+#: ../src/common/config.py:257
msgid "Hides the group chat occupants list in group chat window."
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:258
+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:254
+#: ../src/common/config.py:259
msgid "Indentation when using merge consecutive nickname."
msgstr "當åˆä½µé€£çºŒæš±ç¨±æ™‚縮排。"
-#: ../src/common/config.py:255
+#: ../src/common/config.py:260
msgid "Smooth scroll message in conversation window"
msgstr "平滑æ²å‹•èŠå¤©è¦–窗ä¸çš„訊æ¯"
-#: ../src/common/config.py:256
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
+#: ../src/common/config.py:261
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
msgstr "在多人èŠå¤©ä¸ç”¨æ–¼æš±ç¨±çš„é¡è‰²æ¸…單，以\":\"分隔。"
-#: ../src/common/config.py:257
+#: ../src/common/config.py:262
msgid "Ctrl-Tab go to next composing tab when none is unread."
msgstr "當所有分é ä¸æ²’有未讀訊æ¯æ™‚按 Ctrl-Tab 轉到下一個æ£åœ¨ç·¨è¼¯çš„標籤。"
-#: ../src/common/config.py:258
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
+#: ../src/common/config.py:263
+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 "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
+#: ../src/common/config.py:264
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
msgstr "是å¦é¡¯ç¤ºç¢ºèªé˜»æ–·è¯çµ¡äººå°è©±æ–¹å¡Š?空å—串æ„味著永é ä¸é¡¯ç¤ºå°è©±æ–¹å¡Šã€‚"
-#: ../src/common/config.py:260
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
+#: ../src/common/config.py:265
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
msgstr "是å¦é¡¯ç¤ºç¢ºèªå‚³é€è‡ªè¨‚狀態å°è©±æ–¹å¡Š?空å—串æ„味著永é ä¸é¡¯ç¤ºå°è©±æ–¹å¡Šã€‚"
-#: ../src/common/config.py:261
-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:266
+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:262
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
+#: ../src/common/config.py:267
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
msgstr "如果為真，Gajim 會使用 Gnome Keyring (如果å¯ç”¨) 儲å˜å¸³è™Ÿçš„密碼。"
-#: ../src/common/config.py:263
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "如果為真，Gajim 會使用 KDE Wallet (如果 kwalletcli å¯ç”¨) 儲å˜å¸³è™Ÿçš„密碼。"
+#: ../src/common/config.py:268
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"如果為真，Gajim 會使用 KDE Wallet (如果 kwalletcli å¯ç”¨) 儲å˜å¸³è™Ÿçš„密碼。"
-#: ../src/common/config.py:264
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
+#: ../src/common/config.py:269
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
msgstr "如果為真，Gajim 會在帳號和群組所在列顯示線上和總共è¯çµ¡äººæ•¸ç›®ã€‚"
-#: ../src/common/config.py:265
-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:270
+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:266
-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:271
+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:267
-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:272
+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:268
+#: ../src/common/config.py:273
msgid "Time of inactivity needed before the change status window closes down."
msgstr "時間，如果在æ¤æ™‚間內沒有活動，將變更狀態視窗關閉。"
-#: ../src/common/config.py:269
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
+#: ../src/common/config.py:274
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
msgstr "在å°è©±ä¸æœ€å¤šé¡¯ç¤ºçš„列數。最舊的那些列會被清除。"
-#: ../src/common/config.py:270
-msgid "If True, notification windows from notification-daemon will be attached to notification icon."
+#: ../src/common/config.py:275
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
msgstr "如果為真，由 notification-daemon 建立的æ示視窗會ä¾é™„於通知å€åŸŸåœ–示。"
-#: ../src/common/config.py:271
+#: ../src/common/config.py:276
msgid "Choose interval between 2 checks of idleness."
msgstr "兩次檢查閒置之間的時間間隔。"
-#: ../src/common/config.py:272
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
+#: ../src/common/config.py:277
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
msgstr "變更這個值以變更顯示的 LaTeX 方程的大å°ã€‚更高則更大。"
-#: ../src/common/config.py:273
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
-msgstr "åˆæ³•çš„ URI Scheme。åªæœ‰é€™å€‹æ¸…å–®ä¸çš„ Scheme 會被接å—為\"真æ£çš„\" URI。(mailto å’Œ xmpp 被分開處ç†)"
+#: ../src/common/config.py:278
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+msgstr ""
+"åˆæ³•çš„ URI Scheme。åªæœ‰é€™å€‹æ¸…å–®ä¸çš„ Scheme 會被接å—為\"真æ£çš„\" URI。(mailto "
+"å’Œ xmpp 被分開處ç†)"
-#: ../src/common/config.py:274
-msgid "Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!"
-msgstr "請求所有離線è¯çµ¡äººçš„離線狀態訊æ¯ï¼Œç•¶ä¸€å€‹å¸³è™Ÿå»ºç«‹é€£ç·šæ™‚。è¦å‘Š: 這會傳é€å¤§é‡çš„請求!"
+#: ../src/common/config.py:279
+msgid ""
+"Ask offline status message to all offline contacts when connection to an "
+"accoutn is established. WARNING: This causes a lot of requests to be sent!"
+msgstr ""
+"請求所有離線è¯çµ¡äººçš„離線狀態訊æ¯ï¼Œç•¶ä¸€å€‹å¸³è™Ÿå»ºç«‹é€£ç·šæ™‚。è¦å‘Š: 這會傳é€å¤§é‡çš„"
+"請求!"
-#: ../src/common/config.py:275
+#: ../src/common/config.py:280
msgid "If True, completion in groupchats will be like a shell auto-completion"
msgstr "如果為真，多人èŠå¤©ä¸æœƒåƒ shell 一樣自動補全"
-#: ../src/common/config.py:276
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
+#: ../src/common/config.py:281
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
msgstr "何時顯示自己。å¯ä»¥æ˜¯\"總是\"，\"當用其他資æºé€£ç·šæ™‚\"或\"æ°¸é ä¸\""
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
msgstr "å¯é¸åœ°ä¿®æ£ jingle 視訊輸出的圖框速率。比如: 10/1 或 25/2"
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
msgid "Optionally resize jingle output video. Example: 320x240"
msgstr "å¯é¸åœ°ç¸®æ”¾ jingle 視訊輸出尺寸。比如: 320x240"
-#: ../src/common/config.py:285
-msgid "If True, Gajim will try to use a STUN server when using jingle. The one in \"stun_server\" option, or the one given by the jabber server."
-msgstr "如果為真，Gajim 在使用 jingle 時會嘗試使用 STUN 伺æœå™¨ã€‚伺æœå™¨å¯ä»¥ç”±\"stun_server\"é¸é …給出，或由 jabber 伺æœå™¨çµ¦å‡ºã€‚"
+#: ../src/common/config.py:290
+msgid ""
+"If True, Gajim will try to use a STUN server when using jingle. The one in "
+"\"stun_server\" option, or the one given by the jabber server."
+msgstr ""
+"如果為真，Gajim 在使用 jingle 時會嘗試使用 STUN 伺æœå™¨ã€‚伺æœå™¨å¯ä»¥ç”±"
+"\"stun_server\"é¸é …給出，或由 jabber 伺æœå™¨çµ¦å‡ºã€‚"
-#: ../src/common/config.py:286
+#: ../src/common/config.py:291
msgid "STUN server to use when using jingle"
msgstr "在使用 jingle 時使用的 STUN 伺æœå™¨"
-#: ../src/common/config.py:287
-msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
+#: ../src/common/config.py:292
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
msgstr "如果為真，Gajim 會在èŠå¤©å®¤å®¤å‹çš„ç‹€æ…‹åœ–ç¤ºä¸ŠåŠ ä¸Šä¸€å€‹å½©è‰²æ–¹æ¡†ä»¥ç¤ºæ¸å±¬"
-#: ../src/common/config.py:300
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
+#: ../src/common/config.py:306
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
msgstr "優先ç‰ç´šå°‡æ ¹æ“šæ‚¨çš„狀態自動變更。優先ç‰ç´šåœ¨ autopriority_* é¸é …ä¸å®šç¾©ã€‚"
-#: ../src/common/config.py:308
-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"
+#: ../src/common/config.py:314
+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 ""
-"自動連線時使用的狀態。å¯ä»¥æ˜¯\"線上\"，\"èŠå¤©\"，\"離開\"，\"離開很久了\"，\"è«‹å‹¿\n"
+"自動連線時使用的狀態。å¯ä»¥æ˜¯\"線上\"，\"èŠå¤©\"，\"離開\"，\"離開很久了"
+"\"，\"請勿\n"
"打擾\"，\"隱身\"。注æ„: 僅當 restore_last_status 被åœç”¨æ™‚這個é¸é …其作用"
-#: ../src/common/config.py:309
+#: ../src/common/config.py:315
msgid "If enabled, restore the last status that was used."
msgstr "如果啟用，則æ¢å¾©ä¸Šæ¬¡ä½¿ç”¨çš„狀態。"
-#: ../src/common/config.py:311
-msgid "If True, Contacts requesting authorization will be automatically accepted."
+#: ../src/common/config.py:317
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
msgstr "如果為真，è¯çµ¡äººçš„èªè‰è«‹æ±‚將被自動接å—。"
-#: ../src/common/config.py:312
-msgid "If False, this account will be disabled and will not appear in roster window."
+#: ../src/common/config.py:318
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
msgstr "如果為å‡ï¼Œé€™å€‹å¸³è™Ÿå°‡è¢«åœç”¨ä¸”ä¸æœƒå‡ºç¾åœ¨è¯çµ¡äººæ¸…單視窗ä¸ã€‚"
-#: ../src/common/config.py:315
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
+#: ../src/common/config.py:321
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
msgstr "如果åœç”¨ï¼Œå³ä½¿ GPG 被é…置，也ä¸ä½¿ç”¨ GPG 密鑰簽å presences。"
-#: ../src/common/config.py:317
+#: ../src/common/config.py:323
msgid "Enable ESessions encryption for this account."
msgstr "為這個帳號啟用 ESession åŠ å¯†ã€‚"
-#: ../src/common/config.py:318
+#: ../src/common/config.py:324
msgid "Should Gajim automatically start an encrypted session when possible?"
msgstr "Gajim 是å¦æ‡‰è©²åœ¨å¯èƒ½æ™‚è‡ªå‹•ç™¼èµ·åŠ å¯†çš„ä½œæ¥éšŽæ®µ?"
-#: ../src/common/config.py:319
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
+#: ../src/common/config.py:325
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
msgstr "應嘗試的連線類型的有åºæ¸…å–®(ç”¨ç©ºæ ¼åˆ†éš”)。å¯ä»¥åŒ…å« tls，ssl，或 plain"
-#: ../src/common/config.py:320
-msgid "Show a warning dialog before sending password on an plaintext connection."
+#: ../src/common/config.py:326
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
msgstr "在使用明文連線傳é€å¯†ç¢¼å‰é¡¯ç¤ºä¸€å€‹è¦å‘Šå°è©±æ–¹å¡Šã€‚"
-#: ../src/common/config.py:321
+#: ../src/common/config.py:327
msgid "Show a warning dialog before using standard SSL library."
msgstr "在使用標準 SSL 函å¼åº«å‰é¡¯ç¤ºä¸€å€‹è¦å‘Šå°è©±æ–¹å¡Šã€‚"
-#: ../src/common/config.py:322
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
-msgstr "在é€éŽæ˜Žæ–‡é€£ç·šæ˜Žæ–‡å‚³é€å¯†ç¢¼å‰é¡¯ç¤ºä¸€å€‹è¦å‘Šå°è©±æ–¹å¡Šã€‚"
+#: ../src/common/config.py:328
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain connection."
+msgstr "在é€éŽæ˜Žæ–‡é€£ç·šå‚³é€æ˜Žæ–‡å¯†ç¢¼å‰é¡¯ç¤ºè¦å‘Šå°è©±æ¡†ã€‚"
-#: ../src/common/config.py:324
+#: ../src/common/config.py:330
msgid "Space separated list of ssl errors to ignore."
msgstr "應忽略的 SSL éŒ¯èª¤æ¸…å–®ï¼Œä»¥ç©ºæ ¼åˆ†éš”"
-#: ../src/common/config.py:333
+#: ../src/common/config.py:339
msgid "Whitespace sent after inactivity"
msgstr "在ä¸æ´»å‹•å¾Œå‚³é€çš„空白"
-#: ../src/common/config.py:334
+#: ../src/common/config.py:340
msgid "XMPP ping sent after inactivity"
msgstr "在ä¸æ´»å‹•å¾Œå‚³é€çš„ XMPP ping"
-#: ../src/common/config.py:338
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
+#: ../src/common/config.py:344
+msgid ""
+"How many seconds to wait for the answer of ping alive packet before we try "
+"to reconnect."
msgstr "在é‡æ–°é€£ç·šå‰ç‰å¾… ping alive packet 的回應多少秒"
#. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:348
msgid "Jabberd2 workaround"
msgstr "為 Jabberd2 變通"
-#: ../src/common/config.py:345
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "如果é¸å–，Gajim 會使用您在 file_transfer_proxies é¸é …ä¸å®šç¾©çš„ IP 和代ç†é€²è¡Œæª”案傳輸。"
+#: ../src/common/config.py:351
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"如果é¸å–，Gajim 會使用您在 file_transfer_proxies é¸é …ä¸å®šç¾©çš„ IP 和代ç†é€²è¡Œæª”"
+"案傳輸。"
-#: ../src/common/config.py:359
+#: ../src/common/config.py:365
msgid "Answer to receipt requests"
msgstr "å°å›žåŸ·è«‹æ±‚的回應"
-#: ../src/common/config.py:360
+#: ../src/common/config.py:366
msgid "Sent receipt requests"
msgstr "傳é€å›žåŸ·è«‹æ±‚"
-#: ../src/common/config.py:370
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
+#: ../src/common/config.py:375
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "å…許 Gajim 發é€æ‚¨æ£åœ¨åŸ·è¡Œçš„作æ¥ç³»çµ±ç›¸é—œè³‡è¨Šã€‚"
+
+#: ../src/common/config.py:376
+msgid "Allow Gajim to send your local time."
+msgstr "å…許 Gajim 發é€æ‚¨çš„本地時間。"
+
+#: ../src/common/config.py:377
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
msgstr "在å”å•†åŠ å¯†çš„ä½œæ¥éšŽæ®µæ™‚，Gajim 是å¦æ‡‰è©²å‡è¨æ‚¨æƒ³è¦æ‚¨çš„訊æ¯è¢«è¨˜éŒ„?"
-#: ../src/common/config.py:373
+#: ../src/common/config.py:380
msgid "Message that is sent to contacts you want to add"
msgstr "å‘æ‚¨å¸Œæœ›åŠ å…¥çš„è¯çµ¡äººå‚³é€çš„訊æ¯"
-#: ../src/common/config.py:374
+#: ../src/common/config.py:381
msgid "Last time we syncronized with logs from server."
msgstr "上次從伺æœå™¨åŒæ¥å‘½ä»¤æ·ç¨‹è¨˜éŒ„"
-#: ../src/common/config.py:436
+#: ../src/common/config.py:443
msgid "Is OpenPGP enabled for this contact?"
msgstr "是å¦ç‚ºæ¤è¯çµ¡äººä½¿ç”¨ OpenPGP?"
-#: ../src/common/config.py:437
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
+#: ../src/common/config.py:444
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
msgstr "å°æ–¼æ¤è¯çµ¡äººï¼ŒGajim 是å¦æ‡‰è©²è‡ªå‹•ç™¼èµ·åŠ 密作æ¥éšŽæ®µï¼Œç•¶å¯èƒ½æ™‚?"
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:445 ../src/common/config.py:448
msgid "Language for which we want to check misspelled words"
msgstr "想è¦é€²è¡Œæ‹¼å¯«æª¢æŸ¥çš„語言"
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "all 或 ç©ºæ ¼åˆ†å‰²çš„ä¸€äº›ç‹€æ…‹"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes'，'no'，或'both'"
-
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'yes'，'no' 或 ''"
-
-#: ../src/common/config.py:460
-msgid "State whether plugins should be activated on exit (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead."
-msgstr "表述在離開時是å¦å•Ÿç”¨å¤–掛程å¼(在 Gajim 離開時這會被儲å˜)。這個é¸é …ä¸æ‡‰è©²ç”¨æ–¼å•Ÿç”¨æˆ–åœç”¨å¤–掛程å¼ã€‚使用圖形介é¢ä»£æ›¿ã€‚"
+#: ../src/common/config.py:451
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+"表述在離開時是å¦å•Ÿç”¨å¤–掛程å¼(在 Gajim 離開時這會被儲å˜)。這個é¸é …ä¸æ‡‰è©²ç”¨æ–¼å•Ÿ"
+"用或åœç”¨å¤–掛程å¼ã€‚使用圖形介é¢ä»£æ›¿ã€‚"
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:456 ../src/common/pep.py:157
msgid "Sleeping"
msgstr "æ£åœ¨ç¡è¦º"
-#: ../src/common/config.py:466
+#: ../src/common/config.py:457
msgid "Back soon"
msgstr "馬上回來"
-#: ../src/common/config.py:466
+#: ../src/common/config.py:457
msgid "Back in some minutes."
msgstr "幾分é˜å°±å›žä¾†ã€‚"
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:458 ../src/common/pep.py:127
msgid "Eating"
msgstr "åƒæ±è¥¿"
-#: ../src/common/config.py:467
+#: ../src/common/config.py:458
msgid "I'm eating, so leave me a message."
msgstr "我在åƒæ±è¥¿ï¼Œè«‹ç•™è¨€"
-#: ../src/common/config.py:468
+#: ../src/common/config.py:459
msgid "Movie"
msgstr "電影"
-#: ../src/common/config.py:468
+#: ../src/common/config.py:459
msgid "I'm watching a movie."
msgstr "我æ£åœ¨çœ‹é›»å½±ã€‚"
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:460 ../src/common/pep.py:186
msgid "Working"
msgstr "工作"
-#: ../src/common/config.py:469
+#: ../src/common/config.py:460
msgid "I'm working."
msgstr "我æ£åœ¨å·¥ä½œã€‚"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:461
msgid "Phone"
msgstr "打電話"
-#: ../src/common/config.py:470
+#: ../src/common/config.py:461
msgid "I'm on the phone."
msgstr "我æ£åœ¨æ‰“電話"
-#: ../src/common/config.py:471
+#: ../src/common/config.py:462
msgid "Out"
msgstr "外出"
-#: ../src/common/config.py:471
+#: ../src/common/config.py:462
msgid "I'm out enjoying life."
msgstr "我æ£åœ¨äº«å—戶外生活。"
-#: ../src/common/config.py:482
+#: ../src/common/config.py:473
msgid "I'm available."
msgstr "我ç¾åœ¨ç·šä¸Šã€‚"
-#: ../src/common/config.py:483
+#: ../src/common/config.py:474
msgid "I'm free for chat."
msgstr "和我èŠå¤©å§"
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:475 ../src/config.py:1609
msgid "Be right back."
msgstr "很快回來。"
-#: ../src/common/config.py:485
+#: ../src/common/config.py:476
msgid "I'm not available."
msgstr "我已經很久ä¸åœ¨äº†ã€‚"
-#: ../src/common/config.py:486
+#: ../src/common/config.py:477
msgid "Do not disturb."
msgstr "請勿打擾。"
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:478 ../src/common/config.py:479
msgid "Bye!"
msgstr "å†è¦‹!"
-#: ../src/common/config.py:498
-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_highlight_words\" 或您的暱稱時æ’放的è²éŸ³ã€‚"
+#: ../src/common/config.py:489
+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_highlight_words\" 或您的暱稱時æ’放的è²éŸ³ã€‚"
-#: ../src/common/config.py:499
+#: ../src/common/config.py:490
msgid "Sound to play when any MUC message arrives."
msgstr "收到任æ„多人èŠå¤©è¨Šæ¯æ’放的è²éŸ³ã€‚"
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:499 ../src/common/optparser.py:310
msgid "green"
msgstr "ç¶ è‰²"
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:503 ../src/common/optparser.py:296
msgid "grocery"
msgstr "雜貨店"
-#: ../src/common/config.py:516
+#: ../src/common/config.py:507
msgid "human"
msgstr "人類別"
-#: ../src/common/config.py:520
+#: ../src/common/config.py:511
msgid "marine"
msgstr "æµ·æ´‹"
-#: ../src/common/connection_handlers_events.py:322
+#: ../src/common/connection_handlers_events.py:345
#, 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/ çš„è¯çµ¡äººæ¸…單管ç†å·¥å…·ç§»é™¤å®ƒ"
-#: ../src/common/connection_handlers_events.py:746
+#: ../src/common/connection_handlers_events.py:776
#, python-format
msgid "unsubscribe request from %s"
msgstr "來自 %s 的解除èªè‰è«‹æ±‚"
-#: ../src/common/connection_handlers_events.py:804
-#: ../src/common/connection_handlers.py:469
-#: ../src/common/connection_handlers.py:1504
-#: ../src/common/connection_handlers.py:1623
-#: ../src/common/connection_handlers.py:1796 ../src/common/connection.py:451
-#: ../src/common/logger.py:1124 ../src/gajim.py:374
+#: ../src/common/connection_handlers_events.py:861
+#: ../src/common/connection_handlers.py:339
+#: ../src/common/connection_handlers.py:943
+#: ../src/common/connection_handlers.py:1053
+#: ../src/common/connection_handlers.py:1710 ../src/common/connection.py:448
+#: ../src/common/logger.py:1124 ../src/gajim.py:390
msgid "Disk Write Error"
msgstr "ç£ç¢Ÿå¯«å…¥éŒ¯èª¤"
-#: ../src/common/connection_handlers_events.py:808
-#: ../src/common/connection_handlers.py:1507
-#: ../src/common/connection_handlers.py:1626
-#: ../src/common/connection_handlers.py:1799 ../src/common/connection.py:455
-#: ../src/common/logger.py:1127 ../src/gajim.py:193 ../src/session.py:139
+#: ../src/common/connection_handlers_events.py:865
+#: ../src/common/connection_handlers.py:946
+#: ../src/common/connection_handlers.py:1056
+#: ../src/common/connection_handlers.py:1713 ../src/common/connection.py:452
+#: ../src/common/logger.py:1127 ../src/gajim.py:209 ../src/session.py:98
#, 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)或移除它(所有命令æ·ç¨‹è¨˜éŒ„將丟失)。"
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:826
+#: ../src/common/connection_handlers_events.py:886
msgid "Room has been destroyed"
msgstr "èŠå¤©å®¤å·²ç¶“被銷毀了"
-#: ../src/common/connection_handlers_events.py:834
+#: ../src/common/connection_handlers_events.py:894
#, python-format
msgid "You can join this room instead: %s"
msgstr "åšç‚ºæ›¿ä»£ï¼Œæ‚¨å¯ä»¥åŠ 入這個èŠå¤©å®¤: %s"
-#: ../src/common/connection_handlers_events.py:903
-#: ../src/common/connection.py:255 ../src/config.py:2093 ../src/config.py:2102
-#: ../src/config.py:2170 ../src/config.py:3576 ../src/dataforms_widget.py:603
-#: ../src/dialogs.py:2949
+#: ../src/common/connection_handlers_events.py:967
+#: ../src/common/connection.py:259 ../src/config.py:2106 ../src/config.py:2115
+#: ../src/config.py:2183 ../src/config.py:3619 ../src/dataforms_widget.py:623
+#: ../src/dialogs.py:3079
msgid "Invalid Jabber ID"
msgstr "無效的 Jabber ID"
-#: ../src/common/connection_handlers_events.py:904
+#: ../src/common/connection_handlers_events.py:968
msgid "A message from a non-valid JID arrived, it has been ignored."
msgstr "收到了一個從一個無效的 JID 傳é€çš„訊æ¯ï¼Œå®ƒå·²ç¶“被忽略了。"
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1005
+#: ../src/gui_interface.py:415 ../src/gui_interface.py:429
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "å‚³é€ %(message)s 時出ç¾éŒ¯èª¤( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1422
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "ä¸æ˜Žçš„ SSL 錯誤: %d"
+
+#: ../src/common/connection_handlers_events.py:1950 ../src/dialogs.py:2771
+#: ../src/notify.py:260
+msgid "New Single Message"
+msgstr "æ–°å–®æ¢è¨Šæ¯"
+
+#: ../src/common/connection_handlers_events.py:1952
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr " %(nickname)s 發來的新訊æ¯"
+
+#: ../src/common/connection_handlers_events.py:1956 ../src/dialogs.py:2772
+#: ../src/notify.py:261
+msgid "New Private Message"
+msgstr "新個人訊æ¯"
+
+#: ../src/common/connection_handlers_events.py:1958
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "來自èŠå¤©å®¤ %s çš„ç§äººè¨Šæ¯"
+
+#: ../src/common/connection_handlers_events.py:1961
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:1964
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "來自 %(nickname)s 的訊æ¯"
+
+#: ../src/common/connection_handlers_events.py:1968 ../src/dialogs.py:2771
+#: ../src/notify.py:260
+msgid "New Message"
+msgstr "新訊æ¯"
+
+#: ../src/common/connection_handlers_events.py:1970
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "來自 %(nickname)s 的新訊æ¯"
+
+#: ../src/common/connection_handlers_events.py:2099
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s 變更了狀態"
+
+#: ../src/common/connection_handlers_events.py:2101
+#: ../src/groupchat_control.py:202 ../src/groupchat_control.py:1755
+#: ../src/history_window.py:447
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s 的狀態是 %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2106 ../src/dialogs.py:2783
+#: ../src/notify.py:274
+msgid "Contact Changed Status"
+msgstr "è¯çµ¡äººç‹€æ…‹è®Šæ›´"
+
+#: ../src/common/connection_handlers_events.py:2108
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s 上線了"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2113 ../src/dialogs.py:2767
+#: ../src/notify.py:256
+msgid "Contact Signed In"
+msgstr "è¯çµ¡äººç™»å…¥"
+
+#: ../src/common/connection_handlers_events.py:2115
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s 離開了"
+
+#: ../src/common/connection_handlers_events.py:2120 ../src/dialogs.py:2769
+#: ../src/notify.py:258
+msgid "Contact Signed Out"
+msgstr "è¯çµ¡äººé›¢é–‹ç™»å…¥"
+
+#: ../src/common/connection_handlers.py:95
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
msgid "Unable to load idle module"
msgstr "無法載入閒置模組"
-#: ../src/common/connection_handlers.py:127
+#: ../src/common/connection_handlers.py:128
#, python-format
msgid "Registration information for transport %s has not arrived in time"
msgstr "ä»£ç† %s 的註冊資訊未按時抵é”"
-#: ../src/common/connection_handlers.py:134
+#: ../src/common/connection_handlers.py:135
msgid "Registration succeeded"
msgstr "註冊æˆåŠŸ"
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
#, python-format
msgid "Registration with agent %s succeeded"
msgstr "註冊æˆåŠŸï¼Œagent %s"
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
msgid "Registration failed"
msgstr "註冊失敗"
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
#, python-format
-msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
msgstr "註冊失敗，agent %(agent)s，錯誤 %(error)s: %(error_msg)s"
-#: ../src/common/connection_handlers.py:712 ../src/common/connection.py:1479
+#: ../src/common/connection_handlers.py:573 ../src/common/connection.py:1546
msgid "Invisibility not supported"
msgstr "ä¸æ”¯æ´éš±èº«"
-#: ../src/common/connection_handlers.py:713 ../src/common/connection.py:1480
+#: ../src/common/connection_handlers.py:574 ../src/common/connection.py:1547
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "帳號 %s ä¸æ”¯æ´éš±èº«"
-#: ../src/common/connection_handlers.py:1833
+#: ../src/common/connection_handlers.py:1755
msgid "I would like to add you to my roster."
msgstr "æˆ‘æƒ³å°‡æ‚¨åŠ å…¥åˆ°æˆ‘çš„è¯çµ¡äººæ¸…單。"
@@ -4374,27 +4628,27 @@ msgstr "密鑰用途ä¸ä¸åŒ…å«è‰æ›¸ç±¤å稱"
msgid "Application verification failure"
msgstr "應用程å¼é©—è‰å¤±æ•—"
-#: ../src/common/connection.py:256 ../src/dialogs.py:2950
+#: ../src/common/connection.py:260 ../src/dialogs.py:3080
#, 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:278
+#: ../src/common/connection.py:282
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "é 端 presence 未簽å，也未指定密鑰。"
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:285
#, 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:333
+#: ../src/common/connection.py:337
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[本æ¢è¨Šæ¯å·² *åŠ å¯†* (見: XEP:`27`]"
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:435
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -4403,76 +4657,74 @@ msgstr ""
"主題: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:845
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "帳號\"%s\"的連線丟失"
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:846
msgid "Reconnect manually."
msgstr "手動é‡é€£ã€‚"
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:857
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr "伺æœå™¨ %(name)s å°è¨»å†Šè«‹æ±‚的回應有誤: %(error)s"
-#: ../src/common/connection.py:857
+#. requested config has changed since first connection
+#: ../src/common/connection.py:899
#, python-format
msgid "Server %s provided a different registration form"
msgstr "伺æœå™¨ %s æ供了一個ä¸åŒçš„註冊表單"
-#: ../src/common/connection.py:870
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "ä¸æ˜Žçš„ SSL 錯誤: %d"
-
#. wrong answer
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:915
msgid "Invalid answer"
msgstr "ç”案錯誤"
-#: ../src/common/connection.py:886
+#: ../src/common/connection.py:916
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr "æœå‹™ä»£ç† %(name)s å°è¨»å†Šè«‹æ±‚的回應有誤: %(error)s"
-#: ../src/common/connection.py:1168 ../src/common/connection.py:1297
-#: ../src/common/connection.py:1794
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/connection.py:1224 ../src/common/connection.py:1358
+#: ../src/common/connection.py:1972
+#: ../src/common/zeroconf/connection_zeroconf.py:204
#, python-format
msgid "Could not connect to \"%s\""
msgstr "æ²’æœ‰èƒ½å¤ é€£ç·šåˆ°\"%s\""
-#: ../src/common/connection.py:1169 ../src/gui_interface.py:603
+#: ../src/common/connection.py:1225 ../src/gui_interface.py:524
msgid "Check your connection or try again later."
msgstr "檢查連線或ç¨å¾Œé‡è©¦ã€‚"
-#: ../src/common/connection.py:1174
+#: ../src/common/connection.py:1230
#, python-format
msgid "Server replied: %s"
msgstr "伺æœå™¨å›žæ‡‰: %s"
-#: ../src/common/connection.py:1187
+#: ../src/common/connection.py:1243
msgid "Connection to proxy failed"
msgstr "連線代ç†ä¼ºæœå™¨å¤±æ•—"
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1275 ../src/common/connection.py:1337
#, python-format
msgid "Could not connect to account %s"
msgstr "æ²’æœ‰èƒ½å¤ é€£ç·šåˆ°å¸³è™Ÿ %s"
-#: ../src/common/connection.py:1219 ../src/common/connection.py:1278
+#: ../src/common/connection.py:1276 ../src/common/connection.py:1338
#, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr "帳號 %s 的連線丟失。é‡æ–°å˜—試連線。"
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1301
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "%s è‰æ›¸çš„èªè‰å¯èƒ½æ˜¯ç„¡æ•ˆçš„"
-#: ../src/common/connection.py:1247
+#: ../src/common/connection.py:1304
#, python-format
msgid ""
"\n"
@@ -4481,7 +4733,7 @@ msgstr ""
"\n"
"SSL 錯誤: <b>%s</b>"
-#: ../src/common/connection.py:1249
+#: ../src/common/connection.py:1306
#, python-format
msgid ""
"\n"
@@ -4490,65 +4742,69 @@ msgstr ""
"\n"
"ä¸æ˜Ž SSL 錯誤: %d"
-#: ../src/common/connection.py:1298
+#: ../src/common/connection.py:1359
msgid "Check your connection or try again later"
msgstr "檢查連線或ç¨å¾Œé‡è©¦"
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1393
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "\"%s\"登入驗è‰å¤±æ•—"
-#: ../src/common/connection.py:1333
+#: ../src/common/connection.py:1395
msgid "Please check your login and password for correctness."
msgstr "請檢查登入資訊和密碼的æ£ç¢ºæ€§"
-#: ../src/common/connection.py:1402
+#: ../src/common/connection.py:1468
msgid "Error while removing privacy list"
msgstr "移除隱ç§ç–略清單時發生錯誤"
-#: ../src/common/connection.py:1403
+#: ../src/common/connection.py:1469
#, 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:1660
+#: ../src/common/connection.py:1839
#, python-format
msgid "Sent contact: \"%s\" (%s)"
msgstr "已傳é€è¯çµ¡äºº: \"%s\" (%s)"
-#: ../src/common/connection.py:1663
+#: ../src/common/connection.py:1842
msgid "Sent contacts:"
-msgstr "已傳é€è¯çµ¡äºº: "
+msgstr "已傳é€è¯çµ¡äºº:"
-#: ../src/common/connection.py:1809 ../src/common/connection.py:1832
+#: ../src/common/connection.py:1989 ../src/common/connection.py:2012
msgid "Not fetched because of invisible status"
msgstr "由於隱身狀態，未ç²å–"
-#: ../src/common/connection.py:2264
+#: ../src/common/connection.py:2542
msgid "Unregister failed"
msgstr "移除註冊失敗"
-#: ../src/common/connection.py:2265
+#: ../src/common/connection.py:2543
#, python-format
msgid "Unregistration with server %(server)s failed: %(error)s"
msgstr "在伺æœå™¨ä¸Š %(server)s 移除註冊失敗: %(error)s"
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:530
+#: ../src/common/contacts.py:126 ../src/common/helpers.py:60
+#: ../src/gui_interface.py:467
msgid "Observers"
msgstr "æ—觀者"
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
+#: ../src/common/contacts.py:130 ../src/common/contacts.py:358
+#: ../src/common/helpers.py:60 ../src/disco.py:120 ../src/disco.py:121
#: ../src/disco.py:1517 ../src/roster_window.py:856
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#: ../src/roster_window.py:1552 ../src/roster_window.py:1640
+#: ../src/roster_window.py:1642 ../src/roster_window.py:1804
+#: ../src/roster_window.py:2480
msgid "Transports"
msgstr "æœå‹™ä»£ç†"
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:366
msgid "Not in roster"
msgstr "ä¸åœ¨è¯çµ¡äººæ¸…å–®ä¸"
@@ -4582,7 +4838,7 @@ msgstr "ä¸èƒ½è®€å–資料庫。"
msgid "Service not available: Gajim is not running, or remote_control is False"
msgstr "æœå‹™ç„¡æ³•ä½¿ç”¨: Gajim ä¸åœ¨åŸ·è¡Œï¼Œæˆ–是 remote_control 為å‡"
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
msgid "D-Bus is not present on this machine or python module is missing"
msgstr "在這臺電腦上沒有 D-Bus 或是 Python 模組缺失"
@@ -4672,7 +4928,7 @@ msgstr "%(0)s點10分"
#: ../src/common/fuzzyclock.py:45
#, python-format
msgid "quarter past %(0)s"
-msgstr "%(0)s點一刻"
+msgstr "%(0)s點15分"
#: ../src/common/fuzzyclock.py:45
#, python-format
@@ -4702,7 +4958,7 @@ msgstr "差20分%(1)s點"
#: ../src/common/fuzzyclock.py:47
#, python-format
msgid "quarter to %(1)s"
-msgstr "差一刻%(1)s點"
+msgstr "差15分%(1)s點"
#: ../src/common/fuzzyclock.py:47
#, python-format
@@ -4767,249 +5023,257 @@ msgstr "一週末"
msgid "Weekend!"
msgstr "週末"
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:151
msgid "Username must be between 1 and 1023 chars"
msgstr "使用者åç¨±å¿…é ˆåœ¨ 1 到 1023 個å—元之間"
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:156
msgid "Invalid character in username."
msgstr "在使用者å稱ä¸æœ‰ç„¡æ•ˆçš„å—元。"
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
msgid "Server must be between 1 and 1023 chars"
msgstr "伺æœå™¨åç¨±å¿…é ˆåœ¨ 1 到 1023 個å—元之間"
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:167
msgid "Invalid character in hostname."
msgstr "主機å稱ä¸æœ‰ç„¡æ•ˆçš„å—元。"
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
msgid "Server address required."
msgstr "伺æœå™¨çš„ä½å€æ˜¯å¿…é ˆçš„ã€‚"
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
msgid "Resource must be between 1 and 1023 chars"
msgstr "資æºå¿…é ˆåœ¨ 1 到 1023 個å—元之間"
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:178
msgid "Invalid character in resource."
msgstr "資æºä¸å«æœ‰ç„¡æ•ˆå—元。"
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
msgid "_Busy"
msgstr "忙碌(_B)"
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:220 ../src/tooltips.py:195
msgid "Busy"
msgstr "忙碌"
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
msgid "_Not Available"
msgstr "離開很久了(_N)"
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+msgid "Not Available"
+msgstr "離開很久了"
+
+#: ../src/common/helpers.py:228
msgid "_Free for Chat"
msgstr "和我èŠå¤©å§(_F)"
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:230 ../src/tooltips.py:191
msgid "Free for Chat"
msgstr "和我èŠå¤©å§"
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:233
msgid "?user status:_Available"
msgstr "線上(_A)"
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:235 ../src/tooltips.py:189
msgid "?user status:Available"
msgstr "線上"
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
msgid "Connecting"
msgstr "æ£åœ¨é€£ç·š"
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
msgid "A_way"
msgstr "離開(_A)"
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:245
msgid "_Offline"
msgstr "離線(_O)"
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:247 ../src/tooltips.py:199
msgid "Offline"
msgstr "離線"
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:250
msgid "_Invisible"
msgstr "隱身(_I)"
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:252
+msgid "Invisible"
+msgstr "隱身"
+
+#: ../src/common/helpers.py:256
msgid "?contact has status:Unknown"
msgstr "ä¸æ˜Ž"
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:258
msgid "?contact has status:Has errors"
msgstr "有錯誤"
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:263
msgid "?Subscription we already have:None"
msgstr "ç„¡"
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:265
msgid "To"
msgstr "To"
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
msgid "From"
msgstr "From"
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
msgid "Both"
msgstr "Both"
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:277
msgid "?Ask (for Subscription):None"
msgstr "ç„¡"
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:279
msgid "Subscribe"
msgstr "èªè‰"
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
msgid "?Group Chat Contact Role:None"
msgstr "ç„¡"
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
msgid "Moderators"
msgstr "主æŒäºº"
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
msgid "Moderator"
msgstr "主æŒäºº"
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:296
msgid "Participants"
msgstr "åƒèˆ‡è€…"
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:298
msgid "Participant"
msgstr "åƒèˆ‡è€…"
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:301
msgid "Visitors"
msgstr "訪客"
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:303
msgid "Visitor"
msgstr "訪客"
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:309 ../src/tooltips.py:210
msgid "?Group Chat Contact Affiliation:None"
msgstr "ç„¡"
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:311 ../src/tooltips.py:216
msgid "Owner"
msgstr "所有者"
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:313 ../src/tooltips.py:214
msgid "Administrator"
msgstr "管ç†å“¡"
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:315 ../src/tooltips.py:212
msgid "Member"
msgstr "æˆå“¡"
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:354
msgid "is paying attention to the conversation"
msgstr "注æ„著與您的å°è©±"
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:356
msgid "is doing something else"
msgstr "在åšå…¶ä»–事情"
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
msgid "is composing a message..."
msgstr "æ£åœ¨è¼¸å…¥è¨Šæ¯â€¦"
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:361
msgid "paused composing a message"
msgstr "æš«åœè¼¸å…¥è¨Šæ¯"
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:363
msgid "has closed the chat window or tab"
msgstr "關閉了èŠå¤©è¦–窗或標籤"
#. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:628
#, python-format
msgid "%s GiB"
msgstr "%s GiB"
#. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:631
#, python-format
msgid "%s GB"
msgstr "%s GB"
#. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:635
#, python-format
msgid "%s MiB"
msgstr "%s MiB"
#. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:638
#, python-format
msgid "%s MB"
msgstr "%s MB"
#. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:642
#, python-format
msgid "%s KiB"
msgstr "%s KiB"
#. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:645
#, python-format
msgid "%s KB"
msgstr "%s KB"
#. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:648
#, python-format
msgid "%s B"
msgstr "%s B"
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
msgstr[0] "%d æ¢è¨Šæ¯æœªè™•ç†"
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1112
#, python-format
msgid " from room %s"
msgstr " 來自èŠå¤©å®¤ %s"
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
#, python-format
msgid " from user %s"
msgstr " 來自使用者 %s"
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1117
#, python-format
msgid " from %s"
msgstr " 來自 %s"
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
msgstr[0] "%d 個未處ç†äº‹ä»¶"
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1162
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
@@ -5026,15 +5290,19 @@ msgstr "%s è¨å®šéŒ¯èª¤"
#: ../src/common/jingle_rtp.py:108
#, python-format
msgid ""
-"Couldn't setup %s. Check your configuration.\n\n"
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
"Pipeline was:\n"
-"%s\n\n"
+"%s\n"
+"\n"
"Error was:\n"
"%s"
msgstr ""
-"ä¸èƒ½è¨å®š %s。請檢查您的é…置。\n\n"
+"ä¸èƒ½è¨å®š %s。請檢查您的é…置。\n"
+"\n"
"管線: \n"
-"%s\n\n"
+"%s\n"
+"\n"
"錯誤: \n"
"%s"
@@ -5063,7 +5331,7 @@ msgstr "音訊輸出"
msgid "video input"
msgstr "視訊輸入"
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:390
msgid "video output"
msgstr "視訊輸出"
@@ -5077,59 +5345,66 @@ msgstr "在執行命令\"%(command)s\"時發生錯誤: %(error)s"
msgid "%s is not a valid loglevel"
msgstr "%s ä¸æ˜¯ä¸€å€‹åˆæ³•çš„日誌層級"
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:39
msgid " Default device"
msgstr "é è¨è£ç½®"
#. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:60
msgid "Audio test"
msgstr "音訊測試"
#. Auto src
#. Auto sink
#. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:63
+#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:111
msgid "Autodetect"
msgstr "自動åµæ¸¬"
#. Alsa src
#. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:81
#, python-format
msgid "ALSA: %s"
msgstr "ALSA: %s"
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:83
+#, python-format
+msgid "Pulse: %s"
+msgstr "Pulse: %s"
+
#. Fake sink
#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:105
msgid "Fake audio output"
msgstr "å½è£éŸ³è¨Šè¼¸å‡º"
#. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:90
msgid "Video test"
msgstr "視訊測試"
#. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:95
#, python-format
msgid "V4L2: %s"
msgstr "V4L2: %s"
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:108
#, python-format
msgid "X Window System (X11/XShm/Xv): %s"
msgstr "X 視窗系統 (X11/XShm/Xv): %s"
#. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:110
msgid "X Window System (without Xv)"
msgstr "X 視窗系統 (沒有Xv)"
@@ -5139,11 +5414,11 @@ msgstr "X 視窗系統 (沒有Xv)"
msgid "error: cannot open %s for reading"
msgstr "錯誤: 無法讀å–檔案 %s"
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
msgid "cyan"
msgstr "é’色"
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:385
msgid "migrating logs database to indices"
msgstr "é·ç§»è¨˜éŒ„資料庫到索引"
@@ -5780,19 +6055,19 @@ msgstr "å¸ç¿’"
msgid "Writing"
msgstr "寫作"
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:339
msgid "Unknown Artist"
msgstr "ä¸æ˜Žæ¼”出者"
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:342
msgid "Unknown Title"
msgstr "ä¸æ˜Žæ¨™é¡Œ"
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:345
msgid "Unknown Source"
msgstr "ä¸æ˜Žä¾†æº"
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:348
#, python-format
msgid ""
"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5808,19 +6083,25 @@ msgid "Unable to bind to port %s."
msgstr "無法繫çµé€£æŽ¥åŸ %s。"
#: ../src/common/socks5.py:92
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+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:423
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[é€™æ˜¯åŠ å¯†ä½œæ¥éšŽæ®µçš„一部分。如果您看到了這æ¢è¨Šæ¯ï¼Œä¸€å®šæ˜¯æœ‰ä»€éº¼åœ°æ–¹ç™¼ç”ŸéŒ¯èª¤äº†ã€‚]"
+#: ../src/common/stanza_session.py:424
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[é€™æ˜¯åŠ å¯†ä½œæ¥éšŽæ®µçš„一部分。如果您看到了這æ¢è¨Šæ¯ï¼Œä¸€å®šæ˜¯æœ‰ä»€éº¼åœ°æ–¹ç™¼ç”ŸéŒ¯èª¤"
+"了。]"
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:192
msgid "Avahi error"
msgstr "Avahi 錯誤"
-#: ../src/common/zeroconf/connection_zeroconf.py:183
+#: ../src/common/zeroconf/connection_zeroconf.py:193
#, python-format
msgid ""
"%s\n"
@@ -5829,304 +6110,327 @@ msgstr ""
"%s\n"
"Link-local 訊æ¯å¯èƒ½ç„¡æ³•æ£å¸¸å·¥ä½œã€‚"
-#: ../src/common/zeroconf/connection_zeroconf.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:205
msgid "Please check if Avahi or Bonjour is installed."
msgstr "請檢查 Avahi 或是 Bonjour 是å¦å·²ç¶“安è£ã€‚"
-#: ../src/common/zeroconf/connection_zeroconf.py:203
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:219
msgid "Could not start local service"
msgstr "無法啟動本地æœå‹™"
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:216
#, python-format
msgid "Unable to bind to port %d."
msgstr "無法繫çµé€£æŽ¥åŸ %d。"
-#: ../src/common/zeroconf/connection_zeroconf.py:208
-#: ../src/common/zeroconf/connection_zeroconf.py:288
-#: ../src/common/zeroconf/connection_zeroconf.py:299
-#: ../src/common/zeroconf/connection_zeroconf.py:313
+#: ../src/common/zeroconf/connection_zeroconf.py:220
+#: ../src/common/zeroconf/connection_zeroconf.py:304
+#: ../src/common/zeroconf/connection_zeroconf.py:317
+#: ../src/common/zeroconf/connection_zeroconf.py:333
msgid "Please check if avahi-daemon is running."
msgstr "請檢查 avahi-daemon 是å¦æ£åœ¨åŸ·è¡Œã€‚"
-#: ../src/common/zeroconf/connection_zeroconf.py:287
-#: ../src/common/zeroconf/connection_zeroconf.py:298
-#: ../src/common/zeroconf/connection_zeroconf.py:312
+#: ../src/common/zeroconf/connection_zeroconf.py:303
+#: ../src/common/zeroconf/connection_zeroconf.py:316
+#: ../src/common/zeroconf/connection_zeroconf.py:332
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "無法變更帳號\"%s\"的狀態"
-#: ../src/common/zeroconf/connection_zeroconf.py:330
+#: ../src/common/zeroconf/connection_zeroconf.py:351
+#: ../src/common/zeroconf/connection_zeroconf.py:390
msgid "Your message could not be sent."
msgstr "您的訊æ¯æœªèƒ½è¢«å‚³é€ã€‚"
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:340
+#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:404
msgid "Contact is offline. Your message could not be sent."
msgstr "è¯çµ¡äººé›¢ç·šã€‚您的訊æ¯æœªèƒ½è¢«å‚³é€ã€‚"
-#: ../src/common/zeroconf/connection_zeroconf.py:365
-msgid "Connection to host could not be established: Timeout while sending data."
+#: ../src/common/zeroconf/connection_zeroconf.py:431
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
msgstr "無法建立到主機的連線: 傳é€è³‡æ–™é€¾æ™‚。"
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_avahi.py:193
#: ../src/common/zeroconf/zeroconf_bonjour.py:191
#, python-format
msgid "Error while adding service. %s"
msgstr "åŠ å…¥æœå‹™éŒ¯èª¤ã€‚ %s"
-#: ../src/config.py:397
+#: ../src/config.py:406
msgid "Default Message"
msgstr "é è¨è¨Šæ¯"
-#: ../src/config.py:406
+#: ../src/config.py:415
msgid "Enabled"
msgstr "啟用"
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3115
msgid "Default"
msgstr "é è¨"
-#: ../src/config.py:733 ../src/dialogs.py:1411
+#: ../src/config.py:746 ../src/dialogs.py:1493
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "語言 %s 的詞典無法使用"
-#: ../src/config.py:734
+#: ../src/config.py:747
#, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "æ‚¨éœ€å®‰è£ %s 詞典以使用拼寫檢查，或是è¨å®šæ‹¼å¯«æª¢æŸ¥é¸é …以é¸æ“‡å¦å¤–一種語言。(_L)"
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"æ‚¨éœ€å®‰è£ %s 詞典以使用拼寫檢查，或是è¨å®šæ‹¼å¯«æª¢æŸ¥é¸é …以é¸æ“‡å¦å¤–一種語言。(_L)"
-#: ../src/config.py:1214
+#: ../src/config.py:1223
msgid "status message title"
msgstr "狀態訊æ¯æ¨™é¡Œ"
-#: ../src/config.py:1214
+#: ../src/config.py:1223
msgid "status message text"
msgstr "狀態訊æ¯æ–‡å—"
#. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2401 ../src/dialogs.py:2467
-#: ../src/dialogs.py:3233 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py:1523 ../src/dialogs.py:2528 ../src/dialogs.py:2595
+#: ../src/dialogs.py:3382 ../src/disco.py:886 ../src/disco.py:1744
+#: ../src/disco.py:2046 ../src/history_window.py:90
msgid "Name"
msgstr "å稱"
-#: ../src/config.py:1609
+#: ../src/config.py:1618
msgid "Relogin now?"
msgstr "ç¾åœ¨é‡æ–°ç™»å…¥?"
-#: ../src/config.py:1610
+#: ../src/config.py:1619
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr "如果想使所有調整立å³ç”Ÿæ•ˆï¼Œæ‚¨å¿…é ˆé‡æ–°ç™»å…¥ã€‚"
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1773 ../src/config.py:1906
msgid "OpenPGP is not usable on this computer"
msgstr "OpenPGP 在這臺電腦上無法使用"
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1946 ../src/config.py:1993
msgid "Unread events"
msgstr "未讀å–的事件"
-#: ../src/config.py:1934
+#: ../src/config.py:1947
msgid "Read all pending events before removing this account."
msgstr "移除帳號å‰è«‹æª¢è¦–所有未處ç†äº‹ä»¶ã€‚"
-#: ../src/config.py:1963
+#: ../src/config.py:1976
#, python-format
msgid "You have opened chat in account %s"
msgstr "您已在帳號 %s é–‹å•ŸèŠå¤©"
-#: ../src/config.py:1964
+#: ../src/config.py:1977
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr "所有的èŠå¤©å’Œå¤šäººèŠå¤©è¦–窗將會關閉。您想繼續嗎?"
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:1989 ../src/config.py:2531 ../src/config.py:2567
msgid "You are currently connected to the server"
msgstr "æ£åœ¨é€£ç·šåˆ°ä¼ºæœå™¨"
-#: ../src/config.py:1977
+#: ../src/config.py:1990
msgid "To change the account name, you must be disconnected."
msgstr "如è¦è®Šæ›´å¸³è™Ÿå稱，需ä¸æ–·é€£ç·šã€‚"
-#: ../src/config.py:1981
+#: ../src/config.py:1994
msgid "To change the account name, you must read all pending events."
msgstr "如è¦è®Šæ›´å¸³è™Ÿå稱，需先處ç†æ‰€æœ‰æœªè™•ç†äº‹ä»¶"
-#: ../src/config.py:1987
+#: ../src/config.py:2000
msgid "Account Name Already Used"
msgstr "帳號å稱已經被佔用"
-#: ../src/config.py:1988
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:2001
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
msgstr "該å稱已被您的å¦ä¸€å€‹å¸³è™Ÿä½¿ç”¨ã€‚è«‹é¸æ“‡å…¶ä»–å稱"
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2005 ../src/config.py:2009
msgid "Invalid account name"
msgstr "無效的帳號å稱"
-#: ../src/config.py:1993
+#: ../src/config.py:2006
msgid "Account name cannot be empty."
msgstr "帳號å稱ä¸èƒ½ç‚ºç©ºã€‚"
-#: ../src/config.py:1997
+#: ../src/config.py:2010
msgid "Account name cannot contain spaces."
msgstr "帳號å稱ä¸èƒ½åŒ…å«ç©ºæ ¼ã€‚"
-#: ../src/config.py:2074
+#: ../src/config.py:2087
msgid "Rename Account"
msgstr "é‡æ–°å‘½å帳號"
-#: ../src/config.py:2075
+#: ../src/config.py:2088
#, python-format
msgid "Enter a new name for account %s"
msgstr "為帳號 %s 輸入新的å稱"
-#: ../src/config.py:2103
+#: ../src/config.py:2116
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Jabber ID çš„æ ¼å¼ç‚º \"使用者@伺æœå™¨å稱\"。"
-#: ../src/config.py:2320 ../src/config.py:3622
+#: ../src/config.py:2339 ../src/config.py:3665
msgid "Invalid entry"
msgstr "無效輸入"
-#: ../src/config.py:2321 ../src/config.py:3623
+#: ../src/config.py:2340 ../src/config.py:3666
msgid "Custom port must be a port number."
msgstr "è‡ªè¨‚é€£æŽ¥åŸ å¿…é ˆç‚ºé€£æŽ¥åŸ è™Ÿç¢¼ã€‚"
-#: ../src/config.py:2342
+#: ../src/config.py:2361
msgid "Failed to get secret keys"
msgstr "ç²å–密鑰失敗"
-#: ../src/config.py:2343
+#: ../src/config.py:2362
msgid "There is no OpenPGP secret key available."
msgstr "沒有å¯ç”¨çš„ OpenPGP ç§é‘°"
-#: ../src/config.py:2377
+#: ../src/config.py:2396
msgid "OpenPGP Key Selection"
msgstr "OpenPGP 密鑰é¸æ“‡"
-#: ../src/config.py:2378
+#: ../src/config.py:2397
msgid "Choose your OpenPGP key"
msgstr "é¸æ“‡æ‚¨çš„ OpenPGP 密鑰"
-#: ../src/config.py:2385
+#: ../src/config.py:2404
msgid "No such account available"
msgstr "ä¸æ˜Žçš„帳號å¯ç”¨"
-#: ../src/config.py:2386
+#: ../src/config.py:2405
msgid "You must create your account before editing your personal information."
msgstr "æ‚¨å¿…é ˆåœ¨ç·¨è¼¯å€‹äººè³‡è¨Šå‰å»ºç«‹å¸³è™Ÿã€‚"
-#: ../src/config.py:2393 ../src/dialogs.py:2154 ../src/dialogs.py:2389
-#: ../src/dialogs.py:2575 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2412 ../src/dialogs.py:2281 ../src/dialogs.py:2517
+#: ../src/dialogs.py:2705 ../src/disco.py:515 ../src/profile_window.py:361
msgid "You are not connected to the server"
msgstr "尚未連線到伺æœå™¨"
-#: ../src/config.py:2394
+#: ../src/config.py:2413
msgid "Without a connection, you can not edit your personal information."
msgstr "無法離線編輯個人資訊。"
-#: ../src/config.py:2398
+#: ../src/config.py:2417
msgid "Your server doesn't support Vcard"
msgstr "您的伺æœå™¨ä¸æ”¯æ´ Vcard"
-#: ../src/config.py:2399
+#: ../src/config.py:2418
msgid "Your server can't save your personal information."
msgstr "您的伺æœå™¨ç„¡æ³•å„²å˜æ‚¨çš„個人資訊。"
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2532 ../src/config.py:2568
msgid "To disable the account, you must be disconnected."
msgstr "è¦åœç”¨å¸³è™Ÿï¼Œæ‚¨å¿…é ˆä¸æ–·é€£ç·šã€‚"
-#: ../src/config.py:2517
+#: ../src/config.py:2537
msgid "Account Local already exists."
msgstr "帳號本地已å˜åœ¨ã€‚"
-#: ../src/config.py:2518
+#: ../src/config.py:2538
msgid "Please rename or remove it before enabling link-local messaging."
msgstr "請在使用本地訊æ¯å‰é‡æ–°å‘½å或移除它。"
-#: ../src/config.py:2675
+#: ../src/config.py:2695
#, python-format
msgid "Edit %s"
msgstr "編輯 %s"
-#: ../src/config.py:2677
+#: ../src/config.py:2697
#, python-format
msgid "Register to %s"
msgstr "註冊到 %s"
#. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2733
msgid "Ban List"
msgstr "å°ç¦åå–®"
-#: ../src/config.py:2714
+#: ../src/config.py:2734
msgid "Member List"
msgstr "æˆå“¡æ¸…å–®"
-#: ../src/config.py:2714
+#: ../src/config.py:2734
msgid "Owner List"
msgstr "室長清單"
-#: ../src/config.py:2715
+#: ../src/config.py:2735
msgid "Administrator List"
msgstr "管ç†å“¡æ¸…å–®"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2799 ../src/disco.py:893 ../src/history_manager.py:207
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2789
+#: ../src/config.py:2809
msgid "Reason"
msgstr "åŽŸå› "
-#: ../src/config.py:2796
+#: ../src/config.py:2816
msgid "Nick"
msgstr "暱稱"
-#: ../src/config.py:2802
+#: ../src/config.py:2822
msgid "Role"
msgstr "角色"
-#: ../src/config.py:2829
+#: ../src/config.py:2849
msgid "Banning..."
msgstr "å°ç¦â€¦"
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
-msgid "<b>Whom do you want to ban?</b>\n\n"
-msgstr "<b>想åšå°ç¦èª°?</b>\n\n"
+#: ../src/config.py:2851
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr ""
+"<b>想åšå°ç¦èª°?</b>\n"
+"\n"
-#: ../src/config.py:2833
+#: ../src/config.py:2853
msgid "Adding Member..."
msgstr "æ£åœ¨åŠ å…¥æˆå“¡â€¦"
-#: ../src/config.py:2834
-msgid "<b>Whom do you want to make a member?</b>\n\n"
-msgstr "<b>想è¦å°‡èª°åŠ 為æˆå“¡?</b>\n\n"
+#: ../src/config.py:2854
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr ""
+"<b>想è¦å°‡èª°åŠ 為æˆå“¡?</b>\n"
+"\n"
-#: ../src/config.py:2836
+#: ../src/config.py:2856
msgid "Adding Owner..."
msgstr "åŠ å…¥å®¤é•·â€¦"
-#: ../src/config.py:2837
-msgid "<b>Whom do you want to make an owner?</b>\n\n"
-msgstr "<b>您想è¦è®“誰æˆç‚ºå®¤é•·?</b>\n\n"
+#: ../src/config.py:2857
+msgid ""
+"<b>Whom do you want to make an owner?</b>\n"
+"\n"
+msgstr ""
+"<b>您想è¦è®“誰æˆç‚ºå®¤é•·?</b>\n"
+"\n"
-#: ../src/config.py:2839
+#: ../src/config.py:2859
msgid "Adding Administrator..."
msgstr "åŠ å…¥ç®¡ç†å“¡â€¦"
-#: ../src/config.py:2840
-msgid "<b>Whom do you want to make an administrator?</b>\n\n"
-msgstr "<b>您想è¦è®“誰æˆç‚ºç®¡ç†å“¡?</b>\n\n"
+#: ../src/config.py:2860
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr ""
+"<b>您想è¦è®“誰æˆç‚ºç®¡ç†å“¡?</b>\n"
+"\n"
-#: ../src/config.py:2841
+#: ../src/config.py:2861
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -6142,147 +6446,157 @@ msgstr ""
"4。domain (欄ä½å稱本身匹é…，任何 user@domain，\n"
"domain/resource，或是包å«ä¸€å€‹å欄ä½å稱的ä½å€ä¹ŸåŒ¹é…)。"
-#: ../src/config.py:2943
+#: ../src/config.py:2962
#, python-format
msgid "Removing %s account"
msgstr "移除帳號 %s"
-#: ../src/config.py:2958
+#: ../src/config.py:2977
msgid "Account is disabled"
msgstr "帳號被åœç”¨"
-#: ../src/config.py:2959
+#: ../src/config.py:2978
msgid "To unregister from a server, account must be enabled."
msgstr "è¦å¾žä¼ºæœå™¨ç§»é™¤è¨»å†Šï¼Œå¸³è™Ÿå¿…é ˆè¢«å•Ÿç”¨ã€‚"
-#: ../src/config.py:2972 ../src/gui_interface.py:293
-#: ../src/gui_interface.py:985
+#: ../src/config.py:2991 ../src/gui_interface.py:278
+#: ../src/gui_interface.py:696
msgid "Password Required"
msgstr "需è¦å¯†ç¢¼"
-#: ../src/config.py:2973 ../src/gui_interface.py:965
+#: ../src/config.py:2992 ../src/gui_interface.py:676
#, python-format
msgid "Enter your password for account %s"
msgstr "輸入帳號 %s 的密碼"
-#: ../src/config.py:2974 ../src/gui_interface.py:985
+#: ../src/config.py:2993 ../src/gui_interface.py:696
msgid "Save password"
msgstr "儲å˜å¯†ç¢¼"
-#: ../src/config.py:2984
+#: ../src/config.py:3003
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "帳號 \"%s\" 已連線到伺æœå™¨"
-#: ../src/config.py:2985
+#: ../src/config.py:3004
msgid "If you remove it, the connection will be lost."
msgstr "如果移除，將會丟失連線"
-#: ../src/config.py:2999
+#: ../src/config.py:3018
#, python-format
msgid "Connection to server %s failed"
msgstr "連線伺æœå™¨ %s 失敗"
-#: ../src/config.py:3000
+#: ../src/config.py:3019
msgid "What would you like to do?"
msgstr "您想åšä»€éº¼?"
-#: ../src/config.py:3001
+#: ../src/config.py:3020
msgid "Remove only from Gajim"
msgstr "僅從 Gajim 移除帳號"
-#: ../src/config.py:3002
+#: ../src/config.py:3021
msgid "Don't remove anything. I'll try again later"
msgstr "ä¸è¦ç§»é™¤ä»»ä½•æ±è¥¿ã€‚我éŽä¸€æœƒå…’會é‡è©¦ä¸€ä¸‹"
-#: ../src/config.py:3095
+#: ../src/config.py:3115
msgid "?print_status:All"
msgstr "全部"
-#: ../src/config.py:3096
+#: ../src/config.py:3116
msgid "Enter and leave only"
msgstr "åªæ˜¯é€²å…¥å’Œé›¢é–‹"
-#: ../src/config.py:3097
+#: ../src/config.py:3117
msgid "?print_status:None"
msgstr "ç„¡"
-#: ../src/config.py:3167
+#: ../src/config.py:3189
msgid "New Group Chat"
msgstr "æ–°èŠå¤©å®¤"
-#: ../src/config.py:3200
+#: ../src/config.py:3222
msgid "This bookmark has invalid data"
msgstr "æ¤æ›¸ç±¤å«ç„¡æ•ˆè³‡æ–™"
-#: ../src/config.py:3201
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:3223
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
msgstr "請確èªå¡«å¯«ä¼ºæœå™¨èˆ‡èŠå¤©å®¤æ¬„ä½æˆ–移除æ¤æ›¸ç±¤ã€‚"
#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1952
+#: ../src/config.py:3348 ../src/dialogs.py:2070
msgid "Invalid nickname"
msgstr "無效的暱稱"
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3349 ../src/config.py:3360 ../src/config.py:3369
+#: ../src/config.py:3380 ../src/config.py:3388
msgid "Character not allowed"
msgstr "ä¸å…許的å—å…ƒ"
-#: ../src/config.py:3333 ../src/config.py:3598
+#: ../src/config.py:3360 ../src/config.py:3368 ../src/config.py:3380
+#: ../src/config.py:3641
msgid "Invalid server"
msgstr "無效的伺æœå™¨"
-#: ../src/config.py:3347
+#: ../src/config.py:3387
msgid "Invalid room"
msgstr "無效èŠå¤©å®¤"
-#: ../src/config.py:3514
+#: ../src/config.py:3557
msgid "Account has been added successfully"
msgstr "帳號已æˆåŠŸåŠ å…¥"
-#: ../src/config.py:3515 ../src/config.py:3521
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menu item under the Edit menu from the main window."
-msgstr "您å¯ä»¥é»žæ“Š\"進階\"按鈕以è¨å®šé€²éšŽå¸³è™Ÿé¸é …，或ç¨å¾Œé¸æ“‡ä¸»è¦–窗\"編輯\"é¸å–®ä¸‹\"帳號\"é¸å–®é …。"
+#: ../src/config.py:3558 ../src/config.py:3564
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menu item under the Edit menu from the main "
+"window."
+msgstr ""
+"您å¯ä»¥é»žæ“Š\"進階\"按鈕以è¨å®šé€²éšŽå¸³è™Ÿé¸é …，或ç¨å¾Œé¸æ“‡ä¸»è¦–窗\"編輯\"é¸å–®ä¸‹\"帳"
+"號\"é¸å–®é …。"
-#: ../src/config.py:3520
+#: ../src/config.py:3563
msgid "Your new account has been created successfully"
msgstr "註冊新帳號æˆåŠŸ"
-#: ../src/config.py:3559
+#: ../src/config.py:3602
msgid "Invalid username"
msgstr "無效使用者å稱"
-#: ../src/config.py:3561
+#: ../src/config.py:3604
msgid "You must provide a username to configure this account."
msgstr "å¿…é ˆæ供使用者å稱來é…ç½®æ¤å¸³è™Ÿã€‚"
-#: ../src/config.py:3599
+#: ../src/config.py:3642
msgid "Please provide a server on which you want to register."
msgstr "請指定一個伺æœå™¨ã€‚您將註冊到這個伺æœå™¨ã€‚"
-#: ../src/config.py:3655 ../src/gui_interface.py:1624
+#: ../src/config.py:3698 ../src/gui_interface.py:1174
msgid "Certificate Already in File"
msgstr "è‰æ›¸å·²ç¶“在檔案ä¸"
-#: ../src/config.py:3656 ../src/gui_interface.py:1625
+#: ../src/config.py:3699 ../src/gui_interface.py:1175
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "è‰æ›¸å·²ç¶“在檔案 %s ä¸ï¼Œæ‰€ä»¥å®ƒæ²’有被å†æ¬¡åŠ 入。"
-#: ../src/config.py:3733
+#: ../src/config.py:3788
#, python-format
msgid ""
-"<b>Security Warning</b>\n\n"
+"<b>Security Warning</b>\n"
+"\n"
"The authenticity of the %(hostname)s SSL certificate could be invalid.\n"
"SSL Error: %(error)s\n"
"Do you still want to connect to this server?"
msgstr ""
-"<b>安全性è¦å‘Š</b>\n\n"
+"<b>安全性è¦å‘Š</b>\n"
+"\n"
"%(hostname)s çš„ SSL è‰æ›¸çš„權é™ä¸èƒ½è¢«é©—è‰ã€‚\n"
"SSL 錯誤: %(error)s\n"
"您ä»ç„¶æƒ³è¦é€£ç·šåˆ°é€™å€‹ä¼ºæœå™¨å—Ž?"
-#: ../src/config.py:3739 ../src/gui_interface.py:1652
+#: ../src/config.py:3794 ../src/gui_interface.py:1203
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6293,845 +6607,905 @@ msgstr ""
"這個è‰æ›¸çš„ SHA1 指紋資訊: \n"
"%s"
-#: ../src/config.py:3771 ../src/config.py:3805
+#: ../src/config.py:3826 ../src/config.py:3860
msgid "An error occurred during account creation"
msgstr "建立帳號期間發生錯誤"
-#: ../src/config.py:3870
+#: ../src/config.py:3925
msgid "Account name is in use"
msgstr "帳號å稱已經被使用"
-#: ../src/config.py:3871
+#: ../src/config.py:3926
msgid "You already have an account using this name."
msgstr "您已經有帳號使用這個å稱了。"
-#: ../src/config.py:3990
+#: ../src/config.py:4056
msgid "PEP node was not removed"
msgstr "PEP節點沒有被移除"
-#: ../src/config.py:3991
+#: ../src/config.py:4057
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "PEP 節點 %(node)s 沒有被移除: %(message)s"
-#: ../src/config.py:4035
+#: ../src/config.py:4085
+#, python-format
+msgid "Configure %s"
+msgstr "çµ„é… %s"
+
+#: ../src/config.py:4101 ../src/plugins/gui.py:73
msgid "Active"
msgstr "活動"
-#: ../src/config.py:4043
+#: ../src/config.py:4109
msgid "Event"
msgstr "事件"
-#: ../src/config.py:4078
+#: ../src/config.py:4144
msgid "First Message Received"
msgstr "最åˆæ”¶åˆ°çš„訊æ¯"
-#: ../src/config.py:4079
+#: ../src/config.py:4145
msgid "Next Message Received Focused"
msgstr "å·²èšç„¦æ”¶åˆ°çš„下一ç†è¨Šæ¯"
-#: ../src/config.py:4081
+#: ../src/config.py:4147
msgid "Next Message Received Unfocused"
msgstr "解除èšç„¦æ”¶åˆ°çš„下一ç†è¨Šæ¯"
-#: ../src/config.py:4082
+#: ../src/config.py:4148
msgid "Contact Connected"
msgstr "已連線的è¯çµ¡äºº"
-#: ../src/config.py:4083
+#: ../src/config.py:4149
msgid "Contact Disconnected"
msgstr "è¯çµ¡äººå·²ä¸æ–·é€£ç·š"
-#: ../src/config.py:4084
+#: ../src/config.py:4150
msgid "Message Sent"
msgstr "訊æ¯å·²å‚³é€"
-#: ../src/config.py:4085
+#: ../src/config.py:4151
msgid "Group Chat Message Highlight"
msgstr "多人èŠå¤©è¨Šæ¯é«˜äº®åº¦é¡¯ç¤º"
-#: ../src/config.py:4086
+#: ../src/config.py:4152
msgid "Group Chat Message Received"
msgstr "收到的多人èŠå¤©è¨Šæ¯"
-#: ../src/config.py:4087
+#: ../src/config.py:4153
msgid "GMail Email Received"
msgstr "收到 GMail 郵件"
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:603
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
"for a long time, it's likely the message got lost."
-msgstr "這個圖示是說這æ¢è¨Šæ¯é‚„沒有被é 端收到。如果這個圖示已經å˜åœ¨å¾ˆä¹…了，很å¯èƒ½é€™æ¢è¨Šæ¯ä¸Ÿå¤±äº†ã€‚"
+msgstr ""
+"這個圖示是說這æ¢è¨Šæ¯é‚„沒有被é 端收到。如果這個圖示已經å˜åœ¨å¾ˆä¹…了，很å¯èƒ½é€™æ¢"
+"訊æ¯ä¸Ÿå¤±äº†ã€‚"
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:622
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
msgstr "以下文å—是您上次注æ„這個èŠå¤©å®¤ä»¥ä¾†çš„èŠå¤©å…§å®¹"
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:742
msgid "_Quote"
msgstr "åƒç…§(_Q)"
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:749
#, python-format
msgid "_Actions for \"%s\""
msgstr "\"%s\"的動作(_A)"
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
msgid "Read _Wikipedia Article"
msgstr "檢視 Wikipedia æ–‡ç« (_W)"
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:767
msgid "Look it up in _Dictionary"
msgstr "從å—å…¸ä¸æœå°‹(_D)"
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:784
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "å—å…¸ä½å€ä¸ç¼ºå°‘ \"%s\" 並且它ä¸æ˜¯ \"WIKTIONARY\""
#. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:797
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "網路æœå°‹ä½å€ç¼ºå°‘ \"%s\""
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:800
msgid "Web _Search for it"
msgstr "在網際網路上æœå°‹(_S)"
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:806
msgid "Open as _Link"
msgstr "åšç‚ºé€£çµé–‹å•Ÿ(_L)"
#. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1310
#, python-format
msgid "Yesterday"
-msgid_plural "%i days ago"
-msgstr[0] "%i天å‰"
+msgid_plural "%(nb_days)i days ago"
+msgstr[0] "%(nb_days)i天å‰"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1359 ../src/history_window.py:480
#, python-format
msgid "Subject: %s\n"
msgstr "主題: %s\n"
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:565
msgid "Unable to load image"
msgstr "無法載入圖åƒ"
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:567
#, python-format
msgid "Media type not supported: %s"
msgstr "ä¸æ”¯æ´çš„媒體類型: %s"
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:582
msgid "This field is required"
msgstr "æ¤ä¸€é …æ˜¯å¿…é ˆçš„"
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:627
msgid "Jabber ID already in list"
msgstr "Jabber ID 已經在清單ä¸äº†"
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:628
msgid "The Jabber ID you entered is already in the list. Choose another one."
msgstr "您輸入的 Jabber ID 已經在清單ä¸äº†ã€‚è«‹é¸æ“‡å¦å¤–一個。"
#. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:639
msgid "new@jabber.id"
msgstr "new@jabber.id"
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
#, python-format
msgid "new%d@jabber.id"
msgstr "new%d@jabber.id"
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:81
#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "è¯çµ¡äººå稱: <i>%s</i>"
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:83
#, python-format
msgid "Jabber ID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+msgstr "Jabber ID: <i>%s</i>"
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:197
msgid "Group"
msgstr "群組"
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:204
msgid "In the group"
msgstr "群組內"
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:295
msgid "KeyID"
msgstr "KeyID"
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:300
msgid "Contact name"
msgstr "è¯çµ¡äººå稱"
-#: ../src/dialogs.py:473
+#: ../src/dialogs.py:475
msgid "Set Mood"
msgstr "è¨å®š Mood"
-#: ../src/dialogs.py:593
+#: ../src/dialogs.py:595
#, python-format
msgid "%s Status Message"
msgstr " %s 狀態訊æ¯"
-#: ../src/dialogs.py:607
+#: ../src/dialogs.py:609
msgid "Status Message"
msgstr "狀態訊æ¯"
-#: ../src/dialogs.py:796
+#: ../src/dialogs.py:800
msgid "Overwrite Status Message?"
msgstr "覆寫狀態訊�"
-#: ../src/dialogs.py:797
-msgid "This name is already used. Do you want to overwrite this status message?"
+#: ../src/dialogs.py:801
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
msgstr "這個å稱已被使用。您想è¦è¦†å¯«é€™å€‹ç‹€æ…‹è¨Šæ¯å—Ž?"
-#: ../src/dialogs.py:805
+#: ../src/dialogs.py:809
msgid "Save as Preset Status Message"
msgstr "å¦å˜ç‚ºé è¨ç‹€æ…‹è¨Šæ¯"
-#: ../src/dialogs.py:806
+#: ../src/dialogs.py:810
msgid "Please type a name for this status message"
msgstr "請為這個狀態訊æ¯è¼¸å…¥ä¸€å€‹å稱"
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:838
msgid "AIM Address:"
-msgstr "AIM ä½å€: "
+msgstr "AIM ä½å€:"
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:839
msgid "GG Number:"
-msgstr "GG 號碼: "
+msgstr "GG 號碼:"
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:840
msgid "ICQ Number:"
-msgstr "ICQ 號碼: "
+msgstr "ICQ 號碼:"
-#: ../src/dialogs.py:837
+#: ../src/dialogs.py:841
msgid "MSN Address:"
-msgstr "MSN ä½å€: "
+msgstr "MSN ä½å€:"
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:842
msgid "Yahoo! Address:"
-msgstr "Yahoo! ä½å€: "
+msgstr "Yahoo! ä½å€:"
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:879
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr "è«‹å¡«å…¥æ‚¨æƒ³åŠ å…¥åˆ°å¸³è™Ÿ %s çš„è¯çµ¡äººçš„資訊"
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:882
msgid "Please fill in the data of the contact you want to add"
msgstr "è«‹å¡«å…¥æ‚¨æƒ³åŠ å…¥çš„è¯çµ¡äººçš„資訊"
-#: ../src/dialogs.py:1047 ../src/dialogs.py:1053 ../src/dialogs.py:1058
-#: ../src/dialogs.py:3466
+#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
+#: ../src/dialogs.py:3615
msgid "Invalid User ID"
msgstr "無效的使用者ID"
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1081
msgid "The user ID must not contain a resource."
msgstr "使用者IDä¸æ‡‰åŒ…å«è³‡æºã€‚"
-#: ../src/dialogs.py:1059
+#: ../src/dialogs.py:1086
msgid "You cannot add yourself to your roster."
msgstr "您ä¸èƒ½å°‡æ‚¨è‡ªå·±åŠ 入到您的è¯çµ¡äººæ¸…å–®ä¸ã€‚"
-#: ../src/dialogs.py:1073
+#: ../src/dialogs.py:1100
msgid "Contact already in roster"
msgstr "è¯çµ¡äººå·²ç¶“在è¯çµ¡äººæ¸…å–®ä¸"
-#: ../src/dialogs.py:1074
+#: ../src/dialogs.py:1101
msgid "This contact is already listed in your roster."
msgstr "æ¤è¯çµ¡äººå·²ç¶“在您的è¯çµ¡äººæ¸…å–®ä¸äº†"
-#: ../src/dialogs.py:1120
+#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
msgid "User ID:"
-msgstr "使用者 ID: "
+msgstr "使用者 ID:"
-#: ../src/dialogs.py:1191
-msgid "A GTK+ jabber client"
-msgstr "一個 GTK+ Jabber 客戶端"
+#: ../src/dialogs.py:1273
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "一個 GTK+ 的 Jabber 客戶端"
-#: ../src/dialogs.py:1192
+#: ../src/dialogs.py:1274
msgid "GTK+ Version:"
-msgstr "GTK+ 版本: "
+msgstr "GTK+ 版本:"
-#: ../src/dialogs.py:1193
+#: ../src/dialogs.py:1275
msgid "PyGTK Version:"
-msgstr "PyGTK 版本: "
+msgstr "PyGTK 版本:"
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1285
msgid "Current Developers:"
-msgstr "ç›®å‰çš„開發者: "
+msgstr "ç›®å‰çš„開發者:"
-#: ../src/dialogs.py:1205
+#: ../src/dialogs.py:1287
msgid "Past Developers:"
-msgstr "既往開發者: "
+msgstr "既往開發者:"
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1293
msgid "THANKS:"
-msgstr "æ„Ÿè¬: "
+msgstr "æ„Ÿè¬:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1217
+#: ../src/dialogs.py:1299
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:1229
+#: ../src/dialogs.py:1311
msgid "translator-credits"
msgstr ""
"wwld <wwld@radio.lzusiyu.org>\n"
"kangkang <kanger@gmail.com>\n"
"jeanet <qianxiaojun604@gmail.com>\n"
"Guanhao Yin <yinguanhao@gmail.com>\n"
-"root <root@localdomain>"
+"趙惟倫 <chaoweilun@gmail.com>"
-#: ../src/dialogs.py:1412
+#: ../src/dialogs.py:1494
#, python-format
msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n\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 è©žå…¸æ‰èƒ½ä½¿ç”¨æ‹¼å¯«æª¢æŸ¥ï¼Œæˆ–是在拼寫檢查語言é¸é …ä¸è¨å®šå¦ä¸€ç¨®èªžè¨€ã€‚\n"
+"æ‚¨å¿…é ˆå®‰è£ %s è©žå…¸æ‰èƒ½ä½¿ç”¨æ‹¼å¯«æª¢æŸ¥ï¼Œæˆ–是在拼寫檢查語言é¸é …ä¸è¨å®šå¦ä¸€ç¨®èªž"
+"言。\n"
"高亮度拼寫錯誤的特性ä¸æœƒè¢«å•Ÿç”¨ã€‚"
-#: ../src/dialogs.py:1953 ../src/dialogs.py:2340
+#: ../src/dialogs.py:1872
+msgid "_Resume"
+msgstr "å†çºŒ(_R)"
+
+#: ../src/dialogs.py:1880
+msgid "Re_place"
+msgstr "ç½®æ›(_P)"
+
+#: ../src/dialogs.py:2071 ../src/dialogs.py:2470
msgid "The nickname has not allowed characters."
msgstr "暱稱包å«ä¸åˆæ³•å—元。"
-#: ../src/dialogs.py:2071
+#: ../src/dialogs.py:2189
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "%(jid)s å°å¸³è™Ÿ %(account)s çš„èªè‰è«‹æ±‚"
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2192
#, python-format
msgid "Subscription request from %s"
msgstr "%s çš„èªè‰è«‹æ±‚"
-#: ../src/dialogs.py:2149 ../src/gui_interface.py:2402
+#: ../src/dialogs.py:2276 ../src/gui_interface.py:1925
#, python-format
msgid "You are already in group chat %s"
msgstr "您已經在èŠå¤©å®¤ %s"
-#: ../src/dialogs.py:2155
+#: ../src/dialogs.py:2282
msgid "You can not join a group chat unless you are connected."
msgstr "æ‚¨å¿…é ˆé€£ç·šæ‰èƒ½åŠ å…¥èŠå¤©å®¤ã€‚"
-#: ../src/dialogs.py:2196
+#: ../src/dialogs.py:2326
#, python-format
msgid "Join Group Chat with account %s"
msgstr "使用帳號 %s åŠ å…¥èŠå¤©å®¤"
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2457
msgid "Invalid Account"
msgstr "無效的帳號"
-#: ../src/dialogs.py:2328
-msgid "You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2458
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
msgstr "您需è¦é¸æ“‡ä¸€å€‹å¸³è™Ÿï¼Œç”¨å®ƒä¾†åŠ å…¥èŠå¤©å®¤ã€‚"
-#: ../src/dialogs.py:2339
+#: ../src/dialogs.py:2469
msgid "Invalid Nickname"
msgstr "ä¸åˆæ³•çš„暱稱"
-#: ../src/dialogs.py:2344 ../src/dialogs.py:2350
-#: ../src/groupchat_control.py:1877
+#: ../src/dialogs.py:2474 ../src/dialogs.py:2480
+#: ../src/groupchat_control.py:2079
msgid "Invalid group chat Jabber ID"
msgstr "無效的èŠå¤©å®¤ Jabber ID"
-#: ../src/dialogs.py:2345
+#: ../src/dialogs.py:2475
msgid "Please enter the group chat Jabber ID as room@server."
msgstr "請輸入èŠå¤©å®¤çš„ Jabber ID，以 room@server çš„å½¢å¼ã€‚"
-#: ../src/dialogs.py:2351 ../src/groupchat_control.py:1878
+#: ../src/dialogs.py:2481 ../src/groupchat_control.py:2080
msgid "The group chat Jabber ID has not allowed characters."
msgstr "èŠå¤©å®¤ Jabber ID 包å«ä¸åˆæ³•å—元。"
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2485 ../src/gui_interface.py:1907
msgid "This is not a group chat"
msgstr "這ä¸æ˜¯ä¸€å€‹èŠå¤©å®¤"
-#: ../src/dialogs.py:2359
+#: ../src/dialogs.py:2486 ../src/gui_interface.py:1908
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s ä¸æ˜¯ä¸€å€‹èŠå¤©å®¤çš„å稱。"
-#: ../src/dialogs.py:2390
+#: ../src/dialogs.py:2518
msgid "Without a connection, you can not synchronise your contacts."
msgstr "未連線時，您ä¸èƒ½åŒæ¥æ‚¨çš„è¯çµ¡äººã€‚"
-#: ../src/dialogs.py:2404
+#: ../src/dialogs.py:2531
msgid "Server"
msgstr "伺æœå™¨"
-#: ../src/dialogs.py:2439
+#: ../src/dialogs.py:2567
msgid "This account is not connected to the server"
msgstr "這個帳號已經連線到伺æœå™¨"
-#: ../src/dialogs.py:2440
+#: ../src/dialogs.py:2568
msgid "You cannot synchronize with an account unless it is connected."
msgstr "這個帳號連線後您æ‰å¯ä»¥èˆ‡ä¹‹åŒæ¥"
-#: ../src/dialogs.py:2464
+#: ../src/dialogs.py:2593
msgid "Synchronise"
msgstr "åŒæ¥"
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2654
#, python-format
msgid "Start Chat with account %s"
msgstr "使用帳號 %s 開始èŠå¤©"
-#: ../src/dialogs.py:2527
+#: ../src/dialogs.py:2656
msgid "Start Chat"
msgstr "開始èŠå¤©"
-#: ../src/dialogs.py:2528
+#: ../src/dialogs.py:2657
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
-msgstr "填寫一個暱稱或是 Jabber ID，您將è¦çµ¦å…¶å‚³é€èŠå¤©è¨Šæ¯: "
+msgstr "填寫一個暱稱或是 Jabber ID，您將è¦çµ¦å…¶å‚³é€èŠå¤©è¨Šæ¯:"
#. if offline or connecting
-#: ../src/dialogs.py:2554 ../src/dialogs.py:2935 ../src/dialogs.py:3147
+#: ../src/dialogs.py:2684 ../src/dialogs.py:3065 ../src/dialogs.py:3295
msgid "Connection not available"
msgstr "連線無法使用"
-#: ../src/dialogs.py:2555 ../src/dialogs.py:2936 ../src/dialogs.py:3148
+#: ../src/dialogs.py:2685 ../src/dialogs.py:3066 ../src/dialogs.py:3296
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "請確èªæ‚¨å·²ç¶“連線到 \"%s\"。"
-#: ../src/dialogs.py:2564 ../src/dialogs.py:2567
+#: ../src/dialogs.py:2694 ../src/dialogs.py:2697
msgid "Invalid JID"
msgstr "無效的 JID"
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:2697
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "ç„¡æ³•è§£æž \"%s\"。"
-#: ../src/dialogs.py:2576
+#: ../src/dialogs.py:2706
msgid "Without a connection, you can not change your password."
msgstr "連線後æ‰å¯è®Šæ›´å¯†ç¢¼ã€‚"
-#: ../src/dialogs.py:2595
+#: ../src/dialogs.py:2725
msgid "Invalid password"
msgstr "無效密碼"
-#: ../src/dialogs.py:2595
+#: ../src/dialogs.py:2725
msgid "You must enter a password."
msgstr "æ‚¨å¿…é ˆè¼¸å…¥å¯†ç¢¼"
-#: ../src/dialogs.py:2599
+#: ../src/dialogs.py:2729
msgid "Passwords do not match"
msgstr "密碼ä¸ç¬¦"
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2730
msgid "The passwords typed in both fields must be identical."
msgstr "在兩個輸入框ä¸è¼¸å…¥çš„å¯†ç¢¼å¿…é ˆä¸€è‡´ã€‚"
-#. default value
-#: ../src/dialogs.py:2637 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "è¯çµ¡äººç™»å…¥"
-
-#: ../src/dialogs.py:2639 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "è¯çµ¡äººé›¢é–‹ç™»å…¥"
-
-#. chat message
-#: ../src/dialogs.py:2641 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "新訊æ¯"
-
-#. single message
-#: ../src/dialogs.py:2641 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "æ–°å–®æ¢è¨Šæ¯"
-
-#. private message
-#: ../src/dialogs.py:2642 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "新個人訊æ¯"
-
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1095 ../src/notify.py:487
+#: ../src/dialogs.py:2772 ../src/gui_interface.py:813 ../src/notify.py:270
msgid "New E-mail"
msgstr "æ–°é›»å郵件"
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1154 ../src/notify.py:480
+#: ../src/dialogs.py:2774 ../src/gui_interface.py:868 ../src/notify.py:263
msgid "File Transfer Request"
msgstr "檔案傳輸請求"
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1057
-#: ../src/gui_interface.py:1123 ../src/notify.py:482
+#: ../src/dialogs.py:2776 ../src/gui_interface.py:775
+#: ../src/gui_interface.py:839 ../src/notify.py:265
msgid "File Transfer Error"
msgstr "檔案傳輸錯誤"
-#: ../src/dialogs.py:2648 ../src/gui_interface.py:1200
-#: ../src/gui_interface.py:1223 ../src/gui_interface.py:1240
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2778 ../src/gui_interface.py:914
+#: ../src/gui_interface.py:937 ../src/gui_interface.py:954
+#: ../src/notify.py:267
msgid "File Transfer Completed"
msgstr "檔案傳輸完æˆ"
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:1203 ../src/notify.py:485
+#: ../src/dialogs.py:2779 ../src/gui_interface.py:917 ../src/notify.py:268
msgid "File Transfer Stopped"
msgstr "檔案傳輸已åœæ¢"
-#: ../src/dialogs.py:2651 ../src/gui_interface.py:908 ../src/notify.py:489
+#: ../src/dialogs.py:2781 ../src/gui_interface.py:609 ../src/notify.py:272
msgid "Groupchat Invitation"
msgstr "多人èŠå¤©é‚€è«‹"
-#: ../src/dialogs.py:2653 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "è¯çµ¡äººç‹€æ…‹è®Šæ›´"
-
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:2984
#, python-format
msgid "Single Message using account %s"
msgstr "å–®æ¢è¨Šæ¯ï¼Œä½¿ç”¨å¸³è™Ÿ %s"
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:2986
#, python-format
msgid "Single Message in account %s"
msgstr "å–®æ¢è¨Šæ¯ï¼Œåœ¨å¸³è™Ÿ %s"
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:2988
msgid "Single Message"
msgstr "å–®æ¢è¨Šæ¯"
#. prepare UI for Sending
-#: ../src/dialogs.py:2861
+#: ../src/dialogs.py:2991
#, python-format
msgid "Send %s"
msgstr "å‚³é€ %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2884
+#: ../src/dialogs.py:3014
#, python-format
msgid "Received %s"
msgstr "已接收 %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2907
+#: ../src/dialogs.py:3037
#, 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:2986
+#: ../src/dialogs.py:3116
#, python-format
msgid "RE: %s"
msgstr "回復: %s"
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3117
#, python-format
msgid "%s wrote:\n"
msgstr "%s 寫é“: \n"
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3176
#, python-format
msgid "XML Console for %s"
msgstr "帳號 %s 的 XML 主控臺"
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3178
msgid "XML Console"
msgstr " XML 主控臺"
#. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3177
+#: ../src/dialogs.py:3325
msgid "add"
msgstr "åŠ å…¥"
-#: ../src/dialogs.py:3177
+#: ../src/dialogs.py:3325
msgid "modify"
msgstr "修改"
-#: ../src/dialogs.py:3178
+#: ../src/dialogs.py:3326
msgid "remove"
msgstr "移除"
-#: ../src/dialogs.py:3206
+#: ../src/dialogs.py:3355
#, python-format
-msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些è¯çµ¡äººã€‚"
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3268
+#: ../src/dialogs.py:3371 ../src/dialogs.py:3417
msgid "Add"
msgstr "åŠ å…¥"
#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3224 ../src/dialogs.py:3299
+#: ../src/dialogs.py:3373 ../src/dialogs.py:3448
msgid "Modify"
msgstr "修改"
-#: ../src/dialogs.py:3230
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3375 ../src/dialogs.py:3472
+msgid "Delete"
+msgstr "刪除"
+
+#: ../src/dialogs.py:3379
msgid "Jabber ID"
msgstr "Jabber ID"
-#: ../src/dialogs.py:3236
+#: ../src/dialogs.py:3385
msgid "Groups"
msgstr "群組"
#. it is selected
#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3344
+#: ../src/dialogs.py:3493
#, python-format
msgid "%s suggested me to add you in my roster."
msgstr "%s 建è°æˆ‘å°‡æ‚¨åŠ å…¥åˆ°æˆ‘çš„è¯çµ¡äººæ¸…單。"
-#: ../src/dialogs.py:3358
+#: ../src/dialogs.py:3507
#, python-format
msgid "Added %s contacts"
msgstr "åŠ å…¥äº† %s è¯çµ¡äºº"
-#: ../src/dialogs.py:3395
+#: ../src/dialogs.py:3544
#, python-format
msgid "Removed %s contacts"
msgstr "移除了 %s è¯çµ¡äºº"
-#: ../src/dialogs.py:3435 ../src/dialogs.py:3612
+#: ../src/dialogs.py:3584 ../src/dialogs.py:3761
#, python-format
msgid "Archiving Preferences for %s"
msgstr "%s çš„å˜æª”å好è¨å®š"
-#: ../src/dialogs.py:3475
+#: ../src/dialogs.py:3624
msgid "Invalid expire value"
msgstr "無效的éŽæœŸå€¼"
-#: ../src/dialogs.py:3476
+#: ../src/dialogs.py:3625
msgid "Expire must be a valid positive integer."
msgstr "éŽæœŸå€¼å¿…é ˆæ˜¯ä¸€å€‹æœ‰æ•ˆçš„æ£æ•´æ•¸ã€‚"
-#: ../src/dialogs.py:3523
+#: ../src/dialogs.py:3672
msgid "There is an error with the form"
msgstr "åœ¨è¡¨æ ¼ä¸æœ‰ä¸€è™•éŒ¯èª¤"
-#: ../src/dialogs.py:3734
+#: ../src/dialogs.py:3892
msgid "There is an error"
msgstr "有一處錯誤"
-#: ../src/dialogs.py:3798
+#: ../src/dialogs.py:3960
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "éš±ç§ç–略清單 <b><i>%s</i></b>"
-#: ../src/dialogs.py:3802
+#: ../src/dialogs.py:3964
#, python-format
msgid "Privacy List for %s"
msgstr "%s çš„éš±ç§ç–略清單"
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4031
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr "é †åº: %(order)s，動作: %(action)s，類型: %(type)s，值: %(value)s"
-#: ../src/dialogs.py:3863
+#: ../src/dialogs.py:4036
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "é †åº: %(order)s，動作: %(action)s"
-#: ../src/dialogs.py:3907
+#: ../src/dialogs.py:4087
msgid "<b>Edit a rule</b>"
msgstr "<b>編輯è¦å‰‡</b>"
-#: ../src/dialogs.py:4018
+#: ../src/dialogs.py:4198
msgid "<b>Add a rule</b>"
msgstr "<b>åŠ å…¥è¦å‰‡</b>"
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4297
#, python-format
msgid "Privacy Lists for %s"
msgstr "%s çš„éš±ç§ç–略清單"
-#: ../src/dialogs.py:4120
+#: ../src/dialogs.py:4299
msgid "Privacy Lists"
msgstr "éš±ç§ç–略清單"
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4388
msgid "Invalid List Name"
msgstr "ä¸åˆæ³•çš„清單å稱"
-#: ../src/dialogs.py:4191
+#: ../src/dialogs.py:4389
msgid "You must enter a name to create a privacy list."
msgstr "æ‚¨å¿…é ˆè¼¸å…¥ä¸€å€‹å稱以建立一個隱ç§ç–略清單。"
-#: ../src/dialogs.py:4223
+#: ../src/dialogs.py:4421
msgid "You are invited to a groupchat"
msgstr "您被邀請到一個èŠå¤©å®¤"
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4424
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact é‚€è«‹æ‚¨åŠ å…¥ä¸€å€‹èŠå¤©å®¤"
-#: ../src/dialogs.py:4228
+#: ../src/dialogs.py:4426
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact 邀請您åƒåŠ èŠå¤©å®¤ %(room_jid)s"
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4434
#, python-format
msgid "Comment: %s"
msgstr "註釋: %s"
-#: ../src/dialogs.py:4238
+#: ../src/dialogs.py:4436
msgid "Do you want to accept the invitation?"
msgstr "您是å¦æŽ¥å—邀請?"
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4498
msgid "Choose Client Cert #PCKS12"
msgstr "é¸æ“‡å®¢æˆ¶ç«¯è‰æ›¸ #PCKS12"
-#: ../src/dialogs.py:4310 ../src/dialogs.py:4353 ../src/dialogs.py:4409
-#: ../src/dialogs.py:4497
+#: ../src/dialogs.py:4508 ../src/dialogs.py:4550 ../src/dialogs.py:4606
+#: ../src/dialogs.py:4694
msgid "All files"
msgstr "所有檔案"
-#: ../src/dialogs.py:4315
+#: ../src/dialogs.py:4513
msgid "PKCS12 Files"
msgstr "PKCS12 檔案"
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4540
msgid "Choose Sound"
msgstr "é¸æ“‡è²éŸ³"
-#: ../src/dialogs.py:4358
+#: ../src/dialogs.py:4555
msgid "Wav Sounds"
msgstr "Wavè²éŸ³"
-#: ../src/dialogs.py:4396
+#: ../src/dialogs.py:4593
msgid "Choose Image"
msgstr "é¸æ“‡åœ–åƒ"
-#: ../src/dialogs.py:4414
+#: ../src/dialogs.py:4611
msgid "Images"
msgstr "圖åƒ"
-#: ../src/dialogs.py:4484
+#: ../src/dialogs.py:4681
msgid "Choose Archive"
msgstr "é¸æ“‡æ¸æª”檔案"
-#: ../src/dialogs.py:4502
+#: ../src/dialogs.py:4699
msgid "Zip files"
msgstr "Zip 檔案"
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4725
#, python-format
msgid "When %s becomes:"
-msgstr "當 %s 變為: "
+msgstr "當 %s 變為:"
-#: ../src/dialogs.py:4529
+#: ../src/dialogs.py:4727
#, python-format
msgid "Adding Special Notification for %s"
msgstr "æ£åœ¨ç‚º %s åŠ å…¥ç‰¹æ®Šæ示"
-#: ../src/dialogs.py:4604
-msgid "Condition"
-msgstr "æ¢ä»¶"
-
-#: ../src/dialogs.py:4724
-msgid "when I am "
-msgstr "當我"
-
-#: ../src/dialogs.py:5200
+#: ../src/dialogs.py:4947
#, python-format
msgid ""
-"Your chat session with <b>%(jid)s</b> is encrypted.\n\n"
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
+"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
-"您與 <b>%(jid)s</b> çš„èŠå¤©ä½œæ¥éšŽæ®µå·²è¢«åŠ 密。\n\n"
+"您與 <b>%(jid)s</b> çš„èŠå¤©ä½œæ¥éšŽæ®µå·²è¢«åŠ 密。\n"
+"\n"
"作æ¥éšŽæ®µçš„çŸèªè‰å—串是 <b>%(sas)s</b>。"
-#: ../src/dialogs.py:5203
+#: ../src/dialogs.py:4950
msgid "You have already verified this contact's identity."
msgstr "您已經確èªäº†é€™å€‹è¯çµ¡äººçš„身分。"
-#: ../src/dialogs.py:5209 ../src/dialogs.py:5293
+#: ../src/dialogs.py:4956 ../src/dialogs.py:5040
msgid "Contact's identity verified"
msgstr "è¯çµ¡äººèº«åˆ†å·²ç¢ºèª"
-#: ../src/dialogs.py:5215
+#: ../src/dialogs.py:4962
msgid "Verify again..."
msgstr "é‡æ–°é©—è‰â€¦"
-#: ../src/dialogs.py:5220
-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:4967
+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:5223 ../src/dialogs.py:5274 ../src/dialogs.py:5287
+#: ../src/dialogs.py:4970 ../src/dialogs.py:5021 ../src/dialogs.py:5034
msgid "Contact's identity NOT verified"
msgstr "è¯çµ¡äººèº«åˆ†æœªç¢ºèª"
-#: ../src/dialogs.py:5228
+#: ../src/dialogs.py:4975
msgid "Verify..."
msgstr "確èªâ€¦"
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:4986
msgid "Have you verified the contact's identity?"
msgstr "您確èªäº†è¯çµ¡äººçš„身分嗎?"
-#: ../src/dialogs.py:5240
+#: ../src/dialogs.py:4987
#, 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\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> 直接交談(當é¢æˆ–通電話)並確èªä»–們看到的çŸèªè‰å—串(SAS)與您相åŒã€‚\n\n"
+"為了防æ¢æ‚¨æ˜¯åœ¨èˆ‡ä¸æ˜Žæ–¹äº¤è«‡ï¼Œæ‚¨æ‡‰è©²èˆ‡ <b>%(jid)s</b> 直接交談(當é¢æˆ–通電話)並"
+"確èªä»–們看到的çŸèªè‰å—串(SAS)與您相åŒã€‚\n"
+"\n"
"這次作æ¥éšŽæ®µçš„çŸèªè‰å—串是 <b>%(sas)s</b>"
-#: ../src/dialogs.py:5241
+#: ../src/dialogs.py:4988
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "您與é 端è¯çµ¡äººé€šè©±ä¸¦é©—è‰äº† SAS å—Ž?"
-#: ../src/dialogs.py:5275
+#: ../src/dialogs.py:5022
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
msgstr "è¯çµ¡äººçš„密鑰(%s)與在 Gajim ä¸æŒ‡å®šçš„密鑰<b>ä¸åŒ¹é…</b>。"
-#: ../src/dialogs.py:5281
+#: ../src/dialogs.py:5028
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr "沒有為這個è¯çµ¡äººæŒ‡å®šå¯†é‘°ã€‚å› æ¤æ‚¨ç„¡æ³•åŠ 密訊æ¯ã€‚"
-#: ../src/dialogs.py:5288
-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 "盡管為這個è¯çµ¡äººæŒ‡å®šäº†å¯†é‘°ï¼Œä½†æ‚¨<b>ä¸ä¿¡ä»»</b>ä»–çš„å¯†é‘°ï¼Œå› æ¤è¨Šæ¯<b>無法</b>è¢«åŠ å¯†ã€‚ä½¿ç”¨æ‚¨çš„ GPG 客戶端以信任他的密鑰。"
+#: ../src/dialogs.py:5035
+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 ""
+"盡管為這個è¯çµ¡äººæŒ‡å®šäº†å¯†é‘°ï¼Œä½†æ‚¨<b>ä¸ä¿¡ä»»</b>ä»–çš„å¯†é‘°ï¼Œå› æ¤è¨Šæ¯<b>無法</b>被"
+"åŠ å¯†ã€‚ä½¿ç”¨æ‚¨çš„ GPG 客戶端以信任他的密鑰。"
-#: ../src/dialogs.py:5294
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
+#: ../src/dialogs.py:5041
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
msgstr "è¯çµ¡äººè¢«æŒ‡å®šäº† GPG 密鑰，且您信任他的密鑰，所以訊æ¯æœƒè¢«åŠ 密。"
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5106
msgid "an audio and video"
msgstr "一個音訊和視訊"
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5108
msgid "an audio"
msgstr "一個音訊"
-#: ../src/dialogs.py:5363
+#: ../src/dialogs.py:5110
msgid "a video"
msgstr "一個視訊"
-#: ../src/dialogs.py:5367
+#: ../src/dialogs.py:5114
#, python-format
-msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
msgstr "%(contact)s 想è¦èˆ‡æ‚¨ç™¼èµ·ä¸€å€‹ %(type)s 作æ¥éšŽæ®µã€‚您è¦å›žæ‡‰å—Ž?"
+#: ../src/dialogs.py:5182
+#, python-format
+msgid "Certificate for account %s"
+msgstr "å¸³è™Ÿæ†‘è‰ %s"
+
+#: ../src/dialogs.py:5182
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+"<b>發行å°è±¡:</b>\n"
+"一般å稱 (CN):%(scn)s\n"
+"組織 (O):%(sorg)s\n"
+"çµ„ç¹”å–®ä½ (OU):%(sou)s\n"
+"åºè™Ÿ:%(sn)s\n"
+"\n"
+"<b>發行來æº:</b>\n"
+"一般å稱 (CN):%(icn)s\n"
+"組織 (O):%(iorg)s\n"
+"çµ„ç¹”å–®ä½ (OU):%(iou)s\n"
+"\n"
+"<b>效力:</b>\n"
+"發行日:%(io)s\n"
+"逾期日:%(eo)s\n"
+"\n"
+"<b>指紋</b>\n"
+"SHA1 指紋:%(sha1)s"
+
+#: ../src/dialogs.py:5216 ../src/dialogs.py:5233
+msgid "View cert..."
+msgstr "檢視憑è‰â€¦"
+
#: ../src/disco.py:119
msgid "Others"
msgstr "其他"
@@ -7141,57 +7515,59 @@ msgstr "其他"
msgid "Conference"
msgstr "會è°"
-#: ../src/disco.py:513
+#: ../src/disco.py:516
msgid "Without a connection, you can not browse available services"
msgstr "連線後æ‰å¯ç€è¦½å¯ç”¨æœå‹™"
-#: ../src/disco.py:600
+#: ../src/disco.py:602
#, python-format
msgid "Service Discovery using account %s"
msgstr "æ£åœ¨ä½¿ç”¨å¸³è™Ÿ %s 來發掘æœå‹™"
-#: ../src/disco.py:602
+#: ../src/disco.py:604
msgid "Service Discovery"
msgstr "æœå°‹æœå‹™"
-#: ../src/disco.py:758
+#: ../src/disco.py:760
msgid "The service could not be found"
msgstr "找ä¸åˆ°è©²æœå‹™"
-#: ../src/disco.py:759
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
+#: ../src/disco.py:761
+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:763 ../src/disco.py:1100
+#: ../src/disco.py:765 ../src/disco.py:1102
msgid "The service is not browsable"
msgstr "該æœå‹™ç„¡æ³•ç€è¦½"
-#: ../src/disco.py:764
+#: ../src/disco.py:766
msgid "This type of service does not contain any items to browse."
msgstr "æ¤æœå‹™æ²’æœ‰é …ç›®å¯ç€è¦½ã€‚"
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:806 ../src/disco.py:816
msgid "Invalid Server Name"
msgstr "無效的伺æœå™¨å稱"
-#: ../src/disco.py:868
+#: ../src/disco.py:870
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "用帳號 %(account)s ç€è¦½ä½å€ %(address)s"
-#: ../src/disco.py:912
+#: ../src/disco.py:914
msgid "_Browse"
msgstr "ç€è¦½(_B)"
-#: ../src/disco.py:1101
+#: ../src/disco.py:1103
msgid "This service does not contain any items to browse."
msgstr "æ¤æœå‹™ä¸åŒ…å«ä»»ä½•é …ç›®å¯ç€è¦½ã€‚"
-#: ../src/disco.py:1341
+#: ../src/disco.py:1343
msgid "_Execute Command"
msgstr "執行命令(_E)…"
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1353 ../src/disco.py:1522
msgid "Re_gister"
msgstr "註冊(_G)"
@@ -7215,247 +7591,292 @@ msgstr "æè¿°"
msgid "Id"
msgstr "Id"
-#: ../src/disco.py:1835 ../src/gui_interface.py:2927
+#: ../src/disco.py:1835 ../src/gui_interface.py:2443
msgid "Bookmark already set"
msgstr "書籤已è¨å®š"
-#: ../src/disco.py:1836 ../src/gui_interface.py:2928
+#: ../src/disco.py:1836 ../src/gui_interface.py:2444
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "èŠå¤©å®¤\"%s\"已在您的書籤ä¸ã€‚"
-#: ../src/disco.py:1845 ../src/gui_interface.py:2942
+#: ../src/disco.py:1845 ../src/gui_interface.py:2458
msgid "Bookmark has been added successfully"
msgstr "æ›¸ç±¤åŠ å…¥æˆåŠŸ"
-#: ../src/disco.py:1846 ../src/gui_interface.py:2943
+#: ../src/disco.py:1846 ../src/gui_interface.py:2459
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "您å¯ä»¥é€éŽ\"動作\"é¸å–®ç®¡ç†æ‚¨çš„書籤。"
-#: ../src/disco.py:2057
+#: ../src/disco.py:2055
msgid "Subscribed"
msgstr "訂閱"
-#: ../src/disco.py:2065
+#: ../src/disco.py:2063
msgid "Node"
msgstr "節點"
-#: ../src/disco.py:2129
+#: ../src/disco.py:2127
msgid "New post"
msgstr "新發表"
-#: ../src/disco.py:2135
+#: ../src/disco.py:2133
msgid "_Subscribe"
msgstr "訂閱(_S)"
-#: ../src/disco.py:2141
+#: ../src/disco.py:2139
msgid "_Unsubscribe"
msgstr "退訂(_S)"
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
-msgstr "SSL è‰æ›¸é©—è‰"
-
#: ../src/features_window.py:50
-msgid "A library used to validate server certificates to ensure a secure connection."
+msgid "SSL certificate validation"
+msgstr "SSL 憑è‰é©—è‰"
+
+#: ../src/features_window.py:51
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
msgstr "一個用於驗è‰ä¼ºæœå™¨çš„è‰æ›¸ä»¥ä¿è‰é€£ç·šå®‰å…¨çš„函å¼åº«ã€‚"
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:52 ../src/features_window.py:53
msgid "Requires python-pyopenssl."
msgstr "éœ€è¦ python-pyopenssl。"
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
msgid "Bonjour / Zeroconf"
msgstr "Bonjour / Zeroconf"
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
msgid "Serverless chatting with autodetected clients in a local network."
msgstr "無需伺æœå™¨è‡ªå‹•åµæ¸¬æœ¬åœ°ç¶²è·¯ä¸å…¶ä»–客戶端進行èŠå¤©"
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
msgid "Requires python-avahi."
msgstr "éœ€è¦ python-avahi。"
-#: ../src/features_window.py:56
+#: ../src/features_window.py:57
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:57
+#: ../src/features_window.py:58
msgid "Command line"
msgstr "命令列"
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
msgid "A script to control Gajim via commandline."
msgstr "一個在命令列下控制 Gajim 的命令稿。"
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
msgid "Requires python-dbus."
msgstr "éœ€è¦ python-dbus。"
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:61 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:77
+#: ../src/features_window.py:85 ../src/features_window.py:89
+#: ../src/features_window.py:109 ../src/features_window.py:113
+#: ../src/features_window.py:117
msgid "Feature not available under Windows."
msgstr "特性在 Windows 下無法使用。"
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
msgid "OpenGPG message encryption"
msgstr "OpenPGP 訊æ¯åŠ 密"
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
msgid "Encrypting chat messages with gpg keys."
msgstr "用 gpg å¯†é‘°åŠ å¯†èŠå¤©è¨Šæ¯ã€‚"
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "éœ€è¦ gpg å’Œ python-GnuPGInterface。"
+#: ../src/features_window.py:64
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr "éœ€è¦ gpg å’Œ python-gnupg (http://code.google.com/p/python-gnupg/)。"
#: ../src/features_window.py:65
+msgid "Requires gpg.exe in PATH."
+msgstr "PATH ä¸è¦æœ‰ gpg.exe。"
+
+#: ../src/features_window.py:66
msgid "Network-manager"
msgstr "Network-manager"
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
msgid "Autodetection of network status."
msgstr "自動åµæ¸¬ç¶²è·¯ç‹€æ…‹ã€‚"
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
msgid "Requires gnome-network-manager and python-dbus."
msgstr "éœ€è¦ gnome-network-manager å’Œ python-dbus。"
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
msgid "Session Management"
msgstr "作æ¥éšŽæ®µç®¡ç†"
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
msgid "Gajim session is stored on logout and restored on login."
msgstr "Gajim 作æ¥éšŽæ®µåœ¨é›¢é–‹æ™‚會被儲å˜è€Œå¾Œç™»å…¥æ™‚æ¢å¾©ã€‚"
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
msgid "Requires python-gnome2."
msgstr "éœ€è¦ python-gnome2。"
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
msgid "Password encryption"
msgstr "å¯†ç¢¼åŠ å¯†"
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
msgid "Passwords can be stored securely and not just in plaintext."
msgstr "密碼å¯ä»¥è¢«å®‰å…¨åœ°å„²å˜ï¼Œè€Œä¸åªæ˜¯ä»¥ç´”æ–‡å—æ–¹å¼ã€‚"
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
msgstr "éœ€è¦ gnome-keyring å’Œ python-gnome2-desktop，或 kwalletcli。"
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
msgid "SRV"
msgstr "SRV"
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
msgid "Ability to connect to servers which are using SRV records."
msgstr "連線到有 SRV 記錄的伺æœå™¨çš„能力。"
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
msgid "Requires dnsutils."
msgstr "éœ€è¦ dnsutils。"
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
msgid "Requires nslookup to use SRV records."
msgstr "éœ€è¦ nslookup 以使用 SRV 記錄。"
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
msgid "Spell Checker"
msgstr "拼寫檢查工具"
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
msgid "Spellchecking of composed messages."
msgstr "å°æ£åœ¨ç·¨è¼¯çš„訊æ¯é€²è¡Œæ‹¼å¯«æª¢æŸ¥ã€‚"
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
msgid "Requires libgtkspell."
msgstr "éœ€è¦ libgtkspell。"
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
msgid "Notification"
msgstr "通知"
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
msgid "Passive popups notifying for new events."
msgstr "有新的時間時，主動彈出æ示。"
-#: ../src/features_window.py:87
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
+#: ../src/features_window.py:88
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
msgstr "éœ€è¦ python-notify 或 python-dbus å’Œ notification-daemon的組åˆã€‚"
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
msgid "Automatic status"
msgstr "自動調整狀態"
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
msgid "Ability to measure idle time, in order to set auto status."
msgstr "測算閒置時間以自動調整狀態的能力。"
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
msgid "Requires libxss library."
msgstr "éœ€è¦ libxss 函å¼åº«ã€‚"
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
msgid "Requires python2.5."
msgstr "éœ€è¦ python2.5。"
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
msgid "LaTeX"
msgstr "LaTeX"
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
msgid "Transform LaTeX expressions between $$ $$."
msgstr "è½‰æ› $$ $$ 之間的 LaTeX é‹ç®—å¼ã€‚"
-#: ../src/features_window.py:95
-msgid "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "éœ€è¦ texlive-latex-base å’Œ (dvipng 或 ImageMagick)。您需è¦åœ¨é€²éšŽè¨å®šç·¨è¼¯å™¨ä¸å°‡ 'use_latex' è¨å®šç‚ºçœŸã€‚"
-
#: ../src/features_window.py:96
-msgid "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "éœ€è¦ texlive-latex-base å’Œ (dvipng 或 ImageMagick) (全部在 MikTeX ä¸)。您需è¦åœ¨é€²éšŽè¨å®šç·¨è¼¯å™¨ä¸å°‡ 'use_latex' è¨å®šç‚ºçœŸã€‚"
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"éœ€è¦ texlive-latex-base å’Œ (dvipng 或 ImageMagick)。您需è¦åœ¨é€²éšŽè¨å®šç·¨è¼¯å™¨ä¸"
+"å°‡ 'use_latex' è¨å®šç‚ºçœŸã€‚"
#: ../src/features_window.py:97
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"éœ€è¦ texlive-latex-base å’Œ (dvipng 或 ImageMagick) (全部在 MikTeX ä¸)。您需è¦"
+"在進階è¨å®šç·¨è¼¯å™¨ä¸å°‡ 'use_latex' è¨å®šç‚ºçœŸã€‚"
+
+#: ../src/features_window.py:98
msgid "End to End message encryption"
msgstr "End to End 訊æ¯åŠ 密"
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
msgid "Encrypting chat messages."
msgstr "åŠ å¯†èŠå¤©è¨Šæ¯ã€‚"
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:100 ../src/features_window.py:101
msgid "Requires python-crypto."
msgstr "éœ€è¦ python-crypto。"
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
msgid "RST Generator"
msgstr "RST 產生器"
-#: ../src/features_window.py:102
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "從 RST 程å¼ç¢¼ç”¢ç”Ÿ XHTML 輸出 (åƒè€ƒ http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)。"
+#: ../src/features_window.py:103
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"從 RST 程å¼ç¢¼ç”¢ç”Ÿ XHTML 輸出 (åƒè€ƒ http://docutils.sourceforge.net/docs/ref/"
+"rst/restructuredtext.html)。"
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:104 ../src/features_window.py:105
msgid "Requires python-docutils."
msgstr "éœ€è¦ python-docutils。"
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
msgid "Ability to start audio and video chat."
msgstr "開始進行語音視訊通話的能力。"
-#: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "éœ€è¦ python-farsight。"
+#: ../src/features_window.py:108
+msgid "Requires python-farsight and gstreamer-plugins-bad."
+msgstr "éœ€è¦ python-farsight å’Œ gstreamer-plugins-bad。"
+
+#: ../src/features_window.py:110
+msgid "UPnP-IGD"
+msgstr "UPnP-IGD"
+
+#: ../src/features_window.py:111
+msgid "Ability to request your router to forward port for file transfer."
+msgstr "è¦æ±‚您的路由器於檔案傳é€æ™‚è½‰ç”¨é€šè¨ŠåŸ çš„èƒ½åŠ›ã€‚"
+
+#: ../src/features_window.py:112
+msgid "Requires python-gupnp-igd."
+msgstr "éœ€è¦ python-gupnp-igd。"
+
+#: ../src/features_window.py:114
+msgid "UPower"
+msgstr ""
#: ../src/features_window.py:115
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:116
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "éœ€è¦ python-dbus。"
+
+#: ../src/features_window.py:124
msgid "?features:Available"
msgstr "å¯ç”¨"
-#: ../src/features_window.py:122
+#: ../src/features_window.py:131
msgid "Feature"
msgstr "特性"
@@ -7476,7 +7897,7 @@ msgstr "處ç†åº"
msgid "Filename: %s"
msgstr "檔案å稱: %s"
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
#, python-format
msgid "Size: %s"
msgstr "大å°: %s"
@@ -7484,7 +7905,7 @@ msgstr "大å°: %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/history_manager.py:541
msgid "You"
msgstr "您"
@@ -7493,15 +7914,15 @@ msgstr "您"
msgid "Sender: %s"
msgstr "傳é€è€…: %s"
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
#: ../src/tooltips.py:742
msgid "Recipient: "
-msgstr "接收者: %s"
+msgstr "接收者: "
#: ../src/filetransfers_window.py:201
#, python-format
msgid "Saved in: %s"
-msgstr "儲å˜åœ¨: %s"
+msgstr "儲å˜åœ¨: %s"
#: ../src/filetransfers_window.py:203
msgid "File transfer completed"
@@ -7529,78 +7950,80 @@ msgstr "錯誤訊æ¯: %s"
msgid "File transfer stopped"
msgstr "檔案傳輸已åœæ¢"
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:266
msgid "Choose File to Send..."
msgstr "é¸æ“‡è¦å‚³é€çš„檔案…"
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
msgid "Description: "
msgstr "æè¿°: "
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:295
msgid "Gajim cannot access this file"
msgstr "Gajim 無法å˜å–æ¤æª”案"
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:296
msgid "This file is being used by another process."
msgstr "æ¤æª”案æ£åœ¨è¢«å…¶ä»–程å¼ä½¿ç”¨ã€‚"
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:330
#, python-format
msgid "File: %s"
msgstr "檔案: %s"
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:336
#, python-format
msgid "Type: %s"
msgstr "é¡žåž‹: %s"
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:338
#, python-format
msgid "Description: %s"
msgstr "æè¿°: %s"
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:339
#, python-format
msgid "%s wants to send you a file:"
-msgstr "%s 想傳é€çµ¦æ‚¨ä¸€å€‹æª”案: "
+msgstr "%s 想傳é€çµ¦æ‚¨ä¸€å€‹æª”案:"
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:879
+#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "無法覆寫ç¾æœ‰æª”案\"%s\""
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:880
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
msgstr "檔案å稱已經å˜åœ¨ä¸”您沒有權é™è¦†å¯«å®ƒã€‚"
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
msgid "This file already exists"
msgstr "檔案已經å˜åœ¨"
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
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:369 ../src/gtkgui_helpers.py:891
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:862
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "目錄 \"%s\" ä¸å¯å¯«"
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:892
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
msgid "You do not have permission to create files in this directory."
msgstr "您沒有權é™åœ¨é€™å€‹ç›®éŒ„裡建立檔案。"
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:389
msgid "Save File as..."
msgstr "å¦å˜ç‚ºâ€¦"
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
#. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:459
#, python-format
msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7608,75 +8031,77 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
#. This should make the string Kb/s,
#. where 'Kb' part is taken from %s.
#. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:552
#, python-format
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/s)"
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
msgid "Invalid File"
msgstr "無效檔案"
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:595
msgid "File: "
msgstr "檔案: "
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:599
msgid "It is not possible to send empty files"
msgstr "無法傳é€ç©ºæª”案"
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
msgid "Name: "
msgstr "å稱: "
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
msgid "Sender: "
msgstr "傳é€è€…: "
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:787
msgid "Pause"
msgstr "æš«åœ"
-#: ../src/gajim.py:175
+#: ../src/gajim.py:191
msgid "Gajim needs X server to run. Quiting..."
msgstr "Gajim éœ€è¦ X 伺æœå™¨æ‰èƒ½åŸ·è¡Œã€‚離開…"
-#: ../src/gajim.py:177
+#: ../src/gajim.py:193
#, python-format
msgid "importing PyGTK failed: %s"
msgstr "匯入 PyGTK 失敗: %s"
-#: ../src/gajim.py:219
+#: ../src/gajim.py:235
msgid "Gajim needs PyGTK 2.16 or above"
msgstr "Gajim éœ€è¦ PyGTK 2.16 或更高版本"
-#: ../src/gajim.py:220
+#: ../src/gajim.py:236
msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
msgstr "Gajim éœ€è¦ PyGTK 2.16 或更高版本æ‰èƒ½åŸ·è¡Œã€‚離開…"
-#: ../src/gajim.py:222
+#: ../src/gajim.py:238
msgid "Gajim needs GTK 2.16 or above"
msgstr "Gajim éœ€è¦ GTK 2.16 或更高版本"
-#: ../src/gajim.py:223
+#: ../src/gajim.py:239
msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
msgstr "Gajim éœ€è¦ GTK 2.16 或更高版本æ‰èƒ½åŸ·è¡Œã€‚離開…"
-#: ../src/gajim.py:232
+#: ../src/gajim.py:248
msgid "Gajim needs pywin32 to run"
msgstr "Gajim éœ€è¦ pywin32 æ‰èƒ½åŸ·è¡Œ"
-#: ../src/gajim.py:233
+#: ../src/gajim.py:249
#, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %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:349
+#: ../src/gajim.py:365
msgid "Gajim is already running"
msgstr "Gajim 已經在執行"
-#: ../src/gajim.py:350
+#: ../src/gajim.py:366
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7684,38 +8109,33 @@ msgstr ""
"Gajim å¦ä¸€å€‹å¯¦é«”似乎æ£åœ¨åŸ·è¡Œ\n"
"ä¸ç®¡æ€Žæ¨£ï¼Œä»ç„¶åŸ·è¡Œ?"
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:77
msgid "Shows a help on specific command"
msgstr "為特定命令顯示求助"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:80
msgid "command"
msgstr "命令"
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:81
msgid "show help on command"
msgstr "為命令顯示求助"
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:85
msgid "Shows or hides the roster window"
msgstr "顯示/éš±è—è¯çµ¡äººæ¸…單視窗"
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:89
msgid "Pops up a window with the next pending event"
msgstr "為下一ç†æœªè™•ç†äº‹ä»¶å½ˆå‡ºè¦–窗"
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
+#: ../src/gajim-remote.py:93
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
msgstr "列å°è¯çµ¡äººæ¸…å–®ä¸æ‰€æœ‰è¯çµ¡äººã€‚æ¯å€‹è¯çµ¡äººä¸€åˆ—。"
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -7727,336 +8147,244 @@ msgstr "列å°è¯çµ¡äººæ¸…å–®ä¸æ‰€æœ‰è¯çµ¡äººã€‚æ¯å€‹è¯çµ¡äººä¸€åˆ—。"
msgid "account"
msgstr "帳號"
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:96
msgid "show only contacts of the given account"
msgstr "åªé¡¯ç¤ºæŒ‡å®šå¸³è™Ÿçš„è¯çµ¡äºº"
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:102
msgid "Prints a list of registered accounts"
msgstr "列å°è¨»å†Šçš„帳號"
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:106
msgid "Changes the status of account or accounts"
msgstr "變更一個或多個帳號狀態"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:109
msgid "status"
msgstr "狀態"
-#: ../src/gajim-remote-plugin.py:106
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "下列ä¸çš„ä¸€é …: offline，online，chat，away，xa，dnd，invisible"
+#: ../src/gajim-remote.py:109
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"下列之一: offline，online，chat，away，xa，dnd，invisible。如果沒有è¨å®šï¼Œä½¿ç”¨"
+"帳號先å‰çš„狀態"
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:110
msgid "status message"
msgstr "狀態訊æ¯"
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
+#: ../src/gajim-remote.py:111
+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-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "變更一個或多個帳號的優先ç‰ç´š"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "優先ç‰ç´š"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "您想è¦çµ¦äºˆé€™å€‹å¸³è™Ÿçš„優先ç‰ç´š"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"變更指定帳號的優先ç‰ç´šã€‚如果ä¸æŒ‡æ˜Žï¼Œå°‡è®Šæ›´æ‰€æœ‰è¨å®šäº†\"與全域狀態åŒæ¥\"é¸é …çš„"
+"帳號"
+
+#: ../src/gajim-remote.py:127
msgid "Shows the chat dialog so that you can send messages to a contact"
msgstr "顯示å°è©±æ–¹å¡Šç”¨æ–¼çµ¦è¯çµ¡äººå‚³é€è¨Šæ¯"
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:129
msgid "JID of the contact that you want to chat with"
msgstr "您想èŠå¤©çš„ JID"
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
msgid "if specified, contact is taken from the contact list of this account"
msgstr "如指定，將從æ¤å¸³è™Ÿæ¸…單下移出è¯çµ¡äºº"
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
-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:134
+msgid "message content. The account must be specified or \"\""
+msgstr "訊æ¯å…§å®¹ã€‚å¸³è™Ÿå¿…é ˆè¢«æŒ‡å®šæˆ–ç‚º\"\""
+
+#: ../src/gajim-remote.py:139
+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-plugin.py:127 ../src/gajim-remote-plugin.py:140
#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
msgid "JID of the contact that will receive the message"
msgstr "è¯çµ¡äººçš„JID將收到訊æ¯"
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
msgid "message contents"
msgstr "訊æ¯å…§å®¹"
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "pgp key"
msgstr "PGP 密鑰"
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "if specified, the message will be encrypted using this public key"
msgstr "如指定，該訊æ¯å°‡ä½¿ç”¨æœ¬å…¬å…±å¯†é‘°åŠ 密"
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
msgid "if specified, the message will be sent using this account"
msgstr "如指定，訊æ¯å°‡è¢«ç”¨æ¤å¸³è™Ÿå‚³é€"
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
-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:152
+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-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
msgid "subject"
msgstr "主題"
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
msgid "message subject"
msgstr "訊æ¯ä¸»é¡Œ"
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:166
msgid "Sends new message to a groupchat you've joined."
msgstr "å‘ä¸€å€‹æ‚¨åŠ å…¥çš„èŠå¤©å®¤å‚³é€æ–°è¨Šæ¯ã€‚"
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:168
msgid "JID of the room that will receive the message"
msgstr "è¦æ”¶åˆ°é€™æ¢è¨Šæ¯çš„èŠå¤©å®¤çš„ JID"
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:175
msgid "Gets detailed info on a contact"
msgstr "ç²å¾—è¯çµ¡äººçš„詳細資訊"
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
msgid "JID of the contact"
msgstr "è¯çµ¡äººçš„ JID "
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:181
msgid "Gets detailed info on a account"
msgstr "ç²å¾—帳號的詳細資訊"
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:183
msgid "Name of the account"
msgstr "帳號å稱"
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:187
msgid "Sends file to a contact"
msgstr "å‘è¯çµ¡äººå‚³é€æª”案"
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
msgid "file"
msgstr "檔案"
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
msgid "File path"
msgstr "檔案路徑"
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:191
msgid "if specified, file will be sent using this account"
msgstr "如指定，檔案將被用æ¤å¸³è™Ÿå‚³é€"
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:196
msgid "Lists all preferences and their values"
msgstr "列出所有的åƒæ•¸åŠå®ƒå€‘的值"
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:200
msgid "Sets value of 'key' to 'value'."
msgstr "å°‡\"密鑰\"的值è¨ç‚º\"值\""
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
msgid "key=value"
msgstr "éµ=值"
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
msgid "'key' is the name of the preference, 'value' is the value to set it to"
msgstr "\"密鑰\"是åƒæ•¸å稱，而\"值\"是賦予åƒæ•¸çš„數值"
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:207
msgid "Deletes a preference item"
msgstr "刪除一個åƒæ•¸é …"
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
msgid "key"
msgstr "éµ"
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
msgid "name of the preference to be deleted"
msgstr "需è¦åˆªé™¤çš„åƒæ•¸å稱"
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:213
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "將目å‰Gajim的國家è¨å®šå¯«å…¥ .config 檔案"
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:218
msgid "Removes contact from roster"
msgstr "從è¯çµ¡äººæ¸…單移除è¯çµ¡äºº"
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:227
msgid "Adds contact to roster"
msgstr "å‘è¯çµ¡äººæ¸…å–®åŠ å…¥è¯çµ¡äºº"
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:230
msgid "Adds new contact to this account"
msgstr "為æ¤å¸³è™ŸåŠ 入新è¯çµ¡äºº"
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:235
msgid "Returns current status (the global one unless account is specified)"
msgstr "回傳目å‰ç‹€æ…‹(如ä¸æŒ‡å®šå¸³è™Ÿå°‡å›žå‚³å…¨åŸŸè¨å®š)"
-#: ../src/gajim-remote-plugin.py:226
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "回傳目å‰çš„狀態資訊 (如ä¸æŒ‡å®šå¸³è™Ÿå‰‡å›žå‚³å…¨åŸŸè¨å®š)"
+#: ../src/gajim-remote.py:242
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr "回傳目å‰ç‹€æ…‹è³‡è¨Š(如ä¸æŒ‡å®šå¸³è™Ÿå°‡å›žå‚³å…¨åŸŸè¨å®š)"
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:249
msgid "Returns number of unread messages"
msgstr "回傳未讀訊æ¯æ•¸"
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:253
msgid "Opens 'Start Chat' dialog"
msgstr "é–‹å•Ÿ '開始èŠå¤©' å°è©±æ–¹å¡Š"
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:255
msgid "Starts chat, using this account"
msgstr "開始èŠå¤©ï¼Œä½¿ç”¨é€™å€‹å¸³è™Ÿ"
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:259
msgid "Sends custom XML"
msgstr "傳é€è‡ªè¨‚ XML"
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:261
msgid "XML to send"
msgstr "å‚³é€ XML"
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "XML 將被傳é€çš„帳號; 如果ä¸æŒ‡å®šï¼ŒXML 將被傳é€è‡³æ‰€æœ‰å¸³è™Ÿ"
-
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "處ç†ä¸€å€‹ xmpp:/ uri"
-
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "åŠ å…¥èŠå¤©å®¤"
-
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
-msgstr "èŠå¤©å®¤"
-
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "暱稱"
-
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
-msgstr "密碼"
-
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "請檢查 Gajim 是å¦æ£åœ¨åŸ·è¡Œ"
-
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "顯示/éš±è— ipython 視窗"
-
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "缺失的\"è¯çµ¡äºº JID\"åƒæ•¸"
-
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"\"%s\" ä¸åœ¨æ‚¨çš„è¯çµ¡äººæ¸…å–®ä¸ã€‚\n"
-"請為傳é€æ¤è¨Šæ¯æŒ‡å®šå¸³è™Ÿã€‚"
-
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "沒有活動的帳號"
-
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr "似乎 Gajim ä¸åœ¨åŸ·è¡Œã€‚å› æ¤æ‚¨ç„¡æ³•ä½¿ç”¨ gajim-remote。"
-
-#: ../src/gajim-remote-plugin.py:412
-#, python-format
-msgid "Usage: %s %s %s \n\t %s"
-msgstr "用法: %s %s %s \n\t %s"
-
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "åƒæ•¸: "
-
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr " %s 找ä¸åˆ°"
-
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"用法: %s 命令 [åƒæ•¸] \n"
-"命令是下列之一: \n"
-
-#: ../src/gajim-remote-plugin.py:496
-#, python-format
+#: ../src/gajim-remote.py:262
msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"åƒæ•¸å¤ªå¤šã€‚\n"
-"輸入\"%s help %s\"以ç²å–更多資訊"
-
-#: ../src/gajim-remote-plugin.py:500
-#, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"åƒæ•¸\"%s\"未指定。\n"
-"輸入\"%s help %s\"以ç²å–更多資訊"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "錯誤的 uri"
-
-#: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account's previous status"
-msgstr "下列之一: offline，online，chat，away，xa，dnd，invisible。如果沒有è¨å®šï¼Œä½¿ç”¨å¸³è™Ÿå…ˆå‰çš„狀態"
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "變更一個或多個帳號的優先ç‰ç´š"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "優先ç‰ç´š"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "您想è¦çµ¦äºˆé€™å€‹å¸³è™Ÿçš„優先ç‰ç´š"
-
-#: ../src/gajim-remote.py:121
-msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
-msgstr "變更指定帳號的優先ç‰ç´šã€‚如果ä¸æŒ‡æ˜Žï¼Œå°‡è®Šæ›´æ‰€æœ‰è¨å®šäº†\"與全域狀態åŒæ¥\"é¸é …的帳號"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "訊æ¯å…§å®¹ã€‚å¸³è™Ÿå¿…é ˆè¢«æŒ‡å®šæˆ–ç‚º\"\""
-
-#: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "回傳目å‰ç‹€æ…‹è³‡è¨Š(如ä¸æŒ‡å®šå¸³è™Ÿå°‡å›žå‚³å…¨åŸŸè¨å®š)"
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr "XML 將被傳é€çš„帳號; 如果ä¸æŒ‡å®šï¼ŒXML 將被傳é€è‡³æ‰€æœ‰å¸³è™Ÿ"
#: ../src/gajim-remote.py:268
msgid "Change the avatar"
@@ -8067,9 +8395,19 @@ msgid "Picture to use"
msgstr "è¦ä½¿ç”¨çš„圖片"
#: ../src/gajim-remote.py:271
-msgid "Account in which the avatar will be set; if not specified, the avatar will be set for all accounts"
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
msgstr "è¦è¨å®šç‚ºé€™å€‹é åƒçš„帳號; 如果ä¸æŒ‡å®šï¼Œæ‰€æœ‰å¸³è™Ÿéƒ½å°‡è¢«è¨å®šç‚ºé€™å€‹é åƒã€‚"
+#: ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "處ç†ä¸€å€‹ xmpp:/ uri"
+
+#: ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
#: ../src/gajim-remote.py:279
msgid "URI to handle"
msgstr "è¦è™•ç†çš„ URI"
@@ -8082,14 +8420,30 @@ msgstr "您想è¦ç”¨å…¶è™•ç†å®ƒçš„帳號"
msgid "Message content"
msgstr "訊æ¯å…§å®¹"
+#: ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "åŠ å…¥èŠå¤©å®¤"
+
+#: ../src/gajim-remote.py:288
+msgid "room"
+msgstr "èŠå¤©å®¤"
+
#: ../src/gajim-remote.py:288
msgid "Room JID"
msgstr "èŠå¤©å®¤ JID"
+#: ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "暱稱"
+
#: ../src/gajim-remote.py:289
msgid "Nickname to use"
msgstr "è¦ä½¿ç”¨çš„暱稱"
+#: ../src/gajim-remote.py:290
+msgid "password"
+msgstr "密碼"
+
#: ../src/gajim-remote.py:290
msgid "Password to enter the room"
msgstr "進入èŠå¤©å®¤çš„密碼"
@@ -8098,12 +8452,63 @@ msgstr "進入èŠå¤©å®¤çš„密碼"
msgid "Account from which you want to enter the room"
msgstr "您想è¦ç”¨å…¶åŠ å…¥èŠå¤©å®¤çš„帳號"
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "請檢查 Gajim 是å¦æ£åœ¨åŸ·è¡Œ"
+
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "顯示/éš±è— ipython 視窗"
+
+#: ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "缺失的\"è¯çµ¡äºº JID\"åƒæ•¸"
+
+#: ../src/gajim-remote.py:349
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"\"%s\" ä¸åœ¨æ‚¨çš„è¯çµ¡äººæ¸…å–®ä¸ã€‚\n"
+"請為傳é€æ¤è¨Šæ¯æŒ‡å®šå¸³è™Ÿã€‚"
+
+#: ../src/gajim-remote.py:352
+msgid "You have no active account"
+msgstr "沒有活動的帳號"
+
+#: ../src/gajim-remote.py:405
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr "似乎 Gajim ä¸åœ¨åŸ·è¡Œã€‚å› æ¤æ‚¨ç„¡æ³•ä½¿ç”¨ gajim-remote。"
+
+#: ../src/gajim-remote.py:432
+#, python-format
+msgid ""
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+msgstr ""
+"用法: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+
+#: ../src/gajim-remote.py:436
+msgid "Arguments:"
+msgstr "åƒæ•¸:"
+
+#: ../src/gajim-remote.py:440
#, python-format
-msgid "Usage: %(basename)s %(command)s %(arguments)s \n\t %(help)s"
-msgstr "用法: %(basename)s %(command)s %(arguments)s \n\t %(help)s"
+msgid "%s not found"
+msgstr " %s 找ä¸åˆ°"
+
+#: ../src/gajim-remote.py:446
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"用法: %s 命令 [åƒæ•¸] \n"
+"命令是下列之一: \n"
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:515
#, python-format
msgid ""
"Too many arguments. \n"
@@ -8112,7 +8517,7 @@ msgstr ""
"åƒæ•¸å¤ªå¤šã€‚\n"
"輸入 \"%(basename)s help %(command)s\" ç²å–更多資訊"
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:520
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8121,10 +8526,14 @@ msgstr ""
"åƒæ•¸ \"%(arg)s\" 未指定。\n"
"輸入 \"%(basename)s help %(command)s\" ç²å–更多資訊"
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:539
msgid "No uri given"
msgstr "沒有給出 URI"
+#: ../src/gajim-remote.py:541
+msgid "Wrong uri"
+msgstr "錯誤的 uri"
+
#: ../src/gajim_themes_window.py:59
msgid "Theme"
msgstr "主題"
@@ -8150,196 +8559,229 @@ msgstr "無法刪除目å‰ä¸»é¡Œ"
msgid "Please first choose another for your current theme."
msgstr "è«‹å…ˆé¸æ“‡å…¶ä»–主題åšç‚ºç›®å‰ä¸»é¡Œ"
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1557
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s ç¾åœ¨æˆäº† %(new_nick)s"
+
+#: ../src/groupchat_control.py:230
msgid "Sending private message failed"
msgstr "傳é€ç§æœ‰è¨Šæ¯å¤±æ•—"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:232
#, 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:472
+#: ../src/groupchat_control.py:560
msgid "Insert Nickname"
msgstr "æ’入暱稱"
-#: ../src/groupchat_control.py:653
+#: ../src/groupchat_control.py:743
msgid "Conversation with "
msgstr "å°è©±ï¼Œèˆ‡"
-#: ../src/groupchat_control.py:655
+#: ../src/groupchat_control.py:745
msgid "Continued conversation"
msgstr "繼續å°è©±"
+#: ../src/groupchat_control.py:1222
+#, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s 將主題è¨å®šç‚º %(subject)s"
+
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1305 ../src/gui_interface.py:860
+#: ../src/groupchat_control.py:1240 ../src/groupchat_control.py:1499
msgid "Any occupant is allowed to see your full JID"
msgstr "所有室å‹å¯ä»¥çœ‹åˆ°æ‚¨çš„全部 JID"
+#: ../src/groupchat_control.py:1243
+msgid "Room now shows unavailable member"
+msgstr "èŠå¤©å®¤ç¾åœ¨é¡¯ç¤ºäº†ç„¡æ³•ä½¿ç”¨çš„æˆå“¡"
+
+#: ../src/groupchat_control.py:1245
+msgid "room now does not show unavailable members"
+msgstr "èŠå¤©å®¤ç¾åœ¨ä¸é¡¯ç¤ºç„¡æ³•ä½¿ç”¨çš„æˆå“¡"
+
+#: ../src/groupchat_control.py:1247
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "一個無關隱ç§çš„èŠå¤©å®¤è¨å®šç™¼ç”Ÿäº†è®ŠåŒ–"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1251
+msgid "Room logging is now enabled"
+msgstr "èŠå¤©å®¤è¨Šæ¯è¨˜éŒ„已啟用"
+
+#: ../src/groupchat_control.py:1253
+msgid "Room logging is now disabled"
+msgstr "èŠå¤©å®¤è¨Šæ¯è¨˜éŒ„å·²åœç”¨"
+
+#: ../src/groupchat_control.py:1255
+msgid "Room is now non-anonymous"
+msgstr "èŠå¤©å®¤ç¾åœ¨æ˜¯éžåŒ¿åçš„"
+
+#: ../src/groupchat_control.py:1258
+msgid "Room is now semi-anonymous"
+msgstr "èŠå¤©å®¤ç¾åœ¨æ˜¯åŠåŒ¿åçš„"
+
+#: ../src/groupchat_control.py:1261
+msgid "Room is now fully-anonymous"
+msgstr "èŠå¤©å®¤ç¾åœ¨æ˜¯å®Œå…¨åŒ¿åçš„"
+
#. Can be a message (see handle_event_gc_config_change in
#. gajim.py)
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1504
msgid "Room logging is enabled"
msgstr "èŠå¤©å®¤è¨˜éŒ„被啟用"
-#: ../src/groupchat_control.py:1311
+#: ../src/groupchat_control.py:1506
msgid "A new room has been created"
msgstr "一個新的èŠå¤©å®¤è¢«å»ºç«‹"
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1509
msgid "The server has assigned or modified your roomnick"
msgstr "伺æœå™¨æŒ‡å®šæˆ–修改了您的èŠå¤©å®¤æš±ç¨±"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1320
+#: ../src/groupchat_control.py:1515
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s 被踢出: %(reason)s"
-#: ../src/groupchat_control.py:1323
+#: ../src/groupchat_control.py:1518
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s 被 %(who)s 踢出: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1527
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s 被å°ç¦: %(reason)s"
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1530
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s 被 %(who)s å°ç¦: %(reason)s"
-#: ../src/groupchat_control.py:1346 ../src/groupchat_control.py:1450
+#: ../src/groupchat_control.py:1541 ../src/groupchat_control.py:1645
#, python-format
msgid "You are now known as %s"
msgstr "您ç¾åœ¨æˆäº† %s "
-#: ../src/groupchat_control.py:1362 ../src/gui_interface.py:734
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s ç¾åœ¨æˆäº† %(new_nick)s"
-
-#: ../src/groupchat_control.py:1404 ../src/groupchat_control.py:1409
-#: ../src/groupchat_control.py:1415
+#: ../src/groupchat_control.py:1599 ../src/groupchat_control.py:1604
+#: ../src/groupchat_control.py:1610
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s 已經被從這個èŠå¤©å®¤ç§»é™¤(%(reason)s)"
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1601
msgid "affiliation changed"
msgstr "æ¸å±¬è®Šæ›´"
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1606
msgid "room configuration changed to members-only"
msgstr "èŠå¤©å®¤é…置變為\"僅æˆå“¡\""
-#: ../src/groupchat_control.py:1417
+#: ../src/groupchat_control.py:1612
msgid "system shutdown"
msgstr "系統關閉"
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1695
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
msgstr "** %(nick)s çš„æ¸å±¬è¢« %(actor)s è¨å®šç‚º %(affiliation)s"
-#: ../src/groupchat_control.py:1504
+#: ../src/groupchat_control.py:1699
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr "** %(nick)s çš„æ¸å±¬è¢«è¨å®šç‚º %(affiliation)s"
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1714
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
msgstr "** %(nick)s 的角色被 %(actor)s è¨å®šç‚º %(role)s"
-#: ../src/groupchat_control.py:1523
+#: ../src/groupchat_control.py:1718
#, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
msgstr "** %(nick)s 的角色被è¨å®šç‚º %(role)s"
-#: ../src/groupchat_control.py:1553
+#: ../src/groupchat_control.py:1748
#, python-format
msgid "%s has left"
msgstr "%s 離開了"
-#: ../src/groupchat_control.py:1558
+#: ../src/groupchat_control.py:1753
#, python-format
msgid "%s has joined the group chat"
msgstr "%s åŠ å…¥èŠå¤©å®¤"
-#: ../src/groupchat_control.py:1560 ../src/gui_interface.py:761
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s 的狀態是 %(status)s"
-
-#: ../src/groupchat_control.py:1804
+#: ../src/groupchat_control.py:2006
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "您確定è¦é›¢é–‹èŠå¤©å®¤\"%s\"å—Ž?"
-#: ../src/groupchat_control.py:1806
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:2008
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
msgstr "如果關閉æ¤è¦–窗，您將ä¸æ–·æ¤èŠå¤©å®¤çš„連線。"
-#: ../src/groupchat_control.py:1810 ../src/gui_interface.py:958
-#: ../src/gui_interface.py:1712 ../src/gui_interface.py:1749
-#: ../src/gui_interface.py:1784 ../src/message_window.py:224
-#: ../src/roster_window.py:2816 ../src/roster_window.py:3476
-#: ../src/roster_window.py:4206
+#: ../src/groupchat_control.py:2012 ../src/gui_interface.py:668
+#: ../src/gui_interface.py:1277 ../src/gui_interface.py:1317
+#: ../src/gui_interface.py:1358 ../src/message_window.py:224
+#: ../src/roster_window.py:2942 ../src/roster_window.py:3617
+#: ../src/roster_window.py:4386
msgid "_Do not ask me again"
msgstr "ä¸è¦å†å•æˆ‘了(_D)"
-#: ../src/groupchat_control.py:1844
+#: ../src/groupchat_control.py:2046
msgid "Changing Subject"
msgstr "æ£åœ¨æ›´æ›è©±é¡Œ"
-#: ../src/groupchat_control.py:1845
+#: ../src/groupchat_control.py:2047
msgid "Please specify the new subject:"
-msgstr "請指定新話題: "
+msgstr "請指定新話題:"
-#: ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2054
msgid "Changing Nickname"
msgstr "æ£åœ¨æ›´æ›æš±ç¨±"
-#: ../src/groupchat_control.py:1853
+#: ../src/groupchat_control.py:2055
msgid "Please specify the new nickname you want to use:"
-msgstr "請指定您想使用的新暱稱: "
+msgstr "請指定您想使用的新暱稱:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1884
+#: ../src/groupchat_control.py:2086
#, python-format
msgid "Destroying %s"
msgstr "æ£åœ¨éŠ·æ¯€ %s"
-#: ../src/groupchat_control.py:1885
+#: ../src/groupchat_control.py:2087
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
msgstr ""
"您æ£è¦å¾¹åº•éŠ·æ¯€é€™å€‹èŠå¤©å®¤ã€‚\n"
-"您å¯ä»¥åœ¨ä¸‹é¢æŒ‡å®šä¸€å€‹åŽŸå› : "
+"您å¯ä»¥åœ¨ä¸‹é¢æŒ‡å®šä¸€å€‹åŽŸå› :"
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:2089
msgid "You may also enter an alternate venue:"
-msgstr "您也å¯ä»¥è¼¸å…¥ä¸€å€‹å¯é¸çš„替代地點: "
+msgstr "您也å¯ä»¥è¼¸å…¥ä¸€å€‹å¯é¸çš„替代地點:"
#. ask for reason
-#: ../src/groupchat_control.py:2076
+#: ../src/groupchat_control.py:2284
#, python-format
msgid "Kicking %s"
msgstr "將踢走 %s"
-#: ../src/groupchat_control.py:2077 ../src/groupchat_control.py:2404
+#: ../src/groupchat_control.py:2285 ../src/groupchat_control.py:2617
msgid "You may specify a reason below:"
-msgstr "您å¯ä»¥æŒ‡å®šä¸€å€‹åŽŸå› : "
+msgstr "您å¯ä»¥æŒ‡å®šä¸€å€‹åŽŸå› :"
#. ask for reason
-#: ../src/groupchat_control.py:2403
+#: ../src/groupchat_control.py:2616
#, python-format
msgid "Banning %s"
msgstr "å°‡å°ç¦ %s"
@@ -8349,7 +8791,9 @@ msgid "A programming error has been detected"
msgstr "一個程å¼éŒ¯èª¤è¢«åµæ¸¬åˆ°"
#: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
msgstr "它å¯èƒ½ä¸æ˜¯åš´é‡çš„，但ä»æ‡‰è©²è¢«å ±å‘Šçµ¦é–‹ç™¼è€…們。"
#: ../src/gtkexcepthook.py:54
@@ -8366,151 +8810,146 @@ msgstr "細節"
msgid "Error: cannot open %s for reading"
msgstr "錯誤: 無法按讀開啟檔案 %s"
-#: ../src/gtkgui_helpers.py:377
+#: ../src/gtkgui_helpers.py:348
msgid "Error reading file:"
-msgstr "讀檔案錯誤: "
+msgstr "讀檔案錯誤:"
-#: ../src/gtkgui_helpers.py:380
+#: ../src/gtkgui_helpers.py:351
msgid "Error parsing file:"
-msgstr "分æžæª”案錯誤: "
+msgstr "分æžæª”案錯誤:"
#. do not traceback (could be a permission problem)
#. we talk about a file here
-#: ../src/gtkgui_helpers.py:421
+#: ../src/gtkgui_helpers.py:392
#, python-format
msgid "Could not write to %s. Session Management support will not work"
msgstr "ä¸èƒ½å¯«å…¥åˆ° %s 。作æ¥éšŽæ®µç®¡ç†æ”¯æ´åŠŸèƒ½æœªå•Ÿç”¨"
#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:795
+#: ../src/gtkgui_helpers.py:766
msgid "Gajim is not the default Jabber client"
msgstr "Gajim ä¸æ˜¯é è¨çš„ Jabber 客戶端"
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:767
msgid "Would you like to make Gajim the default Jabber client?"
msgstr "您想è¦ä½¿ Gajim æˆç‚ºé è¨çš„ Jabber 客戶端嗎?"
-#: ../src/gtkgui_helpers.py:797
+#: ../src/gtkgui_helpers.py:768
msgid "Always check to see if Gajim is the default Jabber client on startup"
msgstr "總是在啟動時åµæ¸¬ Gajim 是å¦æ˜¯é è¨çš„ Jabber 客戶端"
-#: ../src/gtkgui_helpers.py:864
+#: ../src/gtkgui_helpers.py:835
msgid "Extension not supported"
msgstr "ä¸æ”¯æ´æ“´å……"
-#: ../src/gtkgui_helpers.py:865
+#: ../src/gtkgui_helpers.py:836
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
msgstr "圖片ä¸èƒ½è¢«å¦å˜ç‚º %(type)s æ ¼å¼ã€‚å¦å˜ç‚º %(new_filename)s?"
-#: ../src/gtkgui_helpers.py:901
+#: ../src/gtkgui_helpers.py:872
msgid "Save Image as..."
msgstr "圖片å¦å˜ç‚ºâ€¦"
#. we are banned
#. group chat does not exist
-#: ../src/gui_interface.py:127 ../src/gui_interface.py:305
-#: ../src/gui_interface.py:314 ../src/gui_interface.py:319
-#: ../src/gui_interface.py:322 ../src/gui_interface.py:325
-#: ../src/gui_interface.py:330
+#: ../src/gui_interface.py:126 ../src/gui_interface.py:290
+#: ../src/gui_interface.py:299 ../src/gui_interface.py:305
+#: ../src/gui_interface.py:308 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:316
msgid "Unable to join group chat"
msgstr "ç„¡æ³•åŠ å…¥èŠå¤©å®¤"
-#: ../src/gui_interface.py:128
+#: ../src/gui_interface.py:127
#, 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"
-"在下é¢æŒ‡å®šå¦ä¸€å€‹æš±ç¨±: "
+"在下é¢æŒ‡å®šå¦ä¸€å€‹æš±ç¨±:"
-#: ../src/gui_interface.py:131
+#: ../src/gui_interface.py:130
msgid "Always use this nickname when there is a conflict"
msgstr "在發生è¡çªæ™‚總是使用這個暱稱"
-#: ../src/gui_interface.py:148
+#: ../src/gui_interface.py:147
msgid "Do you accept this request?"
msgstr "是å¦æŽ¥å—這個請求?"
-#: ../src/gui_interface.py:150
+#: ../src/gui_interface.py:149
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "是å¦æŽ¥å—這個å°å¸³è™Ÿ %s 的請求?"
-#: ../src/gui_interface.py:153
+#: ../src/gui_interface.py:152
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "%(url)s (id: %(id)s) çš„ HTTP (%(method)s) èªè‰"
-#: ../src/gui_interface.py:199 ../src/notify.py:493
+#: ../src/gui_interface.py:195 ../src/notify.py:276
msgid "Connection Failed"
msgstr "連線失敗"
-#: ../src/gui_interface.py:294
+#: ../src/gui_interface.py:279
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "需è¦å¯†ç¢¼æ‰èƒ½åŠ å…¥èŠå¤©å®¤ %s。請輸入一個密碼。"
-#: ../src/gui_interface.py:306
+#: ../src/gui_interface.py:291
#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "%s 已經é”到了最大的使用者數目"
+msgid "Maximum number of users for <b>%s</b> has been reached"
+msgstr "已經é”到了 <b>%s</b> 的最大使用者數目"
-#: ../src/gui_interface.py:315
+#: ../src/gui_interface.py:300
#, python-format
-msgid "You are banned from group chat %s."
-msgstr "您被èŠå¤©å®¤ %s å°ç¦ã€‚"
+msgid "You are banned from group chat <b>%s</b>."
+msgstr "您被多人èŠå¤© <b>%s</b> å°ç¦ã€‚"
-#: ../src/gui_interface.py:320
+#: ../src/gui_interface.py:306
#, python-format
-msgid "Group chat %s does not exist."
-msgstr "èŠå¤©å®¤ %s ä¸å˜åœ¨ã€‚"
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "多人èŠå¤© <b>%s</b> ä¸å˜åœ¨ã€‚"
-#: ../src/gui_interface.py:323
+#: ../src/gui_interface.py:309
msgid "Group chat creation is restricted."
msgstr "èŠå¤©å®¤å»ºç«‹æ˜¯å—é™çš„。"
-#: ../src/gui_interface.py:326
+#: ../src/gui_interface.py:312
#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "您在èŠå¤©å®¤ %s ä¸è¨»å†Šçš„æš±ç¨±å¿…é ˆè¢«ä½¿ç”¨ã€‚"
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
+msgstr "æ‚¨å·²è¨»å†Šçš„æš±ç¨±å¿…é ˆåœ¨å¤šäººèŠå¤© <b>%s</b> ä¸ä½¿ç”¨ã€‚"
-#: ../src/gui_interface.py:331
+#: ../src/gui_interface.py:317
#, python-format
msgid "You are not in the members list in groupchat %s."
-msgstr "您ä¸å†èŠå¤©å®¤ %s çš„æˆå“¡æ¸…å–®ä¸ã€‚"
+msgstr "您ä¸åœ¨èŠå¤©å®¤ %s çš„æˆå“¡æ¸…å–®ä¸ã€‚"
-#: ../src/gui_interface.py:465 ../src/gui_interface.py:469
+#: ../src/gui_interface.py:400 ../src/gui_interface.py:404
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "錯誤 %(code)s: %(msg)s"
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:480 ../src/gui_interface.py:495
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "å‚³é€ %(message)s 時出ç¾éŒ¯èª¤( %(error)s )"
-
-#: ../src/gui_interface.py:519 ../src/notify.py:495
+#: ../src/gui_interface.py:456 ../src/notify.py:278
msgid "Subscription request"
msgstr "èªè‰è«‹æ±‚"
-#: ../src/gui_interface.py:544
+#: ../src/gui_interface.py:481
msgid "Authorization accepted"
msgstr "授權被接å—"
-#: ../src/gui_interface.py:545
+#: ../src/gui_interface.py:482
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "è¯çµ¡äºº\"%s\"已授權您檢視他/她的狀態。"
-#: ../src/gui_interface.py:553
+#: ../src/gui_interface.py:490
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "è¯çµ¡äºº\"%s\"移除了å°æ‚¨çš„èªè‰"
-#: ../src/gui_interface.py:554
+#: ../src/gui_interface.py:491
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -8518,296 +8957,280 @@ msgstr ""
"您將一直看到他/她處於離線狀態。\n"
"è¦å°‡ä»–/她從您的è¯çµ¡äººæ¸…å–®ä¸ç§»é™¤å—Ž?"
-#: ../src/gui_interface.py:575 ../src/notify.py:497
+#: ../src/gui_interface.py:512 ../src/notify.py:280
msgid "Unsubscribed"
msgstr "å·²å–消èªè‰çš„"
-#: ../src/gui_interface.py:602
+#: ../src/gui_interface.py:523
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "無法與\"%s\"建立連線"
-#: ../src/gui_interface.py:796
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s 將主題è¨å®šç‚º %(subject)s"
-
-#: ../src/gui_interface.py:863
-msgid "Room now shows unavailable member"
-msgstr "èŠå¤©å®¤ç¾åœ¨é¡¯ç¤ºäº†ç„¡æ³•ä½¿ç”¨çš„æˆå“¡"
-
-#: ../src/gui_interface.py:865
-msgid "room now does not show unavailable members"
-msgstr "èŠå¤©å®¤ç¾åœ¨ä¸é¡¯ç¤ºç„¡æ³•ä½¿ç”¨çš„æˆå“¡"
-
-#: ../src/gui_interface.py:867
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "一個無關隱ç§çš„èŠå¤©å®¤è¨å®šç™¼ç”Ÿäº†è®ŠåŒ–"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:871
-msgid "Room logging is now enabled"
-msgstr "èŠå¤©å®¤è¨Šæ¯è¨˜éŒ„已啟用"
-
-#: ../src/gui_interface.py:873
-msgid "Room logging is now disabled"
-msgstr "èŠå¤©å®¤è¨Šæ¯è¨˜éŒ„å·²åœç”¨"
-
-#: ../src/gui_interface.py:875
-msgid "Room is now non-anonymous"
-msgstr "èŠå¤©å®¤ç¾åœ¨æ˜¯éžåŒ¿åçš„"
-
-#: ../src/gui_interface.py:878
-msgid "Room is now semi-anonymous"
-msgstr "èŠå¤©å®¤ç¾åœ¨æ˜¯åŠåŒ¿åçš„"
-
-#: ../src/gui_interface.py:881
-msgid "Room is now fully-anonymous"
-msgstr "èŠå¤©å®¤ç¾åœ¨æ˜¯å®Œå…¨åŒ¿åçš„"
-
-#: ../src/gui_interface.py:922
-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 agent，但並沒有æ£åœ¨åŸ·è¡Œçš„ GPG agent 或是它回傳了一個錯誤的密碼。\n"
+#: ../src/gui_interface.py:621
+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 agent，但並沒有æ£åœ¨åŸ·è¡Œçš„ GPG agent 或是它回傳了一個"
+"錯誤的密碼。\n"
-#: ../src/gui_interface.py:924 ../src/gui_interface.py:931
+#: ../src/gui_interface.py:623 ../src/gui_interface.py:631
msgid "You are currently connected without your OpenPGP key."
msgstr "您已經連線，但沒有使用您的 OpenPGP 密鑰。"
-#: ../src/gui_interface.py:926
+#: ../src/gui_interface.py:625
msgid "Your passphrase is incorrect"
msgstr "您的密碼ä¸æ£ç¢º"
-#: ../src/gui_interface.py:930
+#: ../src/gui_interface.py:630
msgid "OpenGPG Passphrase Incorrect"
msgstr "OpenPGP 密碼ä¸æ£ç¢º"
-#: ../src/gui_interface.py:956
+#: ../src/gui_interface.py:643
+msgid "Certificate Passphrase Required"
+msgstr "è¦æ±‚憑è‰å¯†èªž"
+
+#: ../src/gui_interface.py:644
+#, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "è¼¸å…¥å¯†èªžç”¨æ–¼å¸³è™Ÿæ†‘è‰ %s"
+
+#: ../src/gui_interface.py:666
msgid "GPG key not trusted"
msgstr "GPG 密鑰ä¸è¢«ä¿¡ä»»"
-#: ../src/gui_interface.py:956
-msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
+#: ../src/gui_interface.py:666
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
msgstr "ç”¨æ–¼åŠ å¯†é€™æ¬¡å°è©±çš„ GPG 密鑰未被信任。您確實想è¦åŠ 密這æ¢è¨Šæ¯å—Ž?"
-#: ../src/gui_interface.py:968
-msgid "Gnome Keyring is installed but not correctly started (environment variable probably not correctly set)"
-msgstr "Gnome Keyring 雖然被安è£äº†ä½†æ˜¯æ²’有æ£ç¢ºåœ°å•Ÿå‹•(環境變數å¯èƒ½æ²’有被æ£ç¢ºåœ°è¨å®š)"
+#: ../src/gui_interface.py:679
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr "Gnome Keyring 雖然已安è£ä½†æœªæ£ç¢ºå•Ÿå‹• (環境變數å¯èƒ½æ²’有æ£ç¢ºè¨å®š)"
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:786
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "%(gmail_mail_address)s 上的新郵件"
-#: ../src/gui_interface.py:1070
+#: ../src/gui_interface.py:788
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
msgstr[0] "您有 %d æ¢æ–°éƒµä»¶ä½œæ¥éšŽæ®µ"
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:801
#, python-format
msgid ""
-"\n\n"
+"\n"
+"\n"
"From: %(from_address)s\n"
"Subject: %(subject)s\n"
"%(snippet)s"
msgstr ""
-"\n\n"
+"\n"
+"\n"
"來自: %(from_address)s\n"
"主題: %(subject)s\n"
"%(snippet)s"
-#: ../src/gui_interface.py:1152
+#: ../src/gui_interface.py:866
#, python-format
msgid "%s wants to send you a file."
msgstr "%s 想傳é€çµ¦æ‚¨ä¸€å€‹æª”案。"
-#: ../src/gui_interface.py:1189 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:903 ../src/roster_window.py:1891
msgid "Remote contact stopped transfer"
msgstr "é 端è¯çµ¡äººåœæ¢äº†å‚³è¼¸"
-#: ../src/gui_interface.py:1192 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:906 ../src/roster_window.py:1893
msgid "Error opening file"
msgstr "開啟檔案錯誤"
-#: ../src/gui_interface.py:1224
+#: ../src/gui_interface.py:938
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "您æˆåŠŸçš„從 %(name)s 收到檔案 %(filename)s。"
#. ft stopped
-#: ../src/gui_interface.py:1228
+#: ../src/gui_interface.py:942
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被åœæ¢ã€‚"
-#: ../src/gui_interface.py:1241
+#: ../src/gui_interface.py:955
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "您æˆåŠŸçš„給 %(name)s 傳é€äº†æª”案 %(filename)s。"
#. ft stopped
-#: ../src/gui_interface.py:1245
+#: ../src/gui_interface.py:959
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被åœæ¢ã€‚"
-#: ../src/gui_interface.py:1363
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"無法解密來自 %s 的訊æ¯\n"
-"它å¯èƒ½è¢«ç¯¡æ”¹äº†ã€‚"
-
-#: ../src/gui_interface.py:1370
+#: ../src/gui_interface.py:1034
msgid "Unable to decrypt message"
msgstr "無法解密訊æ¯"
-#: ../src/gui_interface.py:1442
+#: ../src/gui_interface.py:1046
msgid "Username Conflict"
msgstr "使用者å稱è¡çª"
-#: ../src/gui_interface.py:1443
+#: ../src/gui_interface.py:1047
msgid "Please type a new username for your local account"
msgstr "<b>請在您本地帳號填寫新的使用者å稱</b>"
-#: ../src/gui_interface.py:1456
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1469
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1480
-msgid "Error."
-msgstr "錯誤。"
-
-#: ../src/gui_interface.py:1493
+#: ../src/gui_interface.py:1062
msgid "Resource Conflict"
msgstr "資æºè¡çª"
-#: ../src/gui_interface.py:1494
-msgid "You are already connected to this account with the same resource. Please type a new one"
+#: ../src/gui_interface.py:1063
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
msgstr "您已經用åŒä¸€å€‹è³‡æºé€£ç·šåˆ°é€™å€‹å¸³è™Ÿäº†ã€‚請輸入一個新的資æº"
#. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1539
+#: ../src/gui_interface.py:1108
#, python-format
msgid "%s wants to start a voice chat."
msgstr "%s 想è¦ç™¼èµ·èªžéŸ³èŠå¤©ã€‚"
-#: ../src/gui_interface.py:1542
+#: ../src/gui_interface.py:1111
msgid "Voice Chat Request"
msgstr "語音èŠå¤©è«‹æ±‚"
-#: ../src/gui_interface.py:1647
+#: ../src/gui_interface.py:1198
msgid "Error verifying SSL certificate"
msgstr "é©—è‰ SSL è‰æ›¸ç™¼ç”ŸéŒ¯èª¤"
-#: ../src/gui_interface.py:1648
+#: ../src/gui_interface.py:1199
#, 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 ""
"在驗è‰æ‚¨çš„ jabber 伺æœå™¨çš„ SSL è‰æ›¸æ™‚發生錯誤: \n"
"%(error)s\n"
"您ä»ç„¶æƒ³è¦é€£ç·šé€™å€‹ä¼ºæœå™¨å—Ž?"
-#: ../src/gui_interface.py:1656
+#: ../src/gui_interface.py:1208
msgid "Ignore this error for this certificate."
msgstr "忽略這個è‰æ›¸çš„這個錯誤。"
-#: ../src/gui_interface.py:1676
+#: ../src/gui_interface.py:1233
msgid "SSL certificate error"
msgstr "SSLè‰æ›¸éŒ¯èª¤"
-#: ../src/gui_interface.py:1677
+#: ../src/gui_interface.py:1234
#, python-format
msgid ""
-"It seems the SSL certificate of account %(account)s 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"
+"New fingerprint: %(new)s\n"
+"\n"
"Do you still want to connect and update the fingerprint of the certificate?"
msgstr ""
"帳號 %(account)s çš„ SSL è‰æ›¸ä¼¼ä¹Žç™¼ç”Ÿäº†è®ŠåŒ–，或是您的連線被入侵了。\n"
"舊指紋: %(old)s\n"
-"新指紋: %(new)s\n\n"
+"新指紋: %(new)s\n"
+"\n"
"您ä»æƒ³é€£ç·šä¸¦æ›´æ–°è‰æ›¸çš„指紋資訊嗎?"
-#: ../src/gui_interface.py:1707 ../src/gui_interface.py:1744
-#: ../src/gui_interface.py:1780
+#: ../src/gui_interface.py:1270 ../src/gui_interface.py:1312
+#: ../src/gui_interface.py:1354
msgid "Insecure connection"
msgstr "ä¸å®‰å…¨çš„連線"
-#: ../src/gui_interface.py:1708
-msgid "You are about to connect to the server with an insecure connection. This means all your conversations will be exchanged unencrypted. Are you sure you want to do that?"
-msgstr "您將é€éŽä¸€å€‹ä¸å®‰å…¨çš„連線連線伺æœå™¨ã€‚這æ„味著您的所有å°è©±éƒ½æœƒä¸ç¶“åŠ å¯†åœ°è¢«äº¤æ›ã€‚您確定è¦é€™æ¨£åšå—Ž?"
+#: ../src/gui_interface.py:1271
+#, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. Are you sure you want to do that?"
+msgstr ""
+"您å³å°‡é€éŽä¸å®‰å…¨çš„連線與帳號 %(account)s (%(server)s) 連接。這æ„味著您的所有"
+"å°è©±éƒ½æœƒä¸ç¶“åŠ å¯†åœ°è¢«äº¤æ›ã€‚您確定è¦é€™æ¨£åšå—Žï¼Ÿ"
-#: ../src/gui_interface.py:1711 ../src/gui_interface.py:1748
-#: ../src/gui_interface.py:1783
+#: ../src/gui_interface.py:1276 ../src/gui_interface.py:1316
+#: ../src/gui_interface.py:1357
msgid "Yes, I really want to connect insecurely"
msgstr "是的，我確實想è¦ä¸å®‰å…¨åœ°é€£ç·š"
-#: ../src/gui_interface.py:1745
-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/gui_interface.py:1313
+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/gui_interface.py:1781
-msgid "You are about to send your password unencrypted on an insecure connection. Are you sure you want to do that?"
+#: ../src/gui_interface.py:1355
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
msgstr "您將é€éŽä¸å®‰å…¨çš„連線傳é€æœªç¶“åŠ å¯†çš„å¯†ç¢¼ã€‚æ‚¨ç¢ºå®šè¦é€™æ¨£åšå—Ž?"
#. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2354 ../src/gui_interface.py:2377
+#: ../src/gui_interface.py:1864 ../src/gui_interface.py:1887
msgid "Emoticons disabled"
msgstr "表情圖示被åœç”¨"
-#: ../src/gui_interface.py:2355
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
+#: ../src/gui_interface.py:1865
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
msgstr "您é…置的表情圖示主題找ä¸åˆ°ï¼Œæ‰€ä»¥è¡¨æƒ…圖示被åœç”¨ã€‚"
-#: ../src/gui_interface.py:2378
-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/gui_interface.py:1888
+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/gui_interface.py:2409 ../src/roster_window.py:3643
+#: ../src/gui_interface.py:1932 ../src/roster_window.py:3784
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/gui_interface.py:2803
+#: ../src/gui_interface.py:2319
msgid "Could not save your settings and preferences"
msgstr "無法儲å˜æ‚¨çš„è¨å®šã€‚"
-#: ../src/gui_interface.py:3348
+#: ../src/gui_interface.py:2869
msgid "Passphrase Required"
msgstr "è¦æ±‚密文"
-#: ../src/gui_interface.py:3349
+#: ../src/gui_interface.py:2870
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "輸入 GPG 密鑰 %(keyid)s (帳號 %(account)s) 的密碼。"
-#: ../src/gui_interface.py:3363
+#: ../src/gui_interface.py:2884
msgid "GPG key expired"
msgstr "GPG 密鑰éŽæœŸ"
-#: ../src/gui_interface.py:3364
+#: ../src/gui_interface.py:2885
#, python-format
msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
msgstr "您的 GPG 密鑰已éŽæœŸï¼Œæ‚¨å°‡åœ¨æ²’有 OpenPGP 情æ³ä¸‹é€£ç·šåˆ° %s。"
#. ask again
-#: ../src/gui_interface.py:3373
+#: ../src/gui_interface.py:2894
msgid "Wrong Passphrase"
msgstr "錯誤欄ä½"
-#: ../src/gui_interface.py:3374
+#: ../src/gui_interface.py:2895
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "è«‹é‡æ–°è¼¸å…¥æ‚¨çš„ GPG 欄ä½æˆ–點\"å–消\""
@@ -8815,72 +9238,91 @@ msgstr "è«‹é‡æ–°è¼¸å…¥æ‚¨çš„ GPG 欄ä½æˆ–點\"å–消\""
msgid "_New Group Chat"
msgstr "æ–°èŠå¤©å®¤(_N)"
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:419
msgid "I would like to add you to my roster"
msgstr "æˆ‘å¸Œæœ›å°‡æ‚¨åŠ å…¥åˆ°æˆ‘çš„è¯çµ¡äººæ¸…å–®"
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:116
msgid "Cannot find history logs database"
msgstr "無法找到命令æ·ç¨‹è¨˜éŒ„資料庫"
#. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:156
msgid "Contacts"
msgstr "è¯çµ¡äºº"
#. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_manager.py:169 ../src/history_manager.py:213
#: ../src/history_window.py:98
msgid "Date"
msgstr "日期"
#. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:176 ../src/history_manager.py:232
msgid "Nickname"
msgstr "暱稱"
#. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_manager.py:185 ../src/history_manager.py:220
#: ../src/history_window.py:106
msgid "Message"
msgstr "訊æ¯"
#. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:193 ../src/history_manager.py:226
msgid "Subject"
msgstr "主題"
-#: ../src/history_manager.py:241
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+#: ../src/history_manager.py:252
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
msgstr "您確定è¦æ¸…除資料庫?(å¼·çƒˆå»ºè° GAJIM 執行時ä¸è¦é€²è¡Œæ¤ä½œæ¥)"
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:254
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\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"
+"\n"
"如果您點擊\"是\"，請ç‰å¾……"
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:259
+msgid "Database Cleanup"
+msgstr "資料庫清ç†"
+
+#: ../src/history_manager.py:477
msgid "Exporting History Logs..."
msgstr "輸出命令æ·ç¨‹è¨˜éŒ„…"
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:554
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s 在 %(time)s 時說: %(message)s\n"
-#: ../src/history_manager.py:572
-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] "您確定è¦åˆªé™¤æ‰€é¸å–è¯çµ¡äººçš„命令æ·ç¨‹è¨˜éŒ„?"
+#: ../src/history_manager.py:592
+#, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "您真的è¦åˆªé™¤ %(jid)s 的記錄檔嗎？"
+
+#: ../src/history_manager.py:596
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "您真的è¦åˆªé™¤å·²é¸è¯çµ¡äººçš„記錄檔嗎？"
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:598 ../src/history_manager.py:637
msgid "This is an irreversible operation."
msgstr "該作æ¥æ˜¯ä¸å¯æ’¤æ¶ˆçš„。"
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:600 ../src/history_manager.py:639
+msgid "Deletion Confirmation"
+msgstr "刪除確èª"
+
+#: ../src/history_manager.py:634
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "您確定è¦åˆªé™¤æ‰€é¸å–的訊æ¯?"
@@ -8918,14 +9360,18 @@ msgstr "ç¾åœ¨ç‹€æ…‹: %(status)s: %(status_msg)s"
msgid "Status is now: %(status)s"
msgstr "ç¾åœ¨ç‹€æ…‹: %(status)s "
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523 ../src/htmltextview.py:533
msgid "Timeout loading image"
msgstr "讀å–檔案逾時"
-#: ../src/htmltextview.py:535
+#: ../src/htmltextview.py:543
msgid "Image is too big"
msgstr "圖片太大"
+#: ../src/htmltextview.py:576
+msgid "Loading"
+msgstr "載入"
+
#: ../src/message_window.py:222
msgid "You are going to close several tabs"
msgstr "您將è¦é—œé–‰å¤šå€‹æ¨™ç±¤"
@@ -8934,19 +9380,19 @@ msgstr "您將è¦é—œé–‰å¤šå€‹æ¨™ç±¤"
msgid "Do you really want to close them all?"
msgstr "您確定è¦é—œé–‰æ‰€æœ‰é€™äº›å—Ž"
-#: ../src/message_window.py:485
+#: ../src/message_window.py:497
msgid "Chats"
msgstr "èŠå¤©"
-#: ../src/message_window.py:487
+#: ../src/message_window.py:499
msgid "Group Chats"
msgstr "多人èŠå¤©"
-#: ../src/message_window.py:489
+#: ../src/message_window.py:501
msgid "Private Chats"
msgstr "ç§äººèŠå¤©"
-#: ../src/message_window.py:495
+#: ../src/message_window.py:507
msgid "Messages"
msgstr "訊æ¯"
@@ -8958,286 +9404,305 @@ msgstr "- 訊æ¯å°‡æœƒè¢«è¨˜éŒ„"
msgid "- messages will not be logged"
msgstr "- 訊æ¯å°‡ä¸æœƒè¢«è¨˜éŒ„"
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s 變更了狀態"
+#: ../src/notify.py:319
+msgid "Ignore"
+msgstr "忽略"
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s 上線了"
+#: ../src/plugins/gui.py:67
+msgid "Plugin"
+msgstr "外掛程å¼"
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s 離開了"
+#: ../src/plugins/gui.py:161
+msgid "Plugin failed"
+msgstr "外掛程å¼å¤±æ•—"
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr " %(nickname)s 發來的新訊æ¯"
+#: ../src/plugins/gui.py:205
+msgid "Unable to properly remove the plugin"
+msgstr "無法é©ç•¶åœ°ç§»é™¤å¤–掛程å¼"
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "來自èŠå¤©å®¤ %s çš„ç§äººè¨Šæ¯"
+#. members not safe
+#: ../src/plugins/gui.py:213 ../src/plugins/pluginmanager.py:497
+#: ../src/plugins/pluginmanager.py:505
+msgid "Archive is malformed"
+msgstr "å˜æª”異常"
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#: ../src/plugins/gui.py:236 ../src/plugins/gui.py:244
+#: ../src/plugins/pluginmanager.py:513
+msgid "Plugin already exists"
+msgstr "外掛程å¼å·²ç¶“å˜åœ¨"
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "來自 %(nickname)s 的訊æ¯"
+#: ../src/plugins/gui.py:236
+msgid "Overwrite?"
+msgstr "覆寫？"
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "來自 %(nickname)s 的新訊æ¯"
+#: ../src/plugins/gui.py:265
+msgid "Configuration"
+msgstr "組態"
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "忽略"
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:483 ../src/plugins/pluginmanager.py:489
+msgid "Archive corrupted"
+msgstr "å˜æª”å·²æ壞"
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:485
+msgid "Archive empty"
+msgstr "å˜æª”為空"
+
+#: ../src/profile_window.py:60
msgid "Retrieving profile..."
msgstr "æ£åœ¨ç²å–å´å¯«â€¦"
-#: ../src/profile_window.py:111 ../src/roster_window.py:3012
+#: ../src/profile_window.py:125 ../src/roster_window.py:3137
msgid "File is empty"
msgstr "檔案為空"
-#: ../src/profile_window.py:114 ../src/roster_window.py:3015
+#: ../src/profile_window.py:128 ../src/roster_window.py:3140
msgid "File does not exist"
msgstr "檔案ä¸å˜åœ¨"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3017 ../src/roster_window.py:3028
+#: ../src/profile_window.py:142 ../src/profile_window.py:158
+#: ../src/roster_window.py:3142 ../src/roster_window.py:3153
msgid "Could not load image"
msgstr "無法讀å–圖片"
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:229
msgid "Wrong date format"
msgstr "éŒ¯èª¤çš„è³‡æ–™æ ¼å¼"
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:230
msgid "Format of the date must be YYYY-MM-DD"
msgstr "æ—¥æœŸçš„æ ¼å¼å¿…é ˆæ˜¯ YYYY-MM-DD"
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:284
msgid "Information received"
msgstr "資訊已收到"
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:362
msgid "Without a connection you can not publish your contact information."
msgstr "沒有連線的情æ³ä¸‹æ‚¨ç„¡æ³•ç™¼å¸ƒæ‚¨çš„è¯çµ¡äººè³‡è¨Šã€‚"
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:375
msgid "Sending profile..."
msgstr "傳é€å´å¯«â€¦"
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:394
msgid "Information NOT published"
msgstr "資訊沒有發布"
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:401
msgid "vCard publication failed"
msgstr "vCard 發布失敗"
-#: ../src/profile_window.py:377
-msgid "There was an error while publishing your personal information, try again later."
+#: ../src/profile_window.py:402
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
msgstr "發布您的個人資訊時發生錯誤，請ç¨å¾Œé‡è©¦ã€‚"
-#: ../src/roster_window.py:262 ../src/roster_window.py:1028
+#: ../src/roster_window.py:240 ../src/roster_window.py:1028
msgid "Merged accounts"
msgstr "å·²åˆä½µçš„帳號"
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:1956
msgid "Authorization has been sent"
msgstr "授權傳é€æˆåŠŸ"
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1957
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "ç¾åœ¨\"%s\"將知é“您的狀態。"
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:1980
msgid "Subscription request has been sent"
msgstr "èªè‰è«‹æ±‚已發出"
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:1981
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "如果\"%s\"接å—æ¤è«‹æ±‚，您將知é“ä»–/她的狀態。"
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:1995
msgid "Authorization has been removed"
msgstr "授權被移除"
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:1996
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "\"%s\" 將一直看到您的狀態為離線。"
-#: ../src/roster_window.py:2009
+#: ../src/roster_window.py:2023
msgid "GPG is not usable"
msgstr "GPG 無法使用"
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2024
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "您將在無 OpenPGP 情æ³ä¸‹é€£ç·šåˆ° %s。"
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3573
+#: ../src/roster_window.py:2231 ../src/roster_window.py:3714
msgid "You are participating in one or more group chats"
msgstr "您æ£åœ¨åƒèˆ‡ä¸€å€‹æˆ–多個多人èŠå¤©"
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3574
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
+#: ../src/roster_window.py:2232 ../src/roster_window.py:3715
+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:2249
+#: ../src/roster_window.py:2258
msgid "desync'ed"
msgstr "未åŒæ¥"
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2324
msgid "Really quit Gajim?"
msgstr "真得è¦é›¢é–‹ Gajim?"
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2325
msgid "Are you sure you want to quit Gajim?"
msgstr "您確定您è¦é›¢é–‹ Gajim å—Ž?"
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2326
msgid "Always close Gajim"
msgstr "總是關閉 Gajim"
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2410
msgid "You have running file transfers"
msgstr "您有傳é€ä¸çš„檔案"
-#: ../src/roster_window.py:2397
-msgid "If you quit now, the file(s) being transferred will be stopped. Do you still want to quit?"
+#: ../src/roster_window.py:2411
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
msgstr "如果ç¾åœ¨é›¢é–‹ï¼Œå‚³é€ä¸çš„檔案會åœæ¢å‚³è¼¸ã€‚您ä»ç„¶è¦é›¢é–‹å—Ž?"
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2730
+#: ../src/roster_window.py:2442 ../src/roster_window.py:2856
msgid "You have unread messages"
msgstr "您有未讀訊æ¯"
-#: ../src/roster_window.py:2429
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
+#: ../src/roster_window.py:2443
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
msgstr ""
"除éžæ‚¨å•Ÿç”¨äº†å‘½ä»¤æ·ç¨‹è¨˜éŒ„而且å‘您傳é€è¨Šæ¯çš„è¯çµ¡äººåœ¨æ‚¨çš„è¯çµ¡äººæ¸…å–®ä¸ï¼Œæ‚¨æ‰èƒ½\n"
"在以後讀到這些訊æ¯ã€‚"
-#: ../src/roster_window.py:2731
+#: ../src/roster_window.py:2857
msgid "You must read them before removing this transport."
msgstr "在移除代ç†ä¹‹å‰æ‚¨å¿…é ˆæª¢è¦–å®ƒå€‘ã€‚"
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2860
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "代ç†\"%s\"將被移除"
-#: ../src/roster_window.py:2735
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
+#: ../src/roster_window.py:2861
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
msgstr "您將無法å†å’Œä½¿ç”¨é€™å€‹ä»£ç†çš„è¯çµ¡äººæ”¶ç™¼è¨Šæ¯ã€‚"
-#: ../src/roster_window.py:2738
+#: ../src/roster_window.py:2864
msgid "Transports will be removed"
msgstr "代ç†å°‡è¢«ç§»é™¤"
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2869
#, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
msgstr "您無法å†å’Œä¾†è‡ªé€™äº›ä»£ç†çš„è¯çµ¡äººæ”¶ç™¼è¨Šæ¯: %s"
-#: ../src/roster_window.py:2811
+#: ../src/roster_window.py:2937
msgid "You are about to block a contact. Are you sure you want to continue?"
msgstr "您將è¦é˜»æ–·ä¸€å€‹è¯çµ¡äººã€‚您確定è¦ç¹¼çºŒå—Ž?"
-#: ../src/roster_window.py:2813
-msgid "This contact will see you offline and you will not receive messages he will send you."
+#: ../src/roster_window.py:2939
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
msgstr "這個è¯çµ¡äººå°‡çœ‹åˆ°æ‚¨é›¢ç·šä¸¦ä¸”您ä¸æœƒåœ¨æ”¶åˆ°ä»–傳é€çµ¦æ‚¨çš„訊æ¯ã€‚"
#. it's jid
-#: ../src/roster_window.py:2904
+#: ../src/roster_window.py:3029
msgid "Rename Contact"
msgstr "é‡æ–°å‘½åè¯çµ¡äºº"
-#: ../src/roster_window.py:2905
+#: ../src/roster_window.py:3030
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "為è¯çµ¡äºº %s 輸入新的暱稱"
-#: ../src/roster_window.py:2912
+#: ../src/roster_window.py:3037
msgid "Rename Group"
msgstr "é‡æ–°å‘½å群組"
-#: ../src/roster_window.py:2913
+#: ../src/roster_window.py:3038
#, python-format
msgid "Enter a new name for group %s"
msgstr "為群組 %s 輸入新的å稱"
-#: ../src/roster_window.py:2958
+#: ../src/roster_window.py:3083
msgid "Remove Group"
msgstr "移除群組"
-#: ../src/roster_window.py:2959
+#: ../src/roster_window.py:3084
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "您想從è¯çµ¡äººæ¸…å–®ä¸åˆªé™¤çµ„ %s ?"
-#: ../src/roster_window.py:2960
+#: ../src/roster_window.py:3085
msgid "Also remove all contacts in this group from your roster"
msgstr "åŒæ™‚從è¯çµ¡äººæ¸…單移除這個群組的所有è¯çµ¡äºº"
-#: ../src/roster_window.py:2999
+#: ../src/roster_window.py:3124
msgid "Assign OpenPGP Key"
msgstr "指定 OpenPGP 密鑰"
-#: ../src/roster_window.py:3000
+#: ../src/roster_window.py:3125
msgid "Select a key to apply to the contact"
msgstr "é¸æ“‡ä¸€å€‹å°æ‡‰æ–¼è©²è¯çµ¡äººçš„密鑰。"
-#: ../src/roster_window.py:3383
+#: ../src/roster_window.py:3524
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "è¯çµ¡äºº\"%s\"將從您的è¯çµ¡äººæ¸…å–®ä¸è¢«ç§»é™¤"
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3526
#, python-format
msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
msgstr "您將從您的è¯çµ¡äººæ¸…å–®ä¸å°‡ \"%(name)s\" (%(jid)s) 移除。\n"
-#: ../src/roster_window.py:3390
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
+#: ../src/roster_window.py:3531
+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:3396
+#: ../src/roster_window.py:3537
msgid "Do you want to continue?"
msgstr "您è¦ç¹¼çºŒå—Ž?"
-#: ../src/roster_window.py:3400
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
+#: ../src/roster_window.py:3541
+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:3403
+#: ../src/roster_window.py:3544
msgid "I want this contact to know my status after removal"
msgstr "我想讓æ¤è¯çµ¡äººåœ¨è¢«ç§»é™¤ä¹‹å¾Œä»ç„¶çŸ¥é“我的狀態"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3407
+#: ../src/roster_window.py:3548
msgid "Contacts will be removed from your roster"
msgstr "è¯çµ¡äººå°‡å¾žæ‚¨çš„è¯çµ¡äººæ¸…å–®ä¸è¢«ç§»é™¤"
-#: ../src/roster_window.py:3412
+#: ../src/roster_window.py:3553
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -9246,191 +9711,206 @@ msgstr ""
"移除這些è¯çµ¡äºº: %s çš„åŒæ™‚\n"
"將移除èªè‰å°Žè‡´ä»–們將一直看到您為離線。"
-#: ../src/roster_window.py:3470
-msgid "You are about to send a custom status. Are you sure you want to continue?"
+#: ../src/roster_window.py:3611
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
msgstr "您將傳é€ä¸€å€‹è‡ªè¨‚的狀態。您確定è¦ç¹¼çºŒå—Ž?"
-#: ../src/roster_window.py:3472
+#: ../src/roster_window.py:3613
#, python-format
-msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he or she will see your global status."
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he or she will see your global status."
msgstr ""
"這個è¯çµ¡äººæœƒæš«æ™‚看到您的狀態為 %(status)s，直到您下次變更您的狀態。之後\n"
"他/她會看到您的全域狀態。"
-#: ../src/roster_window.py:3491
+#: ../src/roster_window.py:3632
msgid "No account available"
msgstr "沒有有效帳號"
-#: ../src/roster_window.py:3492
+#: ../src/roster_window.py:3633
msgid "You must create an account before you can chat with other contacts."
msgstr "æ‚¨å¿…é ˆåœ¨èˆ‡ä»–äººèŠå¤©å‰æ–°å¢žå¸³è™Ÿã€‚"
-#: ../src/roster_window.py:4106
+#: ../src/roster_window.py:4286
msgid "Metacontacts storage not supported by your server"
msgstr "您的伺æœå™¨ä¸æ”¯æ´å„²å˜å…ƒè¯çµ¡äººè³‡è¨Š"
-#: ../src/roster_window.py:4108
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "您的伺æœå™¨ä¸æ”¯æ´å„²å˜å…ƒè¯çµ¡äººè³‡è¨Šã€‚所以這些資訊在下次é‡æ–°é€£ç·šæ™‚ä¸æœƒè¢«å„²å˜ã€‚"
+#: ../src/roster_window.py:4288
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"您的伺æœå™¨ä¸æ”¯æ´å„²å˜å…ƒè¯çµ¡äººè³‡è¨Šã€‚所以這些資訊在下次é‡æ–°é€£ç·šæ™‚ä¸æœƒè¢«å„²å˜ã€‚"
-#: ../src/roster_window.py:4200
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4380
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
msgstr "您在建立一個元è¯çµ¡äººã€‚確定繼續?"
-#: ../src/roster_window.py:4202
-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."
+#: ../src/roster_window.py:4382
+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\n"
"帳號或代ç†å¸³è™Ÿæ™‚用到。"
-#: ../src/roster_window.py:4317
+#: ../src/roster_window.py:4503
msgid "Invalid file URI:"
-msgstr "無效的檔案ä½å€: "
+msgstr "無效的檔案ä½å€:"
-#: ../src/roster_window.py:4329
+#: ../src/roster_window.py:4515
#, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
-msgstr[0] "您想è¦å°‡æª”案傳é€çµ¦ %s å—Ž: "
+msgstr[0] "您想è¦å°‡æª”案傳é€çµ¦ %s å—Ž:"
-#: ../src/roster_window.py:4444
+#: ../src/roster_window.py:4650
#, python-format
msgid "Send %s to %s"
msgstr "å‚³é€ %s 給 %s"
-#: ../src/roster_window.py:4450
+#: ../src/roster_window.py:4661
+#, python-format
+msgid "Make %s first contact"
+msgstr "å°‡ %s è¨ç‚ºç¬¬ä¸€è¯çµ¡äºº"
+
+#: ../src/roster_window.py:4664
#, python-format
msgid "Make %s and %s metacontacts"
-msgstr "ç”± %s 與 %s 建立元è¯çµ¡äºº"
+msgstr "å°‡ %s 與 %s è¨ç‚ºä¸ç¹¼è¯çµ¡äºº"
#. new chat
#. single message
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4889 ../src/roster_window.py:4943
-#: ../src/roster_window.py:4952 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5104 ../src/roster_window.py:5158
+#: ../src/roster_window.py:5167 ../src/statusicon.py:264
+#: ../src/statusicon.py:311 ../src/statusicon.py:317
#, python-format
msgid "using account %s"
msgstr "使用帳號 %s"
#. add
-#: ../src/roster_window.py:4959
+#: ../src/roster_window.py:5174
#, python-format
msgid "to %s account"
msgstr "至帳號 %s"
#. disco
-#: ../src/roster_window.py:4964
+#: ../src/roster_window.py:5179
#, python-format
msgid "using %s account"
msgstr "使用 %s 帳號"
-#: ../src/roster_window.py:5003 ../src/statusicon.py:326
+#: ../src/roster_window.py:5218 ../src/statusicon.py:327
msgid "_Manage Bookmarks..."
msgstr "管ç†æ›¸ç±¤(_M)…"
#. profile, avatar
-#: ../src/roster_window.py:5023
+#: ../src/roster_window.py:5238
#, python-format
msgid "of account %s"
msgstr "帳號 %s 的"
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5279
#, python-format
msgid "for account %s"
msgstr "帳號 %s"
-#: ../src/roster_window.py:5124 ../src/roster_window.py:5229
+#: ../src/roster_window.py:5339 ../src/roster_window.py:5447
msgid "_Change Status Message"
msgstr "變更狀態訊æ¯(_C)"
-#: ../src/roster_window.py:5157
+#: ../src/roster_window.py:5372
msgid "Publish Tune"
msgstr "發布音樂"
-#: ../src/roster_window.py:5159
+#: ../src/roster_window.py:5374
msgid "Publish Location"
msgstr "發布ä½ç½®è³‡è¨Š"
-#: ../src/roster_window.py:5162
+#: ../src/roster_window.py:5377
msgid "Configure Services..."
msgstr "é…ç½®æœå‹™â€¦"
-#: ../src/roster_window.py:5307
+#: ../src/roster_window.py:5525
msgid "_Maximize All"
msgstr "放到最大全部(_M)"
-#: ../src/roster_window.py:5317 ../src/roster_window.py:5491
+#: ../src/roster_window.py:5535 ../src/roster_window.py:5708
msgid "Send Group M_essage"
msgstr "傳é€ç¾¤çµ„訊æ¯(_E)"
-#: ../src/roster_window.py:5325
+#: ../src/roster_window.py:5543
msgid "To all users"
msgstr "å‘所有的使用者"
-#: ../src/roster_window.py:5329
+#: ../src/roster_window.py:5547
msgid "To all online users"
msgstr "å‘所有線上使用者"
#. Manage Transport submenu
-#: ../src/roster_window.py:5511
+#: ../src/roster_window.py:5728
msgid "_Manage Contacts"
msgstr "管ç†è¯çµ¡äºº(_M)"
#. Edit Groups
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5737
msgid "Edit _Groups"
msgstr "編輯群組(_G)"
#. Send single message
-#: ../src/roster_window.py:5575
+#: ../src/roster_window.py:5792
msgid "Send Single Message"
msgstr "傳é€å–®æ¢è¨Šæ¯(_S)"
#. Execute Command
-#: ../src/roster_window.py:5622
+#: ../src/roster_window.py:5839
msgid "Execute Command..."
msgstr "執行命令…"
#. Manage Transport submenu
-#: ../src/roster_window.py:5632
+#: ../src/roster_window.py:5849
msgid "_Manage Transport"
msgstr "管ç†ä»£ç†(_M)"
#. Modify Transport
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:5858
msgid "_Modify Transport"
msgstr "修改代ç†(_M)"
#. Rename
-#: ../src/roster_window.py:5651
+#: ../src/roster_window.py:5868
msgid "_Rename"
msgstr "é‡æ–°å‘½å(_R)"
-#: ../src/roster_window.py:5711
+#: ../src/roster_window.py:5928
msgid "_Maximize"
msgstr "放到最大(_M)"
-#: ../src/roster_window.py:5720
+#: ../src/roster_window.py:5937
msgid "_Reconnect"
msgstr "é‡æ–°é€£ç·š(_R)"
-#: ../src/roster_window.py:5727
+#: ../src/roster_window.py:5944
msgid "_Disconnect"
msgstr "ä¸æ–·é€£ç·š(_D)"
#. History manager
-#: ../src/roster_window.py:5816
+#: ../src/roster_window.py:6033
msgid "History Manager"
msgstr "命令æ·ç¨‹è¨˜éŒ„管ç†å™¨"
-#: ../src/roster_window.py:5827
+#: ../src/roster_window.py:6044
msgid "_Join New Group Chat"
msgstr "åŠ å…¥æ–°çš„èŠå¤©å®¤(_J)"
-#: ../src/roster_window.py:6055
+#: ../src/roster_window.py:6263
msgid "Change Status Message..."
msgstr "變更狀態訊æ¯â€¦"
@@ -9447,52 +9927,55 @@ msgstr "在收到的資料表ä¸æœ‰éŒ¯èª¤"
msgid "No result"
msgstr "ç„¡çµæžœ"
-#: ../src/session.py:136
+#: ../src/session.py:95
msgid "Disk WriteError"
msgstr "ç£ç¢Ÿå¯«å…¥éŒ¯èª¤"
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "主題: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:406 ../src/session.py:450
msgid "Confirm these session options"
msgstr "確定這些作æ¥éšŽæ®µå±¬æ€§"
-#: ../src/session.py:448
+#: ../src/session.py:407
#, python-format
msgid ""
"The remote client wants '\n"
-" 'to negotiate an session with these features:\n\n"
-"%s\n\n"
+" 'to negotiate an session with these features:\n"
+"\n"
+"%s\n"
+"\n"
"Are these options acceptable?"
msgstr ""
"é 端客戶端想è¦\n"
-" å”商建立一個具有一下特性的作æ¥éšŽæ®µ: \n\n"
-"%s\n\n"
+" å”商建立一個具有一下特性的作æ¥éšŽæ®µ: \n"
+"\n"
+"%s\n"
+"\n"
"是å¦æŽ¥å—?"
-#: ../src/session.py:492
+#: ../src/session.py:451
#, python-format
msgid ""
-"The remote client selected these options:\n\n"
-"%s\n\n"
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
"Continue with the session?"
msgstr ""
-"é 端客戶端é¸æ“‡äº†é€™äº›ç‰¹æ€§: \n\n"
-"%s\n\n"
+"é 端客戶端é¸æ“‡äº†é€™äº›ç‰¹æ€§: \n"
+"\n"
+"%s\n"
+"\n"
"繼續進行作æ¥éšŽæ®µ?"
-#: ../src/statusicon.py:227
+#: ../src/statusicon.py:228
msgid "_Change Status Message..."
msgstr "變更狀態訊æ¯_(C)…"
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:342
msgid "Hide _Roster"
msgstr "éš±è—è¯çµ¡äººæ¸…å–®(_R)"
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:353
msgid "Hide this menu"
msgstr "éš±è—本é¸å–®"
@@ -9631,56 +10114,65 @@ msgstr ""
"這個æœå‹™ç„¡æ³•æ‡‰ç”詳細的資訊。\n"
"這很å¯èƒ½æ˜¯ä¼ºæœå™¨çš„éºç•™å•é¡Œï¼Œæˆ–是伺æœå™¨è¢«æ壞了"
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
msgid "?Client:Unknown"
msgstr "ä¸æ˜Ž"
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
msgid "?OS:Unknown"
msgstr "ä¸æ˜Ž"
-#: ../src/vcard.py:288
+#: ../src/vcard.py:310
msgid "?Time:Unknown"
msgstr "ä¸æ˜Ž"
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
#, python-format
msgid "since %s"
msgstr "自 %s"
-#: ../src/vcard.py:345
+#: ../src/vcard.py:367
msgid "?Role in Group Chat:<b>Role:</b>"
msgstr "?Role in Group Chat:<b>角色</b>"
-#: ../src/vcard.py:349
+#: ../src/vcard.py:371
msgid "<b>Affiliation:</b>"
-msgstr "<b>æ¸å±¬: </b>"
+msgstr "<b>æ¸å±¬:</b>"
-#: ../src/vcard.py:357
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+#: ../src/vcard.py:379
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
msgstr "æ¤è¯çµ¡äººå°æ‚¨çš„狀態資訊感興趣，但您ä¸é—œå¿ƒä»–/她的狀態"
-#: ../src/vcard.py:359
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+#: ../src/vcard.py:381
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
msgstr "您å°æ¤è¯çµ¡äººçš„狀態資訊感興趣，但他/她ä¸é—œå¿ƒæ‚¨çš„狀態"
-#: ../src/vcard.py:361
+#: ../src/vcard.py:383
msgid "You and the contact are interested in each other's presence information"
msgstr "您與æ¤è¯çµ¡äººåŒæ™‚å°å°æ–¹çš„狀態資訊感興趣"
#. None
-#: ../src/vcard.py:363
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+#: ../src/vcard.py:385
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
msgstr "您與他/她互ä¸é—œå¿ƒå°æ–¹çš„狀態資訊"
-#: ../src/vcard.py:370
+#: ../src/vcard.py:392
msgid "You are waiting contact's answer about your subscription request"
msgstr "ç‰å¾…è¯çµ¡äººå›žæ‡‰æ‚¨çš„èªè‰è«‹æ±‚"
-#: ../src/vcard.py:372
+#: ../src/vcard.py:394
msgid "There is no pending subscription request."
msgstr "沒有未處ç†çš„èªè‰è«‹æ±‚"
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
msgid " resource with priority "
msgstr "帶有優先ç‰ç´šçš„資æº"
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "一個 GTK+ Jabber 客戶端"
diff --git a/scripts/dev/plugins_translate b/scripts/dev/plugins_translate
new file mode 100755
index 0000000000000000000000000000000000000000..dc9233cb4bc5107e7ae375b968a381b89b8a7d1a
--- /dev/null
+++ b/scripts/dev/plugins_translate
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+PYFILES=$(find -L ./ -type f -name "*.py")
+GLADEFILES=$(find -L ./ -type f -name "*.ui")
+
+
+check_args()
+{
+ if [ $# -ne 2 ]; then
+ echo "Missing lang argument" >&2
+ exit 4
+ fi
+}
+
+init_ln()
+{
+ if [ -e "core_plugins" ] && [ ! -L "core_plugins" ]; then
+ echo "core_plugins must be a symbolic link" >&2
+ exit 1
+ fi
+ if [ ! -e "core_plugins" ]; then
+ ln -s ../../plugins core_plugins
+ fi
+ if [ ! -L "community_plugins" ]; then
+ echo "community_plugins should be a symbolic link to gajim-plugins repository, else they won't be in po files"
+ fi
+}
+
+make_pot()
+{
+ # Generate .ui.h
+ find -L ./ -type f -name "*.ui" -exec intltool-extract --type="gettext/glade" {} \;
+ GLADEHFILES=$(find -L ./ -type f -name "*.ui.h")
+ xgettext -k_ -kN_ -o plugins_translations.pot $PYFILES $GLADEHFILES --from-code=utf-8
+ rm $GLADEHFILES
+}
+
+make_po()
+{
+ if [ -f $1.po ]; then
+ echo "Updating '$1' language";
+ msgmerge -U $1.po plugins_translations.pot;
+ else
+ msginit -l $1.UTF-8 -o $1.po;
+ fi
+}
+
+make_mo()
+{
+ if [ ! -f $1.po ]; then
+ echo "$1.po doesn't existe. Use plugins_translation make_po $1 to create it.";
+ exit 3
+ fi
+ mkdir -p locale/$1/LC_MESSAGES
+ msgfmt -o $1.mo $1.po
+}
+
+install_mo()
+{
+ if [ -L community_plugins ]; then
+ cp $1.mo community_plugins/plugins_translate/
+ fi
+ mkdir -p ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/
+ cp $1.mo ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/gajim_plugins.mo
+}
+
+
+case "$1" in
+ make_po)
+ check_args $@
+ init_ln
+ make_pot
+ make_po $2
+ ;;
+ make_mo)
+ check_args $@
+ make_mo $2
+ ;;
+ install_mo)
+ install_mo
+ ;;
+ all)
+ check_args $@
+ init_ln
+ make_pot
+ make_po $2
+ make_mo $2
+ install_mo $2
+ ;;
+ *)
+ echo "Usage: plugins_translation {all|make_po|make_mo|install_mo}" >&2
+ echo "example: plugins_translation make_po fr_FR"
+ exit 2
+ ;;
+esac
diff --git a/setup_win32.py b/setup_win32.py
index 7a94bb72471cbd11155013b9fdadf8b9be4e40e4..c65b62857634991994d8a197f3471bcaa36b5515 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -31,7 +31,8 @@ if 'gtk' in os.listdir('.'):
options = {
'build_exe': {
- 'includes': ['gtk.keysyms'],
+ 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'potr',
+ 'goocanvas'],
'base': 'Win32GUI',
'bin_excludes': [
'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',
@@ -49,11 +50,11 @@ options = {
setup(
name='Gajim',
- version='0.14.1',
+ version='0.15',
description='A full featured Jabber client',
author='Gajim Development Team',
- url='http://www.gajim.org/',
- download_url='http://www.gajim.org/downloads.php',
+ url='http://gajim.org/',
+ download_url='http://gajim.org/downloads.php',
license='GPL',
options=options,
executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'),
diff --git a/src/chat_control.py b/src/chat_control.py
index a31af5cf43d13218bbf2bc241c25c5a73eedb188..dac0224e9f04fffd6e7720c5ef646e31caa3415d 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -54,6 +54,7 @@ from common.pep import MOODS, ACTIVITIES
from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC
from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION
from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER
+from common.xmpp.protocol import NS_CHATSTATES
from common.connection_handlers_events import MessageOutgoingEvent
from command_system.implementation.middleware import ChatCommandProcessor
@@ -63,6 +64,7 @@ from command_system.implementation.hosts import ChatCommands
# Here we load the module with the standard commands, so they are being detected
# and dispatched.
import command_system.implementation.standard
+import command_system.implementation.execute
try:
import gtkspell
@@ -309,9 +311,16 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
def on_seclabels_ready(self):
lb = self.seclabel_combo.get_model()
lb.clear()
- for label in gajim.connections[self.account].seclabel_catalogues[self.contact.jid][2]:
+ i = 0
+ sel = 0
+ catalogue = gajim.connections[self.account].seclabel_catalogues[
+ self.contact.jid]
+ for label in catalogue[2]:
lb.append([label])
- self.seclabel_combo.set_active(0)
+ if label == catalogue[3]:
+ sel = i
+ i += 1
+ self.seclabel_combo.set_active(sel)
self.seclabel_combo.set_no_show_all(False)
self.seclabel_combo.show_all()
@@ -521,8 +530,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
super(ChatControlBase, self).shutdown()
# PluginSystem: removing GUI extension points connected with ChatControlBase
# instance object
- gajim.plugin_manager.remove_gui_extension_point('chat_control_base', self)
- gajim.plugin_manager.remove_gui_extension_point('chat_control_base_draw_banner', self)
+ gajim.plugin_manager.remove_gui_extension_point('chat_control_base',
+ self)
+ gajim.plugin_manager.remove_gui_extension_point(
+ 'chat_control_base_draw_banner', self)
+ gajim.plugin_manager.remove_gui_extension_point('print_special_text',
+ self)
gajim.ged.remove_event_handler('our-show', ged.GUI1,
self._nec_our_status)
@@ -850,8 +863,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
return label
def send_message(self, message, keyID='', type_='chat', chatstate=None,
- msg_id=None, composing_xep=None, resource=None, xhtml=None, callback=None,
- callback_args=[], process_commands=True):
+ msg_id=None, resource=None, xhtml=None, callback=None, callback_args=[],
+ process_commands=True):
"""
Send the given message to the active tab. Doesn't return None if error
"""
@@ -866,9 +879,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
gajim.nec.push_outgoing_event(MessageOutgoingEvent(None,
account=self.account, jid=self.contact.jid, message=message,
keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id,
- composing_xep=composing_xep, resource=resource,
- user_nick=self.user_nick, xhtml=xhtml, label=label,
- callback=callback, callback_args= callback_args))
+ resource=resource, user_nick=self.user_nick, xhtml=xhtml,
+ label=label, callback=callback, callback_args=callback_args,
+ control=self))
# Record the history of sent messages
self.save_message(message, 'sent')
@@ -1426,18 +1439,6 @@ class ChatControl(ChatControlBase):
ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
'chat_control', contact, acct, resource)
- self._dbus_message_sent_match = None
- if dbus_support.supported:
- bus = dbus_support.session_bus.bus()
- try:
- obj = bus.get_object(remote_control.SERVICE, remote_control.OBJ_PATH)
- except:
- # likely dbus service not started
- pass
- else:
- iface = dbus.Interface(obj, remote_control.INTERFACE)
- self._dbus_message_sent_match = iface.connect_to_signal("MessageSent", self.on_message_sent)
-
self.gpg_is_active = False
# for muc use:
# widget = self.xml.get_object('muc_window_actions_button')
@@ -1591,6 +1592,22 @@ class ChatControl(ChatControlBase):
id_ = widget.connect('value_changed', self.on_sound_hscale_value_changed)
self.handlers[id_] = widget
+ self.info_bar = gtk.InfoBar()
+ content_area = self.info_bar.get_content_area()
+ self.info_bar_label = gtk.Label()
+ self.info_bar_label.set_use_markup(True)
+ self.info_bar_label.set_alignment(0, 0)
+ content_area.add(self.info_bar_label)
+ self.info_bar.set_no_show_all(True)
+ widget = self.xml.get_object('vbox2')
+ widget.pack_start(self.info_bar, expand=False, padding=5)
+ widget.reorder_child(self.info_bar, 1)
+
+ # List of waiting infobar messages
+ self.info_bar_queue = []
+
+ self.subscribe_events()
+
if not session:
# Don't use previous session if we want to a specific resource
# and it's not the same
@@ -1660,6 +1677,20 @@ class ChatControl(ChatControlBase):
# instance object
gajim.plugin_manager.gui_extension_point('chat_control', self)
+ def subscribe_events(self):
+ """
+ Register listeners to the events class
+ """
+ gajim.events.event_added_subscribe(self.on_event_added)
+ gajim.events.event_removed_subscribe(self.on_event_removed)
+
+ def unsubscribe_events(self):
+ """
+ Unregister listeners to the events class
+ """
+ gajim.events.event_added_unsubscribe(self.on_event_added)
+ gajim.events.event_removed_unsubscribe(self.on_event_removed)
+
def _update_toolbar(self):
# Formatting
if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active:
@@ -1669,7 +1700,8 @@ class ChatControl(ChatControlBase):
# Add to roster
if not isinstance(self.contact, GC_Contact) \
- and _('Not in Roster') in self.contact.groups:
+ and _('Not in Roster') in self.contact.groups and \
+ gajim.connections[self.account].roster_supported:
self._add_to_roster_button.show()
else:
self._add_to_roster_button.hide()
@@ -2036,24 +2068,13 @@ class ChatControl(ChatControlBase):
if cs and st in ('composing_only', 'all'):
if contact.show == 'offline':
chatstate = ''
- elif contact.composing_xep == 'XEP-0085':
- if st == 'all' or cs == 'composing':
- chatstate = helpers.get_uf_chatstate(cs)
- else:
- chatstate = ''
- elif contact.composing_xep == 'XEP-0022':
- if cs in ('composing', 'paused'):
- # only print composing, paused
- chatstate = helpers.get_uf_chatstate(cs)
- else:
- chatstate = ''
- else:
- # When does that happen ? See [7797] and [7804]
+ elif st == 'all' or cs == 'composing':
chatstate = helpers.get_uf_chatstate(cs)
+ else:
+ chatstate = ''
label_text = '<span %s>%s</span><span %s>%s %s</span>' \
- % (font_attrs, name, font_attrs_small,
- acct_info, chatstate)
+ % (font_attrs, name, font_attrs_small, acct_info, chatstate)
if acct_info:
acct_info = ' ' + acct_info
label_tooltip = '%s%s %s' % (name, acct_info, chatstate)
@@ -2209,7 +2230,7 @@ class ChatControl(ChatControlBase):
dialogs.ESessionInfoWindow(self.session)
def send_message(self, message, keyID='', chatstate=None, xhtml=None,
- process_commands=True):
+ process_commands=True):
"""
Send a message to contact
"""
@@ -2233,25 +2254,9 @@ class ChatControl(ChatControlBase):
chatstates_on = gajim.config.get('outgoing_chat_state_notifications') != \
'disabled'
- composing_xep = contact.composing_xep
chatstate_to_send = None
if chatstates_on and contact is not None:
- if composing_xep is None:
- # no info about peer
- # send active to discover chat state capabilities
- # this is here (and not in send_chatstate)
- # because we want it sent with REAL message
- # (not standlone) eg. one that has body
-
- if contact.our_chatstate:
- # We already asked for xep 85, don't ask it twice
- composing_xep = 'asked_once'
-
- chatstate_to_send = 'active'
- contact.our_chatstate = 'ask' # pseudo state
- # if peer supports jep85 and we are not 'ask', send 'active'
- # NOTE: first active and 'ask' is set in gajim.py
- elif composing_xep is not False:
+ if contact.supports(NS_CHATSTATES):
# send active chatstate on every message (as XEP says)
chatstate_to_send = 'active'
contact.our_chatstate = 'active'
@@ -2274,27 +2279,9 @@ class ChatControl(ChatControlBase):
xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking)
ChatControlBase.send_message(self, message, keyID, type_='chat',
- chatstate=chatstate_to_send, composing_xep=composing_xep,
- xhtml=xhtml, callback=_on_sent,
- callback_args=[contact, message, encrypted, xhtml, self.get_seclabel()],
- process_commands=process_commands)
-
-
- def on_message_sent(self, account_and_message):
- # this is called when an external application sends a chat
- # message using DBus. So we likely need to update the UI
- # accordingly.
- message = account_and_message[1][1]
- jid_and_resource = account_and_message[1][0]
- if not message:
- return
-
- # try to filter based on jid/resource to avoid duplicate
- # messages.
- if jid_and_resource.find('/') > -1:
- jid = jid_and_resource.split('/')[0]
- if jid == self.contact.jid:
- self.print_conversation(message, frm='outgoing')
+ chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent,
+ callback_args=[contact, message, encrypted, xhtml,
+ self.get_seclabel()], process_commands=process_commands)
def check_for_possible_paused_chatstate(self, arg):
"""
@@ -2393,12 +2380,16 @@ class ChatControl(ChatControlBase):
self._show_lock_image(e2e_is_active, 'E2E', e2e_is_active, self.session and \
self.session.is_loggable(), self.session and self.session.verified_identity)
- def print_session_details(self):
- if isinstance(self.session, EncryptedStanzaSession):
+ def print_session_details(self, old_session=None):
+ if isinstance(self.session, EncryptedStanzaSession) or \
+ (old_session and isinstance(old_session, EncryptedStanzaSession)):
self.print_esession_details()
elif isinstance(self.session, ArchivingStanzaSession):
self.print_archiving_session_details()
+ def get_our_nick(self):
+ return gajim.nicks[self.account]
+
def print_conversation(self, text, frm='', tim=None, encrypted=False,
subject=None, xhtml=None, simple=False, xep0184_id=None,
displaymarking=None):
@@ -2455,7 +2446,7 @@ class ChatControl(ChatControlBase):
name = contact.get_shown_name()
else:
kind = 'outgoing'
- name = gajim.nicks[self.account]
+ name = self.get_our_nick()
if not xhtml and not (encrypted and self.gpg_is_active) and \
gajim.config.get('rst_formatting_outgoing_messages'):
from common.rst_xhtml_generator import create_xhtml
@@ -2597,7 +2588,7 @@ class ChatControl(ChatControlBase):
if contact.show == 'offline':
return
- if contact.composing_xep is False: # jid cannot do xep85 nor xep22
+ if not contact.supports(NS_CHATSTATES):
return
# if the new state we wanna send (state) equals
@@ -2605,41 +2596,21 @@ class ChatControl(ChatControlBase):
if contact.our_chatstate == state:
return
- if contact.composing_xep is None:
- # we don't know anything about jid, so return
- # NOTE:
- # send 'active', set current state to 'ask' and return is done
- # in self.send_message() because we need REAL message (with <body>)
- # for that procedure so return to make sure we send only once
- # 'active' until we know peer supports jep85
- return
-
- if contact.our_chatstate == 'ask':
- return
-
- # in JEP22, when we already sent stop composing
- # notification on paused, don't resend it
- if contact.composing_xep == 'XEP-0022' and \
- contact.our_chatstate in ('paused', 'active', 'inactive') and \
- state is not 'composing': # not composing == in (active, inactive, gone)
- contact.our_chatstate = 'active'
- self.reset_kbd_mouse_timeout_vars()
- return
-
- # if we're inactive prevent composing (JEP violation)
+ # if wel're inactive prevent composing (XEP violation)
if contact.our_chatstate == 'inactive' and state == 'composing':
# go active before
gajim.nec.push_outgoing_event(MessageOutgoingEvent(None,
- account=self.account, jid=self.contact.jid, chatstate='active'))
+ account=self.account, jid=self.contact.jid, chatstate='active',
+ control=self))
contact.our_chatstate = 'active'
self.reset_kbd_mouse_timeout_vars()
gajim.nec.push_outgoing_event(MessageOutgoingEvent(None,
account=self.account, jid=self.contact.jid, chatstate=state,
- msg_id=contact.msg_id, composing_xep=contact.composing_xep))
+ msg_id=contact.msg_id, control=self))
contact.our_chatstate = state
- if contact.our_chatstate == 'active':
+ if state == 'active':
self.reset_kbd_mouse_timeout_vars()
def shutdown(self):
@@ -2647,10 +2618,6 @@ class ChatControl(ChatControlBase):
# instance object
gajim.plugin_manager.remove_gui_extension_point('chat_control', self)
- # disconnect from the dbus MessageSent signal.
- if self._dbus_message_sent_match:
- self._dbus_message_sent_match.remove()
-
gajim.ged.remove_event_handler('pep-received', ged.GUI1,
self._nec_pep_received)
gajim.ged.remove_event_handler('vcard-received', ged.GUI1,
@@ -2662,6 +2629,8 @@ class ChatControl(ChatControlBase):
gajim.ged.remove_event_handler('caps-received', ged.GUI1,
self._nec_caps_received)
+ self.unsubscribe_events()
+
# Send 'gone' chatstate
self.send_chatstate('gone', self.contact)
self.contact.chatstate = None
@@ -2906,7 +2875,7 @@ class ChatControl(ChatControlBase):
if row[1] in (constants.KIND_CHAT_MSG_SENT,
constants.KIND_SINGLE_MSG_SENT):
kind = 'outgoing'
- name = gajim.nicks[self.account]
+ name = self.get_our_nick()
elif row[1] in (constants.KIND_SINGLE_MSG_RECV,
constants.KIND_CHAT_MSG_RECV):
kind = 'incoming'
@@ -2956,12 +2925,12 @@ class ChatControl(ChatControlBase):
kind = 'info'
else:
kind = 'print_queue'
- dm = None
- if len(data) > 10:
- dm = data[10]
+ if data[11]:
+ kind = 'out'
+ dm = data[10]
self.print_conversation(data[0], kind, tim=data[3],
- encrypted=data[4], subject=data[1], xhtml=data[7],
- displaymarking=dm)
+ encrypted=data[4], subject=data[1], xhtml=data[7],
+ displaymarking=dm)
if len(data) > 6 and isinstance(data[6], int):
message_ids.append(data[6])
@@ -3173,3 +3142,144 @@ class ChatControl(ChatControlBase):
self.print_conversation(' (', 'status', simple=True)
self.print_conversation('%s' % (status), 'status', simple=True)
self.print_conversation(')', 'status', simple=True)
+
+ def _info_bar_show_message(self):
+ if self.info_bar.get_visible():
+ # A message is already shown
+ return
+ if not self.info_bar_queue:
+ return
+ markup, buttons, args, type_ = self.info_bar_queue[0]
+ self.info_bar_label.set_markup(markup)
+
+ # Remove old buttons
+ area = self.info_bar.get_action_area()
+ for b in area.get_children():
+ area.remove(b)
+
+ # Add new buttons
+ for button in buttons:
+ self.info_bar.add_action_widget(button, 0)
+
+ self.info_bar.set_message_type(type_)
+ self.info_bar.set_no_show_all(False)
+ self.info_bar.show_all()
+
+ def _add_info_bar_message(self, markup, buttons, args,
+ type_=gtk.MESSAGE_INFO):
+ self.info_bar_queue.append((markup, buttons, args, type_))
+ self._info_bar_show_message()
+
+ def _get_file_props_event(self, file_props, type_):
+ evs = gajim.events.get_events(self.account, self.contact.jid, [type_])
+ for ev in evs:
+ if ev.parameters == file_props:
+ return ev
+ return None
+
+ def _on_accept_file_request(self, widget, file_props):
+ gajim.interface.instances['file_transfers'].on_file_request_accepted(
+ self.account, self.contact, file_props)
+ ev = self._get_file_props_event(file_props, 'file-request')
+ if ev:
+ gajim.events.remove_events(self.account, self.contact.jid, event=ev)
+
+ def _on_cancel_file_request(self, widget, file_props):
+ gajim.connections[self.account].send_file_rejection(file_props)
+ ev = self._get_file_props_event(file_props, 'file-request')
+ if ev:
+ gajim.events.remove_events(self.account, self.contact.jid, event=ev)
+
+ def _got_file_request(self, file_props):
+ """
+ Show an InfoBar on top of control
+ """
+ markup = '<b>%s:</b> %s' % (_('File transfer'), file_props['name'])
+ if 'desc' in file_props and file_props['desc']:
+ markup += ' (%s)' % file_props['desc']
+ markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes(
+ file_props['size']))
+ b1 = gtk.Button(_('_Accept'))
+ b1.connect('clicked', self._on_accept_file_request, file_props)
+ b2 = gtk.Button(stock=gtk.STOCK_CANCEL)
+ b2.connect('clicked', self._on_cancel_file_request, file_props)
+ self._add_info_bar_message(markup, [b1, b2], file_props,
+ gtk.MESSAGE_QUESTION)
+
+ def _on_open_ft_folder(self, widget, file_props):
+ if 'file-name' not in file_props:
+ return
+ path = os.path.split(file_props['file-name'])[0]
+ if os.path.exists(path) and os.path.isdir(path):
+ helpers.launch_file_manager(path)
+ ev = self._get_file_props_event(file_props, 'file-completed')
+ if ev:
+ gajim.events.remove_events(self.account, self.contact.jid, event=ev)
+
+ def _on_ok(self, widget, file_props, type_):
+ ev = self._get_file_props_event(file_props, type_)
+ if ev:
+ gajim.events.remove_events(self.account, self.contact.jid, event=ev)
+
+ def _got_file_completed(self, file_props):
+ markup = '<b>%s:</b> %s' % (_('File transfer completed'),
+ file_props['name'])
+ if 'desc' in file_props and file_props['desc']:
+ markup += ' (%s)' % file_props['desc']
+ b1 = gtk.Button(_('_Open Containing Folder'))
+ b1.connect('clicked', self._on_open_ft_folder, file_props)
+ b2 = gtk.Button(stock=gtk.STOCK_OK)
+ b2.connect('clicked', self._on_ok, file_props, 'file-completed')
+ self._add_info_bar_message(markup, [b1, b2], file_props)
+
+ def _got_file_error(self, file_props, type_, pri_txt, sec_txt):
+ markup = '<b>%s:</b> %s' % (pri_txt, sec_txt)
+ b = gtk.Button(stock=gtk.STOCK_OK)
+ b.connect('clicked', self._on_ok, file_props, type_)
+ self._add_info_bar_message(markup, [b], file_props, gtk.MESSAGE_ERROR)
+
+ def on_event_added(self, event):
+ if event.account != self.account:
+ return
+ if event.jid != self.contact.jid:
+ return
+ if event.type_ == 'file-request':
+ self._got_file_request(event.parameters)
+ elif event.type_ == 'file-completed':
+ self._got_file_completed(event.parameters)
+ elif event.type_ in ('file-error', 'file-stopped'):
+ msg_err = ''
+ if event.parameters['error'] == -1:
+ msg_err = _('Remote contact stopped transfer')
+ elif event.parameters['error'] == -6:
+ msg_err = _('Error opening file')
+ self._got_file_error(event.parameters, event.type_,
+ _('File transfer stopped'), msg_err)
+ elif event.type_ in ('file-request-error', 'file-send-error'):
+ self._got_file_error(event.parameters, event.type_,
+ _('File transfer cancelled'),
+ _('Connection with peer cannot be established.'))
+
+ def on_event_removed(self, event_list):
+ """
+ Called when one or more events are removed from the event list
+ """
+ for ev in event_list:
+ if ev.account != self.account:
+ continue
+ if ev.jid != self.contact.jid:
+ continue
+ if ev.type_ not in ('file-request', 'file-completed', 'file-error',
+ 'file-stopped', 'file-request-error', 'file-send-error'):
+ continue
+ i = 0
+ for ib_msg in self.info_bar_queue:
+ if ib_msg[2] == ev.parameters:
+ self.info_bar_queue.remove(ib_msg)
+ if i == 0:
+ # We are removing the one currently displayed
+ self.info_bar.hide()
+ # show next one?
+ gobject.idle_add(self._info_bar_show_message)
+ break
+ i += 1
diff --git a/src/command_system/implementation/execute.py b/src/command_system/implementation/execute.py
index 2ebdef64be06bf09ea41cf2f4cc25002c8e50b75..5089d51289c938217c4e31dcd75d0f087915f2c7 100644
--- a/src/command_system/implementation/execute.py
+++ b/src/command_system/implementation/execute.py
@@ -117,4 +117,4 @@ class Show(Execute):
if success and stdout:
processor.send(stdout)
elif not success and stderr:
- processor.echo_error(stderr)
\ No newline at end of file
+ processor.echo_error(stderr)
diff --git a/src/command_system/implementation/standard.py b/src/command_system/implementation/standard.py
index 8f26a93f20f33801e994871d187bbb5459cdef5e..8f39e939af7ac3b74a3bf50963d71800e262c748 100644
--- a/src/command_system/implementation/standard.py
+++ b/src/command_system/implementation/standard.py
@@ -46,11 +46,6 @@ class StandardCommonCommands(CommandContainer):
AUTOMATIC = True
HOSTS = ChatCommands, PrivateChatCommands, GroupChatCommands
- @command
- @doc(_("Clear the text window"))
- def clear(self):
- self.conv_textview.clear()
-
@command
@doc(_("Hide the chat buttons"))
def compact(self):
@@ -168,6 +163,11 @@ class StandardCommonChatCommands(CommandContainer):
AUTOMATIC = True
HOSTS = ChatCommands, PrivateChatCommands
+ @command
+ @doc(_("Clear the text window"))
+ def clear(self):
+ self.conv_textview.clear()
+
@command
@doc(_("Toggle the GPG encryption"))
def gpg(self):
@@ -240,6 +240,13 @@ class StandardGroupChatCommands(CommandContainer):
AUTOMATIC = True
HOSTS = GroupChatCommands,
+ @command
+ @doc(_("Clear the text window"))
+ def clear(self):
+ self.conv_textview.clear()
+ self.gc_count_nicknames_colors = -1
+ self.gc_custom_colors = {}
+
@command(raw=True)
@doc(_("Change your nickname in a group chat"))
def nick(self, new_nick):
@@ -353,4 +360,4 @@ class StandardGroupChatCommands(CommandContainer):
@command('unignore', raw=True)
@doc(_("Allow an occupant to send you public or private messages"))
def unblock(self, who):
- self.on_unblock(None, who)
\ No newline at end of file
+ self.on_unblock(None, who)
diff --git a/src/common/commands.py b/src/common/commands.py
index d303de922358e6b5a0111b0ebe14bd894ca66baf..2e831d9cba10ea013e0a4e73c26023d15cd7b8d4 100644
--- a/src/common/commands.py
+++ b/src/common/commands.py
@@ -27,6 +27,9 @@ import helpers
import dataforms
import gajim
+import logging
+log = logging.getLogger('gajim.c.commands')
+
class AdHocCommand:
commandnode = 'command'
commandname = 'The Command'
@@ -371,7 +374,11 @@ class ConnectionCommands:
Send disco#info result for query for command (JEP-0050, example 6.).
Return True if the result was sent, False if not
"""
- jid = helpers.get_full_jid_from_iq(iq_obj)
+ try:
+ jid = helpers.get_full_jid_from_iq(iq_obj)
+ except helpers.InvalidFormat:
+ log.warn('Invalid JID: %s, ignoring it' % iq_obj.getFrom())
+ return
node = iq_obj.getTagAttr('query', 'node')
if node not in self.__commands: return False
diff --git a/src/common/config.py b/src/common/config.py
index ec522c8646d4e66523ad13b38e058a830dee0b5f..7de2de3e3cf5b094a5b387297c16b6d768b7c338 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -86,7 +86,8 @@ class Config:
'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxa time.') ],
'ask_online_status': [ opt_bool, False ],
'ask_offline_status': [ opt_bool, False ],
- 'trayicon': [opt_str, 'always', _("When to show notification area icon. Can be 'never', 'on_event', 'always'."), True],
+ 'trayicon': [opt_str, 'always', _("When to show notification area icon. Can be 'never', 'on_event', 'always'."), False],
+ 'allow_hide_roster': [opt_bool, False, _("Allow to hide the roster window even if the tray icon is not shown."), False],
'iconset': [ opt_str, DEFAULT_ICONSET, '', True ],
'mood_iconset': [ opt_str, DEFAULT_MOOD_ICONSET, '', True ],
'activity_iconset': [ opt_str, DEFAULT_ACTIVITY_ICONSET, '', True ],
@@ -184,7 +185,7 @@ class Config:
'networkmanager_support': [opt_bool, True, _('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.'), True],
'outgoing_chat_state_notifications': [opt_str, 'all', _('Sent chat state notifications. Can be one of all, composing_only, disabled.')],
'displayed_chat_state_notifications': [opt_str, 'all', _('Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled.')],
- 'autodetect_browser_mailer': [opt_bool, False, '', True],
+ 'autodetect_browser_mailer': [opt_bool, True, '', True],
'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')],
'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')],
'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat jids.')],
@@ -286,9 +287,10 @@ class Config:
'video_size': [opt_str, '', _('Optionally resize jingle output video. Example: 320x240')],
'audio_input_volume': [opt_int, 50],
'audio_output_volume': [opt_int, 50],
- 'use_stun_server': [opt_bool, True, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')],
+ 'use_stun_server': [opt_bool, False, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')],
'stun_server': [opt_str, '', _('STUN server to use when using jingle')],
'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')],
+ 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured')],
}
__options_per_key = {
@@ -297,6 +299,7 @@ class Config:
'hostname': [ opt_str, '', '', True ],
'anonymous_auth': [ opt_bool, False ],
'client_cert': [ opt_str, '', '', True ],
+ 'client_cert_encrypted': [ opt_bool, False, '', False ],
'savepass': [ opt_bool, False ],
'password': [ opt_str, '' ],
'resource': [ opt_str, 'gajim', '', True ],
@@ -321,7 +324,7 @@ class Config:
'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')],
'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')],
'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')],
- 'warn_when_plaintext_connection': [ opt_bool, True, _('Show a warning dialog before sending password on an plaintext connection.') ],
+ 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ],
'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ],
'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ],
'ssl_fingerprint_sha1': [ opt_str, '', '', True ],
@@ -331,7 +334,8 @@ class Config:
'custom_port': [ opt_int, 5222, '', True ],
'custom_host': [ opt_str, '', '', True ],
'sync_with_global_status': [ opt_bool, False, ],
- 'no_log_for': [ opt_str, '' ],
+ 'no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')],
+ 'allow_no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')],
'minimized_gc': [ opt_str, '' ],
'attached_gpg_keys': [ opt_str, '' ],
'keep_alives_enabled': [ opt_bool, True, _('Whitespace sent after inactivity')],
@@ -347,6 +351,7 @@ class Config:
# proxy65 for FT
'file_transfer_proxies': [opt_str, 'proxy.eu.jabber.org, proxy.jabber.ru, proxy.jabbim.cz'],
'use_ft_proxies': [opt_bool, True, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True],
+ 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')],
'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide
'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide
'msgwin-width': [opt_int, 480],
@@ -377,6 +382,11 @@ class Config:
'roster_version': [opt_str, ''],
'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')],
'last_archiving_time': [opt_str, '1970-01-01T00:00:00Z', _('Last time we syncronized with logs from server.')],
+ 'enable_message_carbons': [ opt_bool, False, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')],
+ 'ft_send_local_ips': [ opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')],
+ 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')],
+ 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')],
+ 'oauth2_redirect_url': [ opt_str, 'http%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')],
}, {}),
'statusmsg': ({
'message': [ opt_str, '' ],
@@ -512,6 +522,10 @@ class Config:
}
+ proxies_default = {
+ _('Tor'): ['socks5', 'localhost', 9050],
+ }
+
def foreach(self, cb, data = None):
for opt in self.__options:
cb(data, opt, None, self.__options[opt])
diff --git a/src/common/connection.py b/src/common/connection.py
index e92dc57a0c038648e72197148dacab8d1295b7b3..2eaf4a2dc31aca2f1dcff2d65b6ff932beaa9bde 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -40,6 +40,7 @@ import operator
import time
import locale
import hmac
+import json
try:
randomsource = random.SystemRandom()
@@ -57,9 +58,9 @@ from common import gajim
from common import gpg
from common import passwords
from common import exceptions
-
from connection_handlers import *
+from xmpp import Smacks
from string import Template
import logging
log = logging.getLogger('gajim.c.connection')
@@ -155,6 +156,7 @@ class CommonConnection:
self.private_storage_supported = False
self.archiving_supported = False
self.archive_pref_supported = False
+ self.roster_supported = True
self.muc_jid = {} # jid of muc server for each transport type
self._stun_servers = [] # STUN servers of our jabber server
@@ -247,17 +249,18 @@ class CommonConnection:
raise NotImplementedError
def _prepare_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,
- label=None, original_message=None, delayed=None, callback=None):
+ chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None,
+ session=None, forward_from=None, form_node=None, label=None,
+ original_message=None, delayed=None, callback=None):
if not self.connection or self.connected < 2:
return 1
try:
jid = self.check_jid(jid)
except helpers.InvalidFormat:
- self.dispatch('ERROR', (_('Invalid Jabber ID'),
- _('It is not possible to send a message to %s, this JID is not '
- 'valid.') % jid))
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='error', pri_txt=_('Invalid Jabber ID'), sec_txt=_(
+ 'It is not possible to send a message to %s, this JID is not '
+ 'valid.') % jid))
return
if msg and not xhtml and gajim.config.get(
@@ -298,48 +301,48 @@ class CommonConnection:
self._message_encrypted_cb(output, type_, msg,
msgtxt, original_message, fjid, resource,
jid, xhtml, subject, chatstate, msg_id,
- composing_xep, label, forward_from, delayed,
- session, form_node, user_nick, keyID,
- callback)
+ label, forward_from, delayed, session,
+ form_node, user_nick, keyID, callback)
gajim.nec.push_incoming_event(GPGTrustKeyEvent(None,
conn=self, callback=_on_always_trust))
else:
self._message_encrypted_cb(output, type_, msg, msgtxt,
original_message, fjid, resource, jid, xhtml,
- subject, chatstate, msg_id, composing_xep, label,
- forward_from, delayed, session, form_node,
- user_nick, keyID, callback)
+ subject, chatstate, msg_id, label, forward_from,
+ delayed, session, form_node, user_nick, keyID,
+ callback)
gajim.thread_interface(encrypt_thread, [msg, keyID, False],
- _on_encrypted, [])
+ _on_encrypted, [])
return
self._message_encrypted_cb(('', error), type_, msg, msgtxt,
original_message, fjid, resource, jid, xhtml, subject,
- chatstate, msg_id, composing_xep, label, forward_from, delayed,
- session, form_node, user_nick, keyID, callback)
+ chatstate, msg_id, label, forward_from, delayed, session,
+ form_node, user_nick, keyID, callback)
+ return
self._on_continue_message(type_, msg, msgtxt, original_message, fjid,
resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id,
- composing_xep, label, forward_from, delayed, session, form_node,
- user_nick, callback)
+ label, forward_from, delayed, session, form_node, user_nick,
+ callback)
def _message_encrypted_cb(self, output, type_, msg, msgtxt,
original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id,
- composing_xep, label, forward_from, delayed, session, form_node, user_nick,
- keyID, callback):
+ label, forward_from, delayed, session, form_node, user_nick, keyID,
+ callback):
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
+ if lang is not None and not lang.startswith('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, msg_id, composing_xep, label, forward_from, delayed,
- session, form_node, user_nick, callback)
+ chatstate, msg_id, label, forward_from, delayed, session,
+ form_node, user_nick, callback)
return
# Encryption failed, do not send message
tim = localtime()
@@ -348,8 +351,7 @@ class CommonConnection:
def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid,
resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id,
- composing_xep, label, forward_from, delayed, session, form_node, user_nick,
- callback):
+ label, forward_from, delayed, session, form_node, user_nick, callback):
if type_ == 'chat':
msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_,
xhtml=xhtml)
@@ -385,27 +387,17 @@ class CommonConnection:
contact = gajim.contacts.get_contact_with_highest_priority(self.name,
jid)
- # chatstates - if peer supports xep85 or xep22, send chatstates
- # please note that the only valid tag inside a message containing a <body>
- # tag is the active event
- if chatstate is not None and contact:
- if ((composing_xep == 'XEP-0085' or not composing_xep) \
- and composing_xep != 'asked_once') or \
- contact.supports(common.xmpp.NS_CHATSTATES):
- # XEP-0085
- 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)
- if chatstate is 'composing' or msgtxt:
- chatstate_node.addChild(name='composing')
+ # chatstates - if peer supports xep85, send chatstates
+ # please note that the only valid tag inside a message containing a
+ # <body> tag is the active event
+ if chatstate and contact and contact.supports(NS_CHATSTATES):
+ msg_iq.setTag(chatstate, namespace=NS_CHATSTATES)
if forward_from:
addresses = msg_iq.addChild('addresses',
- namespace=common.xmpp.NS_ADDRESS)
+ namespace=common.xmpp.NS_ADDRESS)
addresses.addChild('address', attrs = {'type': 'ofrom',
- 'jid': forward_from})
+ 'jid': forward_from})
# XEP-0203
if delayed:
@@ -432,7 +424,7 @@ class CommonConnection:
if callback:
callback(jid, msg, keyID, forward_from, session, original_message,
- subject, type_, msg_iq, xhtml)
+ subject, type_, msg_iq, xhtml)
def log_message(self, jid, msg, forward_from, session, original_message,
subject, type_, xhtml=None):
@@ -511,14 +503,14 @@ class CommonConnection:
raise NotImplementedError
def update_contact(self, jid, name, groups):
- if self.connection:
+ if self.connection and self.roster_supported:
self.connection.getRoster().setItem(jid=jid, name=name, groups=groups)
def update_contacts(self, contacts):
"""
Update multiple roster items
"""
- if self.connection:
+ if self.connection and self.roster_supported:
self.connection.getRoster().setItemMulti(contacts)
def new_account(self, name, config, sync=False):
@@ -713,8 +705,12 @@ class Connection(CommonConnection, ConnectionHandlers):
self.available_transports = {} # list of available transports on this
# server {'icq': ['icq.server.com', 'icq2.server.com'], }
self.private_storage_supported = True
+ self.privacy_rules_requested = False
self.streamError = ''
self.secret_hmac = str(random.random())[2:]
+
+ self.sm = Smacks(self) # Stream Management
+
gajim.ged.register_event_handler('privacy-list-received', ged.CORE,
self._nec_privacy_list_received)
gajim.ged.register_event_handler('agent-info-error-received', ged.CORE,
@@ -749,6 +745,7 @@ class Connection(CommonConnection, ConnectionHandlers):
self.pingalives = 0
self.client_cert = gajim.config.get_per('accounts', self.name,
'client_cert')
+ self.client_cert_passphrase = ''
def check_jid(self, jid):
return helpers.parse_jid(jid)
@@ -777,6 +774,8 @@ class Connection(CommonConnection, ConnectionHandlers):
self.connected = 0
self.time_to_reconnect = None
self.privacy_rules_supported = False
+ if on_purpose:
+ self.sm = Smacks(self)
if self.connection:
# make sure previous connection is completely closed
gajim.proxy65_manager.disconnect(self.connection)
@@ -785,6 +784,15 @@ class Connection(CommonConnection, ConnectionHandlers):
self.connection.disconnect()
self.last_connection = None
self.connection = None
+ def set_oldst(self): # Set old state
+ if self.old_show:
+ self.connected = gajim.SHOW_LIST.index(self.old_show)
+ gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
+ show=self.connected))
+ else: # we default to online
+ self.connected = 2
+ gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
+ show=gajim.SHOW_LIST[self.connected]))
def _disconnectedReconnCB(self):
"""
@@ -797,8 +805,9 @@ class Connection(CommonConnection, ConnectionHandlers):
self.old_show = gajim.SHOW_LIST[self.connected]
self.connected = 0
if not self.on_purpose:
- gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
- show='offline'))
+ if not (self.sm and self.sm.resumption):
+ gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
+ show='offline'))
self.disconnect()
if gajim.config.get_per('accounts', self.name, 'autoreconnect'):
self.connected = -1
@@ -906,9 +915,10 @@ class Connection(CommonConnection, ConnectionHandlers):
self.disconnect(on_purpose=True)
return
if not data[1]: # wrong answer
- self.dispatch('ERROR', (_('Invalid answer'),
- _('Transport %(name)s answered wrongly to register '
- 'request: %(error)s') % {'name': data[0],
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self, level='error', pri_txt=_('Invalid answer'),
+ sec_txt=_('Transport %(name)s answered wrongly to '
+ 'register request: %(error)s') % {'name': data[0],
'error': data[3]}))
return
is_form = data[2]
@@ -975,7 +985,7 @@ class Connection(CommonConnection, ConnectionHandlers):
if weightsum >= rndint:
return host
- def connect(self, data = None):
+ def connect(self, data=None):
"""
Start a connection to the Jabber server
@@ -986,10 +996,25 @@ class Connection(CommonConnection, ConnectionHandlers):
if self.connection:
return self.connection, ''
- if data:
+ if self.sm.resuming and self.sm.location:
+ # If resuming and server gave a location, connect from there
+ hostname = self.sm.location
+ self.try_connecting_for_foo_secs = gajim.config.get_per('accounts',
+ self.name, 'try_connecting_for_foo_secs')
+ use_custom = False
+ proxy = helpers.get_proxy_info(self.name)
+
+ elif data:
hostname = data['hostname']
self.try_connecting_for_foo_secs = 45
p = data['proxy']
+ if p and p in gajim.config.get_per('proxies'):
+ proxy = {}
+ proxyptr = gajim.config.get_per('proxies', p)
+ for key in proxyptr.keys():
+ proxy[key] = proxyptr[key][1]
+ else:
+ proxy = None
use_srv = True
use_custom = data['use_custom_host']
if use_custom:
@@ -1000,7 +1025,7 @@ class Connection(CommonConnection, ConnectionHandlers):
usessl = gajim.config.get_per('accounts', self.name, 'usessl')
self.try_connecting_for_foo_secs = gajim.config.get_per('accounts',
self.name, 'try_connecting_for_foo_secs')
- p = gajim.config.get_per('accounts', self.name, 'proxy')
+ proxy = helpers.get_proxy_info(self.name)
use_srv = gajim.config.get_per('accounts', self.name, 'use_srv')
use_custom = gajim.config.get_per('accounts', self.name,
'use_custom_host')
@@ -1009,52 +1034,10 @@ class Connection(CommonConnection, ConnectionHandlers):
# create connection if it doesn't already exist
self.connected = 1
- if p and p in gajim.config.get_per('proxies'):
- proxy = {}
- proxyptr = gajim.config.get_per('proxies', p)
- for key in proxyptr.keys():
- proxy[key] = proxyptr[key][1]
-
- elif gajim.config.get_per('accounts', self.name, 'use_env_http_proxy'):
- try:
- try:
- env_http_proxy = os.environ['HTTP_PROXY']
- except Exception:
- env_http_proxy = os.environ['http_proxy']
- env_http_proxy = env_http_proxy.strip('"')
- # Dispose of the http:// prefix
- env_http_proxy = env_http_proxy.split('://')
- env_http_proxy = env_http_proxy[len(env_http_proxy)-1]
- env_http_proxy = env_http_proxy.split('@')
-
- if len(env_http_proxy) == 2:
- login = env_http_proxy[0].split(':')
- addr = env_http_proxy[1].split(':')
- else:
- login = ['', '']
- addr = env_http_proxy[0].split(':')
-
- proxy = {'host': addr[0], 'type' : u'http', 'user':login[0]}
-
- if len(addr) == 2:
- proxy['port'] = addr[1]
- else:
- proxy['port'] = 3128
-
- if len(login) == 2:
- proxy['pass'] = login[1]
- proxy['useauth'] = True
- else:
- proxy['pass'] = u''
- except Exception:
- proxy = None
- else:
- proxy = None
h = hostname
p = 5222
ssl_p = 5223
-# use_srv = False # wants ssl? disable srv lookup
if use_custom:
h = custom_h
p = custom_p
@@ -1069,8 +1052,8 @@ class Connection(CommonConnection, ConnectionHandlers):
if use_srv:
# add request for srv query to the resolve, on result '_on_resolve'
# will be called
- gajim.resolver.resolve('_xmpp-client._tcp.' + helpers.idn_to_ascii(h),
- self._on_resolve)
+ gajim.resolver.resolve('_xmpp-client._tcp.' + helpers.idn_to_ascii(
+ h), self._on_resolve)
else:
self._on_resolve('', [])
@@ -1081,7 +1064,8 @@ class Connection(CommonConnection, ConnectionHandlers):
# Add ssl port
ssl_p = 5223
if gajim.config.get_per('accounts', self.name, 'use_custom_host'):
- ssl_p = gajim.config.get_per('accounts', self.name, 'custom_port')
+ ssl_p = gajim.config.get_per('accounts', self.name,
+ 'custom_port')
for i in self._hosts:
i['ssl_port'] = ssl_p
self._connect_to_next_host()
@@ -1155,29 +1139,42 @@ class Connection(CommonConnection, ConnectionHandlers):
secure_tuple = (self._current_type, cacerts, mycerts)
con = common.xmpp.NonBlockingClient(
- domain=self._hostname,
- caller=self,
- idlequeue=gajim.idlequeue)
+ domain=self._hostname,
+ caller=self,
+ idlequeue=gajim.idlequeue)
self.last_connection = con
# increase default timeout for server responses
- common.xmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = self.try_connecting_for_foo_secs
+ common.xmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \
+ self.try_connecting_for_foo_secs
# FIXME: this is a hack; need a better way
if self.on_connect_success == self._on_new_account:
con.RegisterDisconnectHandler(self._on_new_account)
- self.log_hosttype_info(port)
- con.connect(
- hostname=self._current_host['host'],
- port=port,
- on_connect=self.on_connect_success,
- on_proxy_failure=self.on_proxy_failure,
- on_connect_failure=self.connect_to_next_type,
- proxy=self._proxy,
- secure_tuple = secure_tuple)
+ if self.client_cert and gajim.config.get_per('accounts', self.name,
+ 'client_cert_encrypted'):
+ gajim.nec.push_incoming_event(ClientCertPassphraseEvent(
+ None, conn=self, con=con, port=port,
+ secure_tuple=secure_tuple))
+ return
+ self.on_client_cert_passphrase('', con, port, secure_tuple)
+
else:
self._connect_to_next_host(retry)
+ def on_client_cert_passphrase(self, passphrase, con, port, secure_tuple):
+ self.client_cert_passphrase = passphrase
+
+ self.log_hosttype_info(port)
+ con.connect(
+ hostname=self._current_host['host'],
+ port=port,
+ on_connect=self.on_connect_success,
+ on_proxy_failure=self.on_proxy_failure,
+ on_connect_failure=self.connect_to_next_type,
+ proxy=self._proxy,
+ secure_tuple = secure_tuple)
+
def log_hosttype_info(self, port):
msg = '>>>>>> Connecting to %s [%s:%d], type = %s' % (self.name,
self._current_host['host'], port, self._current_type)
@@ -1202,7 +1199,9 @@ class Connection(CommonConnection, ConnectionHandlers):
key = common.xmpp.NS_XMPP_STREAMS + ' ' + self.streamError
if key in common.xmpp.ERRORS:
sectxt2 = _('Server replied: %s') % common.xmpp.ERRORS[key][2]
- self.dispatch('ERROR', (pritxt, '%s\n%s' % (sectxt2, sectxt)))
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self, level='error', pri_txt=pritxt,
+ sec_txt='%s\n%s' % (sectxt2, sectxt)))
return
# show popup
gajim.nec.push_incoming_event(ConnectionLostEvent(None,
@@ -1228,10 +1227,16 @@ class Connection(CommonConnection, ConnectionHandlers):
return
con.RegisterDisconnectHandler(self._on_disconnected)
if _con_type == 'plain' and gajim.config.get_per('accounts', self.name,
- 'warn_when_plaintext_connection'):
+ 'action_when_plaintext_connection') == 'warn':
gajim.nec.push_incoming_event(PlainConnectionEvent(None, conn=self,
xmpp_client=con))
return True
+ if _con_type == 'plain' and gajim.config.get_per('accounts', self.name,
+ 'action_when_plaintext_connection') == 'disconnect':
+ self.disconnect(on_purpose=True)
+ gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
+ show='offline'))
+ return False
if _con_type in ('tls', 'ssl') and con.Connection.ssl_lib != 'PYOPENSSL' \
and gajim.config.get_per('accounts', self.name,
'warn_when_insecure_ssl_connection') and \
@@ -1364,9 +1369,10 @@ class Connection(CommonConnection, ConnectionHandlers):
self.disconnect(on_purpose = True)
gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
show='offline'))
- self.dispatch('ERROR', (_('Authentication failed with "%s"') % \
- self._hostname,
- _('Please check your login and password for correctness.')))
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='error', pri_txt=_('Authentication failed with "%s"') % \
+ self._hostname, sec_txt=_('Please check your login and password'
+ 'for correctness.')))
if self.on_connect_auth:
self.on_connect_auth(None)
self.on_connect_auth = None
@@ -1439,10 +1445,11 @@ class Connection(CommonConnection, ConnectionHandlers):
gajim.nec.push_incoming_event(PrivacyListRemovedEvent(None,
conn=self, list_name=privacy_list))
else:
- self.dispatch('ERROR', (_('Error while removing privacy list'),
- _('Privacy list %s has not been removed. It is maybe active in '
- 'one of your connected resources. Deactivate it and try '
- 'again.') % privacy_list))
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='error', pri_txt=_('Error while removing privacy '
+ 'list'), sec_txt=_('Privacy list %s has not been removed. '
+ 'It is maybe active in one of your connected resources. '
+ 'Deactivate it and tryagain.') % privacy_list))
common.xmpp.features_nb.delPrivacyList(self.connection, privacy_list,
_on_del_privacy_list_result)
@@ -1471,14 +1478,14 @@ class Connection(CommonConnection, ConnectionHandlers):
Build a Privacy rule stanza for invisibility
"""
iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '')
- l = iq.getTag('query').setTag('list', {'name': name})
+ l = iq.setQuery().setTag('list', {'name': name})
i = l.setTag('item', {'action': action, 'order': str(order)})
i.setTag('presence-out')
return iq
def build_invisible_rule(self):
iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '')
- l = iq.getTag('query').setTag('list', {'name': 'invisible'})
+ l = iq.setQuery().setTag('list', {'name': 'invisible'})
if self.name in gajim.interface.status_sent_to_groups and \
len(gajim.interface.status_sent_to_groups[self.name]) > 0:
for group in gajim.interface.status_sent_to_groups[self.name]:
@@ -1508,7 +1515,7 @@ class Connection(CommonConnection, ConnectionHandlers):
if not gajim.account_is_connected(self.name):
return
iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '')
- iq.getTag('query').setTag('active', {'name': name})
+ iq.setQuery().setTag('active', {'name': name})
self.connection.send(iq)
def send_invisible_presence(self, msg, signed, initial = False):
@@ -1517,8 +1524,10 @@ class Connection(CommonConnection, ConnectionHandlers):
if not self.privacy_rules_supported:
gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
show=gajim.SHOW_LIST[self.connected]))
- self.dispatch('ERROR', (_('Invisibility not supported'),
- _('Account %s doesn\'t support invisibility.') % self.name))
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='error', pri_txt=_('Invisibility not supported',
+ sec_txt=_('Account %s doesn\'t support invisibility.') % \
+ self.name)))
return
# If we are already connected, and privacy rules are supported, send
# offline presence first as it's required by XEP-0126
@@ -1591,12 +1600,16 @@ class Connection(CommonConnection, ConnectionHandlers):
self.connection.set_send_timeout2(self.pingalives, self.sendPing)
self.connection.onreceive(None)
- self.request_message_archiving_preferences()
-
self.privacy_rules_requested = False
- self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'),
- id_prefix='Gajim_')
+ # If we are not resuming, we ask for discovery info
+ # and archiving preferences
+ if not self.sm.resuming:
+ self.request_message_archiving_preferences()
+ self.discoverInfo(gajim.config.get_per('accounts', self.name,
+ 'hostname'), id_prefix='Gajim_')
+
+ self.sm.resuming = False # back to previous state
# Discover Stun server(s)
gajim.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii(
self.connected_hostname), self._on_stun_resolved)
@@ -1606,6 +1619,8 @@ class Connection(CommonConnection, ConnectionHandlers):
self._stun_servers = self._hosts = [i for i in result_array]
def _request_privacy(self):
+ if not gajim.account_is_connected(self.name):
+ return
iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '')
id_ = self.connection.getAnID()
iq.setID(id_)
@@ -1671,12 +1686,21 @@ class Connection(CommonConnection, ConnectionHandlers):
self.archive_manual_supported = True
if common.xmpp.NS_ARCHIVE_PREF in obj.features:
self.archive_pref_supported = True
+ if common.xmpp.NS_CARBONS in obj.features and \
+ gajim.config.get_per('accounts', self.name,
+ 'enable_message_carbons'):
+ # Server supports carbons, activate it
+ iq = common.xmpp.Iq('set')
+ iq.setTag('enable', namespace=common.xmpp.NS_CARBONS)
+ self.connection.send(iq)
if common.xmpp.NS_BYTESTREAM in obj.features and \
gajim.config.get_per('accounts', self.name, 'use_ft_proxies'):
our_fjid = helpers.parse_jid(our_jid + '/' + \
self.server_resource)
+ testit = gajim.config.get_per('accounts', self.name,
+ 'test_ft_proxies_on_startup')
gajim.proxy65_manager.resolve(obj.fjid, self.connection,
- our_fjid, self.name)
+ our_fjid, default=self.name, testit=testit)
if common.xmpp.NS_MUC in obj.features and is_muc:
type_ = transport_type or 'jabber'
self.muc_jid[type_] = obj.fjid
@@ -1749,10 +1773,10 @@ class Connection(CommonConnection, ConnectionHandlers):
self.connection.send(msg_iq)
def send_message(self, jid, msg, keyID=None, type_='chat', subject='',
- chatstate=None, msg_id=None, composing_xep=None, resource=None,
- user_nick=None, xhtml=None, label=None, session=None, forward_from=None,
- form_node=None, original_message=None, delayed=None, callback=None,
- callback_args=[], now=False):
+ chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None,
+ label=None, session=None, forward_from=None, form_node=None,
+ original_message=None, delayed=None, callback=None, callback_args=[],
+ now=False):
def cb(jid, msg, keyID, forward_from, session, original_message,
subject, type_, msg_iq, xhtml):
@@ -1767,9 +1791,9 @@ class Connection(CommonConnection, ConnectionHandlers):
subject, type_, xhtml)
self._prepare_message(jid, msg, keyID, type_=type_, subject=subject,
- chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep,
- resource=resource, user_nick=user_nick, xhtml=xhtml, label=label,
- session=session, forward_from=forward_from, form_node=form_node,
+ chatstate=chatstate, msg_id=msg_id, resource=resource,
+ user_nick=user_nick, xhtml=xhtml, label=label, session=session,
+ forward_from=forward_from, form_node=form_node,
original_message=original_message, delayed=delayed, callback=cb)
def _nec_message_outgoing(self, obj):
@@ -1792,9 +1816,8 @@ class Connection(CommonConnection, ConnectionHandlers):
self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_,
subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id,
- composing_xep=obj.composing_xep, resource=obj.resource,
- user_nick=obj.user_nick, xhtml=obj.xhtml, label=obj.label,
- session=obj.session, forward_from=obj.forward_from,
+ resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml,
+ label=obj.label, session=obj.session, forward_from=obj.forward_from,
form_node=obj.form_node, original_message=obj.original_message,
delayed=obj.delayed, callback=cb)
@@ -1853,7 +1876,7 @@ class Connection(CommonConnection, ConnectionHandlers):
if name:
infos['name'] = name
iq = common.xmpp.Iq('set', common.xmpp.NS_ROSTER)
- q = iq.getTag('query')
+ q = iq.setQuery()
item = q.addChild('item', attrs=infos)
for g in groups:
item.addChild('group').setData(g)
@@ -1898,7 +1921,7 @@ class Connection(CommonConnection, ConnectionHandlers):
if not gajim.account_is_connected(self.name):
return
iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent)
- iq.getTag('query').setTag('remove')
+ iq.setQuery().setTag('remove')
id_ = self.connection.getAnID()
iq.setID(id_)
self.awaiting_answers[id_] = (AGENT_REMOVED, agent)
@@ -2021,7 +2044,8 @@ class Connection(CommonConnection, ConnectionHandlers):
if not gajim.account_is_connected(self.name):
return
self.seclabel_catalogue_request(to, callback)
- iq = common.xmpp.Iq(typ='get')
+ server = gajim.get_jid_from_account(self.name).split("@")[1] # Really, no better way?
+ iq = common.xmpp.Iq(typ='get', to=server)
iq2 = iq.addChild(name='catalog', namespace=common.xmpp.NS_SECLABEL_CATALOG)
iq2.setAttr('to', to)
self.connection.send(iq)
@@ -2334,7 +2358,7 @@ class Connection(CommonConnection, ConnectionHandlers):
msg_iq.addChild(node = label)
self.connection.send(msg_iq)
gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self,
- jid=jid, message=msg, keyID=None))
+ jid=jid, message=msg, keyID=None, chatstate=None))
def send_gc_subject(self, jid, subject):
if not gajim.account_is_connected(self.name):
@@ -2355,7 +2379,7 @@ class Connection(CommonConnection, ConnectionHandlers):
return
iq = common.xmpp.Iq(typ = 'set', queryNS = common.xmpp.NS_MUC_OWNER,
to = room_jid)
- destroy = iq.getTag('query').setTag('destroy')
+ destroy = iq.setQuery().setTag('destroy')
if reason:
destroy.setTagData('reason', reason)
if jid:
@@ -2402,7 +2426,7 @@ class Connection(CommonConnection, ConnectionHandlers):
return
iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\
common.xmpp.NS_MUC_ADMIN)
- item = iq.getTag('query').setTag('item')
+ item = iq.setQuery().setTag('item')
item.setAttr('nick', nick)
item.setAttr('role', role)
if reason:
@@ -2417,7 +2441,7 @@ class Connection(CommonConnection, ConnectionHandlers):
return
iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\
common.xmpp.NS_MUC_ADMIN)
- item = iq.getTag('query').setTag('item')
+ item = iq.setQuery().setTag('item')
item.setAttr('jid', jid)
item.setAttr('affiliation', affiliation)
if reason:
@@ -2429,7 +2453,7 @@ class Connection(CommonConnection, ConnectionHandlers):
return
iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS = \
common.xmpp.NS_MUC_ADMIN)
- item = iq.getTag('query')
+ item = iq.setQuery()
for jid in users_dict:
item_tag = item.addChild('item', {'jid': jid,
'affiliation': users_dict[jid]['affiliation']})
@@ -2442,7 +2466,7 @@ class Connection(CommonConnection, ConnectionHandlers):
return
iq = common.xmpp.Iq(typ = 'get', to = room_jid, queryNS = \
common.xmpp.NS_MUC_ADMIN)
- item = iq.getTag('query').setTag('item')
+ item = iq.setQuery().setTag('item')
item.setAttr('affiliation', affiliation)
self.connection.send(iq)
@@ -2451,7 +2475,7 @@ class Connection(CommonConnection, ConnectionHandlers):
return
iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\
common.xmpp.NS_MUC_OWNER)
- query = iq.getTag('query')
+ query = iq.setQuery()
form.setAttr('type', 'submit')
query.addChild(node = form)
self.connection.send(iq)
@@ -2469,6 +2493,32 @@ class Connection(CommonConnection, ConnectionHandlers):
def get_password(self, callback, type_):
self.pasword_callback = (callback, type_)
+ if type_ == 'X-MESSENGER-OAUTH2':
+ client_id = gajim.config.get_per('accounts', self.name,
+ 'oauth2_client_id')
+ refresh_token = gajim.config.get_per('accounts', self.name,
+ 'oauth2_refresh_token')
+ if refresh_token:
+ renew_URL = 'https://oauth.live.com/token?client_id=' \
+ '%(client_id)s&redirect_uri=https%%3A%%2F%%2Foauth.live.' \
+ 'com%%2Fdesktop&grant_type=refresh_token&refresh_token=' \
+ '%(refresh_token)s' % locals()
+ result = helpers.download_image(self.name, {'src': renew_URL})[0]
+ if result:
+ dict_ = json.loads(result)
+ if 'access_token' in dict_:
+ self.set_password(dict_['access_token'])
+ return
+ script_url = gajim.config.get_per('accounts', self.name,
+ 'oauth2_redirect_url')
+ token_URL = 'https://oauth.live.com/authorize?client_id=' \
+ '%(client_id)s&scope=wl.messenger%%20wl.offline_access&' \
+ 'response_type=code&redirect_uri=%(script_url)s' % locals()
+ helpers.launch_browser_mailer('url', token_URL)
+ self.disconnect(on_purpose=True)
+ gajim.nec.push_incoming_event(Oauth2CredentialsRequiredEvent(None,
+ conn=self))
+ return
if self.password:
self.set_password(self.password)
return
@@ -2508,9 +2558,11 @@ class Connection(CommonConnection, ConnectionHandlers):
if result.getID() == id_:
on_remove_success(True)
return
- self.dispatch('ERROR', (_('Unregister failed'),
- _('Unregistration with server %(server)s failed: '
- '%(error)s') % {'server': hostname,
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self, level='error',
+ pri_txt=_('Unregister failed'),
+ sec_txt=_('Unregistration with server %(server)s '
+ 'failed: %(error)s') % {'server': hostname,
'error': result.getErrorMsg()}))
on_remove_success(False)
con.RegisterHandler('iq', _on_answer, 'result', system=True)
@@ -2536,7 +2588,7 @@ class Connection(CommonConnection, ConnectionHandlers):
c.setTagData('reason', reason)
self.connection.send(message)
- def request_voice(self, room, nick):
+ def request_voice(self, room):
"""
Request voice in a moderated room
"""
@@ -2576,7 +2628,7 @@ class Connection(CommonConnection, ConnectionHandlers):
def send_search_form(self, jid, form, is_form):
iq = common.xmpp.Iq(typ = 'set', to = jid, queryNS = \
common.xmpp.NS_SEARCH)
- item = iq.getTag('query')
+ item = iq.setQuery()
if is_form:
item.addChild(node=form)
else:
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 9518e14e6e282549745da945fba0061d0c9397d5..61f771fae7e55c344d8c69d9a9d8dfa804e8cc09 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -62,14 +62,7 @@ from common import ged
from common import nec
from common.nec import NetworkEvent
-if gajim.HAVE_FARSIGHT:
- from common.jingle import ConnectionJingle
-else:
- class ConnectionJingle():
- def __init__(self):
- pass
- def _JingleCB(self, con, stanza):
- pass
+from common.jingle import ConnectionJingle
from common import dbus_support
if dbus_support.supported:
@@ -133,8 +126,9 @@ class ConnectionDisco:
def _agent_registered_cb(self, con, resp, agent):
if resp.getType() == 'result':
- self.dispatch('INFORMATION', (_('Registration succeeded'),
- _('Registration with agent %s succeeded') % agent))
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='info', pri_txt=_('Registration succeeded'), sec_txt=_(
+ 'Registration with agent %s succeeded') % agent))
self.request_subscription(agent, auto_auth=True)
self.agent_registrations[agent]['roster_push'] = True
if self.agent_registrations[agent]['sub_received']:
@@ -142,9 +136,10 @@ class ConnectionDisco:
p = self.add_sha(p)
self.connection.send(p)
if resp.getType() == 'error':
- self.dispatch('ERROR', (_('Registration failed'), _('Registration '
- 'with agent %(agent)s failed with error %(error)s: '
- '%(error_msg)s') % {'agent': agent, 'error': resp.getError(),
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='error', pri_txt=_('Registration failed'), sec_txt=_(
+ 'Registration 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):
@@ -152,7 +147,7 @@ class ConnectionDisco:
return
if is_form:
iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to=agent)
- query = iq.getTag('query')
+ query = iq.setQuery()
info.setAttr('type', 'submit')
query.addChild(node=info)
self.connection.SendAndCallForResponse(iq,
@@ -237,8 +232,7 @@ class ConnectionDisco:
log.debug('DiscoverInfoGetCB')
if not self.connection or self.connected < 2:
return
- q = iq_obj.getTag('query')
- node = q.getAttr('node')
+ node = iq_obj.getQuerynode()
if self.commandInfoQuery(con, iq_obj):
raise common.xmpp.NodeProcessed
@@ -249,7 +243,7 @@ class ConnectionDisco:
raise common.xmpp.NodeProcessed
iq = iq_obj.buildReply('result')
- q = iq.getTag('query')
+ q = iq.setQuery()
if node:
q.setAttr('node', node)
q.addChild('identity', attrs=gajim.gajim_identity)
@@ -340,7 +334,8 @@ class ConnectionVcard:
fil.write(str(card))
fil.close()
except IOError, e:
- self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='error', pri_txt=_('Disk Write Error'), sec_txt=str(e)))
def get_cached_vcard(self, fjid, is_fake_jid=False):
"""
@@ -394,7 +389,7 @@ class ConnectionVcard:
iq = common.xmpp.Iq(typ='get')
if jid:
iq.setTo(jid)
- iq.setTag(common.xmpp.NS_VCARD + ' vCard')
+ iq.setQuery('vCard').setNamespace(common.xmpp.NS_VCARD)
id_ = self.connection.getAnID()
iq.setID(id_)
@@ -536,6 +531,8 @@ class ConnectionVcard:
return
if iq_obj.getType() == 'result':
query = iq_obj.getTag('query')
+ if not query:
+ return
delimiter = query.getTagData('roster')
if delimiter:
self.nested_group_delimiter = delimiter
@@ -554,6 +551,15 @@ class ConnectionVcard:
roster = self.connection.getRoster(force=True)
roster.setRaw(roster_data)
self._getRoster()
+ elif iq_obj.getType() == 'error':
+ self.roster_supported = False
+ self.discoverItems(gajim.config.get_per('accounts', self.name,
+ 'hostname'), id_prefix='Gajim_')
+ if gajim.config.get_per('accounts', self.name,
+ 'use_ft_proxies'):
+ self.discover_ft_proxies()
+ gajim.nec.push_incoming_event(RosterReceivedEvent(None,
+ conn=self))
elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED:
if iq_obj.getType() != 'error':
self.privacy_rules_supported = True
@@ -565,9 +571,10 @@ class ConnectionVcard:
self.disconnect(on_purpose=True)
gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
show='offline'))
- self.dispatch('ERROR', (_('Invisibility not supported'),
- _('Account %s doesn\'t support invisibility.') % \
- self.name))
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self, level='error', pri_txt=_('Invisibility not '
+ 'supported'), sec_txt=_('Account %s doesn\'t support '
+ 'invisibility.') % self.name))
return
# Ask metacontacts before roster
self.get_metacontacts()
@@ -646,9 +653,8 @@ class ConnectionVcard:
with_ = element.getAttr('with')
start_ = element.getAttr('start')
self.request_collection_page(with_, start_)
- elif element.getName() == 'removed':
+ #elif element.getName() == 'removed':
# do nothing
- pass
del self.awaiting_answers[id_]
@@ -765,6 +771,8 @@ class ConnectionHandlersBase:
self._nec_iq_error_received)
gajim.ged.register_event_handler('presence-received', ged.CORE,
self._nec_presence_received)
+ gajim.ged.register_event_handler('gc-presence-received', ged.CORE,
+ self._nec_gc_presence_received)
gajim.ged.register_event_handler('message-received', ged.CORE,
self._nec_message_received)
gajim.ged.register_event_handler('decrypted-message-received', ged.CORE,
@@ -775,6 +783,8 @@ class ConnectionHandlersBase:
self._nec_iq_error_received)
gajim.ged.remove_event_handler('presence-received', ged.CORE,
self._nec_presence_received)
+ gajim.ged.remove_event_handler('gc-presence-received', ged.CORE,
+ self._nec_gc_presence_received)
gajim.ged.remove_event_handler('message-received', ged.CORE,
self._nec_message_received)
gajim.ged.remove_event_handler('decrypted-message-received', ged.CORE,
@@ -902,8 +912,7 @@ class ConnectionHandlersBase:
# reset chatstate if needed:
# (when contact signs out or has errors)
if obj.show in ('offline', 'error'):
- obj.contact.our_chatstate = obj.contact.chatstate = \
- obj.contact.composing_xep = None
+ obj.contact.our_chatstate = obj.contact.chatstate = None
# TODO: This causes problems when another
# resource signs off!
@@ -917,27 +926,15 @@ class ConnectionHandlersBase:
# there won't be any sessions here if the contact terminated
# their sessions before going offline (which we do)
for sess in self.get_sessions(jid):
- if obj.fjid != str(sess.jid):
+ sess_fjid = sess.jid.getStripped()
+ if sess.resource:
+ sess_fjid += '/' + sess.resource
+ if obj.fjid != sess_fjid:
continue
if sess.control:
sess.control.no_autonegotiation = False
if sess.enable_encryption:
sess.terminate_e2e()
- self.delete_session(jid, sess.thread_id)
-
- if obj.ptype == 'unavailable':
- for jid in (obj.jid, obj.fjid):
- if jid not in self.sessions:
- continue
- # automatically terminate sessions that they haven't sent a
- # thread ID in, only if other part support thread ID
- for sess in self.sessions[jid].values():
- if not sess.received_thread_id:
- contact = gajim.contacts.get_contact(self.name, jid)
- if contact and (contact.supports(xmpp.NS_SSN) or \
- contact.supports(xmpp.NS_ESESSION)):
- sess.terminate()
- del self.sessions[jid][sess.thread_id]
if gajim.config.get('log_contact_status_changes') and \
gajim.config.should_log(self.name, obj.jid):
@@ -953,6 +950,15 @@ class ConnectionHandlersBase:
self.dispatch('DB_ERROR', (pritext, sectext))
our_jid = gajim.get_jid_from_account(self.name)
+ def _nec_gc_presence_received(self, obj):
+ if obj.conn.name != self.name:
+ return
+ for sess in self.get_sessions(obj.fjid):
+ if obj.fjid != sess.jid:
+ continue
+ if sess.enable_encryption:
+ sess.terminate_e2e()
+
def _nec_message_received(self, obj):
if obj.conn.name != self.name:
return
@@ -972,6 +978,8 @@ class ConnectionHandlersBase:
if keyID:
def decrypt_thread(encmsg, keyID, obj):
decmsg = self.gpg.decrypt(encmsg, keyID)
+ decmsg = self.connection.Dispatcher.replace_non_character(
+ decmsg)
# \x00 chars are not allowed in C (so in GTK)
obj.msgtxt = helpers.decode_string(decmsg.replace('\x00',
''))
@@ -1406,17 +1414,21 @@ ConnectionJingle, ConnectionIBBytestream):
log.debug('SecLabelCB')
query = iq_obj.getTag('catalog')
to = query.getAttr('to')
- items = query.getTags('securitylabel')
+ items = query.getTags('item')
labels = {}
ll = []
+ default = None
for item in items:
- label = item.getTag('displaymarking').getData()
- labels[label] = item
+ label = item.getAttr('selector')
+ labels[label] = item.getTag('securitylabel')
ll.append(label)
+ if item.getAttr('default') == 'true':
+ default = label
if to not in self.seclabel_catalogues:
- self.seclabel_catalogues[to] = [[], None, None]
+ self.seclabel_catalogues[to] = [[], None, None, None]
self.seclabel_catalogues[to][1] = labels
self.seclabel_catalogues[to][2] = ll
+ self.seclabel_catalogues[to][3] = default
for callback in self.seclabel_catalogues[to][0]:
callback()
self.seclabel_catalogues[to][0] = []
@@ -1458,13 +1470,18 @@ ConnectionJingle, ConnectionIBBytestream):
def _nec_version_request_received(self, obj):
if obj.conn.name != self.name:
return
- iq_obj = obj.stanza.buildReply('result')
- qp = iq_obj.getTag('query')
- qp.setTagData('name', 'Gajim')
- qp.setTagData('version', gajim.version)
send_os = gajim.config.get_per('accounts', self.name, 'send_os_info')
if send_os:
+ iq_obj = obj.stanza.buildReply('result')
+ qp = iq_obj.getQuery()
+ qp.setTagData('name', 'Gajim')
+ qp.setTagData('version', gajim.version)
qp.setTagData('os', helpers.get_os_info())
+ else:
+ iq_obj = obj.stanza.buildReply('error')
+ err = common.xmpp.ErrorNode(name=common.xmpp.NS_STANZAS + \
+ ' service-unavailable')
+ iq_obj.addChild(node=err)
self.connection.send(iq_obj)
def _LastCB(self, con, iq_obj):
@@ -1482,7 +1499,7 @@ ConnectionJingle, ConnectionIBBytestream):
if HAS_IDLE and gajim.config.get_per('accounts', self.name,
'send_idle_time'):
iq_obj = obj.stanza.buildReply('result')
- qp = iq_obj.getTag('query')
+ qp = iq_obj.setQuery()
qp.attrs['seconds'] = int(self.sleeper.getIdleSec())
else:
iq_obj = obj.stanza.buildReply('error')
@@ -1509,7 +1526,7 @@ ConnectionJingle, ConnectionIBBytestream):
return
if gajim.config.get_per('accounts', self.name, 'send_time_info'):
iq_obj = obj.stanza.buildReply('result')
- qp = iq_obj.getTag('query')
+ qp = iq_obj.setQuery()
qp.setTagData('utc', strftime('%Y%m%dT%H:%M:%S', gmtime()))
qp.setTagData('tz', helpers.decode_string(tzname[daylight]))
qp.setTagData('display', helpers.decode_string(strftime('%c',
@@ -1662,55 +1679,6 @@ ConnectionJingle, ConnectionIBBytestream):
self.connection.SendAndCallForResponse(iq, self._on_bob_received,
{'cid': cid})
- # process and dispatch a groupchat message
- def dispatch_gc_message(self, msg, frm, msgtxt, jid, tim):
- has_timestamp = bool(msg.timestamp)
-
- statusCode = msg.getStatusCode()
-
- displaymarking = None
- seclabel = msg.getTag('securitylabel')
- if seclabel and seclabel.getNamespace() == common.xmpp.NS_SECLABEL:
- # Ignore message from room in which we are not
- displaymarking = seclabel.getTag('displaymarking')
-
- if jid not in self.last_history_time:
- return
-
- captcha = msg.getTag('captcha', namespace=common.xmpp.NS_CAPTCHA)
- if captcha:
- captcha = captcha.getTag('x', namespace=common.xmpp.NS_DATA)
- found = helpers.replace_dataform_media(captcha, msg)
- if not found:
- self.get_bob_data(uri_data, frm, self.dispatch_gc_message,
- [msg, frm, msgtxt, jid, tim], 0)
- return
- self.dispatch('GC_MSG', (frm, msgtxt, tim, has_timestamp,
- msg.getXHTML(), statusCode, displaymarking, captcha))
-
- tim_int = int(float(mktime(tim)))
- if gajim.config.should_log(self.name, jid) and not \
- tim_int <= self.last_history_time[jid] and msgtxt and frm.find('/') >= 0:
- # if frm.find('/') < 0, it means message comes from room itself
- # usually it hold description and can be send at each connection
- # so don't store it in logs
- try:
- gajim.logger.write('gc_msg', frm, msgtxt, tim=tim)
- # store in memory time of last message logged.
- # this will also be saved in rooms_last_message_time table
- # when we quit this muc
- self.last_history_time[jid] = mktime(tim)
-
- except exceptions.PysqliteOperationalError, e:
- self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e)))
- except exceptions.DatabaseMalformed:
- pritext = _('Database Error')
- sectext = _('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).') % \
- common.logger.LOG_DB_PATH
- self.dispatch('DB_ERROR', (pritext, sectext))
-
def _presenceCB(self, con, prs):
"""
Called when we receive a presence
@@ -1877,10 +1845,13 @@ ConnectionJingle, ConnectionIBBytestream):
'file_transfer_proxies')
our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) + \
'/' + self.server_resource)
+ testit = gajim.config.get_per('accounts', self.name,
+ 'test_ft_proxies_on_startup')
if cfg_proxies:
proxies = [e.strip() for e in cfg_proxies.split(',')]
for proxy in proxies:
- gajim.proxy65_manager.resolve(proxy, self.connection, our_jid)
+ gajim.proxy65_manager.resolve(proxy, self.connection, our_jid,
+ testit=testit)
def _on_roster_set(self, roster):
gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self,
diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 0b83de8bc2409835d28b6e79acadd399cf0b8961..ad348d4a3e404ada791c46e7f5c0638b5c8ca21c 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -20,6 +20,7 @@
import datetime
import sys
+import os
from time import (localtime, time as time_time)
from calendar import timegm
import hmac
@@ -34,6 +35,7 @@ from common import exceptions
from common.zeroconf import zeroconf
from common.logger import LOG_DB_PATH
from common.pep import SUPPORTED_PERSONAL_USER_EVENTS
+from common.xmpp.protocol import NS_CHATSTATES
from common.jingle_transport import JingleTransportSocks5
import gtkgui_helpers
@@ -41,6 +43,28 @@ import gtkgui_helpers
import logging
log = logging.getLogger('gajim.c.connection_handlers_events')
+CONDITION_TO_CODE = {
+ 'realjid-public': 100,
+ 'affiliation-changed': 101,
+ 'unavailable-shown': 102,
+ 'unavailable-not-shown': 103,
+ 'configuration-changed': 104,
+ 'self-presence': 110,
+ 'logging-enabled': 170,
+ 'logging-disabled': 171,
+ 'non-anonymous': 172,
+ 'semi-anonymous': 173,
+ 'fully-anonymous': 174,
+ 'room-created': 201,
+ 'nick-assigned': 210,
+ 'banned': 301,
+ 'new-nick': 303,
+ 'kicked': 307,
+ 'removed-affiliation': 321,
+ 'removed-membership': 322,
+ 'removed-shutdown': 332,
+}
+
class HelperEvent:
def get_jid_resource(self, check_fake_jid=False):
if check_fake_jid and hasattr(self, 'id_') and \
@@ -74,28 +98,16 @@ class HelperEvent:
Extract chatstate from a <message/> stanza
Requires self.stanza and self.msgtxt
"""
- self.composing_xep = None
self.chatstate = None
# chatstates - look for chatstate tags in a message if not delayed
delayed = self.stanza.getTag('x', namespace=xmpp.NS_DELAY) is not None
if not delayed:
- self.composing_xep = False
children = self.stanza.getChildren()
for child in children:
- if child.getNamespace() == 'http://jabber.org/protocol/chatstates':
+ if child.getNamespace() == NS_CHATSTATES:
self.chatstate = child.getName()
- self.composing_xep = 'XEP-0085'
break
- # No XEP-0085 support, fallback to XEP-0022
- if not self.chatstate:
- chatstate_child = self.stanza.getTag('x',
- namespace=xmpp.NS_EVENT)
- if chatstate_child:
- self.chatstate = 'active'
- self.composing_xep = 'XEP-0022'
- if not self.msgtxt and chatstate_child.getTag('composing'):
- self.chatstate = 'composing'
class HttpAuthReceivedEvent(nec.NetworkIncomingEvent):
name = 'http-auth-received'
@@ -711,6 +723,8 @@ PresenceHelperEvent):
self.need_add_in_roster = False
self.need_redraw = False
+ self.popup = False # Do we want to open chat window ?
+
if not self.conn or self.conn.connected < 2:
log.debug('account is no more connected')
return
@@ -719,6 +733,7 @@ PresenceHelperEvent):
try:
self.get_jid_resource()
except Exception:
+ log.warn('Invalid JID: %s, ignoring it' % self.stanza.getFrom())
return
jid_list = gajim.contacts.get_jid_list(self.conn.name)
self.timestamp = None
@@ -825,6 +840,7 @@ class ZeroconfPresenceReceivedEvent(nec.NetworkIncomingEvent):
self.transport_auto_auth = False
self.errcode = None
self.errmsg = ''
+ self.popup = False # Do we want to open chat window ?
return True
class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
@@ -905,7 +921,15 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.status_code = ['destroyed']
else:
self.reason = self.stanza.getReason()
- self.status_code = self.stanza.getStatusCode()
+ conditions = self.stanza.getStatusConditions()
+ if conditions:
+ self.status_code = []
+ for condition in conditions:
+ if condition in CONDITION_TO_CODE:
+ self.status_code.append(CONDITION_TO_CODE[condition])
+ else:
+ self.status_code = self.stanza.getStatusCode()
+
self.role = self.stanza.getRole()
self.affiliation = self.stanza.getAffiliation()
self.real_jid = self.stanza.getJid()
@@ -954,6 +978,8 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.conn = self.base_event.conn
self.stanza = self.base_event.stanza
self.get_id()
+ self.forwarded = False
+ self.sent = False
account = self.conn.name
@@ -972,8 +998,9 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
try:
self.get_jid_resource()
except helpers.InvalidFormat:
- self.conn.dispatch('ERROR', (_('Invalid Jabber ID'),
- _('A message from a non-valid JID arrived, it has been '
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self.conn,
+ level='error', pri_txt=_('Invalid Jabber ID'),
+ sec_txt=_('A message from a non-valid JID arrived, it has been '
'ignored.')))
return
@@ -990,6 +1017,43 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
return
self.jid = gajim.get_jid_without_resource(self.fjid)
+ forward_tag = self.stanza.getTag('forwarded', namespace=xmpp.NS_FORWARD)
+ # Be sure it comes from one of our resource, else ignore forward element
+ if forward_tag and self.jid == gajim.get_jid_from_account(account):
+ received_tag = forward_tag.getTag('received',
+ namespace=xmpp.NS_CARBONS)
+ sent_tag = forward_tag.getTag('sent', namespace=xmpp.NS_CARBONS)
+ if received_tag:
+ msg = forward_tag.getTag('message')
+ self.stanza = xmpp.Message(node=msg)
+ try:
+ self.get_jid_resource()
+ except helpers.InvalidFormat:
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self.conn, level='error',
+ pri_txt=_('Invalid Jabber ID'),
+ sec_txt=_('A message from a non-valid JID arrived, it '
+ 'has been ignored.')))
+ return
+ self.forwarded = True
+ elif sent_tag:
+ msg = forward_tag.getTag('message')
+ self.stanza = xmpp.Message(node=msg)
+ to = self.stanza.getTo()
+ self.stanza.setTo(self.stanza.getFrom())
+ self.stanza.setFrom(to)
+ try:
+ self.get_jid_resource()
+ except helpers.InvalidFormat:
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self.conn, level='error',
+ pri_txt=_('Invalid Jabber ID'),
+ sec_txt=_('A message from a non-valid JID arrived, it '
+ 'has been ignored.')))
+ return
+ self.forwarded = True
+ self.sent = True
+
self.enc_tag = self.stanza.getTag('x', namespace=xmpp.NS_ENCRYPTED)
self.invite_tag = None
@@ -1009,6 +1073,12 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.get_gc_control()
if self.gc_control and self.jid == self.fjid:
+ if self.mtype == 'error':
+ self.msgtxt = _('error while sending %(message)s ( %(error)s )'\
+ ) % {'message': self.msgtxt,
+ 'error': self.stanza.getErrorMsg()}
+ if self.stanza.getTag('html'):
+ self.stanza.delChild('html')
# message from a gc without a resource
self.mtype = 'groupchat'
@@ -1023,7 +1093,8 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.session.last_receive = time_time()
# check if the message is a XEP-0020 feature negotiation request
- if self.stanza.getTag('feature', namespace=xmpp.NS_FEATURE):
+ if not self.forwarded and self.stanza.getTag('feature',
+ namespace=xmpp.NS_FEATURE):
if gajim.HAVE_PYCRYPTO:
feature = self.stanza.getTag(name='feature',
namespace=xmpp.NS_FEATURE)
@@ -1040,7 +1111,8 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.conn.connection.send(reply)
return
- if self.stanza.getTag('init', namespace=xmpp.NS_ESESSION_INIT):
+ if not self.forwarded and self.stanza.getTag('init',
+ namespace=xmpp.NS_ESESSION_INIT):
init = self.stanza.getTag(name='init',
namespace=xmpp.NS_ESESSION_INIT)
form = xmpp.DataForm(node=init.getTag('x'))
@@ -1055,6 +1127,9 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
xep_200_encrypted = self.stanza.getTag('c',
namespace=xmpp.NS_STANZA_CRYPTO)
if xep_200_encrypted:
+ if self.forwarded:
+ # Ignore E2E forwarded encrypted messages
+ return False
self.encrypted = 'xep200'
return True
@@ -1126,6 +1201,10 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.session = self.msg_obj.session
self.timestamp = self.msg_obj.timestamp
self.encrypted = self.msg_obj.encrypted
+ self.forwarded = self.msg_obj.forwarded
+ self.sent = self.msg_obj.sent
+ self.popup = False
+ self.msg_id = None # id in log database
self.receipt_request_tag = self.stanza.getTag('request',
namespace=xmpp.NS_RECEIPTS)
@@ -1162,7 +1241,6 @@ class ChatstateReceivedEvent(nec.NetworkIncomingEvent):
self.jid = self.msg_obj.jid
self.fjid = self.msg_obj.fjid
self.resource = self.msg_obj.resource
- self.composing_xep = self.msg_obj.composing_xep
self.chatstate = self.msg_obj.chatstate
return True
@@ -1199,7 +1277,14 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent):
conn=self.conn, msg_event=self))
return
- self.status_code = self.stanza.getStatusCode()
+ conditions = self.stanza.getStatusConditions()
+ if conditions:
+ self.status_code = []
+ for condition in conditions:
+ if condition in CONDITION_TO_CODE:
+ self.status_code.append(CONDITION_TO_CODE[condition])
+ else:
+ self.status_code = self.stanza.getStatusCode()
if not self.stanza.getTag('body'): # no <body>
# It could be a config change. See
@@ -1699,6 +1784,10 @@ class PasswordRequiredEvent(nec.NetworkIncomingEvent):
name = 'password-required'
base_network_events = []
+class Oauth2CredentialsRequiredEvent(nec.NetworkIncomingEvent):
+ name = 'oauth2-credentials-required'
+ base_network_events = []
+
class FailedDecryptEvent(nec.NetworkIncomingEvent):
name = 'failed-decrypt'
base_network_events = []
@@ -1934,13 +2023,16 @@ class GatewayPromptReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
class NotificationEvent(nec.NetworkIncomingEvent):
name = 'notification'
- base_network_events = ['decrypted-message-received', 'gc-message-received']
+ base_network_events = ['decrypted-message-received', 'gc-message-received',
+ 'presence-received']
def detect_type(self):
if self.base_event.name == 'decrypted-message-received':
self.notif_type = 'msg'
if self.base_event.name == 'gc-message-received':
self.notif_type = 'gc-msg'
+ if self.base_event.name == 'presence-received':
+ self.notif_type = 'pres'
def get_focused(self):
self.control_focused = False
@@ -1985,11 +2077,13 @@ class NotificationEvent(nec.NetworkIncomingEvent):
# We don't want message preview, do_preview = False
self.popup_text = ''
if msg_obj.mtype == 'normal': # single message
+ self.popup_msg_type = 'normal'
self.popup_event_type = _('New Single Message')
self.popup_image = 'gajim-single_msg_recv'
self.popup_title = _('New Single Message from %(nickname)s') % \
{'nickname': nick}
elif msg_obj.mtype == 'pm':
+ self.popup_msg_type = 'pm'
self.popup_event_type = _('New Private Message')
self.popup_image = 'gajim-priv_msg_recv'
self.popup_title = _('New Private Message from group chat %s') % \
@@ -2001,6 +2095,7 @@ class NotificationEvent(nec.NetworkIncomingEvent):
self.popup_text = _('Messaged by %(nickname)s') % \
{'nickname': nick}
else: # chat message
+ self.popup_msg_type = 'chat'
self.popup_event_type = _('New Message')
self.popup_image = 'gajim-chat_msg_recv'
self.popup_title = _('New Message from %(nickname)s') % \
@@ -2031,24 +2126,134 @@ class NotificationEvent(nec.NetworkIncomingEvent):
self.do_sound = True
def handle_incoming_gc_msg_event(self, msg_obj):
+ if not msg_obj.msg_obj.gc_control:
+ # we got a message from a room we're not in? ignore it
+ return
sound = msg_obj.msg_obj.gc_control.highlighting_for_message(
msg_obj.msgtxt, msg_obj.timestamp)[1]
- self.do_sound = True
- if sound == 'received':
- self.sound_event = 'muc_message_received'
- elif sound == 'highlight':
- self.sound_event = 'muc_message_highlight'
+
+ if msg_obj.nickname != msg_obj.msg_obj.gc_control.nick:
+ self.do_sound = True
+ if sound == 'received':
+ self.sound_event = 'muc_message_received'
+ elif sound == 'highlight':
+ self.sound_event = 'muc_message_highlight'
+ else:
+ self.do_sound = False
else:
self.do_sound = False
self.do_popup = False
- def handle_incoming_pres_event(self, msg_obj):
- pass
+ def handle_incoming_pres_event(self, pres_obj):
+ if gajim.jid_is_transport(pres_obj.jid):
+ return True
+ account = pres_obj.conn.name
+ self.jid = pres_obj.jid
+ resource = pres_obj.resource or ''
+ # It isn't an agent
+ for c in pres_obj.contact_list:
+ if c.resource == resource:
+ # we look for other connected resources
+ continue
+ if c.show not in ('offline', 'error'):
+ return True
+
+
+ # no other resource is connected, let's look in metacontacts
+ family = gajim.contacts.get_metacontacts_family(account, self.jid)
+ for info in family:
+ acct_ = info['account']
+ jid_ = info['jid']
+ c_ = gajim.contacts.get_contact_with_highest_priority(acct_, jid_)
+ if not c_:
+ continue
+ if c_.jid == self.jid:
+ continue
+ if c_.show not in ('offline', 'error'):
+ return True
+
+ if pres_obj.old_show < 2 and pres_obj.new_show > 1:
+ event = 'contact_connected'
+ show_image = 'online.png'
+ suffix = '_notif_size_colored'
+ server = gajim.get_server_from_jid(self.jid)
+ account_server = account + '/' + server
+ block_transport = False
+ if account_server in gajim.block_signed_in_notifications and \
+ gajim.block_signed_in_notifications[account_server]:
+ block_transport = True
+ if helpers.allow_showing_notification(account, 'notify_on_signin') \
+ and not gajim.block_signed_in_notifications[account] and \
+ not block_transport:
+ self.do_popup = True
+ if gajim.config.get_per('soundevents', 'contact_connected',
+ 'enabled') and not gajim.block_signed_in_notifications[account] and\
+ not block_transport and helpers.allow_sound_notification(account,
+ 'contact_connected'):
+ self.sound_event = event
+ self.do_sound = True
+
+ elif pres_obj.old_show > 1 and pres_obj.new_show < 2:
+ event = 'contact_disconnected'
+ show_image = 'offline.png'
+ suffix = '_notif_size_bw'
+ if helpers.allow_showing_notification(account, 'notify_on_signout'):
+ self.do_popup = True
+ if gajim.config.get_per('soundevents', 'contact_disconnected',
+ 'enabled') and helpers.allow_sound_notification(account, event):
+ self.sound_event = event
+ self.do_sound = True
+ # Status change (not connected/disconnected or error (<1))
+ elif pres_obj.new_show > 1:
+ event = 'status_change'
+ # FIXME: we don't always 'online.png', but we first need 48x48 for
+ # all status
+ show_image = 'online.png'
+ suffix = '_notif_size_colored'
+ else:
+ return True
+
+ transport_name = gajim.get_transport_name_from_jid(self.jid)
+ img_path = None
+ if transport_name:
+ img_path = os.path.join(helpers.get_transport_path(
+ transport_name), '48x48', show_image)
+ if not img_path or not os.path.isfile(img_path):
+ iconset = gajim.config.get('iconset')
+ img_path = os.path.join(helpers.get_iconset_path(iconset),
+ '48x48', show_image)
+ self.popup_image = gtkgui_helpers.get_path_to_generic_or_avatar(
+ img_path, jid=self.jid, suffix=suffix)
+
+ if event == 'status_change':
+ self.popup_title = _('%(nick)s Changed Status') % \
+ {'nick': gajim.get_name_from_jid(account, self.jid)}
+ self.popup_text = _('%(nick)s is now %(status)s') % \
+ {'nick': gajim.get_name_from_jid(account, self.jid),\
+ 'status': helpers.get_uf_show(pres_obj.show)}
+ if pres_obj.status:
+ self.popup_text = self.popup_text + " : " + pres_obj.status
+ self.popup_event_type = _('Contact Changed Status')
+ elif event == 'contact_connected':
+ self.popup_title = _('%(nickname)s Signed In') % \
+ {'nickname': gajim.get_name_from_jid(account, self.jid)}
+ self.popup_text = ''
+ if pres_obj.status:
+ self.popup_text = pres_obj.status
+ self.popup_event_type = _('Contact Signed In')
+ elif event == 'contact_disconnected':
+ self.popup_title = _('%(nickname)s Signed Out') % \
+ {'nickname': gajim.get_name_from_jid(account, self.jid)}
+ self.popup_text = ''
+ if pres_obj.status:
+ self.popup_text = pres_obj.status
+ self.popup_event_type = _('Contact Signed Out')
def generate(self):
# what's needed to compute output
self.conn = self.base_event.conn
+ self.jid = ''
self.control = None
self.control_focused = False
self.first_unread = False
@@ -2082,7 +2287,7 @@ class NotificationEvent(nec.NetworkIncomingEvent):
self.handle_incoming_pres_event(self.base_event)
return True
-class MessageOutgoingEvent(nec.NetworkIncomingEvent):
+class MessageOutgoingEvent(nec.NetworkOutgoingEvent):
name = 'message-outgoing'
base_network_events = []
@@ -2093,7 +2298,6 @@ class MessageOutgoingEvent(nec.NetworkIncomingEvent):
self.subject = ''
self.chatstate = None
self.msg_id = None
- self.composing_xep = None
self.resource = None
self.user_nick = None
self.xhtml = None
@@ -2107,6 +2311,18 @@ class MessageOutgoingEvent(nec.NetworkIncomingEvent):
self.callback_args = []
self.now = False
self.is_loggable = True
+ self.control = None
def generate(self):
return True
+
+class ClientCertPassphraseEvent(nec.NetworkIncomingEvent):
+ name = 'client-cert-passphrase'
+ base_network_events = []
+
+class InformationEvent(nec.NetworkIncomingEvent):
+ name = 'information'
+ base_network_events = []
+
+ def init(self):
+ self.popup = True
diff --git a/src/common/contacts.py b/src/common/contacts.py
index e115ef46d8383a1900bca2876e99d50914ef12fb..8ddce5b453147a1f91de620360b47727f32e6c30 100644
--- a/src/common/contacts.py
+++ b/src/common/contacts.py
@@ -46,7 +46,7 @@ class XMPPEntity(object):
class CommonContact(XMPPEntity):
def __init__(self, jid, account, resource, show, status, name,
- our_chatstate, composing_xep, chatstate, client_caps=None):
+ our_chatstate, chatstate, client_caps=None):
XMPPEntity.__init__(self, jid, account, resource)
@@ -57,17 +57,8 @@ class CommonContact(XMPPEntity):
self.client_caps = client_caps or caps_cache.NullClientCaps()
# please read xep-85 http://www.xmpp.org/extensions/xep-0085.html
- # we keep track of xep85 support with the peer by three extra states:
- # None, False and 'ask'
- # None if no info about peer
- # False if peer does not support xep85
- # 'ask' if we sent the first 'active' chatstate and are waiting for reply
# this holds what WE SEND to contact (our current chatstate)
self.our_chatstate = our_chatstate
- # tell which XEP we're using for composing state
- # None = have to ask, XEP-0022 = use this xep,
- # XEP-0085 = use this xep, False = no composing support
- self.composing_xep = composing_xep
# this is contact's chatstate
self.chatstate = chatstate
@@ -97,12 +88,12 @@ class Contact(CommonContact):
Information concerning a contact
"""
def __init__(self, jid, account, name='', groups=[], show='', status='',
- sub='', ask='', resource='', priority=0, keyID='', client_caps=None,
- our_chatstate=None, chatstate=None, last_status_time=None, msg_id=
- None, composing_xep=None, last_activity_time=None):
+ sub='', ask='', resource='', priority=0, keyID='', client_caps=None,
+ our_chatstate=None, chatstate=None, last_status_time=None, msg_id=None,
+ last_activity_time=None):
CommonContact.__init__(self, jid, account, resource, show, status, name,
- our_chatstate, composing_xep, chatstate, client_caps=client_caps)
+ our_chatstate, chatstate, client_caps=client_caps)
self.contact_name = '' # nick choosen by contact
self.groups = [i for i in set(groups)] # filter duplicate values
@@ -184,11 +175,11 @@ class GC_Contact(CommonContact):
"""
def __init__(self, room_jid, account, name='', show='', status='', role='',
- affiliation='', jid='', resource='', our_chatstate=None,
- composing_xep=None, chatstate=None):
+ affiliation='', jid='', resource='', our_chatstate=None,
+ chatstate=None):
CommonContact.__init__(self, jid, account, resource, show, status, name,
- our_chatstate, composing_xep, chatstate)
+ our_chatstate, chatstate)
self.room_jid = room_jid
self.role = role
@@ -205,8 +196,8 @@ class GC_Contact(CommonContact):
Create a Contact instance from this GC_Contact instance
"""
return Contact(jid=self.get_full_jid(), account=self.account,
- name=self.name, groups=[], show=self.show, status=self.status,
- sub='none', client_caps=self.client_caps)
+ name=self.name, groups=[], show=self.show, status=self.status,
+ sub='none', client_caps=self.client_caps)
class LegacyContactsAPI:
@@ -249,15 +240,15 @@ class LegacyContactsAPI:
def create_contact(self, jid, account, name='', groups=[], show='',
status='', sub='', ask='', resource='', priority=0, keyID='',
client_caps=None, our_chatstate=None, chatstate=None, last_status_time=None,
- composing_xep=None, last_activity_time=None):
+ last_activity_time=None):
# Use Account object if available
account = self._accounts.get(account, account)
return Contact(jid=jid, account=account, name=name, groups=groups,
- show=show, status=status, sub=sub, ask=ask, resource=resource,
- priority=priority, keyID=keyID, client_caps=client_caps,
- our_chatstate=our_chatstate, chatstate=chatstate,
- last_status_time=last_status_time, composing_xep=composing_xep,
- last_activity_time=last_activity_time)
+ show=show, status=status, sub=sub, ask=ask, resource=resource,
+ priority=priority, keyID=keyID, client_caps=client_caps,
+ our_chatstate=our_chatstate, chatstate=chatstate,
+ last_status_time=last_status_time,
+ last_activity_time=last_activity_time)
def create_self_contact(self, jid, account, resource, show, status, priority,
name='', keyID=''):
@@ -266,27 +257,28 @@ class LegacyContactsAPI:
account = self._accounts.get(account, account) # Use Account object if available
self_contact = self.create_contact(jid=jid, account=account,
name=nick, groups=['self_contact'], show=show, status=status,
- sub='both', ask='none', priority=priority, keyID=keyID,
+ sub='both', ask='none', priority=priority, keyID=keyID,
resource=resource)
self_contact.pep = conn.pep
return self_contact
- def create_not_in_roster_contact(self, jid, account, resource='', name='', keyID=''):
- account = self._accounts.get(account, account) # Use Account object if available
+ def create_not_in_roster_contact(self, jid, account, resource='', name='',
+ keyID=''):
+ # Use Account object if available
+ account = self._accounts.get(account, account)
return self.create_contact(jid=jid, account=account, resource=resource,
- name=name, groups=[_('Not in Roster')], show='not in roster',
- status='', sub='none', keyID=keyID)
+ name=name, groups=[_('Not in Roster')], show='not in roster',
+ status='', sub='none', keyID=keyID)
def copy_contact(self, contact):
return self.create_contact(contact.jid, contact.account,
- name=contact.name, groups=contact.groups, show=contact.show,
- status=contact.status, sub=contact.sub, ask=contact.ask,
- resource=contact.resource, priority=contact.priority,
- keyID=contact.keyID, client_caps=contact.client_caps,
- our_chatstate=contact.our_chatstate, chatstate=contact.chatstate,
- last_status_time=contact.last_status_time,
- composing_xep=contact.composing_xep,
- last_activity_time=contact.last_activity_time)
+ name=contact.name, groups=contact.groups, show=contact.show,
+ status=contact.status, sub=contact.sub, ask=contact.ask,
+ resource=contact.resource, priority=contact.priority,
+ keyID=contact.keyID, client_caps=contact.client_caps,
+ our_chatstate=contact.our_chatstate, chatstate=contact.chatstate,
+ last_status_time=contact.last_status_time,
+ last_activity_time=contact.last_activity_time)
def add_contact(self, account, contact):
if account not in self._accounts:
diff --git a/src/common/defs.py b/src/common/defs.py
index 885de925d6a34af7a598be226097b213c58c7947..6aa68c52dbf7bab053582f8458b63e5013d466b7 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
basedir = '../'
localedir = '../po'
-version = '0.14.1.1'
+version = '0.15-beta3'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,
diff --git a/src/common/events.py b/src/common/events.py
index f51d64fb43e762a43461c03332a6962e2b63f003..cdfcbde7a868a8a395e7ce18ca874511e69b2102 100644
--- a/src/common/events.py
+++ b/src/common/events.py
@@ -122,8 +122,10 @@ class Events:
def remove_account(self, account):
del self._events[account]
- def create_event(self, type_, parameters, time_ = time.time(),
- show_in_roster = False, show_in_systray = True):
+ def create_event(self, type_, parameters, time_=None,
+ show_in_roster=False, show_in_systray=True):
+ if not time_:
+ time_ = time.time()
return Event(type_, time_, parameters, show_in_roster,
show_in_systray)
@@ -219,10 +221,12 @@ class Events:
events_list.append(ev)
return events_list
- def get_first_event(self, account, jid = None, type_ = None):
+ def get_first_event(self, account=None, jid=None, type_=None):
"""
Return the first event of type type_ if given
"""
+ if not account:
+ return self._get_first_event_with_attribute(self._events)
events_list = self.get_events(account, jid, type_)
# be sure it's bigger than latest event
first_event_time = time.time() + 1
diff --git a/src/common/gajim.py b/src/common/gajim.py
index 126bda0ba13fb8cd0e31cbd4193ab80ff98463eb..83ae590f74049097fb08a7a3f2526f0a19e8201e 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -158,8 +158,13 @@ try:
except ImportError:
HAVE_GPG = False
else:
- from os import system
- if system('gpg -h >/dev/null 2>&1'):
+ import os
+ import subprocess
+ if os.name == 'nt':
+ gpg_cmd = 'gpg -h >nul 2>&1'
+ else:
+ gpg_cmd = 'gpg -h >/dev/null 2>&1'
+ if subprocess.call(gpg_cmd, shell=True):
HAVE_GPG = False
# Depends on use_latex option. Will be correctly set after we config options are
@@ -168,10 +173,34 @@ HAVE_LATEX = False
HAVE_FARSIGHT = True
try:
- __import__('farsight')
- __import__('gst')
+ farsight = __import__('farsight')
+ import gst
+ import glib
+ try:
+ conference = gst.element_factory_make('fsrtpconference')
+ session = conference.new_session(farsight.MEDIA_TYPE_AUDIO)
+ del session
+ del conference
+ except glib.GError:
+ HAVE_FARSIGHT = False
+
except ImportError:
HAVE_FARSIGHT = False
+
+HAVE_UPNP_IGD = True
+try:
+ import gupnp.igd
+ gupnp_igd = gupnp.igd.Simple()
+except ImportError:
+ HAVE_UPNP_IGD = False
+
+HAVE_PYCURL = True
+try:
+ __import__('pycurl')
+except ImportError:
+ HAVE_PYCURL = False
+
+
gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE,
xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER,
diff --git a/src/common/ged.py b/src/common/ged.py
index e4035fefb16878a0e23010119fe20464aa96bcc9..72920f05e6931867be27af3bcc4234cef1fa7162 100644
--- a/src/common/ged.py
+++ b/src/common/ged.py
@@ -25,8 +25,10 @@ Global Events Dispatcher module.
:license: GPL
'''
+import traceback
+
import logging
-log = logging.getLogger('gajim.common.ged')
+log = logging.getLogger('gajim.c.ged')
PRECORE = 10
CORE = 20
@@ -85,5 +87,10 @@ class GlobalEventsDispatcher(object):
log.debug('%s\nArgs: %s'%(event_name, str(args)))
if event_name in self.handlers:
for priority, handler in self.handlers[event_name]:
- if handler(*args, **kwargs):
- return True
+ try:
+ if handler(*args, **kwargs):
+ return True
+ except Exception, e:
+ log.error('Error while running an even handler: %s' % \
+ handler)
+ traceback.print_exc()
diff --git a/src/common/gnupg.py b/src/common/gnupg.py
index 88621c0393fb134b586aebbc4891ef4bb8efc160..e3bed526e540e71f20bec068fbbbdbc3e66241f5 100644
--- a/src/common/gnupg.py
+++ b/src/common/gnupg.py
@@ -110,7 +110,7 @@ def _write_passphrase(stream, passphrase, encoding):
passphrase = '%s\n' % passphrase
passphrase = passphrase.encode(encoding)
stream.write(passphrase)
- logger.debug("Wrote passphrase: %r", passphrase)
+ logger.debug("Passphrase written")
def _is_sequence(instance):
return isinstance(instance,list) or isinstance(instance,tuple)
diff --git a/src/common/helpers.py b/src/common/helpers.py
index 25255655f0873644542d291469d2151fac9ebd0f..e4deb3ee6282aaa135ec3af0c9a4540df55742b4 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -35,12 +35,16 @@ import locale
import os
import subprocess
import urllib
+import urllib2
import webbrowser
import errno
import select
import base64
import hashlib
+import shlex
import caps_cache
+import socket
+import time
from encodings.punycode import punycode_encode
from string import Template
@@ -57,6 +61,9 @@ try:
except Exception:
pass
+import logging
+log = logging.getLogger('gajim.c.helpers')
+
special_groups = (_('Transports'), _('Not in Roster'), _('Observers'), _('Groupchats'))
class InvalidFormat(Exception):
@@ -381,8 +388,18 @@ def is_in_path(command, return_abs_path=False):
pass
return False
-def exec_command(command):
- subprocess.Popen('%s &' % command, shell=True).wait()
+def exec_command(command, use_shell=False):
+ """
+ execute a command. if use_shell is True, we run the command as is it was
+ typed in a console. So it may be dangerous if you are not sure about what
+ is executed.
+ """
+ if use_shell:
+ subprocess.Popen('%s &' % command, shell=True).wait()
+ else:
+ args = shlex.split(command.encode('utf-8'))
+ p = subprocess.Popen(args)
+ gajim.thread_interface(p.wait)
def build_command(executable, parameter):
# we add to the parameter (can hold path with spaces)
@@ -609,6 +626,9 @@ def datetime_tuple(timestamp):
# import gajim only when needed (after decode_string is defined) see #4764
import gajim
+if gajim.HAVE_PYCURL:
+ import pycurl
+ from cStringIO import StringIO
def convert_bytes(string):
suffix = ''
@@ -1374,3 +1394,156 @@ def replace_dataform_media(form, stanza):
uri.setData(data.getData())
found = True
return found
+
+def get_proxy_info(account):
+ p = gajim.config.get_per('accounts', account, 'proxy')
+ if not p:
+ if gajim.config.get_per('accounts', account, 'use_env_http_proxy'):
+ try:
+ try:
+ env_http_proxy = os.environ['HTTP_PROXY']
+ except Exception:
+ env_http_proxy = os.environ['http_proxy']
+ env_http_proxy = env_http_proxy.strip('"')
+ # Dispose of the http:// prefix
+ env_http_proxy = env_http_proxy.split('://')[-1]
+ env_http_proxy = env_http_proxy.split('@')
+
+ if len(env_http_proxy) == 2:
+ login = env_http_proxy[0].split(':')
+ addr = env_http_proxy[1].split(':')
+ else:
+ login = ['', '']
+ addr = env_http_proxy[0].split(':')
+
+ proxy = {'host': addr[0], 'type' : u'http', 'user':login[0]}
+
+ if len(addr) == 2:
+ proxy['port'] = addr[1]
+ else:
+ proxy['port'] = 3128
+
+ if len(login) == 2:
+ proxy['pass'] = login[1]
+ proxy['useauth'] = True
+ else:
+ proxy['pass'] = u''
+ return proxy
+
+ except Exception:
+ proxy = None
+ p = gajim.config.get('global_proxy')
+ if p:
+ proxy = {}
+ proxyptr = gajim.config.get_per('proxies', p)
+ for key in proxyptr.keys():
+ proxy[key] = proxyptr[key][1]
+ return proxy
+
+def _get_img_direct(attrs):
+ """
+ Download an image. This function should be launched in a separated thread.
+ """
+ mem, alt = '', ''
+ # Wait maximum 5s for connection
+ socket.setdefaulttimeout(5)
+ try:
+ req = urllib2.Request(attrs['src'])
+ req.add_header('User-Agent', 'Gajim ' + gajim.version)
+ f = urllib2.urlopen(req)
+ except Exception, ex:
+ log.debug('Error loading image %s ' % attrs['src'] + str(ex))
+ pixbuf = None
+ alt = attrs.get('alt', 'Broken image')
+ else:
+ # Wait 0.5s between each byte
+ try:
+ f.fp._sock.fp._sock.settimeout(0.5)
+ except Exception:
+ pass
+ # Max image size = 2 MB (to try to prevent DoS)
+ deadline = time.time() + 3
+ while True:
+ if time.time() > deadline:
+ log.debug('Timeout loading image %s ' % attrs['src'])
+ mem = ''
+ alt = attrs.get('alt', '')
+ if alt:
+ alt += '\n'
+ alt += _('Timeout loading image')
+ break
+ try:
+ temp = f.read(100)
+ except socket.timeout, ex:
+ log.debug('Timeout loading image %s ' % attrs['src'] + str(ex))
+ alt = attrs.get('alt', '')
+ if alt:
+ alt += '\n'
+ alt += _('Timeout loading image')
+ break
+ if temp:
+ mem += temp
+ else:
+ break
+ if len(mem) > 2*1024*1024:
+ alt = attrs.get('alt', '')
+ if alt:
+ alt += '\n'
+ alt += _('Image is too big')
+ break
+ return (mem, alt)
+
+def _get_img_proxy(attrs, proxy):
+ """
+ Download an image through a proxy. This function should be launched in a
+ separated thread.
+ """
+ if not gajim.HAVE_PYCURL:
+ return '', _('PyCURL is not installed')
+ mem, alt = '', ''
+ try:
+ b = StringIO()
+ c = pycurl.Curl()
+ c.setopt(pycurl.URL, attrs['src'].encode('utf-8'))
+ c.setopt(pycurl.FOLLOWLOCATION, 1)
+ c.setopt(pycurl.CONNECTTIMEOUT, 5)
+ c.setopt(pycurl.TIMEOUT, 10)
+ c.setopt(pycurl.MAXFILESIZE, 2000000)
+ c.setopt(pycurl.WRITEFUNCTION, b.write)
+ c.setopt(pycurl.USERAGENT, 'Gajim ' + gajim.version)
+ # set proxy
+ c.setopt(pycurl.PROXY, proxy['host'].encode('utf-8'))
+ c.setopt(pycurl.PROXYPORT, proxy['port'])
+ if proxy['useauth']:
+ c.setopt(pycurl.PROXYUSERPWD, proxy['user'].encode('utf-8')\
+ + ':' + proxy['pass'].encode('utf-8'))
+ c.setopt(pycurl.PROXYAUTH, pycurl.HTTPAUTH_ANY)
+ if proxy['type'] == 'http':
+ c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_HTTP)
+ elif proxy['type'] == 'socks5':
+ c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_SOCKS5)
+ x = c.perform()
+ c.close()
+ t = b.getvalue()
+ return (t, attrs.get('alt', ''))
+ except pycurl.error, ex:
+ alt = attrs.get('alt', '')
+ if alt:
+ alt += '\n'
+ if ex[0] == pycurl.E_FILESIZE_EXCEEDED:
+ alt += _('Image is too big')
+ elif ex[0] == pycurl.E_OPERATION_TIMEOUTED:
+ alt += _('Timeout loading image')
+ else:
+ alt += _('Error loading image')
+ except Exception, ex:
+ log.debug('Error loading image %s ' % attrs['src'] + str(ex))
+ pixbuf = None
+ alt = attrs.get('alt', 'Broken image')
+ return ('', alt)
+
+def download_image(account, attrs):
+ proxy = get_proxy_info(account)
+ if proxy and proxy['type'] in ('http', 'socks5'):
+ return _get_img_proxy(attrs, proxy)
+ return _get_img_direct(attrs)
\ No newline at end of file
diff --git a/src/common/jingle.py b/src/common/jingle.py
index b8238a4b39143a6950fd260d2e9b959528114bf8..6a7519e00058ac73247d85b2d4a9bacce805b174 100644
--- a/src/common/jingle.py
+++ b/src/common/jingle.py
@@ -32,11 +32,12 @@ Handles the jingle signalling protocol
import xmpp
import helpers
+import gajim
from jingle_session import JingleSession, JingleStates
-from jingle_rtp import JingleAudio, JingleVideo
+if gajim.HAVE_FARSIGHT:
+ from jingle_rtp import JingleAudio, JingleVideo
from jingle_ft import JingleFileTransfer
-import gajim
import logging
logger = logging.getLogger('gajim.c.jingle')
diff --git a/src/common/jingle_rtp.py b/src/common/jingle_rtp.py
index a5a801c23798b49a0ab111fea76061aef746a442..20f792f5f18c6f3619626586513f657738701370 100644
--- a/src/common/jingle_rtp.py
+++ b/src/common/jingle_rtp.py
@@ -28,6 +28,7 @@ import gajim
from jingle_transport import JingleTransportICEUDP
from jingle_content import contents, JingleContent, JingleContentSetupException
+from connection_handlers_events import InformationEvent
import logging
@@ -103,11 +104,12 @@ class JingleRTPContent(JingleContent):
bin = gst.parse_bin_from_description(pipeline, True)
return bin
except GError, error_str:
- self.session.connection.dispatch('ERROR',
- (_("%s configuration error") % text.capitalize(),
- _("Couldn't setup %s. Check your configuration.\n\n"
- "Pipeline was:\n%s\n\n"
- "Error was:\n%s") % (text, pipeline, error_str)))
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self.session.connection, level='error',
+ pri_txt=_('%s configuration error') % text.capitalize(),
+ sec_txt=_("Couldn't setup %s. Check your configuration.\n\n"
+ "Pipeline was:\n%s\n\nError was:\n%s") % (text, pipeline,
+ error_str)))
raise JingleContentSetupException
def add_remote_candidates(self, candidates):
@@ -201,10 +203,11 @@ class JingleRTPContent(JingleContent):
# or raise an error, Jingle way
# or maybe one-sided stream?
if not self.stream_failed_once:
- self.session.connection.dispatch('ERROR',
- (_("GStreamer error"),
- _("Error: %s\nDebug: %s" % (message.structure['gerror'],
- message.structure['debug']))))
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self.session.connection, level='error',
+ pri_txt=_('GStreamer error'), sec_txt=_('Error: %s\nDebug: '
+ '%s' % (message.structure['gerror'],
+ message.structure['debug']))))
sink_pad = self.p2psession.get_property('sink-pad')
diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py
index 76c0aabd9bd1db7ac4b4ce6b63c8158505e296d7..5eaffd5dd72087b59daf8f4c3fcaa0e008517840 100644
--- a/src/common/jingle_session.py
+++ b/src/common/jingle_session.py
@@ -756,9 +756,10 @@ class JingleSession(object):
def __content_remove(self, content, reason=None):
assert self.state != JingleStates.ended
- stanza, jingle = self.__make_jingle('content-remove', reason=reason)
- self.__append_content(jingle, content)
- self.connection.connection.send(stanza)
+ if self.connection.connection and self.connection.connected > 1:
+ stanza, jingle = self.__make_jingle('content-remove', reason=reason)
+ self.__append_content(jingle, content)
+ self.connection.connection.send(stanza)
# TODO: this will fail if content is not an RTP content
gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None,
conn=self.connection, jingle_session=self, media=content.media,
diff --git a/src/common/jingle_transport.py b/src/common/jingle_transport.py
index 6470bdb441846fa3cee606876b376c843a36e76a..87d2a302603245795932f6b53d00f9e7221bdf8e 100644
--- a/src/common/jingle_transport.py
+++ b/src/common/jingle_transport.py
@@ -59,8 +59,6 @@ class JingleTransport(object):
Build a candidate stanza for the given candidate
"""
pass
-
-
def make_transport(self, candidates=None):
"""
@@ -323,7 +321,10 @@ class JingleTransportIBB(JingleTransport):
transport.setAttr('sid', self.sid)
return transport
-import farsight
+try:
+ import farsight
+except Exception:
+ pass
class JingleTransportICEUDP(JingleTransport):
def __init__(self, node):
diff --git a/src/common/logger.py b/src/common/logger.py
index f3920138d2b4c11710b6ad1c3d6c7540064624f2..ee7e647f1b0a7fcbe3e88490c5ae86b6261b0261 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -569,7 +569,7 @@ class Logger:
except exceptions.PysqliteOperationalError, e:
# Error trying to create a new jid_id. This means there is no log
return []
- where_sql = self._build_contact_where(account, jid)
+ where_sql, jid_tuple = self._build_contact_where(account, jid)
now = int(float(time.time()))
timed_out = now - (timeout * 60) # before that they are too old
@@ -577,14 +577,13 @@ class Logger:
# 3 - 8 (we avoid the last 2 lines but we still return 5 asked)
try:
self.cur.execute('''
- SELECT time, kind, message FROM logs
- WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d
- ORDER BY time DESC LIMIT %d OFFSET %d
- ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV,
- constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT,
- constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR,
- timed_out, restore_how_many_rows, pending_how_many)
- )
+ SELECT time, kind, message FROM logs
+ WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d
+ ORDER BY time DESC LIMIT %d OFFSET %d
+ ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV,
+ constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT,
+ constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR, timed_out,
+ restore_how_many_rows, pending_how_many), jid_tuple)
results = self.cur.fetchall()
except sqlite.DatabaseError:
@@ -614,23 +613,24 @@ class Logger:
except exceptions.PysqliteOperationalError, e:
# Error trying to create a new jid_id. This means there is no log
return []
- where_sql = self._build_contact_where(account, jid)
+ where_sql, jid_tuple = self._build_contact_where(account, jid)
start_of_day = self.get_unix_time_from_date(year, month, day)
seconds_in_a_day = 86400 # 60 * 60 * 24
last_second_of_day = start_of_day + seconds_in_a_day - 1
self.cur.execute('''
- SELECT contact_name, time, kind, show, message, subject FROM logs
- WHERE (%s)
- AND time BETWEEN %d AND %d
- ORDER BY time
- ''' % (where_sql, start_of_day, last_second_of_day))
+ SELECT contact_name, time, kind, show, message, subject FROM logs
+ WHERE (%s)
+ AND time BETWEEN %d AND %d
+ ORDER BY time
+ ''' % (where_sql, start_of_day, last_second_of_day), jid_tuple)
results = self.cur.fetchall()
return results
- def get_search_results_for_query(self, jid, query, account):
+ def get_search_results_for_query(self, jid, query, account, year=False,
+ month=False, day=False):
"""
Returns contact_name, time, kind, show, message
@@ -651,13 +651,25 @@ class Logger:
return results
else: # user just typed something, we search in message column
- where_sql = self._build_contact_where(account, jid)
+ where_sql, jid_tuple = self._build_contact_where(account, jid)
like_sql = '%' + query.replace("'", "''") + '%'
- self.cur.execute('''
- SELECT contact_name, time, kind, show, message, subject FROM logs
- WHERE (%s) AND message LIKE '%s'
- ORDER BY time
- ''' % (where_sql, like_sql))
+ if year:
+ start_of_day = self.get_unix_time_from_date(year, month, day)
+ seconds_in_a_day = 86400 # 60 * 60 * 24
+ last_second_of_day = start_of_day + seconds_in_a_day - 1
+ self.cur.execute('''
+ SELECT contact_name, time, kind, show, message, subject FROM logs
+ WHERE (%s) AND message LIKE '%s'
+ AND time BETWEEN %d AND %d
+ ORDER BY time
+ ''' % (where_sql, like_sql, start_of_day, last_second_of_day),
+ jid_tuple)
+ else:
+ self.cur.execute('''
+ SELECT contact_name, time, kind, show, message, subject FROM logs
+ WHERE (%s) AND message LIKE '%s'
+ ORDER BY time
+ ''' % (where_sql, like_sql), jid_tuple)
results = self.cur.fetchall()
return results
@@ -672,7 +684,7 @@ class Logger:
# Error trying to create a new jid_id. This means there is no log
return []
days_with_logs = []
- where_sql = self._build_contact_where(account, jid)
+ where_sql, jid_tuple = self._build_contact_where(account, jid)
# First select all date of month whith logs we want
start_of_month = self.get_unix_time_from_date(year, month, 1)
@@ -684,13 +696,13 @@ class Logger:
# and take only one of the same values (distinct)
# Now we have timestamps of time 0:00 of every day with logs
self.cur.execute('''
- SELECT DISTINCT time/(86400)*86400 FROM logs
- WHERE (%s)
- AND time BETWEEN %d AND %d
- AND kind NOT IN (%d, %d)
- ORDER BY time
- ''' % (where_sql, start_of_month, last_second_of_month,
- constants.KIND_STATUS, constants.KIND_GCSTATUS))
+ SELECT DISTINCT time/(86400)*86400 FROM logs
+ WHERE (%s)
+ AND time BETWEEN %d AND %d
+ AND kind NOT IN (%d, %d)
+ ORDER BY time
+ ''' % (where_sql, start_of_month, last_second_of_month,
+ constants.KIND_STATUS, constants.KIND_GCSTATUS), jid_tuple)
result = self.cur.fetchall()
# convert timestamps to day of month
@@ -706,19 +718,21 @@ class Logger:
"""
where_sql = ''
if not is_room:
- where_sql = self._build_contact_where(account, jid)
+ where_sql, jid_tuple = self._build_contact_where(account, jid)
else:
try:
jid_id = self.get_jid_id(jid, 'ROOM')
except exceptions.PysqliteOperationalError, e:
# Error trying to create a new jid_id. This means there is no log
return None
- where_sql = 'jid_id = %s' % jid_id
+ where_sql = 'jid_id = ?'
+ jid_tuple = (jid_id,)
self.cur.execute('''
- SELECT MAX(time) FROM logs
- WHERE (%s)
- AND kind NOT IN (%d, %d)
- ''' % (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS))
+ SELECT MAX(time) FROM logs
+ WHERE (%s)
+ AND kind NOT IN (%d, %d)
+ ''' % (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS),
+ jid_tuple)
results = self.cur.fetchone()
if results is not None:
@@ -766,6 +780,7 @@ class Logger:
Build the where clause for a jid, including metacontacts jid(s) if any
"""
where_sql = ''
+ jid_tuple = ()
# will return empty list if jid is not associated with
# any metacontacts
family = gajim.contacts.get_metacontacts_family(account, jid)
@@ -775,13 +790,15 @@ class Logger:
jid_id = self.get_jid_id(user['jid'])
except exceptions.PysqliteOperationalError, e:
continue
- where_sql += 'jid_id = %s' % jid_id
+ where_sql += 'jid_id = ?'
+ jid_tuple += (jid_id,)
if user != family[-1]:
where_sql += ' OR '
else: # if jid was not associated with metacontacts
jid_id = self.get_jid_id(jid)
- where_sql = 'jid_id = %s' % jid_id
- return where_sql
+ where_sql = 'jid_id = ?'
+ jid_tuple += (jid_id,)
+ return where_sql, jid_tuple
def save_transport_type(self, jid, type_):
"""
@@ -1106,9 +1123,10 @@ class Logger:
self.write(type_, with_, message=msg, tim=tim)
def _nec_gc_message_received(self, obj):
- tim_int = int(float(time.mktime(obj.timestamp)))
+ tim_f = float(time.mktime(obj.timestamp))
+ tim_int = int(tim_f)
if gajim.config.should_log(obj.conn.name, obj.jid) and not \
- tim_int <= obj.conn.last_history_time[obj.jid] and obj.msgtxt and \
+ tim_int < obj.conn.last_history_time[obj.jid] and obj.msgtxt and \
obj.nick:
# if not obj.nick, it means message comes from room itself
# usually it hold description and can be send at each connection
@@ -1118,14 +1136,14 @@ class Logger:
# store in memory time of last message logged.
# this will also be saved in rooms_last_message_time table
# when we quit this muc
- obj.conn.last_history_time[obj.jid] = time.mktime(obj.timestamp)
+ obj.conn.last_history_time[obj.jid] = tim_f
except exceptions.PysqliteOperationalError, e:
- self.conn.dispatch('DB_ERROR', (_('Disk Write Error'), str(e)))
+ obj.conn.dispatch('DB_ERROR', (_('Disk Write Error'), str(e)))
except exceptions.DatabaseMalformed:
pritext = _('Database Error')
sectext = _('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).') % \
LOG_DB_PATH
- self.conn.dispatch('DB_ERROR', (pritext, sectext))
\ No newline at end of file
+ obj.conn.dispatch('DB_ERROR', (pritext, sectext))
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 60619608681600ea0c9de56a40a59329ef9fd62b..a0ed815787cbcc2202a3e123f72a3ab6d477af24 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -224,6 +224,8 @@ class OptionsParser:
self.update_config_to_013901()
if old < [0, 14, 0, 1] and new >= [0, 14, 0, 1]:
self.update_config_to_01401()
+ if old < [0, 14, 90, 0] and new >= [0, 14, 90, 0]:
+ self.update_config_to_014900()
gajim.logger.init_vars()
gajim.logger.attach_cache_database()
@@ -899,8 +901,15 @@ class OptionsParser:
def update_config_to_01401(self):
if 'autodetect_browser_mailer' not in self.old_values or 'openwith' \
not in self.old_values or \
- (self.old_values['autodetect_browser_mailer'] == 'False' and \
+ (self.old_values['autodetect_browser_mailer'] == False and \
self.old_values['openwith'] != 'custom'):
gajim.config.set('autodetect_browser_mailer', True)
gajim.config.set('openwith', gajim.config.DEFAULT_OPENWITH)
gajim.config.set('version', '0.14.0.1')
+
+ def update_config_to_014900(self):
+ if 'use_stun_server' in self.old_values and self.old_values[
+ 'use_stun_server'] and not self.old_values['stun_server']:
+ gajim.config.set('use_stun_server', False)
+ if os.name == 'nt':
+ gajim.config.set('autodetect_browser_mailer', True)
diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py
index cf4edd5462dfd8245c12847f515df550eedd01f7..bea8b10487142c7e3414eecd4d55f5e877c19ef6 100644
--- a/src/common/protocol/bytestream.py
+++ b/src/common/protocol/bytestream.py
@@ -381,8 +381,8 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
self._add_addiditional_streamhosts_to_query(query, file_props)
self._add_local_ips_as_streamhosts_to_query(query, file_props)
self._add_proxy_streamhosts_to_query(query, file_props)
-
- self.connection.send(iq)
+ self._add_upnp_igd_as_streamhost_to_query(query, file_props, iq)
+ # Upnp-igd is ascynchronous, so it will send the iq itself
def _add_streamhosts_to_query(self, query, sender, port, hosts):
for host in hosts:
@@ -393,6 +393,8 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
streamhost.setAttr('jid', sender)
def _add_local_ips_as_streamhosts_to_query(self, query, file_props):
+ if not gajim.config.get_per('accounts', self.name, 'ft_send_local_ips'):
+ return
try:
my_ips = [self.peerhost[0]] # The ip we're connected to server with
# all IPs from local DNS
@@ -404,8 +406,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
port = gajim.config.get('file_transfers_port')
self._add_streamhosts_to_query(query, sender, port, my_ips)
except socket.gaierror:
- self.dispatch('ERROR', (_('Wrong host'),
- _('Invalid local address? :-O')))
+ from common.connection_handlers_events import InformationEvent
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='error', pri_txt=_('Wrong host'),
+ sec_txt=_('Invalid local address? :-O')))
def _add_addiditional_streamhosts_to_query(self, query, file_props):
sender = file_props['sender']
@@ -418,6 +422,84 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
additional_hosts = []
self._add_streamhosts_to_query(query, sender, port, additional_hosts)
+ def _add_upnp_igd_as_streamhost_to_query(self, query, file_props, iq):
+ if not gajim.HAVE_UPNP_IGD:
+ self.connection.send(iq)
+ return
+
+ def ip_is_local(ip):
+ if '.' not in ip:
+ # it's an IPv6
+ return True
+ ip_s = ip.split('.')
+ ip_l = long(ip_s[0])<<24 | long(ip_s[1])<<16 | long(ip_s[2])<<8 | \
+ long(ip_s[3])
+ # 10/8
+ if ip_l & (255<<24) == 10<<24:
+ return True
+ # 172.16/12
+ if ip_l & (255<<24 | 240<<16) == (172<<24 | 16<<16):
+ return True
+ # 192.168
+ if ip_l & (255<<24 | 255<<16) == (192<<24 | 168<<16):
+ return True
+ return False
+
+
+ my_ip = self.peerhost[0]
+
+ if not ip_is_local(my_ip):
+ self.connection.send(iq)
+ return
+
+ self.no_gupnp_reply_id = 0
+
+ def cleanup_gupnp():
+ if self.no_gupnp_reply_id:
+ gobject.source_remove(self.no_gupnp_reply_id)
+ self.no_gupnp_reply_id = 0
+ gajim.gupnp_igd.disconnect(self.ok_id)
+ gajim.gupnp_igd.disconnect(self.fail_id)
+
+ def ok(s, proto, ext_ip, re, ext_port, local_ip, local_port, desc):
+ log.debug('Got GUPnP-IGD answer: external: %s:%s, internal: %s:%s',
+ ext_ip, ext_port, local_ip, local_port)
+ if local_port != gajim.config.get('file_transfers_port'):
+ sender = file_props['sender']
+ receiver = file_props['receiver']
+ sha_str = helpers.get_auth_sha(file_props['sid'], sender,
+ receiver)
+ listener = gajim.socks5queue.start_listener(local_port, sha_str,
+ self._result_socks5_sid, file_props['sid'])
+ if listener:
+ self._add_streamhosts_to_query(query, sender, ext_port,
+ [ext_ip])
+ self.connection.send(iq)
+ cleanup_gupnp()
+
+ def fail(s, error, proto, ext_ip, local_ip, local_port, desc):
+ log.debug('Got GUPnP-IGD error : %s', str(error))
+ self.connection.send(iq)
+ cleanup_gupnp()
+
+ def no_upnp_reply():
+ log.debug('Got not GUPnP-IGD answer')
+ # stop trying to use it
+ gajim.HAVE_UPNP_IGD = False
+ self.no_gupnp_reply_id = 0
+ self.connection.send(iq)
+ cleanup_gupnp()
+ return False
+
+
+ self.ok_id = gajim.gupnp_igd.connect('mapped-external-port', ok)
+ self.fail_id = gajim.gupnp_igd.connect('error-mapping-port', fail)
+
+ port = gajim.config.get('file_transfers_port')
+ self.no_gupnp_reply_id = gobject.timeout_add_seconds(10, no_upnp_reply)
+ gajim.gupnp_igd.add_port('TCP', 0, my_ip, port, 3600,
+ 'Gajim file transfer')
+
def _add_proxy_streamhosts_to_query(self, query, file_props):
proxyhosts = self._get_file_transfer_proxies_from_config(file_props)
if proxyhosts:
@@ -554,6 +636,12 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
}
for attr in item.getAttrs():
host_dict[attr] = item.getAttr(attr)
+ if 'host' not in host_dict:
+ continue
+ if 'jid' not in host_dict:
+ continue
+ if 'port' not in host_dict:
+ continue
streamhosts.append(host_dict)
if file_props is None:
if sid in self.files_props:
@@ -571,6 +659,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
self.send_success_connect_reply, None)
raise xmpp.NodeProcessed
+ if file_props is None:
+ log.warn('Gajim got streamhosts for unknown transfer. Ignoring it.')
+ raise xmpp.NodeProcessed
+
file_props['streamhosts'] = streamhosts
if file_props['type'] == 'r':
gajim.socks5queue.connect_to_hosts(self.name, sid,
@@ -675,11 +767,6 @@ class ConnectionIBBytestream(ConnectionBytestream):
def __init__(self):
ConnectionBytestream.__init__(self)
self._streams = {}
- self._ampnode = xmpp.Node(xmpp.NS_AMP + ' amp', payload=[xmpp.Node(
- 'rule', {'condition': 'deliver-at', 'value': 'stored',
- 'action': 'error'}), xmpp.Node('rule',
- {'condition': 'match-resource', 'value': 'exact',
- 'action':'error'})])
self.last_sent_ibb_id = None
def IBBIqHandler(self, conn, stanza):
@@ -794,8 +881,9 @@ class ConnectionIBBytestream(ConnectionBytestream):
file_props['started'] = True
if file_props['seq'] == 65536:
file_props['seq'] = 0
- self.last_sent_ibb_id = self.connection.send(xmpp.Protocol('iq',
- file_props['direction'][1:], 'set', payload=[datanode]))
+ self.last_sent_ibb_id = self.connection.send(xmpp.Protocol(
+ name='iq', to=file_props['direction'][1:], typ='set',
+ payload=[datanode]))
current_time = time.time()
file_props['elapsed-time'] += current_time - file_props[
'last-time']
diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py
index 5176b460d860955994e36c2fc4c01a60adde2def..80d402e956ed917b96eec6d30e80e0cf23d359b5 100644
--- a/src/common/proxy65_manager.py
+++ b/src/common/proxy65_manager.py
@@ -55,15 +55,17 @@ class Proxy65Manager:
# dict {account: proxy} default proxy for account
self.default_proxies = {}
- def resolve(self, proxy, connection, sender_jid, default=None):
+ def resolve(self, proxy, connection, sender_jid, default=None,
+ testit=True):
"""
Start
+ if testit=False, Gajim won't try to resolve it
"""
if proxy in self.proxies:
resolver = self.proxies[proxy]
else:
# proxy is being ressolved for the first time
- resolver = ProxyResolver(proxy, sender_jid)
+ resolver = ProxyResolver(proxy, sender_jid, testit)
self.proxies[proxy] = resolver
resolver.add_connection(connection)
if default:
@@ -115,6 +117,9 @@ class ProxyResolver:
self.host = str(host)
self.port = int(port)
self.jid = unicode(jid)
+ if not self.testit:
+ self.state = S_FINISHED
+ return
self.state = S_INITIAL
log.info('start resolving %s:%s' % (self.host, self.port))
self.receiver_tester = ReceiverTester(self.host, self.port, self.jid,
@@ -209,7 +214,10 @@ class ProxyResolver:
query.setNamespace(common.xmpp.NS_BYTESTREAM)
connection.send(iq)
- def __init__(self, proxy, sender_jid):
+ def __init__(self, proxy, sender_jid, testit):
+ """
+ if testit is False, don't test it, only get IP/port
+ """
self.proxy = proxy
self.state = S_INITIAL
self.active_connection = None
@@ -221,6 +229,7 @@ class ProxyResolver:
self.port = None
self.sid = helpers.get_random_string_16()
self.sender_jid = sender_jid
+ self.testit = testit
class HostTester(Socks5, IdleObject):
"""
diff --git a/src/common/pubsub.py b/src/common/pubsub.py
index 50a69928bbbdb7f98bd963435aa8ef54d3d49161..277926599432d5cd9b76ec5d43959627c01a1fa1 100644
--- a/src/common/pubsub.py
+++ b/src/common/pubsub.py
@@ -76,7 +76,7 @@ class ConnectionPubSub:
self.__callbacks[id_] = (cb, args, kwargs)
- def send_pb_publish(self, jid, node, item, id_, options=None):
+ def send_pb_publish(self, jid, node, item, id_=None, options=None):
"""
Publish item to a node
"""
@@ -85,7 +85,10 @@ class ConnectionPubSub:
query = xmpp.Iq('set', to=jid)
e = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB)
p = e.addChild('publish', {'node': node})
- p.addChild('item', {'id': id_}, [item])
+ attrs = {}
+ if id_:
+ attrs = {'id': id_}
+ p.addChild('item', attrs, [item])
if options:
p = e.addChild('publish-options')
p.addChild(node=options)
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index ca3b81d53bce2ce6a732d8d82ef8210cf9c6c23d..0cecfa512df1d07a53ebea36d402af34f65b0252 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -58,7 +58,7 @@ class StanzaSession(object):
self.conn = conn
self.jid = jid
self.type = type_
- self.resource = None
+ self.resource = jid.getResource()
if thread_id:
self.received_thread_id = True
@@ -492,6 +492,12 @@ class EncryptedStanzaSession(ArchivingStanzaSession):
for child in parsed.getChildren():
stanza.addChild(node=child)
+ # replace non-character unicode
+ body = stanza.getBody()
+ if body:
+ stanza.setBody(
+ self.conn.connection.Dispatcher.replace_non_character(body))
+
return stanza
def decrypt(self, ciphertext):
@@ -1148,8 +1154,10 @@ class EncryptedStanzaSession(ArchivingStanzaSession):
return xmpp.DataField(name=name, typ='hidden', value=dhs)
def terminate_e2e(self):
- self.terminate()
self.enable_encryption = False
+ if self.control:
+ self.control.print_session_details()
+ self.terminate()
def acknowledge_termination(self):
StanzaSession.acknowledge_termination(self)
diff --git a/src/common/xmpp/__init__.py b/src/common/xmpp/__init__.py
index 4ebc4cfa3d250f2c5c3b6bc1621adb6e2a968eb2..46037a1cb94e4ed5da9025e9a7583fb19b1282ae 100644
--- a/src/common/xmpp/__init__.py
+++ b/src/common/xmpp/__init__.py
@@ -15,3 +15,4 @@ import simplexml, protocol, auth_nb, transports_nb, roster_nb
import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors
from client_nb import NonBlockingClient
from plugin import PlugIn
+from smacks import Smacks
diff --git a/src/common/xmpp/auth_nb.py b/src/common/xmpp/auth_nb.py
index 670526bf96a70b270b40393abee8f989b5265b38..1063ed9a75adbac1dbfaffb1f3b8012d65242ebd 100644
--- a/src/common/xmpp/auth_nb.py
+++ b/src/common/xmpp/auth_nb.py
@@ -22,8 +22,10 @@ See client_nb.py
"""
from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH
+from protocol import NS_STREAM_MGMT
from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID
from plugin import PlugIn
+from smacks import Smacks
import base64
import random
import itertools
@@ -40,13 +42,14 @@ def H(some): return hashlib.md5(some).digest()
def C(some): return ':'.join(some)
try:
- import kerberos
+ kerberos = __import__('kerberos')
have_kerberos = True
except ImportError:
have_kerberos = False
GSS_STATE_STEP = 0
GSS_STATE_WRAP = 1
+SASL_FAILURE_IN_PROGRESS = 'failure-in-process'
SASL_FAILURE = 'failure'
SASL_SUCCESS = 'success'
SASL_UNSUPPORTED = 'not-supported'
@@ -142,7 +145,7 @@ class SASL(PlugIn):
elif self._owner.Dispatcher.Stream.features:
try:
self.FeaturesHandler(self._owner.Dispatcher,
- self._owner.Dispatcher.Stream.features)
+ self._owner.Dispatcher.Stream.features)
except NodeProcessed:
pass
else:
@@ -154,16 +157,16 @@ class SASL(PlugIn):
"""
if 'features' in self._owner.__dict__:
self._owner.UnregisterHandler('features', self.FeaturesHandler,
- xmlns=NS_STREAMS)
+ xmlns=NS_STREAMS)
if 'challenge' in self._owner.__dict__:
self._owner.UnregisterHandler('challenge', self.SASLHandler,
- xmlns=NS_SASL)
+ xmlns=NS_SASL)
if 'failure' in self._owner.__dict__:
self._owner.UnregisterHandler('failure', self.SASLHandler,
- xmlns=NS_SASL)
+ xmlns=NS_SASL)
if 'success' in self._owner.__dict__:
self._owner.UnregisterHandler('success', self.SASLHandler,
- xmlns=NS_SASL)
+ xmlns=NS_SASL)
def auth(self):
"""
@@ -178,12 +181,12 @@ class SASL(PlugIn):
elif self._owner.Dispatcher.Stream.features:
try:
self.FeaturesHandler(self._owner.Dispatcher,
- self._owner.Dispatcher.Stream.features)
+ self._owner.Dispatcher.Stream.features)
except NodeProcessed:
pass
else:
self._owner.RegisterHandler('features',
- self.FeaturesHandler, xmlns=NS_STREAMS)
+ self.FeaturesHandler, xmlns=NS_STREAMS)
def FeaturesHandler(self, conn, feats):
"""
@@ -198,7 +201,8 @@ class SASL(PlugIn):
'mechanism'):
self.mecs.append(mec.getData())
- self._owner.RegisterHandler('challenge', self.SASLHandler, xmlns=NS_SASL)
+ self._owner.RegisterHandler('challenge', self.SASLHandler,
+ xmlns=NS_SASL)
self._owner.RegisterHandler('failure', self.SASLHandler, xmlns=NS_SASL)
self._owner.RegisterHandler('success', self.SASLHandler, xmlns=NS_SASL)
self.MechanismHandler()
@@ -206,7 +210,8 @@ class SASL(PlugIn):
def MechanismHandler(self):
if 'ANONYMOUS' in self.mecs and self.username is None:
self.mecs.remove('ANONYMOUS')
- node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'ANONYMOUS'})
+ node = Node('auth', attrs={'xmlns': NS_SASL,
+ 'mechanism': 'ANONYMOUS'})
self.mechanism = 'ANONYMOUS'
self.startsasl = SASL_IN_PROCESS
self._owner.send(str(node))
@@ -226,11 +231,11 @@ class SASL(PlugIn):
self.mecs.remove('GSSAPI')
try:
self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \
- self._owner.xmpp_hostname)[1]
+ self._owner.xmpp_hostname)[1]
kerberos.authGSSClientStep(self.gss_vc, '')
response = kerberos.authGSSClientResponse(self.gss_vc)
- node=Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'},
- payload=(response or ''))
+ node=Node('auth', attrs={'xmlns': NS_SASL,
+ 'mechanism': 'GSSAPI'}, payload=(response or ''))
self.mechanism = 'GSSAPI'
self.gss_step = GSS_STATE_STEP
self.startsasl = SASL_IN_PROCESS
@@ -247,7 +252,8 @@ class SASL(PlugIn):
raise NodeProcessed
if 'DIGEST-MD5' in self.mecs:
self.mecs.remove('DIGEST-MD5')
- node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'DIGEST-MD5'})
+ node = Node('auth', attrs={'xmlns': NS_SASL,
+ 'mechanism': 'DIGEST-MD5'})
self.mechanism = 'DIGEST-MD5'
self.startsasl = SASL_IN_PROCESS
self._owner.send(str(node))
@@ -258,6 +264,12 @@ class SASL(PlugIn):
self._owner._caller.get_password(self.set_password, self.mechanism)
self.startsasl = SASL_IN_PROCESS
raise NodeProcessed
+ if 'X-MESSENGER-OAUTH2' in self.mecs:
+ self.mecs.remove('X-MESSENGER-OAUTH2')
+ self.mechanism = 'X-MESSENGER-OAUTH2'
+ self._owner._caller.get_password(self.set_password, self.mechanism)
+ self.startsasl = SASL_IN_PROCESS
+ raise NodeProcessed
self.startsasl = SASL_FAILURE
log.info('I can only use EXTERNAL, SCRAM-SHA-1, DIGEST-MD5, GSSAPI and '
'PLAIN mecanisms.')
@@ -271,36 +283,54 @@ class SASL(PlugIn):
"""
if challenge.getNamespace() != NS_SASL:
return
+
+ def scram_base64(s):
+ return ''.join(s.encode('base64').split('\n'))
+
+ incoming_data = challenge.getData()
+ data=base64.decodestring(incoming_data)
### Handle Auth result
- if challenge.getName() == 'failure':
- self.startsasl = SASL_FAILURE
- try:
- reason = challenge.getChildren()[0]
- except Exception:
- reason = challenge
+ def on_auth_fail(reason):
log.info('Failed SASL authentification: %s' % reason)
+ self._owner.send(str(Node('abort', attrs={'xmlns': NS_SASL})))
if len(self.mecs) > 0:
- # There are other mechanisms to test
- self.MechanismHandler()
+ # There are other mechanisms to test, but wait for <failure>
+ # answer from server
+ self.startsasl = SASL_FAILURE_IN_PROGRESS
raise NodeProcessed
if self.on_sasl:
self.on_sasl()
raise NodeProcessed
+
+ if challenge.getName() == 'failure':
+ if self.startsasl == SASL_FAILURE_IN_PROGRESS:
+ self.MechanismHandler()
+ raise NodeProcessed
+ self.startsasl = SASL_FAILURE
+ try:
+ reason = challenge.getChildren()[0]
+ except Exception:
+ reason = challenge
+ on_auth_fail(reason)
elif challenge.getName() == 'success':
- # TODO: Need to validate any data-with-success.
- # TODO: Important for DIGEST-MD5 and SCRAM.
+ if self.mechanism == 'SCRAM-SHA-1':
+ # check data-with-success
+ data = scram_parse(data)
+ if data['v'] != scram_base64(self.scram_ServerSignature):
+ on_auth_fail('ServerSignature is wrong')
+
self.startsasl = SASL_SUCCESS
log.info('Successfully authenticated with remote server.')
handlers = self._owner.Dispatcher.dumpHandlers()
# Bosh specific dispatcher replugging
- # save old features. They will be used in case we won't get response on
- # stream restart after SASL auth (happens with XMPP over BOSH with
- # Openfire)
+ # save old features. They will be used in case we won't get response
+ # on stream restart after SASL auth (happens with XMPP over BOSH
+ # with Openfire)
old_features = self._owner.Dispatcher.Stream.features
self._owner.Dispatcher.PlugOut()
dispatcher_nb.Dispatcher.get_instance().PlugIn(self._owner,
- after_SASL=True, old_features=old_features)
+ after_SASL=True, old_features=old_features)
self._owner.Dispatcher.restoreHandlers(handlers)
self._owner.User = self.username
@@ -309,8 +339,6 @@ class SASL(PlugIn):
raise NodeProcessed
### Perform auth step
- incoming_data = challenge.getData()
- data=base64.decodestring(incoming_data)
log.info('Got challenge:' + data)
if self.mechanism == 'GSSAPI':
@@ -322,12 +350,12 @@ class SASL(PlugIn):
rc = kerberos.authGSSClientUnwrap(self.gss_vc, incoming_data)
response = kerberos.authGSSClientResponse(self.gss_vc)
rc = kerberos.authGSSClientWrap(self.gss_vc, response,
- kerberos.authGSSClientUserName(self.gss_vc))
+ kerberos.authGSSClientUserName(self.gss_vc))
response = kerberos.authGSSClientResponse(self.gss_vc)
if not response:
response = ''
self._owner.send(Node('response', attrs={'xmlns': NS_SASL},
- payload=response).__str__())
+ payload=response).__str__())
raise NodeProcessed
if self.mechanism == 'SCRAM-SHA-1':
hashfn = hashlib.sha1
@@ -353,12 +381,9 @@ class SASL(PlugIn):
ui = XOR(ui, ui_1)
return ui
- def H(s):
+ def scram_H(s):
return hashfn(s).digest()
- def scram_base64(s):
- return ''.join(s.encode('base64').split('\n'))
-
if self.scram_step == 0:
self.scram_step = 1
self.scram_soup += ',' + data + ','
@@ -373,7 +398,7 @@ class SASL(PlugIn):
SaltedPassword = Hi(self.password, salt, iter)
# TODO: Could cache this, along with salt+iter.
ClientKey = HMAC(SaltedPassword, 'Client Key')
- StoredKey = H(ClientKey)
+ StoredKey = scram_H(ClientKey)
ClientSignature = HMAC(StoredKey, self.scram_soup)
ClientProof = XOR(ClientKey, ClientSignature)
r += ',p=' + scram_base64(ClientProof)
@@ -408,8 +433,8 @@ class SASL(PlugIn):
else:
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))
+ self.resp['cnonce'] = ''.join("%x" % randint(0, 2**28) for randint \
+ in itertools.repeat(random.randint, 7))
self.resp['nc'] = ('00000001')
self.resp['qop'] = 'auth'
self.resp['digest-uri'] = 'xmpp/' + self._owner.Server
@@ -417,6 +442,9 @@ class SASL(PlugIn):
# Password is now required
self._owner._caller.get_password(self.set_password, self.mechanism)
elif 'rspauth' in chal:
+ # Check rspauth value
+ if chal['rspauth'] != self.digest_rspauth:
+ on_auth_fail('rspauth is wrong')
self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL})))
else:
self.startsasl = SASL_FAILURE
@@ -449,10 +477,14 @@ class SASL(PlugIn):
hash_realm = self._convert_to_iso88591(self.resp['realm'])
hash_password = self._convert_to_iso88591(self.password)
A1 = C([H(C([hash_username, hash_realm, hash_password])),
- self.resp['nonce'], self.resp['cnonce']])
+ 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)]))
+ response = HH(C([HH(A1), self.resp['nonce'], self.resp['nc'],
+ self.resp['cnonce'], self.resp['qop'], HH(A2)]))
+ A2 = C(['', self.resp['digest-uri']])
+ self.digest_rspauth = 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',
@@ -462,14 +494,19 @@ class SASL(PlugIn):
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])
+ '\r', '').replace('\n', '')
+ node = Node('response', attrs={'xmlns': NS_SASL},
+ payload=[sasl_data])
elif self.mechanism == 'PLAIN':
sasl_data = u'\x00%s\x00%s' % (self.username, self.password)
sasl_data = sasl_data.encode('utf-8').encode('base64').replace(
- '\n', '')
+ '\n', '')
node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'},
- payload=[sasl_data])
+ payload=[sasl_data])
+ elif self.mechanism == 'X-MESSENGER-OAUTH2':
+ node = Node('auth', attrs={'xmlns': NS_SASL,
+ 'mechanism': 'X-MESSENGER-OAUTH2'})
+ node.addData(password)
self._owner.send(str(node))
@@ -501,8 +538,8 @@ class NonBlockingNonSASL(PlugIn):
self.owner = owner
owner.Dispatcher.SendAndWaitForResponse(
- Iq('get', NS_AUTH, payload=[Node('username', payload=[self.user])]),
- func=self._on_username)
+ Iq('get', NS_AUTH, payload=[Node('username', payload=[self.user])]),
+ func=self._on_username)
def _on_username(self, resp):
if not isResultNode(resp):
@@ -517,8 +554,8 @@ class NonBlockingNonSASL(PlugIn):
if query.getTag('digest'):
log.info("Performing digest authentication")
query.setTagData('digest',
- hashlib.sha1(self.owner.Dispatcher.Stream._document_attrs['id']
- + self.password).hexdigest())
+ hashlib.sha1(self.owner.Dispatcher.Stream._document_attrs['id']
+ + self.password).hexdigest())
if query.getTag('password'):
query.delChild('password')
self._method = 'digest'
@@ -533,23 +570,25 @@ class NonBlockingNonSASL(PlugIn):
def hash_n_times(s, count):
return count and hasher(hash_n_times(s, count-1)) or s
- hash_ = hash_n_times(hasher(hasher(self.password) + token), int(seq))
+ hash_ = hash_n_times(hasher(hasher(self.password) + token),
+ int(seq))
query.setTagData('hash', hash_)
self._method='0k'
else:
log.warn("Secure methods unsupported, performing plain text \
- authentication")
+ authentication")
query.setTagData('password', self.password)
self._method = 'plain'
- resp = self.owner.Dispatcher.SendAndWaitForResponse(iq, func=self._on_auth)
+ resp = self.owner.Dispatcher.SendAndWaitForResponse(iq,
+ func=self._on_auth)
def _on_auth(self, resp):
if isResultNode(resp):
log.info('Sucessfully authenticated with remote host.')
self.owner.User = self.user
self.owner.Resource = self.resource
- self.owner._registered_name = self.owner.User+'@'+self.owner.Server+\
- '/'+self.owner.Resource
+ self.owner._registered_name = self.owner.User + '@' + \
+ self.owner.Server+ '/' + self.owner.Resource
return self.on_auth(self._method)
log.info('Authentication failed!')
return self.on_auth(None)
@@ -564,24 +603,34 @@ class NonBlockingBind(PlugIn):
def __init__(self):
PlugIn.__init__(self)
self.bound = None
+ self.supports_sm = False
+ self.resuming = False
def plugin(self, owner):
''' Start resource binding, if allowed at this time. Used internally. '''
if self._owner.Dispatcher.Stream.features:
try:
self.FeaturesHandler(self._owner.Dispatcher,
- self._owner.Dispatcher.Stream.features)
+ self._owner.Dispatcher.Stream.features)
except NodeProcessed:
pass
else:
self._owner.RegisterHandler('features', self.FeaturesHandler,
- xmlns=NS_STREAMS)
+ xmlns=NS_STREAMS)
def FeaturesHandler(self, conn, feats):
"""
Determine if server supports resource binding and set some internal
- attributes accordingly
+ attributes accordingly.
+
+ It also checks if server supports stream management
"""
+
+ if feats.getTag('sm', namespace=NS_STREAM_MGMT):
+ self.supports_sm = True # server supports stream management
+ if self.resuming:
+ self._owner._caller.sm.resume_request()
+
if not feats.getTag('bind', namespace=NS_BIND):
log.info('Server does not requested binding.')
# we try to bind resource anyway
@@ -599,12 +648,14 @@ class NonBlockingBind(PlugIn):
Remove Bind handler from owner's dispatcher. Used internally
"""
self._owner.UnregisterHandler('features', self.FeaturesHandler,
- xmlns=NS_STREAMS)
+ xmlns=NS_STREAMS)
def NonBlockingBind(self, resource=None, on_bound=None):
"""
Perform binding. Use provided resource name or random (if not provided).
"""
+ if self.resuming: # We don't bind if we resume the stream
+ return
self.on_bound = on_bound
self._resource = resource
if self._resource:
@@ -614,8 +665,9 @@ class NonBlockingBind(PlugIn):
self._owner.onreceive(None)
self._owner.Dispatcher.SendAndWaitForResponse(
- Protocol('iq', typ='set', payload=[Node('bind', attrs={'xmlns':NS_BIND},
- payload=self._resource)]), func=self._on_bound)
+ Protocol('iq', typ='set', payload=[Node('bind',
+ attrs={'xmlns': NS_BIND}, payload=self._resource)]),
+ func=self._on_bound)
def _on_bound(self, resp):
if isResultNode(resp):
@@ -625,14 +677,22 @@ class NonBlockingBind(PlugIn):
jid = JID(resp.getTag('bind').getTagData('jid'))
self._owner.User = jid.getNode()
self._owner.Resource = jid.getResource()
+ # Only negociate stream management after bounded
+ sm = self._owner._caller.sm
+ if self.supports_sm:
+ # starts negociation
+ sm.set_owner(self._owner)
+ sm.negociate()
+ self._owner.Dispatcher.sm = sm
+
if hasattr(self, 'session') and self.session == -1:
# Server don't want us to initialize a session
log.info('No session required.')
self.on_bound('ok')
else:
self._owner.SendAndWaitForResponse(Protocol('iq', typ='set',
- payload=[Node('session', attrs={'xmlns':NS_SESSION})]),
- func=self._on_session)
+ payload=[Node('session', attrs={'xmlns':NS_SESSION})]),
+ func=self._on_session)
return
if resp:
log.info('Binding failed: %s.' % resp.getTag('error'))
diff --git a/src/common/xmpp/bosh.py b/src/common/xmpp/bosh.py
index 353e798261cb7b8f6a5074c318710e5413f23a21..9bf5be7f3fde15a665de3268da2458e58295cf9e 100644
--- a/src/common/xmpp/bosh.py
+++ b/src/common/xmpp/bosh.py
@@ -413,15 +413,15 @@ class NonBlockingBOSH(NonBlockingTransport):
'xmlns:xmpp': 'urn:xmpp:xbosh'})
else:
t = BOSHBody(
- attrs={ 'content': self.bosh_content,
- 'hold': str(self.bosh_hold),
- 'route': '%s:%s' % (self.route_host, self.route_port),
- 'to': self.bosh_to,
- 'wait': str(self.bosh_wait),
- 'xml:lang': self.bosh_xml_lang,
- 'xmpp:version': '1.0',
- 'ver': '1.6',
- 'xmlns:xmpp': 'urn:xmpp:xbosh'})
+ attrs={ 'content': self.bosh_content,
+ 'hold': str(self.bosh_hold),
+ 'route': 'xmpp:%s:%s' % (self.route_host, self.route_port),
+ 'to': self.bosh_to,
+ 'wait': str(self.bosh_wait),
+ 'xml:lang': self.bosh_xml_lang,
+ 'xmpp:version': '1.0',
+ 'ver': '1.6',
+ 'xmlns:xmpp': 'urn:xmpp:xbosh'})
self.send_BOSH((t, True))
def start_disconnect(self):
diff --git a/src/common/xmpp/client_nb.py b/src/common/xmpp/client_nb.py
index dc4c4476b8381e00f28104ca8a5098f01032278d..608be0fa67ae0f81a050c7ece2ad377de4c4637b 100644
--- a/src/common/xmpp/client_nb.py
+++ b/src/common/xmpp/client_nb.py
@@ -493,6 +493,8 @@ class NonBlockingClient:
if self._sasl:
auth_nb.SASL.get_instance(self._User, self._Password,
self._on_start_sasl).PlugIn(self)
+ if not hasattr(self, 'SASL'):
+ return
if not self._sasl or self.SASL.startsasl == 'not-supported':
if not self._Resource:
self._Resource = 'xmpppy'
@@ -521,7 +523,16 @@ class NonBlockingClient:
self.connected = None # FIXME: is this intended? We use ''elsewhere
self._on_sasl_auth(None)
elif self.SASL.startsasl == 'success':
- auth_nb.NonBlockingBind.get_instance().PlugIn(self)
+ nb_bind = auth_nb.NonBlockingBind.get_instance()
+ sm = self._caller.sm
+ if sm._owner and sm.resumption:
+ nb_bind.resuming = True
+ sm.set_owner(self)
+ self.Dispatcher.sm = sm
+ nb_bind.PlugIn(self)
+ return
+
+ nb_bind.PlugIn(self)
self.onreceive(self._on_auth_bind)
return True
diff --git a/src/common/xmpp/dispatcher_nb.py b/src/common/xmpp/dispatcher_nb.py
index cca56f33ab7ee848e042fe67269471d2d372f0e2..37020e5c644cfb9b41231e002977bb97761fd45d 100644
--- a/src/common/xmpp/dispatcher_nb.py
+++ b/src/common/xmpp/dispatcher_nb.py
@@ -21,6 +21,7 @@ different handlers to different XMPP stanzas and namespaces
"""
import simplexml, sys, locale
+import re
from xml.parsers.expat import ExpatError
from plugin import PlugIn
from protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence,
@@ -90,6 +91,27 @@ class XMPPDispatcher(PlugIn):
self.SendAndWaitForResponse, self.SendAndCallForResponse,
self.getAnID, self.Event, self.send]
+ # Let the dispatcher know if there is support for stream management
+ self.sm = None
+
+ # \ufddo -> \ufdef range
+ c = u'\ufdd0'
+ r = c.encode('utf8')
+ while (c < u'\ufdef'):
+ c = unichr(ord(c) + 1)
+ r += '|' + c.encode('utf8')
+
+ # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff
+ c = u'\ufffe'
+ r += '|' + c.encode('utf8')
+ r += '|' + unichr(ord(c) + 1).encode('utf8')
+ while (c < u'\U0010fffe'):
+ c = unichr(ord(c) + 0x10000)
+ r += '|' + c.encode('utf8')
+ r += '|' + unichr(ord(c) + 1).encode('utf8')
+
+ self.invalid_chars_re = re.compile(r)
+
def getAnID(self):
global outgoingID
outgoingID += 1
@@ -175,6 +197,9 @@ class XMPPDispatcher(PlugIn):
raise ValueError('Incorrect stream start: (%s,%s). Terminating.'
% (tag, ns))
+ def replace_non_character(self, data):
+ return re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
+
def ProcessNonBlocking(self, data):
"""
Check incoming stream for data waiting
@@ -190,6 +215,7 @@ class XMPPDispatcher(PlugIn):
# disconnect method will never be called.
# Is this intended?
# also look at transports start_disconnect()
+ data = self.replace_non_character(data)
for handler in self._cycleHandlers:
handler(self)
if len(self._pendingExceptions) > 0:
@@ -417,6 +443,12 @@ class XMPPDispatcher(PlugIn):
stanza.props = stanza.getProperties()
ID = stanza.getID()
+ # If server supports stream management
+ if self.sm and self.sm.enabled and (stanza.getName() != 'r' and
+ stanza.getName() != 'a' and stanza.getName() != 'enabled' and
+ stanza.getName() != 'resumed'):
+ # increments the number of stanzas that has been handled
+ self.sm.in_h = self.sm.in_h + 1
list_ = ['default'] # we will use all handlers:
if typ in self.handlers[xmlns][name]:
list_.append(typ) # from very common...
@@ -525,6 +557,14 @@ class XMPPDispatcher(PlugIn):
ID = stanza.getID()
if self._owner._registered_name and not stanza.getAttr('from'):
stanza.setAttr('from', self._owner._registered_name)
+
+ # If no ID then it is a whitespace
+ if self.sm and self.sm.enabled and ID:
+ self.sm.uqueue.append(stanza)
+ self.sm.out_h = self.sm.out_h + 1
+ if len(self.sm.uqueue) > self.sm.max_queue:
+ self.sm.request_ack()
+
self._owner.Connection.send(stanza, now)
return ID
diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py
index f32863674ba61afa1e416ce7d5f63e1bff34c89a..87bc44ec60c2959cae5e3f7fc58bf056fe903226 100644
--- a/src/common/xmpp/protocol.py
+++ b/src/common/xmpp/protocol.py
@@ -47,12 +47,14 @@ NS_BOB = 'urn:xmpp:bob' # XEP-0231
NS_BOOKMARKS = 'storage:bookmarks' # XEP-0048
NS_BROWSE = 'jabber:iq:browse'
NS_BROWSING = 'http://jabber.org/protocol/browsing' # XEP-0195
-NS_BYTESTREAM = 'http://jabber.org/protocol/bytestreams' # JEP-0065
-NS_CAPS = 'http://jabber.org/protocol/caps' # JEP-0115
+NS_BYTESTREAM = 'http://jabber.org/protocol/bytestreams' # XEP-0065
+NS_CAPS = 'http://jabber.org/protocol/caps' # XEP-0115
NS_CAPTCHA = 'urn:xmpp:captcha' # XEP-0158
-NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # JEP-0085
+NS_CARBONS = 'urn:xmpp:carbons:1' # XEP-0280
+NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # XEP-0085
NS_CHATTING = 'http://jabber.org/protocol/chatting' # XEP-0194
NS_CLIENT = 'jabber:client'
+NS_CONDITIONS = 'urn:xmpp:muc:conditions:0' # XEP-0306
NS_COMMANDS = 'http://jabber.org/protocol/commands'
NS_COMPONENT_ACCEPT = 'jabber:component:accept'
NS_COMPONENT_1 = 'http://jabberd.jabberstudio.org/ns/component/1.0'
@@ -69,9 +71,10 @@ NS_DISCO_ITEMS = NS_DISCO + '#items'
NS_ENCRYPTED = 'jabber:x:encrypted' # XEP-0027
NS_ESESSION = 'http://www.xmpp.org/extensions/xep-0116.html#ns'
NS_ESESSION_INIT = 'http://www.xmpp.org/extensions/xep-0116.html#ns-init' # XEP-0116
-NS_EVENT = 'jabber:x:event' # XEP-0022
+NS_EVENT = 'jabber:x:event' # XEP-0022
NS_FEATURE = 'http://jabber.org/protocol/feature-neg'
-NS_FILE = 'http://jabber.org/protocol/si/profile/file-transfer' # JEP-0096
+NS_FILE = 'http://jabber.org/protocol/si/profile/file-transfer' # XEP-0096
+NS_FORWARD = 'urn:xmpp:forward:0' # XEP-0297
NS_GAMING = 'http://jabber.org/protocol/gaming' # XEP-0196
NS_GATEWAY = 'jabber:iq:gateway' # XEP-0100
NS_GEOLOC = 'http://jabber.org/protocol/geoloc' # XEP-0080
@@ -105,7 +108,7 @@ NS_MUC_CONFIG = NS_MUC + '#roomconfig'
NS_NICK = 'http://jabber.org/protocol/nick' # XEP-0172
NS_OFFLINE = 'http://www.jabber.org/jeps/jep-0030.html' # XEP-0013
NS_PHYSLOC = 'http://jabber.org/protocol/physloc' # XEP-0112
-NS_PING = 'urn:xmpp:ping' # SEP-0199
+NS_PING = 'urn:xmpp:ping' # XEP-0199
NS_PRESENCE = 'presence' # Jabberd2
NS_PRIVACY = 'jabber:iq:privacy'
NS_PRIVATE = 'jabber:iq:private'
@@ -113,7 +116,7 @@ NS_PROFILE = 'http://jabber.org/protocol/profile' # XEP-0154
NS_PUBSUB = 'http://jabber.org/protocol/pubsub' # XEP-0060
NS_PUBSUB_EVENT = 'http://jabber.org/protocol/pubsub#event'
NS_PUBSUB_PUBLISH_OPTIONS = NS_PUBSUB + '#publish-options' # XEP-0060
-NS_PUBSUB_OWNER = 'http://jabber.org/protocol/pubsub#owner' # JEP-0060
+NS_PUBSUB_OWNER = 'http://jabber.org/protocol/pubsub#owner' # XEP-0060
NS_REGISTER = 'jabber:iq:register'
NS_ROSTER = 'jabber:iq:roster'
NS_ROSTERNOTES = 'storage:rosternotes'
@@ -123,7 +126,7 @@ NS_RPC = 'jabber:iq:rpc' # XEP-0009
NS_RSM = 'http://jabber.org/protocol/rsm'
NS_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl'
NS_SECLABEL = 'urn:xmpp:sec-label:0'
-NS_SECLABEL_CATALOG = 'urn:xmpp:sec-label:catalog:0'
+NS_SECLABEL_CATALOG = 'urn:xmpp:sec-label:catalog:2'
NS_SEARCH = 'jabber:iq:search'
NS_SERVER = 'jabber:server'
NS_SESSION = 'urn:ietf:params:xml:ns:xmpp-session'
@@ -153,9 +156,10 @@ NS_DATA_LAYOUT = 'http://jabber.org/protocol/xdata-layout' # XEP-0141
NS_DATA_VALIDATE = 'http://jabber.org/protocol/xdata-validate' # XEP-0122
NS_XMPP_STREAMS = 'urn:ietf:params:xml:ns:xmpp-streams'
NS_RECEIPTS = 'urn:xmpp:receipts'
-NS_PUBKEY_PUBKEY='urn:xmpp:pubkey:2' # XEP-0189
-NS_PUBKEY_REVOKE='urn:xmpp:revoke:2'
-NS_PUBKEY_ATTEST='urn:xmpp:attest:2'
+NS_PUBKEY_PUBKEY = 'urn:xmpp:pubkey:2' # XEP-0189
+NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2'
+NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2'
+NS_STREAM_MGMT = 'urn:xmpp:sm:2' # XEP-198
xmpp_stream_error_conditions = '''
bad-format -- -- -- The entity has sent XML that cannot be processed.
@@ -631,6 +635,17 @@ class Protocol(Node):
"""
return self.getTagAttr('error', 'code')
+ def getStatusConditions(self):
+ """
+ Return the status conditions list as defined in XEP-0306.
+ """
+ conds = []
+ condtag = self.getTag('conditions', namespace=NS_CONDITIONS)
+ if condtag:
+ for tag in condtag.getChildren():
+ conds.append(tag.getName())
+ return conds
+
def setError(self, error, code=None):
"""
Set the error code. Obsolete. Use error-conditions instead
@@ -773,10 +788,11 @@ class Message(Protocol):
def buildReply(self, text=None):
"""
Builds and returns another message object with specified text. The to,
- from and thread properties of new message are pre-set as reply to this
- message
+ from, thread and type properties of new message are pre-set as reply to
+ this message
"""
- m = Message(to=self.getFrom(), frm=self.getTo(), body=text)
+ m = Message(to=self.getFrom(), frm=self.getTo(), body=text,
+ typ=self.getType())
th = self.getThread()
if th:
m.setThread(th)
@@ -933,11 +949,20 @@ class Iq(Protocol):
if queryNS:
self.setQueryNS(queryNS)
+ def getQuery(self):
+ """
+ Return the IQ's child element if it exists, None otherwise.
+ """
+ children = self.getChildren()
+ if children and self.getType() != 'error' and \
+ children[0].getName() != 'error':
+ return children[0]
+
def getQueryNS(self):
"""
Return the namespace of the 'query' child element
"""
- tag = self.getTag('query')
+ tag = self.getQuery()
if tag:
return tag.getNamespace()
@@ -945,13 +970,15 @@ class Iq(Protocol):
"""
Return the 'node' attribute value of the 'query' child element
"""
- return self.getTagAttr('query', 'node')
+ tag = self.getQuery()
+ if tag:
+ return tag.getAttr('node')
def getQueryPayload(self):
"""
Return the 'query' child element payload
"""
- tag = self.getTag('query')
+ tag = self.getQuery()
if tag:
return tag.getPayload()
@@ -959,38 +986,79 @@ class Iq(Protocol):
"""
Return the 'query' child element child nodes
"""
- tag = self.getTag('query')
+ tag = self.getQuery()
if tag:
return tag.getChildren()
+ def setQuery(self, name=None):
+ """
+ Change the name of the query node, creating it if needed. Keep the
+ existing name if none is given (use 'query' if it's a creation).
+ Return the query node.
+ """
+ query = self.getQuery()
+ if query is None:
+ query = self.addChild('query')
+ if name is not None:
+ query.setName(name)
+ return query
+
def setQueryNS(self, namespace):
"""
Set the namespace of the 'query' child element
"""
- self.setTag('query').setNamespace(namespace)
+ self.setQuery().setNamespace(namespace)
def setQueryPayload(self, payload):
"""
Set the 'query' child element payload
"""
- self.setTag('query').setPayload(payload)
+ self.setQuery().setPayload(payload)
def setQuerynode(self, node):
"""
Set the 'node' attribute value of the 'query' child element
"""
- self.setTagAttr('query', 'node', node)
+ self.setQuery().setAttr('node', node)
def buildReply(self, typ):
"""
Build and return another Iq object of specified type. The to, from and
query child node of new Iq are pre-set as reply to this Iq.
"""
- iq = Iq(typ, to=self.getFrom(), frm=self.getTo(), attrs={'id': self.getID()})
- if self.getTag('query'):
- iq.setQueryNS(self.getQueryNS())
+ iq = Iq(typ, to=self.getFrom(), frm=self.getTo(),
+ attrs={'id': self.getID()})
+ iq.setQuery(self.getQuery().getName()).setNamespace(self.getQueryNS())
return iq
+class Acks(Node):
+ """
+ Acknowledgement elements for Stream Management
+ """
+ def __init__(self, nsp=NS_STREAM_MGMT):
+ Node.__init__(self, None, {}, [], None, None,False, None)
+ self.setNamespace(nsp)
+
+ def buildAnswer(self, handled):
+ """
+ handled is the number of stanzas handled
+ """
+ self.setName('a')
+ self.setAttr('h', handled)
+
+ def buildRequest(self):
+ self.setName('r')
+
+ def buildEnable(self, resume=False):
+ self.setName('enable')
+ if resume:
+ self.setAttr('resume', 'true')
+
+ def buildResume(self, handled, previd):
+ self.setName('resume')
+ self.setAttr('h', handled)
+ self.setAttr('previd', previd)
+
class ErrorNode(Node):
"""
XMPP-style error element
diff --git a/src/common/xmpp/roster_nb.py b/src/common/xmpp/roster_nb.py
index c5a7bb4632a29ddf305b00a37002c7dc950cc025..9f520e3d385953bb2fa2d3d4610fa2aa586d028f 100644
--- a/src/common/xmpp/roster_nb.py
+++ b/src/common/xmpp/roster_nb.py
@@ -45,7 +45,7 @@ class NonBlockingRoster(PlugIn):
PlugIn.__init__(self)
self.version = version
self._data = {}
- self.set=None
+ self._set=None
self._exported_methods=[self.getRoster]
self.received_from_server = False
@@ -54,8 +54,8 @@ class NonBlockingRoster(PlugIn):
Request roster from server if it were not yet requested (or if the
'force' argument is set)
"""
- if self.set is None:
- self.set = 0
+ if self._set is None:
+ self._set = 0
elif not force:
return
@@ -100,7 +100,7 @@ class NonBlockingRoster(PlugIn):
if group.getData() not in self._data[jid]['groups']:
self._data[jid]['groups'].append(group.getData())
self._data[self._owner.User+'@'+self._owner.Server]={'resources': {}, 'name': None, 'ask': None, 'subscription': None, 'groups': None,}
- self.set=1
+ self._set=1
# Looks like we have a workaround
# raise NodeProcessed # a MUST. Otherwise you'll get back an <iq type='error'/>
@@ -323,7 +323,7 @@ class NonBlockingRoster(PlugIn):
'subscription': None,
'groups': None
}
- self.set = 1
+ self._set = 1
def plugin(self, owner, request=1):
"""
@@ -340,9 +340,9 @@ class NonBlockingRoster(PlugIn):
def _on_roster_set(self, data):
if data:
self._owner.Dispatcher.ProcessNonBlocking(data)
- if not self.set:
+ if not self._set:
return
- if not self._owner:
+ if not hasattr(self, '_owner') or not self._owner:
# Connection has been closed by receiving a <stream:error> for ex,
return
self._owner.onreceive(None)
@@ -356,7 +356,7 @@ class NonBlockingRoster(PlugIn):
Request roster from server if neccessary and returns self
"""
return_self = True
- if not self.set:
+ if not self._set:
self.on_ready = on_ready
self._owner.onreceive(self._on_roster_set)
return_self = False
diff --git a/src/common/xmpp/smacks.py b/src/common/xmpp/smacks.py
new file mode 100644
index 0000000000000000000000000000000000000000..e59b5d1b8596079d23b7816720a0c5ed7961caf2
--- /dev/null
+++ b/src/common/xmpp/smacks.py
@@ -0,0 +1,130 @@
+from protocol import Acks
+from protocol import NS_STREAM_MGMT
+import logging
+log = logging.getLogger('gajim.c.x.smacks')
+
+class Smacks():
+ '''
+ This is Smacks is the Stream Management class. It takes care of requesting
+ and sending acks. Also, it keeps track of the unhandled outgoing stanzas.
+
+ The dispatcher has to be able to access this class to increment the
+ number of handled stanzas
+ '''
+
+ def __init__(self, con):
+ self.con = con # Connection object
+ self.out_h = 0 # Outgoing stanzas handled
+ self.in_h = 0 # Incoming stanzas handled
+ self.uqueue = [] # Unhandled stanzas queue
+ self.session_id = None
+ self.resumption = False # If server supports resume
+ # Max number of stanzas in queue before making a request
+ self.max_queue = 5
+ self._owner = None
+ self.resuming = False
+ self.enabled = False # If SM is enabled
+ self.location = None
+
+ def set_owner(self, owner):
+ self._owner = owner
+
+ # Register handlers
+ owner.Dispatcher.RegisterNamespace(NS_STREAM_MGMT)
+ owner.Dispatcher.RegisterHandler('enabled', self._neg_response,
+ xmlns=NS_STREAM_MGMT)
+ owner.Dispatcher.RegisterHandler('r', self.send_ack,
+ xmlns=NS_STREAM_MGMT)
+ owner.Dispatcher.RegisterHandler('a', self.check_ack,
+ xmlns=NS_STREAM_MGMT)
+ owner.Dispatcher.RegisterHandler('resumed', self.check_ack,
+ xmlns=NS_STREAM_MGMT)
+ owner.Dispatcher.RegisterHandler('failed', self.error_handling,
+ xmlns=NS_STREAM_MGMT)
+
+ def _neg_response(self, disp, stanza):
+ r = stanza.getAttr('resume')
+ if r == 'true' or r == 'True' or r == '1':
+ self.resumption = True
+ self.session_id = stanza.getAttr('id')
+
+ if r == 'false' or r == 'False' or r == '0':
+ self.negociate(False)
+
+ l = stanza.getAttr('location')
+ if l:
+ self.location = l
+
+ def negociate(self, resume=True):
+ # Every time we attempt to negociate, we must erase all previous info
+ # about any previous session
+ self.uqueue = []
+ self.in_h = 0
+ self.out_h = 0
+ self.session_id = None
+ self.enabled = True
+
+ stanza = Acks()
+ stanza.buildEnable(resume)
+ self._owner.Connection.send(stanza, now=True)
+
+ def resume_request(self):
+ if not self.session_id:
+ self.resuming = False
+ log.error('Attempted to resume without a valid session id ')
+ return
+ resume = Acks()
+ resume.buildResume(self.in_h, self.session_id)
+ self._owner.Connection.send(resume, False)
+
+ def send_ack(self, disp, stanza):
+ ack = Acks()
+ ack.buildAnswer(self.in_h)
+ self._owner.Connection.send(ack, False)
+
+ def request_ack(self):
+ r = Acks()
+ r.buildRequest()
+ self._owner.Connection.send(r, False)
+
+ def check_ack(self, disp, stanza):
+ '''
+ Checks if the number of stanzas sent are the same as the
+ number of stanzas received by the server. Pops stanzas that were
+ handled by the server from the queue.
+ '''
+ h = int(stanza.getAttr('h'))
+ diff = self.out_h - h
+
+ if len(self.uqueue) < diff or diff < 0:
+ log.error('Server and client number of stanzas handled mismatch ')
+ else:
+ while (len(self.uqueue) > diff):
+ self.uqueue.pop(0)
+
+ if stanza.getName() == 'resumed':
+ self.resuming = True
+ self.con.set_oldst()
+ if self.uqueue != []:
+ for i in self.uqueue:
+ self._owner.Connection.send(i, False)
+
+ def error_handling(self, disp, stanza):
+ # If the server doesn't recognize previd, forget about resuming
+ # Ask for service discovery, etc..
+ if stanza.getTag('item-not-found'):
+ self.resuming = False
+ # we need to bind a resource
+ self._owner.NonBlockingBind.resuming = False
+ self._owner._on_auth_bind(None)
+ return
+
+ # Doesn't support resumption
+ if stanza.getTag('feature-not-implemented'):
+ self.negociate(False)
+ return
+
+ if stanza.getTag('unexpected-request'):
+ self.enabled = False
+ log.error('Gajim failed to negociate Stream Management')
+ return
diff --git a/src/common/xmpp/stringprepare.py b/src/common/xmpp/stringprepare.py
index bae16fcec236071ce2d50bcc2d86b637f223a5b1..657895c847bebf451d328a7d48f18c5d052c1e29 100644
--- a/src/common/xmpp/stringprepare.py
+++ b/src/common/xmpp/stringprepare.py
@@ -2,7 +2,7 @@
## src/common/xmpp/stringprepare.py
##
## Copyright (C) 2001-2005 Twisted Matrix Laboratories
-## Copyright (C) 2005-2010 Yann Leboulanger <asterix AT lagaule.org>
+## Copyright (C) 2005-2011 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de>
## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org>
##
@@ -202,6 +202,8 @@ class NamePrep:
def nameprep(self, label):
label = idna.nameprep(label)
self.check_prohibiteds(label)
+ if len(label) == 0:
+ raise UnicodeError, "Invalid empty name"
if label[0] == '-':
raise UnicodeError, "Invalid leading hyphen-minus"
if label[-1] == '-':
diff --git a/src/common/xmpp/tls_nb.py b/src/common/xmpp/tls_nb.py
index 7a9c80f9884daa2dbc9eaaed128f0d671b0f4116..cc8393d529781e098940018b72f2b8c229e89821 100644
--- a/src/common/xmpp/tls_nb.py
+++ b/src/common/xmpp/tls_nb.py
@@ -359,7 +359,8 @@ class NonBlockingTLS(PlugIn):
tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
log.debug('Using client cert and key from %s' % conn.client_cert)
try:
- p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read())
+ p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read(),
+ conn.client_cert_passphrase)
except OpenSSL.crypto.Error, exception_obj:
log.warning('Unable to load client pkcs12 certificate from '
'file %s: %s ... Is it a valid PKCS12 cert?' % \
diff --git a/src/common/zeroconf/client_zeroconf.py b/src/common/zeroconf/client_zeroconf.py
index ffad257c3c198af7890bb05da1ca84a1d069ff61..c5049c6fc968c81da05d4334f47ea543400e4a2e 100644
--- a/src/common/zeroconf/client_zeroconf.py
+++ b/src/common/zeroconf/client_zeroconf.py
@@ -66,7 +66,7 @@ class ZeroconfListener(IdleObject):
if hasattr(socket, 'AI_ADDRCONFIG'):
flags |= socket.AI_ADDRCONFIG
ai = socket.getaddrinfo(None, self.port, socket.AF_UNSPEC,
- socket.SOCK_STREAM, 0, flags)[0]
+ socket.SOCK_STREAM, 0, flags)[0]
self._serv = socket.socket(ai[0], ai[1])
self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
@@ -129,7 +129,7 @@ class ZeroconfListener(IdleObject):
class P2PClient(IdleObject):
def __init__(self, _sock, host, port, conn_holder, stanzaqueue=[], to=None,
- on_ok=None, on_not_ok=None):
+ on_ok=None, on_not_ok=None):
self._owner = self
self.Namespace = 'jabber:client'
self.protocol_type = 'XMPP'
@@ -150,8 +150,8 @@ class P2PClient(IdleObject):
else:
self.sock_type = TYPE_CLIENT
self.fd = -1
- conn = P2PConnection('', _sock, host, port, self._caller, self.on_connect,
- self)
+ conn = P2PConnection('', _sock, host, port, self._caller,
+ self.on_connect, self)
if not self.conn_holder:
# An error occured, disconnect() has been called
if on_not_ok:
@@ -166,18 +166,19 @@ class P2PClient(IdleObject):
if is_message:
if self.fd == -1:
if on_not_ok:
- on_not_ok('Connection to host could not be established.')
+ on_not_ok(
+ 'Connection to host could not be established.')
return
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_,
- thread_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_,
- thread_id)]
+ thread_id)]
self.on_responses = {}
@@ -196,16 +197,16 @@ class P2PClient(IdleObject):
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_,
- thread_id))
+ thread_id))
else:
self.conn_holder.ids_of_awaiting_messages[self.fd] = [(id_,
- thread_id)]
+ thread_id)]
return True
def on_message_sent(self, connection_id):
id_, thread_id = \
- self.conn_holder.ids_of_awaiting_messages[connection_id].pop(0)
+ 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
@@ -235,7 +236,8 @@ class P2PClient(IdleObject):
self.Dispatcher._metastream.setNamespace(self.Namespace)
self.Dispatcher._metastream.setAttr('version', '1.0')
self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS)
- self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name)
+ self.Dispatcher._metastream.setAttr('from',
+ self.conn_holder.zeroconf.name)
if self.to:
self.Dispatcher._metastream.setAttr('to', self.to)
self.Dispatcher.send("<?xml version='1.0'?>%s>" % str(
@@ -243,10 +245,12 @@ class P2PClient(IdleObject):
def _check_stream_start(self, ns, tag, attrs):
if ns != NS_STREAMS or tag != 'stream':
- log.error('Incorrect stream start: (%s,%s).Terminating!' % (tag, ns), 'error')
+ log.error('Incorrect stream start: (%s,%s).Terminating!' % (tag,
+ ns), 'error')
self.Connection.disconnect()
if self.on_not_ok:
- self.on_not_ok('Connection to host could not be established: Incorrect answer from server.')
+ self.on_not_ok('Connection to host could not be established: '
+ 'Incorrect answer from server.')
return
if self.sock_type == TYPE_SERVER:
if attrs.has_key('from'):
@@ -303,25 +307,26 @@ class P2PClient(IdleObject):
def _register_handlers(self):
self._caller.peerhost = self.Connection._sock.getsockname()
- self.RegisterHandler('message', lambda conn, data:self._caller._messageCB(
- self.Server, conn, data))
+ self.RegisterHandler('message', lambda conn,
+ data:self._caller._messageCB(self.Server, conn, data))
self.RegisterHandler('iq', self._caller._siSetCB, 'set',
- common.xmpp.NS_SI)
+ common.xmpp.NS_SI)
self.RegisterHandler('iq', self._caller._siErrorCB, 'error',
- common.xmpp.NS_SI)
+ common.xmpp.NS_SI)
self.RegisterHandler('iq', self._caller._siResultCB, 'result',
- common.xmpp.NS_SI)
+ common.xmpp.NS_SI)
self.RegisterHandler('iq', self._caller._bytestreamSetCB, 'set',
- common.xmpp.NS_BYTESTREAM)
+ common.xmpp.NS_BYTESTREAM)
self.RegisterHandler('iq', self._caller._bytestreamResultCB, 'result',
- common.xmpp.NS_BYTESTREAM)
+ common.xmpp.NS_BYTESTREAM)
self.RegisterHandler('iq', self._caller._bytestreamErrorCB, 'error',
- common.xmpp.NS_BYTESTREAM)
+ common.xmpp.NS_BYTESTREAM)
self.RegisterHandler('iq', self._caller._DiscoverItemsGetCB, 'get',
- common.xmpp.NS_DISCO_ITEMS)
+ common.xmpp.NS_DISCO_ITEMS)
self.RegisterHandler('iq', self._caller._JingleCB, 'result')
self.RegisterHandler('iq', self._caller._JingleCB, 'error')
- self.RegisterHandler('iq', self._caller._JingleCB, 'set', common.xmpp.NS_JINGLE)
+ self.RegisterHandler('iq', self._caller._JingleCB, 'set',
+ common.xmpp.NS_JINGLE)
class P2PConnection(IdleObject, PlugIn):
def __init__(self, sock_hash, _sock, host=None, port=None, caller=None,
@@ -353,19 +358,19 @@ class P2PConnection(IdleObject, PlugIn):
self.ais = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
socket.SOCK_STREAM)
except socket.gaierror, e:
- log.info('Lookup failure for %s: %s[%s]', host, e[1], repr(e[0]),
- exc_info=True)
+ log.info('Lookup failure for %s: %s[%s]', host, e[1],
+ repr(e[0]), exc_info=True)
else:
self.connect_to_next_ip()
def connect_to_next_ip(self):
if len(self.ais) == 0:
- log.error('Connection failure to %s', self.host, exc_info=True)
+ log.error('Connection failure to %s', str(self.host), exc_info=True)
self.disconnect()
return
ai = self.ais.pop(0)
- log.info('Trying to connect to %s through %s:%s', self.host, ai[4][0],
- ai[4][1], exc_info=True)
+ log.info('Trying to connect to %s through %s:%s', str(self.host),
+ ai[4][0], ai[4][1], exc_info=True)
try:
self._sock = socket.socket(*ai[:3])
self._sock.setblocking(False)
@@ -392,8 +397,8 @@ class P2PConnection(IdleObject, PlugIn):
def plugout(self):
"""
- Disconnect from the remote server and unregister self.disconnected method
- from the owner's dispatcher
+ Disconnect from the remote server and unregister self.disconnected
+ method from the owner's dispatcher
"""
self.disconnect()
self._owner = None
@@ -439,8 +444,8 @@ class P2PConnection(IdleObject, PlugIn):
if self.fd in ids and len(ids[self.fd]) > 0:
for (id_, thread_id) in ids[self.fd]:
if hasattr(self._owner, 'Dispatcher'):
- self._owner.Dispatcher.Event('', DATA_ERROR, (self.client.to,
- thread_id))
+ self._owner.Dispatcher.Event('', DATA_ERROR, (
+ self.client.to, thread_id))
else:
self._owner.on_not_ok('conenction timeout')
ids[self.fd] = []
@@ -453,12 +458,15 @@ class P2PConnection(IdleObject, PlugIn):
self._sock.setblocking(False)
except Exception, ee:
(errnum, errstr) = ee
- if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK):
+ errors = (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK)
+ if 'WSAEINVAL' in errno.__dict__:
+ errors += (errno.WSAEINVAL,)
+ if errnum in errors:
return
# win32 needs this
elif errnum not in (0, 10056, errno.EISCONN) or self.state != 0:
- log.error('Could not connect to %s: %s [%s]', self.host, errnum,
- errstr)
+ log.error('Could not connect to %s: %s [%s]', str(self.host),
+ errnum, errstr)
self.connect_to_next_ip()
return
else: # socket is already connected
@@ -649,9 +657,9 @@ class ClientZeroconf:
def zeroconf_init(self, show, msg):
self.zeroconf = zeroconf.Zeroconf(self.caller._on_new_service,
- self.caller._on_remove_service, self.caller._on_name_conflictCB,
- self.caller._on_disconnected, self.caller._on_error,
- self.caller.username, self.caller.host, self.port)
+ self.caller._on_remove_service, self.caller._on_name_conflictCB,
+ self.caller._on_disconnected, self.caller._on_error,
+ self.caller.username, self.caller.host, self.port)
self.zeroconf.txt['msg'] = msg
self.zeroconf.txt['status'] = show
self.zeroconf.txt['1st'] = self.caller.first
@@ -762,7 +770,7 @@ class ClientZeroconf:
if not stanza.getID():
stanza.setID('zero')
P2PClient(None, item['address'], item['port'], self,
- [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)
+ [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)
def getAnID(self):
"""
@@ -782,18 +790,19 @@ class ClientZeroconf:
"""
self.disconnect_handlers.remove(handler)
- def SendAndWaitForResponse(self, stanza, timeout=None, func=None, args=None):
+ def SendAndWaitForResponse(self, stanza, timeout=None, func=None,
+ args=None):
"""
- Send stanza and wait for recipient's response to it. Will call transports
- on_timeout callback if response is not retrieved in time
+ Send stanza and wait for recipient's response to it. Will call
+ transports on_timeout callback if response is not retrieved in time
Be aware: Only timeout of latest call of SendAndWait is active.
"""
-# if timeout is None:
-# timeout = DEFAULT_TIMEOUT_SECONDS
+# if timeout is None:
+# timeout = DEFAULT_TIMEOUT_SECONDS
def on_ok(_waitid):
-# if timeout:
-# self._owner.set_timeout(timeout)
+# if timeout:
+# self._owner.set_timeout(timeout)
to = stanza.getTo()
conn = None
if to in self.recipient_to_hash:
diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py
index 12524cf57b912ac523c1961737e2d555b354883d..9b8afd3829071975514307f7fe84800c094afebd 100644
--- a/src/common/zeroconf/connection_zeroconf.py
+++ b/src/common/zeroconf/connection_zeroconf.py
@@ -43,6 +43,7 @@ import gobject
from common.connection import CommonConnection
from common import gajim
+from common import ged
from common.zeroconf import client_zeroconf
from common.zeroconf import zeroconf
from connection_handlers_zeroconf import *
@@ -64,6 +65,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
CommonConnection.__init__(self, name)
self.is_zeroconf = True
+ gajim.ged.register_event_handler('message-outgoing', ged.OUT_CORE,
+ self._nec_message_outgoing)
+
def get_config_values_or_default(self):
"""
Get name, host, port from config, or create zeroconf account with default
@@ -185,8 +189,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
alt_name=alt_name))
def _on_error(self, message):
- self.dispatch('ERROR', (_('Avahi error'),
- _('%s\nLink-local messaging might not work properly.') % message))
+ gajim.nec.push_incoming_event(InformationEvent(None, conn=self,
+ level='error', pri_txt=_('Avahi error'), sec_txt=_('%s\nLink-local '
+ 'messaging might not work properly.') % message))
def connect(self, show='online', msg=''):
self.get_config_values_or_default()
@@ -329,14 +334,14 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
msg=_('Please check if avahi-daemon is running.')))
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, label=None, session=None, forward_from=None,
- form_node=None, original_message=None, delayed=None, callback=None,
- callback_args=[], now=True):
+ chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None,
+ label=None, session=None, forward_from=None, form_node=None,
+ original_message=None, delayed=None, callback=None, callback_args=[],
+ now=True):
def on_send_ok(msg_id):
gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self,
- jid=jid, message=msg, keyID=keyID))
+ jid=jid, message=msg, keyID=keyID, chatstate=None))
if callback:
callback(msg_id, *callback_args)
@@ -362,11 +367,52 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
msg=None, time_=None, session=session))
self._prepare_message(jid, msg, keyID, type_=type_, subject=subject,
- chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep,
- resource=resource, user_nick=user_nick, xhtml=xhtml, session=session,
+ chatstate=chatstate, msg_id=msg_id, resource=resource,
+ user_nick=user_nick, xhtml=xhtml, session=session,
forward_from=forward_from, form_node=form_node,
original_message=original_message, delayed=delayed, callback=cb)
+ def _nec_message_outgoing(self, obj):
+ if obj.account != self.name:
+ return
+
+ def on_send_ok(msg_id):
+ gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self,
+ jid=obj.jid, message=obj.message, keyID=obj.keyID,
+ chatstate=None))
+ if obj.callback:
+ obj.callback(obj.msg_id, *obj.callback_args)
+
+ if not obj.is_loggable:
+ return
+ self.log_message(obj.jid, obj.message, obj.forward_from,
+ obj.session, obj.original_message, obj.subject, obj.type_)
+
+ def on_send_not_ok(reason):
+ reason += ' ' + _('Your message could not be sent.')
+ gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self,
+ fjid=obj.jid, error_code=-1, error_msg=reason, msg=None,
+ time_=None, session=obj.session))
+
+ def cb(jid, msg, keyID, forward_from, session, original_message, subject,
+ type_, msg_iq, xhtml):
+ ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok,
+ on_not_ok=on_send_not_ok)
+
+ if ret == -1:
+ # Contact Offline
+ gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self,
+ fjid=jid, error_code=-1, error_msg=_(
+ 'Contact is offline. Your message could not be sent.'),
+ msg=None, time_=None, session=session))
+
+ self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_,
+ subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id,
+ resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml,
+ label=obj.label, session=obj.session, forward_from=obj.forward_from,
+ form_node=obj.form_node, original_message=obj.original_message,
+ delayed=obj.delayed, callback=cb)
+
def send_stanza(self, stanza):
# send a stanza untouched
if not self.connection:
diff --git a/src/common/zeroconf/zeroconf_bonjour.py b/src/common/zeroconf/zeroconf_bonjour.py
index 1e57c01768623ae9343fea9d9bd69141d9790f25..c8270c178b2f20bcec527144db82c27085648aca 100644
--- a/src/common/zeroconf/zeroconf_bonjour.py
+++ b/src/common/zeroconf/zeroconf_bonjour.py
@@ -286,7 +286,7 @@ class Zeroconf:
self.error_CB("Error while browsing: %s" % e)
def browse_loop(self):
- ready = select.select([self.browse_sdRef], [], [], 2)
+ ready = select.select([self.browse_sdRef], [], [], 0)
if self.browse_sdRef in ready[0]:
pybonjour.DNSServiceProcessResult(self.browse_sdRef)
diff --git a/src/config.py b/src/config.py
index d9610c713ec4d89acf3f8d711ee762c121f74868..37987762936ecb5c4dab3362c74cf4e999e425b1 100644
--- a/src/config.py
+++ b/src/config.py
@@ -68,6 +68,7 @@ except ImportError:
HAS_GST = False
from common.exceptions import GajimGeneralException
+from common.connection_handlers_events import InformationEvent
#---------- PreferencesWindow class -------------#
class PreferencesWindow:
@@ -535,6 +536,14 @@ class PreferencesWindow:
else:
w.set_active(st)
+ # send absolute time info
+ w = self.xml.get_object('send_time_info_checkbutton')
+ st = self.get_per_account_option('send_time_info')
+ if st == 'mixed':
+ w.set_inconsistent(True)
+ else:
+ w.set_active(st)
+
# send idle time
w = self.xml.get_object('send_idle_time_checkbutton')
st = self.get_per_account_option('send_idle_time')
@@ -543,6 +552,8 @@ class PreferencesWindow:
else:
w.set_active(st)
+ self.update_proxy_list()
+
# check if gajm is default
st = gajim.config.get('check_if_gajim_is_default')
self.xml.get_object('check_default_client_checkbutton').set_active(st)
@@ -1166,6 +1177,10 @@ class PreferencesWindow:
widget.set_inconsistent(False)
self.on_per_account_checkbutton_toggled(widget, 'send_os_info')
+ def on_send_time_info_checkbutton_toggled(self, widget):
+ widget.set_inconsistent(False)
+ self.on_per_account_checkbutton_toggled(widget, 'send_time_info')
+
def on_send_idle_time_checkbutton_toggled(self, widget):
widget.set_inconsistent(False)
self.on_per_account_checkbutton_toggled(widget, 'send_idle_time')
@@ -1244,6 +1259,34 @@ class PreferencesWindow:
if event.keyval == gtk.keysyms.Delete:
self.on_delete_msg_button_clicked(widget)
+ def on_proxies_combobox_changed(self, widget):
+ active = widget.get_active()
+ proxy = widget.get_model()[active][0].decode('utf-8')
+ if proxy == _('None'):
+ proxy = ''
+
+ gajim.config.set('global_proxy', proxy)
+
+ def on_manage_proxies_button_clicked(self, widget):
+ if 'manage_proxies' in gajim.interface.instances:
+ gajim.interface.instances['manage_proxies'].window.present()
+ else:
+ gajim.interface.instances['manage_proxies'] = ManageProxiesWindow()
+
+ def update_proxy_list(self):
+ our_proxy = gajim.config.get('global_proxy')
+ if not our_proxy:
+ our_proxy = _('None')
+ proxy_combobox = self.xml.get_object('proxies_combobox')
+ model = proxy_combobox.get_model()
+ model.clear()
+ l = gajim.config.get_per('proxies')
+ l.insert(0, _('None'))
+ for i in xrange(len(l)):
+ model.append([l[i]])
+ if our_proxy == l[i]:
+ proxy_combobox.set_active(i)
+
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()
@@ -1851,6 +1894,10 @@ class AccountsWindow:
client_cert = gajim.config.get_per('accounts', account, 'client_cert')
self.xml.get_object('cert_entry1').set_text(client_cert)
+ client_cert_encrypted = gajim.config.get_per('accounts', account,
+ 'client_cert_encrypted')
+ self.xml.get_object('client_cert_encrypted_checkbutton1').\
+ set_active(client_cert_encrypted)
self.xml.get_object('adjust_priority_with_status_checkbutton1').\
set_active(gajim.config.get_per('accounts', account,
@@ -2222,6 +2269,12 @@ class AccountsWindow:
# if we showed ErrorDialog, there will not be dialog instance
return
+ def on_client_cert_encrypted_checkbutton1_toggled(self, widget):
+ if self.ignore_events:
+ return
+ self.on_checkbutton_toggled(widget, 'client_cert_encrypted',
+ account=self.current_account)
+
def on_autoconnect_checkbutton_toggled(self, widget):
if self.ignore_events:
return
@@ -2523,10 +2576,11 @@ class AccountsWindow:
return
if gajim.ZEROCONF_ACC_NAME in gajim.connections and not \
gajim.connections[gajim.ZEROCONF_ACC_NAME].is_zeroconf:
- gajim.connections[gajim.ZEROCONF_ACC_NAME].dispatch('ERROR',
- (_('Account Local already exists.'),
- _('Please rename or remove it before enabling link-local messaging'
- '.')))
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=gajim.connections[gajim.ZEROCONF_ACC_NAME],
+ level='error', pri_txt=_('Account Local already exists.'),
+ sec_txt=_('Please rename or remove it before enabling '
+ 'link-local messaging.')))
return
if gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') \
@@ -3512,6 +3566,7 @@ class AccountCreationWizardWindow:
def on_back_button_clicked(self, widget):
cur_page = self.notebook.get_current_page()
+ self.forward_button.set_sensitive(True)
if cur_page in (1, 2):
self.notebook.set_current_page(0)
self.back_button.set_sensitive(False)
@@ -3753,6 +3808,16 @@ class AccountCreationWizardWindow:
self.data_form_widget = dataforms_widget.DataFormWidget(dataform)
else:
self.data_form_widget = FakeDataForm(obj.config)
+ empty_config = True
+ for field in obj.config:
+ if field in ('key', 'instructions', 'x', 'registered'):
+ continue
+ empty_config = False
+ break
+ if empty_config:
+ self.forward_button.set_sensitive(False)
+ self.notebook.set_current_page(4) # show form page
+ return
self.data_form_widget.show_all()
self.xml.get_object('form_vbox').pack_start(self.data_form_widget)
self.ssl_fingerprint = obj.ssl_fingerprint
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index d3befe8a855bb7999cafaa87971fa681919215dc..7de98f3175d5e562d7858d9168477a405dcc9ed2 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -915,9 +915,10 @@ class ConversationTextview(gobject.GObject):
self.on_join_group_chat_menuitem_activate, text)
self.handlers[id_] = childs[6]
- if self.account:
- id_ = childs[7].connect('activate', self.on_add_to_roster_activate,
- text)
+ if self.account and gajim.connections[self.account].\
+ roster_supported:
+ id_ = childs[7].connect('activate',
+ self.on_add_to_roster_activate, text)
self.handlers[id_] = childs[7]
childs[7].show() # show add to roster menuitem
else:
@@ -1038,6 +1039,15 @@ class ConversationTextview(gobject.GObject):
Is called by detect_and_print_special_text and prints special text
(emots, links, formatting)
"""
+
+
+ # PluginSystem: adding GUI extension point for ConversationTextview
+ self.plugin_modified = False
+ gajim.plugin_manager.gui_extension_point('print_special_text', self,
+ special_text, other_tags, graphics)
+ if self.plugin_modified:
+ return
+
tags = []
use_other_tags = True
text_is_valid_uri = False
diff --git a/src/dialogs.py b/src/dialogs.py
index 797704065e16e8ce72437e51402ba95186007e82..647b6f96b09088204fdabdf53569bf57309e9ee4 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1270,10 +1270,10 @@ class AboutDialog:
text = open(copying_file_path).read()
dlg.set_license(text)
- dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ jabber client'),
+ dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'),
_('GTK+ Version:'), self.tuple2str(gtk.gtk_version), \
_('PyGTK Version:'), self.tuple2str(gtk.pygtk_version)))
- dlg.set_website('http://www.gajim.org/')
+ dlg.set_website('http://gajim.org/')
authors_file_path = self.get_path('AUTHORS')
if authors_file_path:
@@ -1534,12 +1534,16 @@ class NonModalConfirmationDialog(HigDialog):
"""
def __init__(self, pritext, sectext='', on_response_ok=None,
- on_response_cancel=None):
+ on_response_cancel=None):
self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel
- HigDialog.__init__(self, None,
- gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext,
- self.on_response_ok, self.on_response_cancel)
+ if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
+ parent = gajim.interface.roster.window
+ else:
+ parent = None
+ HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION,
+ gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok,
+ self.on_response_cancel)
self.set_modal(False)
def on_response_ok(self, widget):
@@ -1566,14 +1570,12 @@ class WarningDialog(HigDialog):
"""
def __init__(self, pritext, sectext='', transient_for=None):
- HigDialog.__init__(self, None, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK,
- pritext, sectext)
- self.set_modal(False)
- if transient_for is None and hasattr(gajim.interface, 'roster') and \
+ if not transient_for and hasattr(gajim.interface, 'roster') and \
gajim.interface.roster:
transient_for = gajim.interface.roster.window
- if transient_for:
- self.set_transient_for(transient_for)
+ HigDialog.__init__(self, transient_for, gtk.MESSAGE_WARNING,
+ gtk.BUTTONS_OK, pritext, sectext)
+ self.set_modal(False)
self.popup()
class InformationDialog(HigDialog):
@@ -1582,10 +1584,13 @@ class InformationDialog(HigDialog):
"""
def __init__(self, pritext, sectext=''):
- HigDialog.__init__(self, None, gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
+ if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
+ parent = gajim.interface.roster.window
+ else:
+ parent = None
+ HigDialog.__init__(self, parent, gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
pritext, sectext)
self.set_modal(False)
- self.set_transient_for(gajim.interface.roster.window)
self.popup()
class ErrorDialog(HigDialog):
@@ -1595,7 +1600,11 @@ class ErrorDialog(HigDialog):
def __init__(self, pritext, sectext='', on_response_ok=None,
on_response_cancel=None):
- HigDialog.__init__( self, None, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
+ if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
+ parent = gajim.interface.roster.window
+ else:
+ parent = None
+ HigDialog.__init__(self, parent, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
pritext, sectext, on_response_ok=on_response_ok,
on_response_cancel=on_response_cancel)
self.popup()
@@ -1609,8 +1618,13 @@ class YesNoDialog(HigDialog):
on_response_no=None):
self.user_response_yes = on_response_yes
self.user_response_no = on_response_no
- HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,
- pritext, sectext, on_response_yes=self.on_response_yes,
+ if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
+ parent = gajim.interface.roster.window
+ else:
+ parent = None
+ HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION,
+ gtk.BUTTONS_YES_NO, pritext, sectext,
+ on_response_yes=self.on_response_yes,
on_response_no=self.on_response_no)
if checktext:
@@ -1658,7 +1672,11 @@ class ConfirmationDialogCheck(ConfirmationDialog):
self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel
- HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION,
+ if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
+ parent = gajim.interface.roster.window
+ else:
+ parent = None
+ HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION,
gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok,
self.on_response_cancel)
@@ -1704,11 +1722,16 @@ class ConfirmationDialogDoubleCheck(ConfirmationDialog):
"""
def __init__(self, pritext, sectext='', checktext1='', checktext2='',
- on_response_ok=None, on_response_cancel=None, is_modal=True):
+ tooltip1='', tooltip2='', on_response_ok=None, on_response_cancel=None,
+ is_modal=True):
self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel
- HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION,
+ if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
+ parent = gajim.interface.roster.window
+ else:
+ parent = None
+ HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION,
gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok,
self.on_response_cancel)
@@ -1719,11 +1742,15 @@ class ConfirmationDialogDoubleCheck(ConfirmationDialog):
if checktext1:
self.checkbutton1 = gtk.CheckButton(checktext1)
+ if tooltip1:
+ self.checkbutton1.set_tooltip_text(tooltip1)
self.vbox.pack_start(self.checkbutton1, expand=False, fill=True)
else:
self.checkbutton1 = None
if checktext2:
self.checkbutton2 = gtk.CheckButton(checktext2)
+ if tooltip2:
+ self.checkbutton2.set_tooltip_text(tooltip2)
self.vbox.pack_start(self.checkbutton2, expand=False, fill=True)
else:
self.checkbutton2 = None
@@ -1772,7 +1799,11 @@ class ConfirmationDialogDoubleRadio(ConfirmationDialog):
self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel
- HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION,
+ if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
+ parent = gajim.interface.roster.window
+ else:
+ parent = None
+ HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION,
gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok,
self.on_response_cancel)
@@ -1828,9 +1859,13 @@ class FTOverwriteConfirmationDialog(ConfirmationDialog):
"""
def __init__(self, pritext, sectext='', propose_resume=True,
- on_response=None):
- HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, gtk.BUTTONS_CANCEL,
- pritext, sectext)
+ on_response=None):
+ if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
+ parent = gajim.interface.roster.window
+ else:
+ parent = None
+ HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION,
+ gtk.BUTTONS_CANCEL, pritext, sectext)
self.on_response = on_response
@@ -2130,6 +2165,7 @@ class DoubleInputDialog:
def on_okbutton_clicked(self, widget):
user_input1 = self.input_entry1.get_text().decode('utf-8')
user_input2 = self.input_entry2.get_text().decode('utf-8')
+ self.cancel_handler = None
self.dialog.destroy()
if not self.ok_handler:
return
@@ -2451,7 +2487,8 @@ class JoinGroupchatWindow:
_('The group chat Jabber ID has not allowed characters.'))
return
- if gajim.contacts.get_contact(self.account, room_jid):
+ if gajim.contacts.get_contact(self.account, room_jid) and \
+ not gajim.contacts.get_contact(self.account, room_jid).is_groupchat():
ErrorDialog(_('This is not a group chat'),
_('%s is not the name of a group chat.') % room_jid)
return
@@ -3036,7 +3073,12 @@ class SingleMessageWindow:
_('Please make sure you are connected with "%s".') % self.account)
return
if isinstance(self.to, list):
- sender_list = [i[0].jid + '/' + i[0].resource for i in self.to]
+ sender_list = []
+ for i in self.to:
+ if i[0].resource:
+ sender_list.append(i[0].jid + '/' + i[0].resource)
+ else:
+ sender_list.append(i[0].jid)
else:
sender_list = [self.to_entry.get_text().decode('utf-8')]
@@ -5198,8 +5240,8 @@ class SSLErrorDialog(ConfirmationDialogDoubleCheck):
self.account = account
self.cert = certificate
ConfirmationDialogDoubleCheck.__init__(self, pritext, sectext,
- checktext1, checktext2, on_response_ok, on_response_cancel,
- is_modal=False)
+ checktext1, checktext2, on_response_ok=on_response_ok,
+ on_response_cancel=on_response_cancel, is_modal=False)
b = gtk.Button(_('View cert...'))
b.connect('clicked', self.on_cert_clicked)
b.show_all()
diff --git a/src/features_window.py b/src/features_window.py
index 9ba4dd47ae345769a634d1ad8439a0d36e671e64..79ffd67451010c47f8e1edcc2e178f750ae1fe5a 100644
--- a/src/features_window.py
+++ b/src/features_window.py
@@ -47,66 +47,74 @@ class FeaturesWindow:
# {name: (available_function, unix_text, windows_text)}
self.features = {
- _('SSL certificate validation'): (self.pyopenssl_available,
- _('A library used to validate server certificates to ensure a secure connection.'),
- _('Requires python-pyopenssl.'),
- _('Requires python-pyopenssl.')),
- _('Bonjour / Zeroconf'): (self.zeroconf_available,
- _('Serverless chatting with autodetected clients in a local network.'),
- _('Requires python-avahi.'),
- _('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')),
- _('Command line'): (self.dbus_available,
- _('A script to control Gajim via commandline.'),
- _('Requires python-dbus.'),
- _('Feature not available under Windows.')),
- _('OpenGPG message encryption'): (self.gpg_available,
- _('Encrypting chat messages with gpg keys.'),
- _('Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/).'),
- _('Requires gpg.exe in PATH.')),
- _('Network-manager'): (self.network_manager_available,
- _('Autodetection of network status.'),
- _('Requires gnome-network-manager and python-dbus.'),
- _('Feature not available under Windows.')),
- _('Session Management'): (self.session_management_available,
- _('Gajim session is stored on logout and restored on login.'),
- _('Requires python-gnome2.'),
- _('Feature not available under Windows.')),
- _('Password encryption'): (self.some_keyring_available,
- _('Passwords can be stored securely and not just in plaintext.'),
- _('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'),
- _('Feature not available under Windows.')),
- _('SRV'): (self.srv_available,
- _('Ability to connect to servers which are using SRV records.'),
- _('Requires dnsutils.'),
- _('Requires nslookup to use SRV records.')),
- _('Spell Checker'): (self.speller_available,
- _('Spellchecking of composed messages.'),
- _('Requires libgtkspell.'),
- _('Feature not available under Windows.')),
- _('Notification'): (self.notification_available,
- _('Passive popups notifying for new events.'),
- _('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'),
- _('Feature not available under Windows.')),
- _('Automatic status'): (self.idle_available,
- _('Ability to measure idle time, in order to set auto status.'),
- _('Requires libxss library.'),
- _('Requires python2.5.')),
- _('LaTeX'): (self.latex_available,
- _('Transform LaTeX expressions between $$ $$.'),
- _('Requires texlive-latex-base and (dvipng or ImageMagick). You have to set \'use_latex\' to True in the Advanced Configuration Editor.'),
- _('Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). You have to set \'use_latex\' to True in the Advanced Configuration Editor.')),
- _('End to End message encryption'): (self.pycrypto_available,
- _('Encrypting chat messages.'),
- _('Requires python-crypto.'),
- _('Requires python-crypto.')),
- _('RST Generator'): (self.docutils_available,
- _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'),
- _('Requires python-docutils.'),
- _('Requires python-docutils.')),
- _('Audio / Video'): (self.farsight_available,
- _('Ability to start audio and video chat.'),
- _('Requires python-farsight.'),
- _('Feature not available under Windows.')),
+ _('SSL certificate validation'): (self.pyopenssl_available,
+ _('A library used to validate server certificates to ensure a secure connection.'),
+ _('Requires python-pyopenssl.'),
+ _('Requires python-pyopenssl.')),
+ _('Bonjour / Zeroconf'): (self.zeroconf_available,
+ _('Serverless chatting with autodetected clients in a local network.'),
+ _('Requires python-avahi.'),
+ _('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')),
+ _('Command line'): (self.dbus_available,
+ _('A script to control Gajim via commandline.'),
+ _('Requires python-dbus.'),
+ _('Feature not available under Windows.')),
+ _('OpenGPG message encryption'): (self.gpg_available,
+ _('Encrypting chat messages with gpg keys.'),
+ _('Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/).'),
+ _('Requires gpg.exe in PATH.')),
+ _('Network-manager'): (self.network_manager_available,
+ _('Autodetection of network status.'),
+ _('Requires gnome-network-manager and python-dbus.'),
+ _('Feature not available under Windows.')),
+ _('Session Management'): (self.session_management_available,
+ _('Gajim session is stored on logout and restored on login.'),
+ _('Requires python-gnome2.'),
+ _('Feature not available under Windows.')),
+ _('Password encryption'): (self.some_keyring_available,
+ _('Passwords can be stored securely and not just in plaintext.'),
+ _('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'),
+ _('Feature not available under Windows.')),
+ _('SRV'): (self.srv_available,
+ _('Ability to connect to servers which are using SRV records.'),
+ _('Requires dnsutils.'),
+ _('Requires nslookup to use SRV records.')),
+ _('Spell Checker'): (self.speller_available,
+ _('Spellchecking of composed messages.'),
+ _('Requires libgtkspell.'),
+ _('Requires libgtkspell and libenchant.')),
+ _('Notification'): (self.notification_available,
+ _('Passive popups notifying for new events.'),
+ _('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'),
+ _('Feature not available under Windows.')),
+ _('Automatic status'): (self.idle_available,
+ _('Ability to measure idle time, in order to set auto status.'),
+ _('Requires libxss library.'),
+ _('Requires python2.5.')),
+ _('LaTeX'): (self.latex_available,
+ _('Transform LaTeX expressions between $$ $$.'),
+ _('Requires texlive-latex-base and (dvipng or ImageMagick). You have to set \'use_latex\' to True in the Advanced Configuration Editor.'),
+ _('Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). You have to set \'use_latex\' to True in the Advanced Configuration Editor.')),
+ _('End to End message encryption'): (self.pycrypto_available,
+ _('Encrypting chat messages.'),
+ _('Requires python-crypto.'),
+ _('Requires python-crypto.')),
+ _('RST Generator'): (self.docutils_available,
+ _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'),
+ _('Requires python-docutils.'),
+ _('Requires python-docutils.')),
+ _('Audio / Video'): (self.farsight_available,
+ _('Ability to start audio and video chat.'),
+ _('Requires python-farsight and gstreamer-plugins-bad.'),
+ _('Feature not available under Windows.')),
+ _('UPnP-IGD'): (self.gupnp_igd_available,
+ _('Ability to request your router to forward port for file transfer.'),
+ _('Requires python-gupnp-igd.'),
+ _('Feature not available under Windows.')),
+ _('UPower'): (self.upower_available,
+ _('Ability to disconnect properly just before suspending the machine.'),
+ _('Requires upower and python-dbus.'),
+ _('Feature not available under Windows.')),
}
# name, supported
@@ -209,8 +217,6 @@ class FeaturesWindow:
return helpers.is_in_path('nslookup')
def speller_available(self):
- if os.name == 'nt':
- return False
try:
__import__('gtkspell')
except ImportError:
@@ -249,3 +255,12 @@ class FeaturesWindow:
def farsight_available(self):
return gajim.HAVE_FARSIGHT
+
+ def gupnp_igd_available(self):
+ return gajim.HAVE_UPNP_IGD
+
+ def upower_available(self):
+ if os.name == 'nt':
+ return False
+ import upower_listener
+ return upower_listener.supported
diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py
index 324ae3015991201552bf105b3f8edb46dc38f9d1..501da4df822c16db5292788ab47ad09ca4e44960 100644
--- a/src/filetransfers_window.py
+++ b/src/filetransfers_window.py
@@ -179,7 +179,8 @@ class FileTransfersWindow:
(file_path, file_name) = os.path.split(file_props['file-name'])
else:
file_name = file_props['name']
- sectext = '\t' + _('Filename: %s') % file_name
+ sectext = '\t' + _('Filename: %s') % gobject.markup_escape_text(
+ file_name)
sectext += '\n\t' + _('Size: %s') % \
helpers.convert_bytes(file_props['size'])
if file_props['type'] == 'r':
@@ -235,7 +236,8 @@ class FileTransfersWindow:
file_name = os.path.basename(file_props['file-name'])
else:
file_name = file_props['name']
- sectext = '\t' + _('Filename: %s') % file_name
+ sectext = '\t' + _('Filename: %s') % gobject.markup_escape_text(
+ file_name)
sectext += '\n\t' + _('Recipient: %s') % jid
if error_msg:
sectext += '\n\t' + _('Error message: %s') % error_msg
@@ -333,6 +335,71 @@ class FileTransfersWindow:
self.add_transfer(account, contact, file_props)
gajim.connections[account].send_file_approval(file_props)
+ def on_file_request_accepted(self, account, contact, file_props):
+ def on_ok(widget, account, contact, file_props):
+ file_path = dialog2.get_filename()
+ file_path = gtkgui_helpers.decode_filechooser_file_paths(
+ (file_path,))[0]
+ if os.path.exists(file_path):
+ # check if we have write permissions
+ if not os.access(file_path, os.W_OK):
+ file_name = gobject.markup_escape_text(os.path.basename(
+ file_path))
+ dialogs.ErrorDialog(
+ _('Cannot overwrite existing file "%s"' % file_name),
+ _('A file with this name already exists and you do not '
+ 'have permission to overwrite it.'))
+ return
+ stat = os.stat(file_path)
+ dl_size = stat.st_size
+ file_size = file_props['size']
+ dl_finished = dl_size >= file_size
+
+ def on_response(response):
+ if response < 0:
+ return
+ elif response == 100:
+ file_props['offset'] = dl_size
+ dialog2.destroy()
+ self._start_receive(file_path, account, contact, file_props)
+
+ dialog = dialogs.FTOverwriteConfirmationDialog(
+ _('This file already exists'), _('What do you want to do?'),
+ propose_resume=not dl_finished, on_response=on_response)
+ dialog.set_transient_for(dialog2)
+ dialog.set_destroy_with_parent(True)
+ return
+ else:
+ dirname = os.path.dirname(file_path)
+ if not os.access(dirname, os.W_OK) and os.name != 'nt':
+ # read-only bit is used to mark special folder under
+ # windows, not to mark that a folder is read-only.
+ # See ticket #3587
+ dialogs.ErrorDialog(_('Directory "%s" is not writable') % \
+ dirname, _('You do not have permission to create files '
+ 'in this directory.'))
+ return
+ dialog2.destroy()
+ self._start_receive(file_path, account, contact, file_props)
+
+ def on_cancel(widget, account, contact, file_props):
+ dialog2.destroy()
+ gajim.connections[account].send_file_rejection(file_props)
+
+ dialog2 = dialogs.FileChooserDialog(
+ title_text=_('Save File as...'),
+ action=gtk.FILE_CHOOSER_ACTION_SAVE,
+ buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+ gtk.STOCK_SAVE, gtk.RESPONSE_OK),
+ default_response=gtk.RESPONSE_OK,
+ current_folder=gajim.config.get('last_save_dir'),
+ on_response_ok=(on_ok, account, contact, file_props),
+ on_response_cancel=(on_cancel, account, contact, file_props))
+
+ dialog2.set_current_name(file_props['name'])
+ dialog2.connect('delete-event', lambda widget, event:
+ on_cancel(widget, account, contact, file_props))
+
def show_file_request(self, account, contact, file_props):
"""
Show dialog asking for comfirmation and store location of new file
@@ -353,64 +420,7 @@ class FileTransfersWindow:
dialog = None
def on_response_ok(account, contact, file_props):
-
- def on_ok(widget, account, contact, file_props):
- file_path = dialog2.get_filename()
- file_path = gtkgui_helpers.decode_filechooser_file_paths(
- (file_path,))[0]
- if os.path.exists(file_path):
- # check if we have write permissions
- if not os.access(file_path, os.W_OK):
- file_name = os.path.basename(file_path)
- dialogs.ErrorDialog(_('Cannot overwrite existing file "%s"' % file_name),
- _('A file with this name already exists and you do not have permission to overwrite it.'))
- return
- stat = os.stat(file_path)
- dl_size = stat.st_size
- file_size = file_props['size']
- dl_finished = dl_size >= file_size
-
- def on_response(response):
- if response < 0:
- return
- elif response == 100:
- file_props['offset'] = dl_size
- dialog2.destroy()
- self._start_receive(file_path, account, contact, file_props)
-
- dialog = dialogs.FTOverwriteConfirmationDialog(
- _('This file already exists'), _('What do you want to do?'),
- propose_resume=not dl_finished, on_response=on_response)
- dialog.set_transient_for(dialog2)
- dialog.set_destroy_with_parent(True)
- return
- else:
- dirname = os.path.dirname(file_path)
- if not os.access(dirname, os.W_OK) and os.name != 'nt':
- # read-only bit is used to mark special folder under windows,
- # not to mark that a folder is read-only. See ticket #3587
- dialogs.ErrorDialog(_('Directory "%s" is not writable') % dirname, _('You do not have permission to create files in this directory.'))
- return
- dialog2.destroy()
- self._start_receive(file_path, account, contact, file_props)
-
- def on_cancel(widget, account, contact, file_props):
- dialog2.destroy()
- gajim.connections[account].send_file_rejection(file_props)
-
- dialog2 = dialogs.FileChooserDialog(
- title_text=_('Save File as...'),
- action=gtk.FILE_CHOOSER_ACTION_SAVE,
- buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
- gtk.STOCK_SAVE, gtk.RESPONSE_OK),
- default_response=gtk.RESPONSE_OK,
- current_folder=gajim.config.get('last_save_dir'),
- on_response_ok=(on_ok, account, contact, file_props),
- on_response_cancel=(on_cancel, account, contact, file_props))
-
- dialog2.set_current_name(file_props['name'])
- dialog2.connect('delete-event', lambda widget, event:
- on_cancel(widget, account, contact, file_props))
+ self.on_file_request_accepted(account, contact, file_props)
def on_response_cancel(account, file_props):
gajim.connections[account].send_file_rejection(file_props)
@@ -596,7 +606,7 @@ class FileTransfersWindow:
iter_ = self.model.iter_next(iter_)
def get_send_file_props(self, account, contact, file_path, file_name,
- file_desc=''):
+ file_desc=''):
"""
Create new file_props dict and set initial file transfer properties in it
"""
diff --git a/src/gajim.py b/src/gajim.py
index e87349f9d32ef654627f7da2a1346760eb231e88..e02a1a8f47d7f252d161d3a4e0a6cddf53a5ec82 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -35,15 +35,41 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
##
+import os
+import sys
+import warnings
+
+if os.name == 'nt':
+ log_path = os.path.join(os.environ['APPDATA'], 'Gajim')
+ if not os.path.exists(log_path):
+ os.mkdir(log_path, 0700)
+ log_file = os.path.join(log_path, 'gajim.log')
+ fout = open(log_file, 'a')
+ sys.stdout = fout
+ sys.stderr = fout
+
+ warnings.filterwarnings(action='ignore')
+
+ if os.path.isdir('gtk'):
+ # Used to create windows installer with GTK included
+ paths = os.environ['PATH']
+ list_ = paths.split(';')
+ new_list = []
+ for p in list_:
+ if p.find('gtk') < 0 and p.find('GTK') < 0:
+ new_list.append(p)
+ new_list.insert(0, os.path.join(os.getcwd(), 'gtk', 'lib'))
+ new_list.insert(0, os.path.join(os.getcwd(), 'gtk', 'bin'))
+ os.environ['PATH'] = ';'.join(new_list)
+
from common import demandimport
demandimport.enable()
demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',
'logging.NullHandler', 'dbus.glib', 'dbus.service',
- 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto',
- 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic']
-
-import os
-import sys
+ 'command_system.implementation.standard',
+ 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto',
+ 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',
+ 'Crypto.PublicKey']
if os.name == 'nt':
import locale
@@ -70,32 +96,6 @@ if os.name == 'nt':
libintl.bindtextdomain(APP, DIR)
libintl.bind_textdomain_codeset(APP, 'UTF-8')
-import warnings
-
-if os.name == 'nt':
- log_path = os.path.join(os.environ['APPDATA'], 'Gajim')
- if not os.path.exists(log_path):
- os.mkdir(log_path, 0700)
- log_file = os.path.join(log_path, 'gajim.log')
- fout = open(log_file, 'a')
- sys.stdout = fout
- sys.stderr = fout
-
- warnings.filterwarnings(action='ignore')
-
- if os.path.isdir('gtk'):
- # Used to create windows installer with GTK included
- paths = os.environ['PATH']
- list_ = paths.split(';')
- new_list = []
- for p in list_:
- if p.find('gtk') < 0 and p.find('GTK') < 0:
- new_list.append(p)
- new_list.insert(0, 'gtk/lib')
- new_list.insert(0, 'gtk/bin')
- os.environ['PATH'] = ';'.join(new_list)
- os.environ['GTK_BASEPATH'] = 'gtk'
-
if os.name == 'nt':
# needed for docutils
sys.path.append('.')
@@ -143,10 +143,12 @@ def parseOpts():
config_path_ = a
return profile_, config_path_
+import locale
profile, config_path = parseOpts()
+if config_path:
+ config_path = unicode(config_path, locale.getpreferredencoding())
del parseOpts
-import locale
profile = unicode(profile, locale.getpreferredencoding())
import common.configpaths
@@ -156,6 +158,11 @@ common.configpaths.gajimpaths.init_profile(profile)
del profile
if os.name == 'nt':
+ plugins_locale_dir = os.path.join(common.configpaths.gajimpaths[
+ 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding())
+ libintl.bindtextdomain('gajim_plugins', plugins_locale_dir)
+ libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8')
+
class MyStderr(object):
_file = None
_error = None
@@ -180,6 +187,7 @@ if os.name == 'nt':
warnings.filterwarnings('error', module='gtk')
try:
import gobject
+ gobject.set_prgname('gajim')
import gtk
except Warning, msg2:
if str(msg2) == 'could not open display':
@@ -189,7 +197,6 @@ except Warning, msg2:
sys.exit()
warnings.resetwarnings()
-gobject.set_prgname('gajim')
if os.name == 'nt':
warnings.filterwarnings(action='ignore')
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index b632140211279f926f4f5b0c402cf87c7edfd82f..2ee790155bbaca84c43613dd7d79f06b031aa995 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -138,12 +138,12 @@ class PrivateChatControl(ChatControl):
def __init__(self, parent_win, gc_contact, contact, account, session):
room_jid = gc_contact.room_jid
- room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid,
+ self.room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid,
account)
if room_jid in gajim.interface.minimized_controls[account]:
- room_ctrl = gajim.interface.minimized_controls[account][room_jid]
- if room_ctrl:
- self.room_name = room_ctrl.name
+ self.room_ctrl = gajim.interface.minimized_controls[account][room_jid]
+ if self.room_ctrl:
+ self.room_name = self.room_ctrl.name
else:
self.room_name = room_jid
self.gc_contact = gc_contact
@@ -154,6 +154,9 @@ class PrivateChatControl(ChatControl):
gajim.ged.register_event_handler('gc-presence-received', ged.GUI1,
self._nec_gc_presence_received)
+ def get_our_nick(self):
+ return self.room_ctrl.nick
+
def shutdown(self):
super(PrivateChatControl, self).shutdown()
gajim.ged.remove_event_handler('caps-received', ged.GUI1,
@@ -389,7 +392,7 @@ class GroupchatControl(ChatControlBase):
self.tooltip = tooltips.GCTooltip()
# nickname coloring
- self.gc_count_nicknames_colors = 0
+ self.gc_count_nicknames_colors = -1
self.gc_custom_colors = {}
self.number_of_colors = len(gajim.config.get('gc_nicknames_colors').\
split(':'))
@@ -418,10 +421,9 @@ class GroupchatControl(ChatControlBase):
#status_image, shown_nick, type, nickname, avatar
self.columns = [gtk.Image, str, str, str, gtk.gdk.Pixbuf]
- store = gtk.TreeStore(*self.columns)
- store.set_sort_func(C_NICK, self.tree_compare_iters)
- store.set_sort_column_id(C_NICK, gtk.SORT_ASCENDING)
- self.list_treeview.set_model(store)
+ self.model = gtk.TreeStore(*self.columns)
+ self.model.set_sort_func(C_NICK, self.tree_compare_iters)
+ self.model.set_sort_column_id(C_NICK, gtk.SORT_ASCENDING)
# columns
column = gtk.TreeViewColumn()
@@ -609,14 +611,13 @@ class GroupchatControl(ChatControlBase):
"""
Iterate over all contact rows in the tree model
"""
- model = self.list_treeview.get_model()
- role_iter = model.get_iter_root()
+ role_iter = self.model.get_iter_root()
while role_iter:
- contact_iter = model.iter_children(role_iter)
+ contact_iter = self.model.iter_children(role_iter)
while contact_iter:
- yield model[contact_iter]
- contact_iter = model.iter_next(contact_iter)
- role_iter = model.iter_next(role_iter)
+ yield self.model[contact_iter]
+ contact_iter = self.model.iter_next(contact_iter)
+ role_iter = self.model.iter_next(role_iter)
def on_list_treeview_style_set(self, treeview, style):
"""
@@ -704,8 +705,7 @@ class GroupchatControl(ChatControlBase):
model[iter_][C_NICK] = model[iter_][C_NICK]
def change_roster_style(self):
- model = self.list_treeview.get_model()
- model.foreach(self._change_style)
+ self.model.foreach(self._change_style)
def repaint_themed_widgets(self):
ChatControlBase.repaint_themed_widgets(self)
@@ -972,7 +972,6 @@ class GroupchatControl(ChatControlBase):
self.parent_win.redraw_tab(self, 'attention')
else:
self.attention_flag = True
- helpers.play_sound('muc_message_received')
if '100' in obj.status_code:
# Room is not anonymous
self.is_anonymous = False
@@ -1001,22 +1000,21 @@ class GroupchatControl(ChatControlBase):
no_queue = len(gajim.events.get_events(self.account, fjid)) == 0
event = gajim.events.create_event('pm', (msg, '', 'incoming', tim,
- encrypted, '', msg_id, xhtml, session, displaymarking))
+ encrypted, '', msg_id, xhtml, session, None, displaymarking, False))
gajim.events.add_event(self.account, fjid, event)
autopopup = gajim.config.get('autopopup')
autopopupaway = gajim.config.get('autopopupaway')
iter_ = self.get_contact_iter(nick)
- path = self.list_treeview.get_model().get_path(iter_)
+ path = self.model.get_path(iter_)
if not autopopup or (not autopopupaway and \
gajim.connections[self.account].connected > 2):
if no_queue: # We didn't have a queue: we change icons
- model = self.list_treeview.get_model()
state_images = \
gajim.interface.roster.get_appropriate_state_images(
self.room_jid, icon_name='event')
image = state_images['event']
- model[iter_][C_IMG] = image
+ self.model[iter_][C_IMG] = image
if self.parent_win:
self.parent_win.show_title()
self.parent_win.redraw_tab(self)
@@ -1032,16 +1030,15 @@ class GroupchatControl(ChatControlBase):
gajim.interface.roster.draw_contact(self.room_jid, self.account)
def get_contact_iter(self, nick):
- model = self.list_treeview.get_model()
- role_iter = model.get_iter_root()
+ role_iter = self.model.get_iter_root()
while role_iter:
- user_iter = model.iter_children(role_iter)
+ user_iter = self.model.iter_children(role_iter)
while user_iter:
- if nick == model[user_iter][C_NICK].decode('utf-8'):
+ if nick == self.model[user_iter][C_NICK].decode('utf-8'):
return user_iter
else:
- user_iter = model.iter_next(user_iter)
- role_iter = model.iter_next(role_iter)
+ user_iter = self.model.iter_next(user_iter)
+ role_iter = self.model.iter_next(role_iter)
return None
def print_old_conversation(self, text, contact='', tim=None, xhtml = None,
@@ -1304,6 +1301,8 @@ class GroupchatControl(ChatControlBase):
gajim.gc_connected[self.account][self.room_jid] = True
ChatControlBase.got_connected(self)
+ self.list_treeview.set_model(self.model)
+ self.list_treeview.expand_all()
# We don't redraw the whole banner here, because only icon change
self._update_banner_state_image()
if self.parent_win:
@@ -1311,7 +1310,8 @@ class GroupchatControl(ChatControlBase):
gobject.idle_add(self.msg_textview.grab_focus)
def got_disconnected(self):
- self.list_treeview.get_model().clear()
+ self.list_treeview.set_model(None)
+ self.model.clear()
nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid)
for nick in nick_list:
# Update pm chat window
@@ -1355,7 +1355,7 @@ class GroupchatControl(ChatControlBase):
return True
def draw_roster(self):
- self.list_treeview.get_model().clear()
+ self.model.clear()
for nick in gajim.contacts.get_nick_list(self.account, self.room_jid):
gc_contact = gajim.contacts.get_gc_contact(self.account,
self.room_jid, nick)
@@ -1388,7 +1388,6 @@ class GroupchatControl(ChatControlBase):
iter_ = self.get_contact_iter(nick)
if not iter_:
return
- model = self.list_treeview.get_model()
gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
nick)
state_images = gajim.interface.jabber_state_images['16']
@@ -1435,13 +1434,12 @@ class GroupchatControl(ChatControlBase):
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
+ self.model[iter_][C_IMG] = image
+ self.model[iter_][C_TEXT] = name
def draw_avatar(self, nick):
if not gajim.config.get('show_avatars_in_roster'):
return
- model = self.list_treeview.get_model()
iter_ = self.get_contact_iter(nick)
if not iter_:
return
@@ -1451,19 +1449,18 @@ class GroupchatControl(ChatControlBase):
scaled_pixbuf = None
else:
scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster')
- model[iter_][C_AVATAR] = scaled_pixbuf
+ self.model[iter_][C_AVATAR] = scaled_pixbuf
def draw_role(self, role):
role_iter = self.get_role_iter(role)
if not role_iter:
return
- model = self.list_treeview.get_model()
role_name = helpers.get_uf_role(role, plural=True)
if gajim.config.get('show_contacts_number'):
nbr_role, nbr_total = gajim.contacts.get_nb_role_total_gc_contacts(
self.account, self.room_jid, role)
role_name += ' (%s/%s)' % (repr(nbr_role), repr(nbr_total))
- model[role_iter][C_TEXT] = role_name
+ self.model[role_iter][C_TEXT] = role_name
def draw_all_roles(self):
for role in ('visitor', 'participant', 'moderator'):
@@ -1498,11 +1495,20 @@ class GroupchatControl(ChatControlBase):
# http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-\
# init
if obj.status_code:
+ if '110' in obj.status_code:
+ # We just join the room
+ if self.room_jid in gajim.automatic_rooms[self.account] and \
+ gajim.automatic_rooms[self.account][self.room_jid]['invities']:
+ if self.room_jid not in gajim.interface.instances[
+ self.account]['gc_config']:
+ gajim.connections[self.account].request_gc_config(
+ self.room_jid)
if '100' in obj.status_code:
# Can be a message (see handle_event_gc_config_change in
# gajim.py)
self.print_conversation(
_('Any occupant is allowed to see your full JID'))
+ self.is_anonymous = False
if '170' in obj.status_code:
# Can be a message (see handle_event_gc_config_change in
# gajim.py)
@@ -1766,7 +1772,6 @@ class GroupchatControl(ChatControlBase):
def add_contact_to_roster(self, nick, show, role, affiliation, status,
jid=''):
- model = self.list_treeview.get_model()
role_name = helpers.get_uf_role(role, plural=True)
resource = ''
@@ -1782,11 +1787,11 @@ class GroupchatControl(ChatControlBase):
role_iter = self.get_role_iter(role)
if not role_iter:
- role_iter = model.append(None,
+ role_iter = self.model.append(None,
[gajim.interface.jabber_state_images['16']['closed'], role,
'role', role_name, None] + [None] * self.nb_ext_renderers)
self.draw_all_roles()
- iter_ = model.append(role_iter, [None, nick, 'contact', name, None] + \
+ iter_ = self.model.append(role_iter, [None, nick, 'contact', name, None] + \
[None] * self.nb_ext_renderers)
if not nick in gajim.contacts.get_nick_list(self.account,
self.room_jid):
@@ -1811,26 +1816,24 @@ class GroupchatControl(ChatControlBase):
fake_jid)
if nick == self.nick: # we became online
self.got_connected()
- self.list_treeview.expand_row((model.get_path(role_iter)), False)
+ self.list_treeview.expand_row((self.model.get_path(role_iter)), False)
if self.is_continued:
self.draw_banner_text()
return iter_
def get_role_iter(self, role):
- model = self.list_treeview.get_model()
- role_iter = model.get_iter_root()
+ role_iter = self.model.get_iter_root()
while role_iter:
- role_name = model[role_iter][C_NICK].decode('utf-8')
+ role_name = self.model[role_iter][C_NICK].decode('utf-8')
if role == role_name:
return role_iter
- role_iter = model.iter_next(role_iter)
+ role_iter = self.model.iter_next(role_iter)
return None
def remove_contact(self, nick):
"""
Remove a user from the contacts_list
"""
- model = self.list_treeview.get_model()
iter_ = self.get_contact_iter(nick)
if not iter_:
return
@@ -1838,10 +1841,10 @@ class GroupchatControl(ChatControlBase):
nick)
if gc_contact:
gajim.contacts.remove_gc_contact(self.account, gc_contact)
- parent_iter = model.iter_parent(iter_)
- model.remove(iter_)
- if model.iter_n_children(parent_iter) == 0:
- model.remove(parent_iter)
+ parent_iter = self.model.iter_parent(iter_)
+ self.model.remove(iter_)
+ if self.model.iter_n_children(parent_iter) == 0:
+ self.model.remove(parent_iter)
def send_message(self, message, xhtml=None, process_commands=True):
"""
@@ -1926,6 +1929,8 @@ class GroupchatControl(ChatControlBase):
self._nec_gc_config_changed_received)
gajim.ged.remove_event_handler('signed-in', ged.GUI1,
self._nec_signed_in)
+ gajim.ged.remove_event_handler('decrypted-message-received', ged.GUI2,
+ self._nec_decrypted_message_received)
if self.room_jid in gajim.gc_connected[self.account] and \
gajim.gc_connected[self.account][self.room_jid]:
@@ -2296,8 +2301,7 @@ class GroupchatControl(ChatControlBase):
"""
Make contact's popup menu
"""
- model = self.list_treeview.get_model()
- nick = model[iter_][C_NICK].decode('utf-8')
+ nick = self.model[iter_][C_NICK].decode('utf-8')
c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
fjid = self.room_jid + '/' + nick
jid = c.jid
@@ -2398,7 +2402,8 @@ class GroupchatControl(ChatControlBase):
item = xml.get_object('add_to_roster_menuitem')
our_jid = gajim.get_jid_from_account(self.account)
- if not jid or jid == our_jid:
+ if not jid or jid == our_jid or not gajim.connections[self.account].\
+ roster_supported:
item.set_sensitive(False)
else:
id_ = item.connect('activate', self.on_add_to_roster, jid)
@@ -2418,7 +2423,7 @@ class GroupchatControl(ChatControlBase):
item2.hide()
item = xml.get_object('send_private_message_menuitem')
- id_ = item.connect('activate', self.on_send_pm, model, iter_)
+ id_ = item.connect('activate', self.on_send_pm, self.model, iter_)
self.handlers[id_] = item
item = xml.get_object('send_file_menuitem')
@@ -2457,14 +2462,13 @@ class GroupchatControl(ChatControlBase):
When an iter is activated (dubblick or single click if gnome is set this
way
"""
- model = widget.get_model()
if len(path) == 1: # It's a group
if (widget.row_expanded(path)):
widget.collapse_row(path)
else:
widget.expand_row(path, False)
else: # We want to send a private message
- nick = model[path][C_NICK].decode('utf-8')
+ nick = self.model[path][C_NICK].decode('utf-8')
self._start_private_message(nick)
def on_list_treeview_row_activated(self, widget, path, col=0):
@@ -2488,18 +2492,16 @@ class GroupchatControl(ChatControlBase):
return
if event.button == 3: # right click
widget.get_selection().select_path(path)
- model = widget.get_model()
- iter_ = model.get_iter(path)
+ iter_ = self.model.get_iter(path)
if len(path) == 2:
self.mk_menu(event, iter_)
return True
elif event.button == 2: # middle click
widget.get_selection().select_path(path)
- model = widget.get_model()
- iter_ = model.get_iter(path)
+ iter_ = self.model.get_iter(path)
if len(path) == 2:
- nick = model[iter_][C_NICK].decode('utf-8')
+ nick = self.model[iter_][C_NICK].decode('utf-8')
self._start_private_message(nick)
return True
@@ -2508,9 +2510,8 @@ class GroupchatControl(ChatControlBase):
self.on_row_activated(widget, path)
return True
else:
- model = widget.get_model()
- iter_ = model.get_iter(path)
- nick = model[iter_][C_NICK].decode('utf-8')
+ iter_ = self.model.get_iter(path)
+ nick = self.model[iter_][C_NICK].decode('utf-8')
if not nick in gajim.contacts.get_nick_list(self.account,
self.room_jid):
# it's a group
@@ -2541,7 +2542,6 @@ class GroupchatControl(ChatControlBase):
message_buffer.insert_at_cursor(start + nick + add)
def on_list_treeview_motion_notify_event(self, widget, event):
- model = widget.get_model()
props = widget.get_path_at_pos(int(event.x), int(event.y))
if self.tooltip.timeout > 0:
if not props or self.tooltip.id != props[0]:
@@ -2550,17 +2550,17 @@ class GroupchatControl(ChatControlBase):
[row, col, x, y] = props
iter_ = None
try:
- iter_ = model.get_iter(row)
+ iter_ = self.model.get_iter(row)
except Exception:
self.tooltip.hide_tooltip()
return
- typ = model[iter_][C_TYPE].decode('utf-8')
+ typ = self.model[iter_][C_TYPE].decode('utf-8')
if typ == 'contact':
account = self.account
if self.tooltip.timeout == 0 or self.tooltip.id != props[0]:
self.tooltip.id = row
- nick = model[iter_][C_NICK].decode('utf-8')
+ nick = self.model[iter_][C_NICK].decode('utf-8')
self.tooltip.timeout = gobject.timeout_add(500,
self.show_tooltip, gajim.contacts.get_gc_contact(
account, self.room_jid, nick))
diff --git a/src/groups.py b/src/groups.py
index f38cce2381562cf3dec4b2c7d1ebf109a85ec294..422950f585babb1f0816a85a3941989c9feae237 100644
--- a/src/groups.py
+++ b/src/groups.py
@@ -61,7 +61,6 @@ class GroupsPostWindow:
author.addChild('name', {}, [self.from_entry.get_text()])
item.addChild('generator', {}, ['Gajim'])
item.addChild('title', {}, [self.subject_entry.get_text()])
- item.addChild('id', {}, ['0'])
buf = self.contents_textview.get_buffer()
item.addChild('content', {}, [buf.get_text(buf.get_start_iter(), buf.get_end_iter())])
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 5b62aca0dd9d1c2204b6aa7d7069058557f8d966..c2e1bf2496b9a98ef0d1e2f9b3578db5090e04d2 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -1081,6 +1081,7 @@ def __label_size_allocate(widget, allocation):
return
# set wrap width to the pango.Layout of the labels ###
+ widget.set_alignment(0.0, 0.0)
layout.set_width (allocation.width * pango.SCALE)
lh = layout.get_size()[1]
diff --git a/src/gui_interface.py b/src/gui_interface.py
index 9d255e5e41547afd397d28247c89761107d66adf..09618b6f913e81ae9e0a1bb7c3111b311976c80b 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -81,7 +81,7 @@ from common import dataforms
from common import passwords
from common import logging_helpers
from common.connection_handlers_events import OurShowEvent, \
- FileRequestErrorEvent
+ FileRequestErrorEvent, InformationEvent
from common.connection import Connection
from common import jingle
@@ -106,10 +106,6 @@ class Interface:
### Methods handling events from connection
################################################################################
- def handle_event_error(self, unused, data):
- #('ERROR', account, (title_text, section_text))
- dialogs.ErrorDialog(data[0], data[1])
-
def handle_event_db_error(self, unused, data):
#('DB_ERROR', account, (title_text, section_text))
if self.db_error_dialog:
@@ -119,9 +115,18 @@ class Interface:
self.db_error_dialog = None
self.db_error_dialog.connect('destroy', destroyed)
- def handle_event_information(self, unused, data):
- #('INFORMATION', account, (title_text, section_text))
- dialogs.InformationDialog(data[0], data[1])
+ def handle_event_information(self, obj):
+ if obj.popup:
+ if obj.level == 'error':
+ cls = dialogs.ErrorDialog
+ elif obj.level == 'warn':
+ cls = dialogs.WarningDialog
+ elif obj.level == 'info':
+ cls = dialogs.InformationDialog
+ else:
+ return
+
+ cls(obj.pri_txt, obj.sec_txt)
def handle_ask_new_nick(self, account, room_jid):
title = _('Unable to join group chat')
@@ -245,13 +250,21 @@ class Interface:
gc_control.error_dialog = None
gc_control.error_dialog = dialogs.ErrorDialog(pritext, sectext,
on_response_ok=on_close, on_response_cancel=on_close)
+ gc_control.error_dialog.set_modal(False)
+ if gc_control.parent_win:
+ gc_control.error_dialog.set_transient_for(
+ gc_control.parent_win.window)
else:
- dialogs.ErrorDialog(pritext, sectext)
+ d = dialogs.ErrorDialog(pritext, sectext)
+ if gc_control and gc_control.parent_win:
+ d.set_transient_for(gc_control.parent_win.window)
+ d.set_modal(False)
def handle_gc_password_required(self, account, room_jid, nick):
def on_ok(text):
gajim.connections[account].join_gc(nick, room_jid, text)
gajim.gc_passwords[room_jid] = text
+ gc_control.error_dialog = None
def on_cancel():
# get and destroy window
@@ -261,17 +274,18 @@ class Interface:
win = self.msg_win_mgr.get_window(room_jid, account)
ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
win.remove_tab(ctrl, 3)
+ gc_control.error_dialog = None
gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
if gc_control:
if gc_control.error_dialog:
gc_control.error_dialog.destroy()
- gc_control.error_dialog = dialogs.InputDialog(_('Password Required'),
- _('A Password is required to join the room %s. Please type it.') % \
- room_jid, is_modal=False, ok_handler=on_ok,
- cancel_handler=on_cancel)
- gc_control.error_dialog.input_entry.set_visibility(False)
+ gc_control.error_dialog = dialogs.InputDialog(_('Password Required'),
+ _('A Password is required to join the room %s. Please type it.') % \
+ room_jid, is_modal=False, ok_handler=on_ok,
+ cancel_handler=on_cancel)
+ gc_control.error_dialog.input_entry.set_visibility(False)
def handle_event_gc_presence(self, obj):
gc_control = obj.gc_control
@@ -280,8 +294,8 @@ class Interface:
# maximum user number reached
self.handle_gc_error(gc_control,
_('Unable to join group chat'),
- _('Maximum number of users for %s has been reached') % \
- obj.room_jid)
+ _('Maximum number of users for <b>%s</b> has been reached')\
+ % obj.room_jid)
elif (obj.errcode == '401') or (obj.errcon == 'not-authorized'):
# password required to join
self.handle_gc_password_required(obj.conn.name, obj.room_jid,
@@ -289,19 +303,20 @@ class Interface:
elif (obj.errcode == '403') or (obj.errcon == 'forbidden'):
# we are banned
self.handle_gc_error(gc_control, _('Unable to join group chat'),
- _('You are banned from group chat %s.') % obj.room_jid)
+ _('You are banned from group chat <b>%s</b>.') % \
+ obj.room_jid)
elif (obj.errcode == '404') or (obj.errcon in ('item-not-found',
'remote-server-not-found')):
# group chat does not exist
self.handle_gc_error(gc_control, _('Unable to join group chat'),
- _('Group chat %s does not exist.') % obj.room_jid)
+ _('Group chat <b>%s</b> does not exist.') % obj.room_jid)
elif (obj.errcode == '405') or (obj.errcon == 'not-allowed'):
self.handle_gc_error(gc_control, _('Unable to join group chat'),
_('Group chat creation is restricted.'))
elif (obj.errcode == '406') or (obj.errcon == 'not-acceptable'):
self.handle_gc_error(gc_control, _('Unable to join group chat'),
_('Your registered nickname must be used in group chat '
- '%s.') % obj.room_jid)
+ '<b>%s</b>.') % obj.room_jid)
elif (obj.errcode == '407') or (obj.errcon == \
'registration-required'):
self.handle_gc_error(gc_control, _('Unable to join group chat'),
@@ -346,55 +361,12 @@ class Interface:
gobject.timeout_add_seconds(30,
self.unblock_signed_in_notifications, account_jid)
- else:
- # It isn't an agent
- # Notifications
- obj.show_notif = True
- for c in obj.contact_list:
- if c.resource == resource:
- # we look for other connected resources
- continue
- if c.show not in ('offline', 'error'):
- obj.show_notif = False
- break
- if obj.show_notif:
- # no other resource is connected, let's look in metacontacts
- family = gajim.contacts.get_metacontacts_family(account,
- jid)
- for info in family:
- acct_ = info['account']
- jid_ = info['jid']
- c_ = gajim.contacts.get_contact_with_highest_priority(
- acct_, jid_)
- if not c_:
- continue
- if c_.show not in ('offline', 'error'):
- obj.show_notif = False
- break
- if obj.show_notif:
- if obj.old_show < 2 and obj.new_show > 1:
- notify.notify('contact_connected', jid, account, status)
-
- elif obj.old_show > 1 and obj.new_show < 2:
- notify.notify('contact_disconnected', jid, account, status)
- # Status change (not connected/disconnected or
- # error (<1))
- elif obj.new_show > 1:
- notify.notify('status_change', jid, account, [obj.new_show,
- status])
-
highest = gajim.contacts.get_contact_with_highest_priority(account, jid)
is_highest = (highest and highest.resource == resource)
- # disconnect the session from the ctrl if the highest resource has
- # changed
- if (obj.was_highest and not is_highest) or \
- (not obj.was_highest and is_highest):
- ctrl = self.msg_win_mgr.get_control(jid, account)
- if ctrl:
- ctrl.no_autonegotiation = False
- ctrl.set_session(None)
- ctrl.contact = highest
+ ctrl = self.msg_win_mgr.get_control(jid, account)
+ if ctrl and ctrl.session and ctrl.session.resource == resource:
+ ctrl.remove_session(ctrl.session)
def handle_event_msgerror(self, obj):
#'MSGERROR' (account, (jid, error_code, error_msg, msg, time[session]))
@@ -402,11 +374,6 @@ class Interface:
jids = obj.fjid.split('/', 1)
jid = jids[0]
- if obj.error_code == '503':
- # If we get server-not-found error, stop sending chatstates
- for contact in gajim.contacts.get_contacts(account, jid):
- contact.composing_xep = False
-
session = obj.session
gc_control = self.msg_win_mgr.get_gc_control(jid, account)
@@ -670,6 +637,19 @@ class Interface:
_('You are currently connected without your OpenPGP key.'))
self.forget_gpg_passphrase(obj.keyID)
+ def handle_event_client_cert_passphrase(self, obj):
+ def on_ok(passphrase, checked):
+ obj.conn.on_client_cert_passphrase(passphrase, obj.con, obj.port,
+ obj.secure_tuple)
+
+ def on_cancel():
+ obj.conn.on_client_cert_passphrase('', obj.con, obj.port,
+ obj.secure_tuple)
+
+ dialogs.PassphraseDialog(_('Certificate Passphrase Required'),
+ _('Enter the passphrase for the certificate for account %s') % \
+ obj.conn.name, ok_handler=on_ok, cancel_handler=on_cancel)
+
def handle_event_gpg_password_required(self, obj):
#('GPG_PASSWORD_REQUIRED', account, (callback,))
if obj.keyid in self.gpg_passphrase:
@@ -702,9 +682,9 @@ class Interface:
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)')
+ text += '\n' + _('Gnome Keyring is installed but not '
+ 'correctly started (environment variable probably not '
+ 'correctly set)')
def on_ok(passphrase, save):
if save:
@@ -722,6 +702,30 @@ class Interface:
_('Password Required'), text, _('Save password'), ok_handler=on_ok,
cancel_handler=on_cancel)
+ def handle_oauth2_credentials(self, obj):
+ account = obj.conn.name
+ def on_ok(refresh):
+ gajim.config.set_per('accounts', account, 'oauth2_refresh_token',
+ refresh)
+ st = gajim.config.get_per('accounts', account, 'last_status')
+ msg = helpers.from_one_line(gajim.config.get_per('accounts',
+ account, 'last_status_msg'))
+ gajim.interface.roster.send_status(account, st, msg)
+ del self.pass_dialog[account]
+
+ def on_cancel():
+ gajim.config.set_per('accounts', account, 'oauth2_refresh_token',
+ '')
+ self.roster.set_state(account, 'offline')
+ self.roster.update_status_combobox()
+ del self.pass_dialog[account]
+
+ instruction = _('Please copy / paste the refresh token from the website'
+ ' that has just been opened.')
+ self.pass_dialog[account] = dialogs.InputTextDialog(
+ _('Oauth2 Credentials'), instruction, is_modal=False,
+ ok_handler=on_ok, cancel_handler=on_cancel)
+
def handle_event_roster_info(self, obj):
#('ROSTER_INFO', account, (jid, name, sub, ask, groups))
account = obj.conn.name
@@ -1222,8 +1226,8 @@ class Interface:
f.write(server + '\n')
f.write(obj.cert + '\n\n')
f.close()
- gajim.config.set_per('accounts', account,
- 'ssl_fingerprint_sha1', obj.fingerprint)
+ gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1',
+ obj.fingerprint)
if is_checked[1]:
ignore_ssl_errors = gajim.config.get_per('accounts', account,
'ignore_ssl_errors').split()
@@ -1292,6 +1296,9 @@ class Interface:
# ('PLAIN_CONNECTION', account, (connection))
def on_ok(is_checked):
if not is_checked[0]:
+ if is_checked[1]:
+ gajim.config.set_per('accounts', obj.conn.name,
+ 'action_when_plaintext_connection', 'disconnect')
on_cancel()
return
# On cancel call del self.instances, so don't call it another time
@@ -1300,7 +1307,7 @@ class Interface:
['plain_connection']
if is_checked[1]:
gajim.config.set_per('accounts', obj.conn.name,
- 'warn_when_plaintext_connection', False)
+ 'action_when_plaintext_connection', 'connect')
obj.conn.connection_accepted(obj.xmpp_client, 'plain')
def on_cancel():
@@ -1313,18 +1320,20 @@ class Interface:
pritext = _('Insecure connection')
sectext = _('You are about to connect to the account %(account)s '
'(%(server)s) with an insecure connection. This means all your '
- 'conversations will be exchanged unencrypted. Are you sure you '
- 'want to do that?') % {'account': obj.conn.name,
+ 'conversations will be exchanged unencrypted. This type of '
+ 'connection is really discouraged.\nAre you sure you want to do '
+ 'that?') % {'account': obj.conn.name,
'server': gajim.get_hostname_from_account(obj.conn.name)}
checktext1 = _('Yes, I really want to connect insecurely')
+ tooltip1 = _('Gajim will NOT connect unless you check this box')
checktext2 = _('_Do not ask me again')
if 'plain_connection' in self.instances[obj.conn.name]['online_dialog']:
self.instances[obj.conn.name]['online_dialog']['plain_connection'].\
destroy()
self.instances[obj.conn.name]['online_dialog']['plain_connection'] = \
dialogs.ConfirmationDialogDoubleCheck(pritext, sectext, checktext1,
- checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel,
- is_modal=False)
+ checktext2, tooltip1=tooltip1, on_response_ok=on_ok,
+ on_response_cancel=on_cancel, is_modal=False)
def handle_event_insecure_ssl_connection(self, obj):
# ('INSECURE_SSL_CONNECTION', account, (connection, connection_type))
@@ -1410,13 +1419,13 @@ class Interface:
def create_core_handlers_list(self):
self.handlers = {
- 'ERROR': [self.handle_event_error],
'DB_ERROR': [self.handle_event_db_error],
- 'INFORMATION': [self.handle_event_information],
'FILE_SEND_ERROR': [self.handle_event_file_send_error],
'atom-entry-received': [self.handle_atom_entry],
'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase],
'bookmarks-received': [self.handle_event_bookmarks],
+ 'client-cert-passphrase': [
+ self.handle_event_client_cert_passphrase],
'connection-lost': [self.handle_event_connection_lost],
'failed-decrypt': [(self.handle_event_failed_decrypt, ged.GUI2)],
'file-request-error': [self.handle_event_file_request_error],
@@ -1428,6 +1437,7 @@ class Interface:
'gpg-password-required': [self.handle_event_gpg_password_required],
'gpg-trust-key': [self.handle_event_gpg_trust_key],
'http-auth-received': [self.handle_event_http_auth],
+ 'information': [self.handle_event_information],
'insecure-password': [self.handle_event_insecure_password],
'insecure-ssl-connection': \
[self.handle_event_insecure_ssl_connection],
@@ -1444,6 +1454,7 @@ class Interface:
'metacontacts-received': [self.handle_event_metacontacts],
'muc-admin-received': [self.handle_event_gc_affiliation],
'muc-owner-received': [self.handle_event_gc_config],
+ 'oauth2-credentials-required': [self.handle_oauth2_credentials],
'our-show': [self.handle_event_status],
'password-required': [self.handle_event_password_required],
'plain-connection': [self.handle_event_plain_connection],
@@ -1943,7 +1954,8 @@ class Interface:
Join the room immediately
"""
- if gajim.contacts.get_contact(account, room_jid):
+ if gajim.contacts.get_contact(account, room_jid) and \
+ not gajim.contacts.get_contact(account, room_jid).is_groupchat():
dialogs.ErrorDialog(_('This is not a group chat'),
_('%s is not the name of a group chat.') % room_jid)
return
@@ -1951,11 +1963,17 @@ class Interface:
if not nick:
nick = gajim.nicks[account]
- if self.msg_win_mgr.has_window(room_jid, account) and \
- gajim.gc_connected[account][room_jid]:
- gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
- win = gc_ctrl.parent_win
- win.set_active_tab(gc_ctrl)
+ minimized_control = gajim.interface.minimized_controls[account].get(
+ room_jid, None)
+
+ if (self.msg_win_mgr.has_window(room_jid, account) or \
+ minimized_control) and gajim.gc_connected[account][room_jid]:
+ if self.msg_win_mgr.has_window(room_jid, account):
+ gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
+ win = gc_ctrl.parent_win
+ win.set_active_tab(gc_ctrl)
+ else:
+ self.roster.on_groupchat_maximized(None, room_jid, account)
dialogs.ErrorDialog(_('You are already in group chat %s') % \
room_jid)
return
@@ -1966,9 +1984,6 @@ class Interface:
_('You cannot join a group chat while you are invisible'))
return
- minimized_control = gajim.interface.minimized_controls[account].get(
- room_jid, None)
-
if minimized_control is None and not self.msg_win_mgr.has_window(
room_jid, account):
# Join new groupchat
@@ -1988,10 +2003,6 @@ class Interface:
gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
gc_control.nick = nick
gc_control.parent_win.set_active_tab(gc_control)
- else:
- # We are already in this groupchat and it is minimized
- minimized_control.nick = nick
- self.roster.add_groupchat(room_jid, account)
# Connect
gajim.connections[account].join_gc(nick, room_jid, password)
@@ -2687,6 +2698,18 @@ class Interface:
for o in d:
gajim.config.set_per('themes', theme_name, o,
theme[d.index(o)])
+ # Add Tor proxy if there is not in the config
+ if len(gajim.config.get_per('proxies')) == 0:
+ default = gajim.config.proxies_default
+ for proxy in default:
+ gajim.config.add_per('proxies', proxy)
+ gajim.config.set_per('proxies', proxy, 'type',
+ default[proxy][0])
+ gajim.config.set_per('proxies', proxy, 'host',
+ default[proxy][1])
+ gajim.config.set_per('proxies', proxy, 'port',
+ default[proxy][2])
+
gajim.idlequeue = idlequeue.get_idlequeue()
# resolve and keep current record of resolved hosts
@@ -2759,6 +2782,9 @@ class Interface:
dbus_support.supported:
import network_manager_listener
+ if dbus_support.supported:
+ import upower_listener
+
# Handle gnome screensaver
if dbus_support.supported:
def gnome_screensaver_ActiveChanged_cb(active):
diff --git a/src/gui_menu_builder.py b/src/gui_menu_builder.py
index 8b0a87a6ca2ebd023caeb712ca03e46fe0c00202..440a7668dbdc9987d78d060e5a0e4fbfb9b81710 100644
--- a/src/gui_menu_builder.py
+++ b/src/gui_menu_builder.py
@@ -425,13 +425,17 @@ control=None, gc_contact=None):
revoke_auth_menuitem.connect('activate', roster.revoke_auth, jid,
account)
- else:
+ elif gajim.connections[account].roster_supported:
# contact is in group 'Not in Roster'
add_to_roster_menuitem.set_no_show_all(False)
subscription_menuitem.set_sensitive(False)
add_to_roster_menuitem.connect('activate', roster.on_add_to_roster,
contact, account)
+ else:
+ add_to_roster_menuitem.hide()
+ add_to_roster_menuitem.set_no_show_all(True)
+ subscription_menuitem.set_sensitive(False)
set_custom_avatar_menuitem.connect('activate',
roster.on_set_custom_avatar_activate, contact, account)
diff --git a/src/history_window.py b/src/history_window.py
index 2b03acd1eedf01cf6081591fc146f243e37d66e7..958cae3315b47df7695773eeb4f4d360bbd5a46d 100644
--- a/src/history_window.py
+++ b/src/history_window.py
@@ -83,6 +83,7 @@ class HistoryWindow:
self.query_combobox.set_active(0)
self.results_treeview = xml.get_object('results_treeview')
self.results_window = xml.get_object('results_scrolledwindow')
+ self.search_in_date = xml.get_object('search_in_date')
# contact_name, date, message, time
model = gtk.ListStore(str, str, str, str, str)
@@ -511,9 +512,14 @@ class HistoryWindow:
# This may leed to wrong self nick in the displayed history (Uggh!)
account = gajim.contacts.get_accounts()[0]
+ year, month, day = False, False, False
+ if self.search_in_date.get_active():
+ year, month, day = self.calendar.get_date() # integers
+ month = gtkgui_helpers.make_gtk_month_python_month(month)
+
# contact_name, time, kind, show, message, subject
results = gajim.logger.get_search_results_for_query(
- jid, text, account)
+ jid, text, account, year, month, day)
#FIXME:
# add "subject: | message: " in message column if kind is single
# also do we need show at all? (we do not search on subject)
diff --git a/src/htmltextview.py b/src/htmltextview.py
index b1cf6fb646ff43b990102ad8fef2e1f2ae4d4ab1..3f1b474c11e6b7802f5c7b19f0424e44d193cf4d 100644
--- a/src/htmltextview.py
+++ b/src/htmltextview.py
@@ -41,8 +41,6 @@ import gtk
import xml.sax, xml.sax.handler
import re
from cStringIO import StringIO
-import socket
-import time
import urllib2
import operator
@@ -54,6 +52,7 @@ if __name__ == '__main__':
import gtkgui_helpers
from common import gajim
from gtkgui_helpers import get_icon_pixmap
+from common import helpers
import tooltips
import logging
@@ -76,14 +75,19 @@ classes = {
# styles for elements
element_styles = {
- 'u' : ';text-decoration: underline',
+ 'u' : ';text-decoration: underline',
'em' : ';font-style: oblique',
- 'cite' : '; background-color:rgb(170,190,250); font-style: oblique',
+ 'cite' : '; background-color:rgb(170,190,250);'
+ 'font-style: oblique',
'li' : '; margin-left: 1em; margin-right: 10%',
'strong' : ';font-weight: bold',
- 'pre' : '; background-color:rgb(190,190,190); font-family: monospace; white-space: pre; margin-left: 1em; margin-right: 10%',
- 'kbd' : ';background-color:rgb(210,210,210);font-family: monospace',
- 'blockquote': '; background-color:rgb(170,190,250); margin-left: 2em; margin-right: 10%',
+ 'pre' : '; background-color:rgb(190,190,190);'
+ 'font-family: monospace; white-space: pre;'
+ 'margin-left: 1em; margin-right: 10%',
+ 'kbd' : ';background-color:rgb(210,210,210);'
+ 'font-family: monospace',
+ 'blockquote' : '; background-color:rgb(170,190,250);'
+ 'margin-left: 2em; margin-right: 10%',
'dt' : ';font-weight: bold; font-style: oblique',
'dd' : ';margin-left: 2em; font-style: oblique'
}
@@ -485,62 +489,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
tag.title = title
return tag
- def _get_img(self, attrs):
- '''Download an image. This function is launched in a separate thread.
- '''
- mem, alt = '', ''
- # Wait maximum 5s for connection
- socket.setdefaulttimeout(5)
- try:
- req = urllib2.Request(attrs['src'])
- req.add_header('User-Agent', 'Gajim ' + gajim.version)
- f = urllib2.urlopen(req)
- except Exception, ex:
- log.debug('Error loading image %s ' % attrs['src'] + str(ex))
- pixbuf = None
- alt = attrs.get('alt', 'Broken image')
- else:
- # Wait 0.5s between each byte
- try:
- f.fp._sock.fp._sock.settimeout(0.5)
- except Exception:
- pass
- # Max image size = 2 MB (to try to prevent DoS)
- deadline = time.time() + 3
- while True:
- if time.time() > deadline:
- log.debug(str('Timeout loading image %s ' % \
- attrs['src'] + ex))
- mem = ''
- alt = attrs.get('alt', '')
- if alt:
- alt += '\n'
- alt += _('Timeout loading image')
- break
- try:
- temp = f.read(100)
- except socket.timeout, ex:
- log.debug('Timeout loading image %s ' % \
- attrs['src'] + str(ex))
- alt = attrs.get('alt', '')
- if alt:
- alt += '\n'
- alt += _('Timeout loading image')
- break
- if temp:
- mem += temp
- else:
- break
- if len(mem) > 2*1024*1024:
- alt = attrs.get('alt', '')
- if alt:
- alt += '\n'
- alt += _('Image is too big')
- break
- return (mem, alt)
-
def _update_img(self, (mem, alt), attrs, img_mark):
- '''Callback function called after the function _get_img above.
+ '''Callback function called after the function helpers.download_image.
'''
self._process_img(attrs, (mem, alt, img_mark))
@@ -563,8 +513,9 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
update = True
else:
img_mark = self.textbuf.create_mark(None, self.iter, True)
- gajim.thread_interface(self._get_img, [attrs], \
- self._update_img, [attrs, img_mark])
+ gajim.thread_interface(helpers.download_image, [
+ self.conv_textview.account, attrs], self._update_img,
+ [attrs, img_mark])
alt = attrs.get('alt', '')
if alt:
alt += '\n'
@@ -794,7 +745,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
elif name in ('a', 'img', 'body', 'html'):
pass
elif name in INLINE:
- self._jump_line()
+ pass
else:
log.warning('Unhandled element "%s"' % name)
@@ -830,6 +781,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
elif name in BLOCK:
if name == 'pre':
endPreserving = True
+ elif name in BLOCK_STRUCT:
+ newLine = True
else:
log.warning("Unhandled element '%s'" % name)
self._flush_text()
@@ -838,8 +791,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
if newLine:
self._jump_line()
self._end_span()
- #if not self._starts_line():
- # self.text = ' '
class HtmlTextView(gtk.TextView):
@@ -855,7 +806,8 @@ class HtmlTextView(gtk.TextView):
self.connect('realize', self.on_html_text_view_realized)
self.connect('unrealize', self.on_html_text_view_unrealized)
self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard)
- self.get_buffer().connect_after('mark-set', self.on_text_buffer_mark_set)
+ self.id_ = self.connect('button-release-event',
+ self.on_left_mouse_button_release)
self.get_buffer().create_tag('eol', scale = pango.SCALE_XX_SMALL)
self.tooltip = tooltips.BaseTooltip()
self.config = gajim.config
@@ -939,7 +891,10 @@ class HtmlTextView(gtk.TextView):
self.get_buffer().add_selection_clipboard(self.get_clipboard(
gtk.gdk.SELECTION_PRIMARY))
- def on_text_buffer_mark_set(self, location, mark, unused_data):
+ def on_left_mouse_button_release(self, widget, event):
+ if event.button != 1:
+ return
+
bounds = self.get_buffer().get_selection_bounds()
if bounds:
# textview can be hidden while we add a new line in it.
@@ -979,6 +934,12 @@ if __name__ == '__main__':
log = logging.getLogger()
gaj.Interface()
+ # create fake gajim.plugin_manager.gui_extension_point method for tests
+ def gui_extension_point(*args):
+ pass
+ gajim.plugin_manager = gaj.Interface()
+ gajim.plugin_manager.gui_extension_point = gui_extension_point
+
htmlview = ConversationTextview(None)
path = gtkgui_helpers.get_icon_path('gajim-muc_separator')
diff --git a/src/message_control.py b/src/message_control.py
index d265e57687b72ff2dfa68b3648fd82bcd7345596..be94ab3ddf694a8e76eb59a27aaddd3f95170c0c 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -46,7 +46,8 @@ class MessageControl(object):
MessageWindow
"""
- def __init__(self, type_id, parent_win, widget_name, contact, account, resource = None):
+ def __init__(self, type_id, parent_win, widget_name, contact, account,
+ resource=None):
# dict { cb id : widget}
# keep all registered callbacks of widgets, created by self.xml
self.handlers = {}
@@ -59,6 +60,7 @@ class MessageControl(object):
self.resource = resource
self.session = None
+ self.other_sessions = []
gajim.last_message_time[self.account][self.get_full_jid()] = 0
@@ -201,15 +203,15 @@ class MessageControl(object):
if oldsession:
oldsession.control = None
+ self.other_sessions.append(oldsession)
- jid = self.contact.jid
- if self.resource:
- jid += '/' + self.resource
+ if self.session in self.other_sessions:
+ self.other_sessions.remove(self.session)
crypto_changed = bool(session and isinstance(session,
- EncryptedStanzaSession) and session.enable_encryption) != \
- bool(oldsession and isinstance(oldsession,
- EncryptedStanzaSession) and oldsession.enable_encryption)
+ EncryptedStanzaSession) and session.enable_encryption) != \
+ bool(oldsession and isinstance(oldsession, EncryptedStanzaSession) \
+ and oldsession.enable_encryption)
archiving_changed = bool(session and isinstance(session,
ArchivingStanzaSession) and session.archiving) != \
@@ -217,14 +219,23 @@ class MessageControl(object):
ArchivingStanzaSession) and oldsession.archiving)
if crypto_changed or archiving_changed:
- self.print_session_details()
+ self.print_session_details(oldsession)
+
+ def remove_session(self, session):
+ if session != self.session:
+ return
+ last_session = None
+ if self.other_sessions:
+ last_session = self.other_sessions.pop(0)
+ if session not in self.other_sessions:
+ self.other_sessions.append(session)
+ if last_session:
+ self.session = last_session
def _nec_message_outgoing(self, obj):
# Send the given message to the active tab.
# Doesn't return None if error
- if obj.account != self.account:
- return
- if self.contact.jid != obj.jid:
+ if obj.control != self:
return
obj.message = helpers.remove_invalid_xml_chars(obj.message)
diff --git a/src/message_window.py b/src/message_window.py
index 37eb67b5ae31821ed55495fc348b76166f559309..eeae4bbcd10e2f8a985f4b3e21f1a2bd9174203d 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -1087,6 +1087,26 @@ class MessageWindowMgr(gobject.GObject):
return win.get_control(jid, acct)
return None
+ def search_control(self, jid, account, resource=None):
+ """
+ Search windows with this policy:
+ 1. try to find already opened tab for resource
+ 2. find the tab for this jid with ctrl.resource not set
+ 3. there is none
+ """
+ fjid = jid
+ if resource:
+ fjid += '/' + resource
+ ctrl = self.get_control(fjid, account)
+ if ctrl:
+ return ctrl
+ win = self.get_window(jid, account)
+ if win:
+ ctrl = win.get_control(jid, account)
+ if not ctrl.resource and ctrl.type_id != message_control.TYPE_GC:
+ return ctrl
+ return None
+
def get_gc_control(self, jid, acct):
"""
Same as get_control. Was briefly required, is not any more. May be useful
diff --git a/src/notify.py b/src/notify.py
index ae95f70cce1b88b3ab34bc782acc1c962602a430..1f6eada51cc1cd3cd32405394e76ca89f5754e17 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -72,169 +72,6 @@ def get_show_in_systray(event, account, contact, type_=None):
return False
return gajim.config.get('trayicon_notification_on_events')
-def notify(event, jid, account, parameters):
- """
- Check what type of notifications we want, depending on basic and the
- advanced configuration of notifications and do these notifications;
- """
- # First, find what notifications we want
- do_popup = False
- do_sound = False
- do_cmd = False
- if event == 'status_change':
- new_show = parameters[0]
- status_message = parameters[1]
- # Default: No popup for status change
- elif event == 'contact_connected':
- status_message = parameters
- j = gajim.get_jid_without_resource(jid)
- server = gajim.get_server_from_jid(j)
- account_server = account + '/' + server
- block_transport = False
- if account_server in gajim.block_signed_in_notifications and \
- gajim.block_signed_in_notifications[account_server]:
- block_transport = True
- if helpers.allow_showing_notification(account, 'notify_on_signin') and \
- not gajim.block_signed_in_notifications[account] and \
- not block_transport:
- do_popup = True
- if gajim.config.get_per('soundevents', 'contact_connected',
- 'enabled') and not gajim.block_signed_in_notifications[account] and \
- not block_transport and helpers.allow_sound_notification(account,
- event):
- do_sound = True
- elif event == 'contact_disconnected':
- status_message = parameters
- if helpers.allow_showing_notification(account, 'notify_on_signout'):
- do_popup = True
- if gajim.config.get_per('soundevents', 'contact_disconnected',
- 'enabled') and helpers.allow_sound_notification(account, event):
- do_sound = True
- elif event == 'new_message':
- message_type = parameters[0]
- is_first_message = parameters[1]
- nickname = parameters[2]
- if gajim.config.get('notification_preview_message'):
- message = parameters[3]
- if message.startswith('/me ') or message.startswith('/me\n'):
- message = '* ' + nickname + message[3:]
- else:
- # We don't want message preview, do_preview = False
- message = ''
- focused = parameters[4]
- if helpers.allow_showing_notification(account, 'notify_on_new_message',
- is_first_message):
- do_popup = True
- if is_first_message and helpers.allow_sound_notification(account,
- 'first_message_received'):
- do_sound = True
- elif not is_first_message and focused and \
- helpers.allow_sound_notification(account,
- 'next_message_received_focused'):
- do_sound = True
- elif not is_first_message and not focused and \
- helpers.allow_sound_notification(account,
- 'next_message_received_unfocused'):
- do_sound = True
- else:
- print '*Event not implemeted yet*'
-
- # Do the wanted notifications
- if do_popup:
- if event in ('contact_connected', 'contact_disconnected',
- 'status_change'): # Common code for popup for these three events
- if event == 'contact_disconnected':
- show_image = 'offline.png'
- suffix = '_notif_size_bw'
- else: # Status Change or Connected
- # FIXME: for status change,
- # we don't always 'online.png', but we
- # first need 48x48 for all status
- show_image = 'online.png'
- suffix = '_notif_size_colored'
- transport_name = gajim.get_transport_name_from_jid(jid)
- img_path = None
- if transport_name:
- img_path = os.path.join(helpers.get_transport_path(
- transport_name), '48x48', show_image)
- if not img_path or not os.path.isfile(img_path):
- iconset = gajim.config.get('iconset')
- img_path = os.path.join(helpers.get_iconset_path(iconset),
- '48x48', show_image)
- path = gtkgui_helpers.get_path_to_generic_or_avatar(img_path,
- jid=jid, suffix=suffix)
- if event == 'status_change':
- title = _('%(nick)s Changed Status') % \
- {'nick': gajim.get_name_from_jid(account, jid)}
- text = _('%(nick)s is now %(status)s') % \
- {'nick': gajim.get_name_from_jid(account, jid),\
- 'status': helpers.get_uf_show(gajim.SHOW_LIST[new_show])}
- if status_message:
- text = text + " : " + status_message
- popup(_('Contact Changed Status'), jid, account,
- path_to_image=path, title=title, text=text)
- elif event == 'contact_connected':
- title = _('%(nickname)s Signed In') % \
- {'nickname': gajim.get_name_from_jid(account, jid)}
- text = ''
- if status_message:
- text = status_message
- popup(_('Contact Signed In'), jid, account,
- path_to_image=path, title=title, text=text)
- elif event == 'contact_disconnected':
- title = _('%(nickname)s Signed Out') % \
- {'nickname': gajim.get_name_from_jid(account, jid)}
- text = ''
- if status_message:
- text = status_message
- popup(_('Contact Signed Out'), jid, account,
- path_to_image=path, title=title, text=text)
- elif event == 'new_message':
- if message_type == 'normal': # single message
- event_type = _('New Single Message')
- img_name = 'gajim-single_msg_recv'
- title = _('New Single Message from %(nickname)s') % \
- {'nickname': nickname}
- text = message
- elif message_type == 'pm': # private message
- event_type = _('New Private Message')
- room_name = gajim.get_nick_from_jid(jid)
- img_name = 'gajim-priv_msg_recv'
- title = _('New Private Message from group chat %s') % room_name
- if message:
- text = _('%(nickname)s: %(message)s') % \
- {'nickname': nickname, 'message': message}
- else:
- text = _('Messaged by %(nickname)s') % \
- {'nickname': nickname}
-
- else: # chat message
- event_type = _('New Message')
- img_name = 'gajim-chat_msg_recv'
- title = _('New Message from %(nickname)s') % \
- {'nickname': nickname}
- text = message
- img_path = gtkgui_helpers.get_icon_path(img_name, 48)
- popup(event_type, jid, account, message_type,
- path_to_image=img_path, title=title, text=text)
-
- if do_sound:
- snd_file = None
- snd_event = None # If not snd_file, play the event
- if event == 'new_message':
- if is_first_message:
- snd_event = 'first_message_received'
- elif focused:
- snd_event = 'next_message_received_focused'
- else:
- snd_event = 'next_message_received_unfocused'
- elif event in ('contact_connected', 'contact_disconnected'):
- snd_event = event
- if snd_file:
- helpers.play_sound_file(snd_file)
- if snd_event:
- helpers.play_sound(snd_event)
-
def popup(event_type, jid, account, msg_type='', path_to_image=None, title=None,
text=None):
"""
@@ -330,7 +167,7 @@ class Notification:
if obj.do_command:
try:
- helpers.exec_command(obj.command)
+ helpers.exec_command(obj.command, use_shell=True)
except Exception:
pass
@@ -355,11 +192,14 @@ class NotificationResponseManager:
self.interface.connect_to_signal('NotificationClosed', self.on_closed)
def on_action_invoked(self, id_, reason):
- self.received.append((id_, time.time(), reason))
if id_ in self.pending:
notification = self.pending[id_]
notification.on_action_invoked(id_, reason)
del self.pending[id_]
+ return
+ # got an action on popup that isn't handled yet? Maybe user clicked too
+ # fast. Remember it.
+ self.received.append((id_, time.time(), reason))
if len(self.received) > 20:
curt = time.time()
for rec in self.received:
@@ -396,7 +236,7 @@ class DesktopNotification:
def __init__(self, event_type, jid, account, msg_type='',
path_to_image=None, title=None, text=None):
- self.path_to_image = path_to_image
+ self.path_to_image = os.path.abspath(path_to_image)
self.event_type = event_type
self.title = title
self.text = text
@@ -527,10 +367,11 @@ class DesktopNotification:
# it seems notification-daemon doesn't like empty text
if self.text:
text = self.text
+ if len(self.text) > 200:
+ text = '%s\n...' % self.text[:200]
else:
text = ' '
if os.environ.get('KDE_FULL_SESSION') == 'true':
- self.path_to_image = os.path.abspath(self.path_to_image)
text = '<table style=\'padding: 3px\'><tr><td>' \
'<img src=\"%s\"></td><td width=20> </td>' \
'<td>%s</td></tr></table>' % (self.path_to_image,
@@ -573,9 +414,8 @@ class DesktopNotification:
self.notify_another_way(e)
def attach_by_id(self, id_):
- self.id = id_
notification_response_manager.attach_to_interface()
- notification_response_manager.add_pending(self.id, self)
+ notification_response_manager.add_pending(id_, self)
def notify_another_way(self, e):
gajim.log.debug('Error when trying to use notification daemon: %s' % \
diff --git a/src/plugins/gui.py b/src/plugins/gui.py
index d095b3da336ff38639f55bf66018492855180f11..8263ad74c503dd4603b513615011ff3c1ffdf606 100644
--- a/src/plugins/gui.py
+++ b/src/plugins/gui.py
@@ -62,6 +62,7 @@ class PluginsWindow(object):
self.installed_plugins_model = gtk.ListStore(gobject.TYPE_PYOBJECT,
gobject.TYPE_STRING, gobject.TYPE_BOOLEAN)
self.installed_plugins_treeview.set_model(self.installed_plugins_model)
+ self.installed_plugins_treeview.set_rules_hint(True)
renderer = gtk.CellRendererText()
col = gtk.TreeViewColumn(_('Plugin'), renderer, text=1)
@@ -113,7 +114,8 @@ class PluginsWindow(object):
self.plugin_homepage_linkbutton.set_property('sensitive', True)
desc_textbuffer = self.plugin_description_textview.get_buffer()
- desc_textbuffer.set_text(plugin.description)
+ from plugins.plugins_i18n import _
+ desc_textbuffer.set_text(_(plugin.description))
self.plugin_description_textview.set_property('sensitive', True)
self.uninstall_plugin_button.set_property('sensitive',
gajim.PLUGINS_DIRS[1] in plugin.__path__)
diff --git a/src/plugins/plugin.py b/src/plugins/plugin.py
index 198089ca074afc44b7188b69ad2355ac5436c598..8c5856c07018be20af092ab945841e33c964eef7 100644
--- a/src/plugins/plugin.py
+++ b/src/plugins/plugin.py
@@ -32,6 +32,9 @@ from common import gajim
from plugins.helpers import log_calls, log
from plugins.gui import GajimPluginConfigDialog
+import logging
+log = logging.getLogger('gajim.p.plugin')
+
class GajimPlugin(object):
'''
@@ -191,18 +194,16 @@ class GajimPlugin(object):
def deactivate(self):
pass
-import shelve
-import UserDict
+import cPickle
-class GajimPluginConfig(UserDict.DictMixin):
+class GajimPluginConfig():
@log_calls('GajimPluginConfig')
def __init__(self, plugin):
self.plugin = plugin
self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR,
self.plugin.short_name).decode('utf-8').encode(
locale.getpreferredencoding())
- #log.debug('FILE_PATH = %s'%(self.FILE_PATH))
- self.data = None
+ self.data = {}
@log_calls('GajimPluginConfig')
def __getitem__(self, key):
@@ -222,17 +223,55 @@ class GajimPluginConfig(UserDict.DictMixin):
del self.data[key]
self.save()
+ @log_calls('GajimPluginConfig')
+ def __contains__(self, key):
+ return key in self.data
+
+ def __iter__(self):
+ for k in self.data.keys():
+ yield k
+
def keys(self):
return self.data.keys()
+ def items(self):
+ return self.data.items()
+
@log_calls('GajimPluginConfig')
def save(self):
- self.data.sync()
- #log.debug(str(self.data))
+ fd = open(self.FILE_PATH, 'wb')
+ cPickle.dump(self.data, fd)
+ fd.close()
@log_calls('GajimPluginConfig')
def load(self):
- self.data = shelve.open(self.FILE_PATH)
+ if os.path.isfile(self.FILE_PATH):
+ fd = open(self.FILE_PATH, 'rb')
+ try:
+ self.data = cPickle.load(fd)
+ fd.close()
+ except:
+ fd.close()
+ try:
+ import shelve
+ s = shelve.open(self.FILE_PATH)
+ for (k, v) in s.iteritems():
+ self.data[k] = v
+ s.close()
+ self.save()
+ except:
+ log.warn('%s plugin config file not readable. Saving it as '
+ '%s and creating a new one' % (self.plugin.short_name,
+ self.FILE_PATH + '.bak'))
+ if os.path.exists(self.FILE_PATH + '.bak'):
+ os.remove(self.FILE_PATH + '.bak')
+ os.rename(self.FILE_PATH, self.FILE_PATH + '.bak')
+ self.data = {}
+ self.save()
+ else:
+ self.data = {}
+ self.save()
+
class GajimPluginException(Exception):
pass
diff --git a/src/plugins/pluginmanager.py b/src/plugins/pluginmanager.py
index f80e5f99171bd38bf1d44e9ab3a41d9a2b689d1b..875c6435614d9482f419cf55ba44e8960007e58f 100644
--- a/src/plugins/pluginmanager.py
+++ b/src/plugins/pluginmanager.py
@@ -143,6 +143,13 @@ class PluginManager(object):
for plugin_class in plugin_classes:
self.add_plugin(plugin_class)
+ @log_calls('PluginManager')
+ def get_active_plugin(self, plugin_name):
+ for plugin in self.active_plugins:
+ if plugin.short_name == plugin_name:
+ return plugin
+ return None
+
@log_calls('PluginManager')
def gui_extension_point(self, gui_extpoint_name, *args):
'''
@@ -208,9 +215,13 @@ class PluginManager(object):
extension point name) to identify element to be removed.
:type args: tuple
'''
-
if gui_extpoint_name in self.gui_extension_points:
- self.gui_extension_points[gui_extpoint_name].remove(args)
+ extension_points = list(self.gui_extension_points[gui_extpoint_name])
+ for ext_point in extension_points:
+ if args[0] in ext_point:
+ self.gui_extension_points[gui_extpoint_name].remove(
+ ext_point)
+
@log_calls('PluginManager')
def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args):
@@ -393,6 +404,7 @@ class PluginManager(object):
:todo: add scanning packages
:todo: add scanning zipped modules
'''
+ from plugins.plugins_i18n import _
plugins_found = []
conf = ConfigParser.ConfigParser()
fields = ('name', 'short_name', 'version', 'description', 'authors',
@@ -414,9 +426,9 @@ class PluginManager(object):
try:
module = __import__(module_name)
except ValueError, value_error:
- pass
+ log.debug(value_error)
except ImportError, import_error:
- pass
+ log.debug(import_error)
elif os.path.isdir(file_path) and scan_dirs:
module_name = elem_name
@@ -424,9 +436,9 @@ class PluginManager(object):
try:
module = __import__(module_name)
except ValueError, value_error:
- pass
+ log.debug(value_error)
except ImportError, import_error:
- pass
+ log.debug(import_error)
if module is None:
@@ -462,11 +474,20 @@ class PluginManager(object):
plugins_found.append(module_attr)
except TypeError, type_error:
- pass
+ # set plugin localization
+ module_attr._ = _
except ConfigParser.NoOptionError, type_error:
# all fields are required
log.debug('%s : %s' % (module_attr_name,
'wrong manifest file. all fields are required!'))
+ except ConfigParser.NoSectionError, type_error:
+ # info section are required
+ log.debug('%s : %s' % (module_attr_name,
+ 'wrong manifest file. info section are required!'))
+ except ConfigParser.MissingSectionHeaderError, type_error:
+ # info section are required
+ log.debug('%s : %s' % (module_attr_name,
+ 'wrong manifest file. section are required!'))
return plugins_found
@@ -540,7 +561,7 @@ class PluginManager(object):
self.plugins.remove(plugin)
if self._plugin_has_entry_in_global_config(plugin):
self._remove_plugin_entry_in_global_config(plugin)
- del sys.modules[plugin.__module__.split('.')[-1]]
+ del sys.modules[plugin.__module__.split('.')[0]]
del plugin.__module__.split('.')[-1]
del plugin
diff --git a/src/plugins/plugins_i18n.py b/src/plugins/plugins_i18n.py
new file mode 100644
index 0000000000000000000000000000000000000000..769d8b06031b45a28291ef1c4b51212a2afc98e6
--- /dev/null
+++ b/src/plugins/plugins_i18n.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+#
+## src/plugins/plugin_installer/plugins_i18n.py
+##
+## Copyright (C) 2010-2011 Denis Fomin <fominde AT gmail.com>
+##
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+##
+import locale
+import gettext
+from os import path as os_path
+import os
+from common import gajim
+
+APP = 'gajim_plugins'
+plugins_locale_dir = os_path.join(gajim.PLUGINS_DIRS[1], 'locale')
+
+if os.name != 'nt':
+ locale.setlocale(locale.LC_ALL, '')
+ locale.bindtextdomain(APP, plugins_locale_dir)
+ gettext.bindtextdomain(APP, plugins_locale_dir)
+ gettext.textdomain(APP)
+
+try:
+ t = gettext.translation(APP, plugins_locale_dir)
+ _ = t.gettext
+except IOError, msg:
+ from common import i18n
+ _ = gettext.gettext
diff --git a/src/remote_control.py b/src/remote_control.py
index 7f47b94c3051eb051fe93edc01db079701bbeea5..3f6a8b468aabb444f7c1a672dc98f99f4f221902 100644
--- a/src/remote_control.py
+++ b/src/remote_control.py
@@ -138,8 +138,7 @@ class Remote:
def on_chatstate_received(self, obj):
self.raise_signal('ChatState', (obj.conn.name, [
- obj.jid, obj.fjid, obj.stanza, obj.resource, obj.composing_xep,
- obj.chatstate]))
+ obj.jid, obj.fjid, obj.stanza, obj.resource, obj.chatstate]))
def on_message_sent(self, obj):
try:
@@ -433,7 +432,18 @@ class SignalObject(dbus.service.Object):
connected_account, contact = self._get_account_and_contact(account, jid)
if connected_account:
connection = gajim.connections[connected_account]
- connection.send_message(jid, message, keyID, type_, subject)
+ sessions = connection.get_sessions(jid)
+ if sessions:
+ session = sessions[0]
+ else:
+ session = connection.make_new_session(jid)
+ ctrl = gajim.interface.msg_win_mgr.search_control(jid,
+ connected_account)
+ if ctrl:
+ ctrl.print_conversation(message, frm='outgoing')
+
+ connection.send_message(jid, message, keyID, type_, subject,
+ session=session)
return DBUS_BOOLEAN(True)
return DBUS_BOOLEAN(False)
@@ -594,7 +604,10 @@ class SignalObject(dbus.service.Object):
Show the window(s) with next pending event in tabbed/group chats
"""
if gajim.events.get_nb_events():
- gajim.interface.systray.handle_first_event()
+ account, jid, event = gajim.events.get_first_systray_event()
+ if not event:
+ return
+ gajim.interface.handle_event(account, jid, event.type_)
@dbus.service.method(INTERFACE, in_signature='s', out_signature='a{sv}')
def contact_info(self, jid):
diff --git a/src/roster_window.py b/src/roster_window.py
index 8cbf6d0904c4b6ebf2a393bc56164374bac830b1..1bd218a5322b6024bf8a30b20d2e05e50aea3c72 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1450,6 +1450,11 @@ class RosterWindow:
self.tree.scroll_to_cell(path)
self.tree.set_cursor(path)
+ def _readjust_expand_collapse_state(self):
+ for account in gajim.connections:
+ self._adjust_account_expand_collapse_state(account)
+ for group in gajim.groups[account]:
+ self._adjust_group_expand_collapse_state(group, account)
def _adjust_account_expand_collapse_state(self, account):
"""
@@ -1495,11 +1500,6 @@ class RosterWindow:
### Roster and Modelfilter handling
##############################################################################
- def _search_roster_func(self, model, column, key, titer):
- key = key.decode('utf-8').lower()
- name = model[titer][C_NAME].decode('utf-8').lower()
- return not (key in name)
-
def refilter_shown_roster_items(self):
self.filtering = True
self.modelfilter.refilter()
@@ -1520,6 +1520,8 @@ class RosterWindow:
return False
def contact_is_visible(self, contact, account):
+ if self.rfilter_enabled:
+ return self.rfilter_string in contact.get_shown_name().lower()
if self.contact_has_pending_roster_events(contact, account):
return True
@@ -1561,9 +1563,17 @@ class RosterWindow:
accounts = [account]
for _acc in accounts:
for contact in gajim.contacts.iter_contacts(_acc):
- if group in contact.get_shown_groups() and \
- self.contact_has_pending_roster_events(contact, _acc):
- return True
+ if group in contact.get_shown_groups():
+ if self.rfilter_enabled:
+ if self.rfilter_string in \
+ contact.get_shown_name().lower():
+ return True
+ elif self.contact_has_pending_roster_events(contact,
+ _acc):
+ return True
+ if self.rfilter_enabled:
+ # No transport has been found
+ return False
return gajim.config.get('show_transports_group') and \
(gajim.account_is_connected(account) or \
gajim.config.get('showoffline'))
@@ -1615,12 +1625,16 @@ class RosterWindow:
account, jid)
return self.contact_is_visible(contact, account)
if type_ == 'agent':
+ if self.rfilter_enabled:
+ return self.rfilter_string in model[titer][C_NAME].lower()
contact = gajim.contacts.get_contact_with_highest_priority(account,
jid)
return self.contact_has_pending_roster_events(contact, account) or \
(gajim.config.get('show_transports_group') and \
(gajim.account_is_connected(account) or \
gajim.config.get('showoffline')))
+ if type_ == 'groupchat' and self.rfilter_enabled:
+ return self.rfilter_string in model[titer][C_NAME].lower()
return True
def _compareIters(self, model, iter1, iter2, data=None):
@@ -1641,7 +1655,11 @@ class RosterWindow:
return 1
if type1 == 'group':
name1 = model[iter1][C_JID]
+ if name1:
+ name1 = name1.decode('utf-8')
name2 = model[iter2][C_JID]
+ if name2:
+ name2 = name2.decode('utf-8')
if name1 == _('Transports'):
return 1
if name2 == _('Transports'):
@@ -2091,11 +2109,6 @@ class RosterWindow:
if gajim.gc_connected[account][gc_control.room_jid]:
gajim.connections[account].send_gc_status(
gc_control.nick, gc_control.room_jid, status, txt)
- else:
- # for some reason, we are not connected to the room even
- # if tab is opened, send initial join_gc()
- gajim.connections[account].join_gc(gc_control.nick,
- gc_control.room_jid, None)
if was_invisible and status != 'offline':
# We come back from invisible, join bookmarks
gajim.interface.auto_join_bookmarks(account)
@@ -2315,9 +2328,9 @@ class RosterWindow:
"""
Main window X button was clicked
"""
- if gajim.interface.systray_enabled and not gajim.config.get(
- 'quit_on_roster_x_button') and gajim.config.get('trayicon') != \
- 'on_event':
+ if not gajim.config.get('quit_on_roster_x_button') and (
+ (gajim.interface.systray_enabled and gajim.config.get('trayicon') != \
+ 'on_event') or gajim.config.get('allow_hide_roster')):
self.tooltip.hide_tooltip()
if gajim.config.get('save-roster-position'):
x, y = self.window.get_position()
@@ -2397,13 +2410,15 @@ class RosterWindow:
self.quit_on_next_offline += 1
accounts_to_disconnect.append(acct)
+ if not self.quit_on_next_offline:
+ # all accounts offline, quit
+ self.quit_gtkgui_interface()
+ return
+
for acct in accounts_to_disconnect:
self.send_status(acct, 'offline', message)
self.send_pep(acct, pep_dict)
- if not self.quit_on_next_offline:
- self.quit_gtkgui_interface()
-
def on_continue2(message, pep_dict):
# check if there is an active file transfer
from common.protocol.bytestream import (is_transfer_active)
@@ -2497,6 +2512,15 @@ class RosterWindow:
if obj.contact:
self.chg_contact_status(obj.contact, obj.show, obj.status, account)
+ if obj.popup:
+ ctrl = gajim.interface.msg_win_mgr.search_control(jid, account)
+ if ctrl:
+ gobject.idle_add(ctrl.parent_win.set_active_tab, ctrl)
+ else:
+ ctrl = gajim.interface.new_chat(obj.contact, account)
+ if len(gajim.events.get_events(account, obj.jid)):
+ ctrl.read_queue()
+
def _nec_gc_presence_received(self, obj):
account = obj.conn.name
if obj.room_jid in gajim.interface.minimized_controls[account]:
@@ -2583,21 +2607,20 @@ class RosterWindow:
typ = ''
if obj.mtype == 'error':
typ = 'error'
+ if obj.forwarded and obj.sent:
+ typ = 'out'
obj.session.control.print_conversation(obj.msgtxt, typ,
- tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject,
- xhtml=obj.xhtml, displaymarking=obj.displaymarking)
+ tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject,
+ xhtml=obj.xhtml, displaymarking=obj.displaymarking)
if obj.msg_id:
gajim.logger.set_read_messages([obj.msg_id])
elif obj.popup:
- if not obj.session.control:
- contact = gajim.contacts.get_contact(obj.conn.name, obj.jid,
- obj.resource_for_chat)
- obj.session.control = gajim.interface.new_chat(contact,
- obj.conn.name, resource=obj.resource_for_chat,
- session=obj.session)
- if len(gajim.events.get_events(obj.conn.name, obj.fjid)):
- obj.session.control.read_queue()
+ contact = gajim.contacts.get_contact(obj.conn.name, obj.jid)
+ obj.session.control = gajim.interface.new_chat(contact,
+ obj.conn.name, session=obj.session)
+ if len(gajim.events.get_events(obj.conn.name, obj.fjid)):
+ obj.session.control.read_queue()
if obj.show_in_roster:
self.draw_contact(obj.jid, obj.conn.name)
@@ -3335,7 +3358,10 @@ class RosterWindow:
"""
self.tooltip.hide_tooltip()
if event.keyval == gtk.keysyms.Escape:
- self.tree.get_selection().unselect_all()
+ if self.rfilter_enabled:
+ self.disable_rfilter()
+ else:
+ self.tree.get_selection().unselect_all()
elif event.keyval == gtk.keysyms.F2:
treeselection = self.tree.get_selection()
model, list_of_paths = treeselection.get_selected_rows()
@@ -3372,6 +3398,10 @@ class RosterWindow:
elif type_ == 'agent':
self.on_remove_agent(widget, list_)
+ elif gtk.gdk.keyval_to_unicode(event.keyval): # if we got unicode symbol
+ num = gtk.gdk.keyval_to_unicode(event.keyval)
+ self.enable_rfilter(unichr(num))
+
def on_roster_treeview_button_release_event(self, widget, event):
try:
path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0]
@@ -3873,14 +3903,19 @@ class RosterWindow:
def on_roster_window_key_press_event(self, widget, event):
if event.keyval == gtk.keysyms.Escape:
+ if self.rfilter_enabled:
+ self.disable_rfilter()
+ return
if gajim.interface.msg_win_mgr.mode == \
MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER and \
gajim.interface.msg_win_mgr.one_window_opened():
# let message window close the tab
return
list_of_paths = self.tree.get_selection().get_selected_rows()[1]
- if not len(list_of_paths) and gajim.interface.systray_enabled and \
- not gajim.config.get('quit_on_roster_x_button'):
+ if not len(list_of_paths) and not gajim.config.get(
+ 'quit_on_roster_x_button') and ((gajim.interface.systray_enabled and\
+ gajim.config.get('trayicon') == 'always') or gajim.config.get(
+ 'allow_hide_roster')):
self.tooltip.hide_tooltip()
self.window.hide()
elif event.state & gtk.gdk.CONTROL_MASK and event.keyval == \
@@ -4007,6 +4042,8 @@ class RosterWindow:
group = model[titer][C_JID].decode('utf-8')
child_model[child_iter][C_IMG] = \
gajim.interface.jabber_state_images['16']['opened']
+ if self.rfilter_enabled:
+ return
for account in accounts:
if group in gajim.groups[account]: # This account has this group
gajim.groups[account][group]['expand'] = True
@@ -4068,6 +4105,8 @@ class RosterWindow:
if type_ == 'group':
child_model[child_iter][C_IMG] = gajim.interface.\
jabber_state_images['16']['closed']
+ if self.rfilter_enabled:
+ return
group = model[titer][C_JID].decode('utf-8')
for account in accounts:
if group in gajim.groups[account]: # This account has this group
@@ -4218,25 +4257,56 @@ class RosterWindow:
""" When we update the content of the filter """
self.rfilter_string = widget.get_text().lower()
if self.rfilter_string == '':
- self.rfilter_enabled = False
- else:
- self.rfilter_enabled = True
+ self.disable_rfilter()
self.refilter_shown_roster_items()
+ # select first row
+ self.tree.get_selection().unselect_all()
+ def _func(model, path, iter_):
+ if model[iter_][C_TYPE] == 'contact' and self.rfilter_string in \
+ model[iter_][C_NAME].lower():
+ col = self.tree.get_column(0)
+ self.tree.set_cursor_on_cell(path, col)
+ return True
+ self.modelfilter.foreach(_func)
def on_rfilter_entry_icon_press(self, widget, icon, event):
- """ Disable the roster filtering by clicking the icon in the textEntry """
- self.xml.get_object('show_rfilter_menuitem').set_active(False)
- self.rfilter_enabled = False
- self.refilter_shown_roster_items()
+ """
+ Disable the roster filtering by clicking the icon in the textEntry
+ """
+ self.disable_rfilter()
- def on_show_rfilter_menuitem_toggled(self, widget):
- """ Show the roster filter entry """
- self.rfilter_enabled = widget.get_active()
- self.rfilter_entry.set_visible(self.rfilter_enabled)
- self.rfilter_entry.set_editable(self.rfilter_enabled)
+ def on_rfilter_entry_key_press_event(self, widget, event):
+ if event.keyval == gtk.keysyms.Escape:
+ self.disable_rfilter()
+ elif event.keyval == gtk.keysyms.Return:
+ self.tree.grab_focus()
+ self.tree.emit('key_press_event', event)
+ self.disable_rfilter()
+ elif event.keyval in (gtk.keysyms.Up, gtk.keysyms.Down):
+ self.tree.grab_focus()
+ self.tree.emit('key_press_event', event)
+
+ def enable_rfilter(self, search_string):
if self.rfilter_enabled:
- self.rfilter_entry.set_text('')
- self.rfilter_entry.grab_focus()
+ self.rfilter_entry.set_text(self.rfilter_entry.get_text() + \
+ search_string)
+ else:
+ self.rfilter_enabled = True
+ self.rfilter_entry.set_text(search_string)
+ self.tree.expand_all()
+ self.rfilter_entry.set_visible(True)
+ self.rfilter_entry.set_editable(True)
+ self.rfilter_entry.grab_focus()
+ self.rfilter_entry.set_position(-1)
+
+ def disable_rfilter(self):
+ self.rfilter_enabled = False
+ self.rfilter_entry.set_text('')
+ self.rfilter_entry.set_visible(False)
+ self.rfilter_entry.set_editable(False)
+ self.refilter_shown_roster_items()
+ self.tree.grab_focus()
+ self._readjust_expand_collapse_state()
def on_roster_hpaned_notify(self, pane, gparamspec):
"""
@@ -5391,8 +5461,11 @@ class RosterWindow:
edit_account_menuitem.connect('activate', self.on_edit_account,
account)
- add_contact_menuitem.connect('activate', self.on_add_new_contact,
- account)
+ if gajim.connections[account].roster_supported:
+ add_contact_menuitem.connect('activate',
+ self.on_add_new_contact, account)
+ else:
+ add_contact_menuitem.set_sensitive(False)
service_discovery_menuitem.connect('activate',
self.on_service_disco_menuitem_activate, account)
hostname = gajim.config.get_per('accounts', account, 'hostname')
@@ -6357,9 +6430,6 @@ class RosterWindow:
col.set_visible(False)
self.tree.set_expander_column(col)
- # set search function
- self.tree.set_search_equal_func(self._search_roster_func)
-
# signals
self.TARGET_TYPE_URI_LIST = 80
TARGETS = [('MY_TREE_MODEL_ROW',
@@ -6426,6 +6496,8 @@ class RosterWindow:
self.rfilter_entry = self.xml.get_object('rfilter_entry')
self.rfilter_string = ''
self.rfilter_enabled = False
+ self.rfilter_entry.connect('key-press-event',
+ self.on_rfilter_entry_key_press_event)
gajim.ged.register_event_handler('presence-received', ged.GUI1,
self._nec_presence_received)
diff --git a/src/secrets.py b/src/secrets.py
index ff013d0ffb1cef359c078ac55f74622a74c13007..d5a40eca00d75c3c4a78f9334e07abbd3c158299 100644
--- a/src/secrets.py
+++ b/src/secrets.py
@@ -87,7 +87,7 @@ class Secrets:
try:
pk = self.privkeys[account]
except KeyError:
- pk = Crypto.PublicKey.RSA.generate(384, crypto.random_bytes)
+ pk = Crypto.PublicKey.RSA.generate(2048, crypto.random_bytes)
self.privkeys[account] = pk
self.save()
diff --git a/src/session.py b/src/session.py
index 4a7b62e76be9789690048523cfde89c7547a32be..b41cc9e24a9b4be3b70bfb0d148a6f4d0cbd9cf4 100644
--- a/src/session.py
+++ b/src/session.py
@@ -28,7 +28,8 @@ from common import gajim
from common import stanza_session
from common import contacts
from common import ged
-from common.connection_handlers_events import ChatstateReceivedEvent
+from common.connection_handlers_events import ChatstateReceivedEvent, \
+ InformationEvent
import common.xmpp
@@ -73,15 +74,17 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
if self.control and self.control.resource:
self.control.change_resource(self.resource)
- msg_id = None
-
if obj.mtype == 'chat':
if not obj.stanza.getTag('body') and obj.chatstate is None:
return
- log_type = 'chat_msg_recv'
+ log_type = 'chat_msg'
else:
- log_type = 'single_msg_recv'
+ log_type = 'single_msg'
+ end = '_recv'
+ if obj.forwarded and obj.sent:
+ end = '_sent'
+ log_type += end
if self.is_loggable() and obj.msgtxt:
try:
@@ -89,19 +92,21 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
msg_to_log = obj.xhtml
else:
msg_to_log = obj.msgtxt
- msg_id = gajim.logger.write(log_type, obj.fjid,
+ obj.msg_id = gajim.logger.write(log_type, obj.fjid,
msg_to_log, tim=obj.timestamp, subject=obj.subject)
except exceptions.PysqliteOperationalError, e:
- self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e)))
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self.conn, level='error', pri_txt=_('Disk WriteError'),
+ sec_txt=str(e)))
except exceptions.DatabaseMalformed:
pritext = _('Database Error')
sectext = _('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).') % \
common.logger.LOG_DB_PATH
- self.conn.dispatch('ERROR', (pritext, sectext))
-
- obj.msg_id = msg_id
+ gajim.nec.push_incoming_event(InformationEvent(None,
+ conn=self.conn, level='error', pri_txt=pritxt,
+ sec_txt=sectxt))
treat_as = gajim.config.get('treat_incoming_messages')
if treat_as:
@@ -115,9 +120,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
# Handle chat states
contact = gajim.contacts.get_contact(self.conn.name, obj.jid,
obj.resource)
- if contact:
- if contact.composing_xep != 'XEP-0085': # We cache xep85 support
- contact.composing_xep = obj.composing_xep
+ if contact and (not obj.forwarded or not obj.sent):
if self.control and self.control.type_id == \
message_control.TYPE_CHAT:
if obj.chatstate is not None:
@@ -134,8 +137,8 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
# Brand new message, incoming.
contact.our_chatstate = obj.chatstate
contact.chatstate = obj.chatstate
- if msg_id: # Do not overwrite an existing msg_id with None
- contact.msg_id = msg_id
+ if obj.msg_id: # Do not overwrite an existing msg_id with None
+ contact.msg_id = obj.msg_id
# THIS MUST BE AFTER chatstates handling
# AND BEFORE playsound (else we ear sounding on chatstates!)
@@ -155,14 +158,9 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
obj.resource == highest_contact.resource or highest_contact.show ==\
'offline'
- if not pm and is_highest:
- jid_of_control = obj.jid
- else:
- jid_of_control = obj.fjid
-
if not self.control:
- ctrl = gajim.interface.msg_win_mgr.get_control(jid_of_control,
- self.conn.name)
+ ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid,
+ obj.conn.name, obj.resource)
if ctrl:
self.control = ctrl
self.control.set_session(self)
@@ -173,8 +171,8 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
if gajim.interface.remote_ctrl:
gajim.interface.remote_ctrl.raise_signal('NewMessage', (
self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
- obj.encrypted, obj.mtype, obj.subject, obj.chatstate, msg_id,
- obj.composing_xep, obj.user_nick, obj.xhtml, obj.form_node]))
+ obj.encrypted, obj.mtype, obj.subject, obj.chatstate,
+ obj.msg_id, obj.user_nick, obj.xhtml, obj.form_node]))
def roster_message2(self, obj):
"""
@@ -183,8 +181,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
contact = None
jid = obj.jid
resource = obj.resource
- # if chat window will be for specific resource
- resource_for_chat = resource
fjid = jid
@@ -211,7 +207,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
else:
# Default to highest prio
fjid = jid
- resource_for_chat = None
contact = highest_contact
if not contact:
@@ -220,21 +215,15 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
obj.conn.name, jid, obj.user_nick)
if not self.control:
- ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.conn.name)
+ ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid,
+ obj.conn.name, obj.resource)
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 jid != gajim.get_jid_from_account(
- self.conn.name):
- fjid = jid
- resource_for_chat = None
+ fjid = jid
obj.popup = helpers.allow_popup_window(self.conn.name)
- obj.resource_for_chat = resource_for_chat
type_ = 'chat'
event_type = 'message_received'
@@ -255,7 +244,8 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
if not self.control:
event = gajim.events.create_event(type_, (obj.msgtxt, obj.subject,
obj.mtype, obj.timestamp, obj.encrypted, obj.resource,
- obj.msg_id, obj.xhtml, self, obj.form_node, obj.displaymarking),
+ obj.msg_id, obj.xhtml, self, obj.form_node, obj.displaymarking,
+ obj.forwarded and obj.sent),
show_in_roster=obj.show_in_roster,
show_in_systray=obj.show_in_systray)
@@ -268,9 +258,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
Display the message or show notification in the roster
"""
contact = None
- # if chat window will be for specific resource
- resource_for_chat = resource
-
fjid = jid
# Try to catch the contact with correct resource
@@ -298,7 +285,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
else:
# Default to highest prio
fjid = jid
- resource_for_chat = None
contact = highest_contact
if not contact:
@@ -312,12 +298,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
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
+ fjid = jid
# Do we have a queue?
no_queue = len(gajim.events.get_events(self.conn.name, fjid)) == 0
@@ -359,15 +340,16 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
contact)
event = gajim.events.create_event(type_, (msg, subject, msg_type, tim,
- encrypted, resource, msg_id, xhtml, self, form_node, displaymarking),
- show_in_roster=show_in_roster, show_in_systray=show_in_systray)
+ encrypted, resource, msg_id, xhtml, self, form_node, displaymarking,
+ False), show_in_roster=show_in_roster,
+ show_in_systray=show_in_systray)
gajim.events.add_event(self.conn.name, fjid, event)
if popup:
if not self.control:
self.control = gajim.interface.new_chat(contact,
- self.conn.name, resource=resource_for_chat, session=self)
+ self.conn.name, session=self)
if len(gajim.events.get_events(self.conn.name, fjid)):
self.control.read_queue()
@@ -429,13 +411,11 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
not_acceptable)
self.dialog = dialogs.YesNoDialog(_('Confirm these '
- 'session options'), _('''The remote client wants '
- 'to negotiate an session with these features:
-
-%s
-
-Are these options acceptable?''') % (negotiation.describe_features(
- ask_user)),
+ 'session options'),
+ _('The remote client wants to negotiate a session '
+ 'with these features:\n\n%s\n\nAre these options '
+ 'acceptable?''') % (
+ negotiation.describe_features(ask_user)),
on_response_yes=accept_nondefault_options,
on_response_no=reject_nondefault_options)
else:
@@ -459,7 +439,18 @@ Are these options acceptable?''') % (negotiation.describe_features(
if ask_user:
def accept_nondefault_options(is_checked):
- dialog.destroy()
+ if dialog:
+ dialog.destroy()
+
+ if is_checked:
+ allow_no_log_for = gajim.config.get_per(
+ 'accounts', self.conn.name,
+ 'allow_no_log_for').split()
+ jid = str(self.jid)
+ if jid not in allow_no_log_for:
+ allow_no_log_for.append(jid)
+ gajim.config.set_per('accounts', self.conn.name,
+ 'allow_no_log_for', ' '.join(allow_no_log_for))
negotiated.update(ask_user)
@@ -472,10 +463,18 @@ Are these options acceptable?''') % (negotiation.describe_features(
self.reject_negotiation()
dialog.destroy()
- dialog = dialogs.YesNoDialog(_('Confirm these session options'),
- _('The remote client selected these options:\n\n%s\n\n'
- 'Continue with the session?') % (
+ allow_no_log_for = gajim.config.get_per('accounts',
+ self.conn.name, 'allow_no_log_for').split()
+ if str(self.jid) in allow_no_log_for:
+ dialog = None
+ accept_nondefault_options(False)
+ else:
+ dialog = dialogs.YesNoDialog(_('Confirm these session '
+ 'options'),
+ _('The remote client selected these options:\n\n%s'
+ '\n\nContinue with the session?') % (
negotiation.describe_features(ask_user)),
+ _('Always accept for this contact'),
on_response_yes = accept_nondefault_options,
on_response_no = reject_nondefault_options)
else:
@@ -526,10 +525,11 @@ Are these options acceptable?''') % (negotiation.describe_features(
# around to test my test suite.
if form.getType() == 'form':
if not self.control:
- jid, resource = gajim.get_room_and_nick_from_fjid(self.jid)
+ jid, resource = gajim.get_room_and_nick_from_fjid(str(self.jid))
account = self.conn.name
- contact = gajim.contacts.get_contact(account, self.jid, resource)
+ contact = gajim.contacts.get_contact(account, str(self.jid),
+ resource)
if not contact:
contact = gajim.contacts.create_contact(jid=jid, account=account,
@@ -538,4 +538,5 @@ Are these options acceptable?''') % (negotiation.describe_features(
gajim.interface.new_chat(contact, account, resource=resource,
session=self)
- negotiation.FeatureNegotiationWindow(account, self.jid, self, form)
+ negotiation.FeatureNegotiationWindow(account, str(self.jid), self,
+ form)
diff --git a/src/tooltips.py b/src/tooltips.py
index 6d193abe7ca225e128f8ac6c4409f4e786731f33..f5ae2511af7f0093a0e80ecc4c10a53fbb426d8a 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -85,6 +85,7 @@ class BaseTooltip:
Create a popup window each time tooltip is requested
"""
self.win = gtk.Window(gtk.WINDOW_POPUP)
+ self.win.set_title('tooltip')
self.win.set_border_width(3)
self.win.set_resizable(False)
self.win.set_name('gtk-tooltips')
diff --git a/src/upower_listener.py b/src/upower_listener.py
new file mode 100644
index 0000000000000000000000000000000000000000..f8d6c79dee4b529b191ac1d448a9a02da27b4902
--- /dev/null
+++ b/src/upower_listener.py
@@ -0,0 +1,50 @@
+## src/upower_listener.py
+##
+## Copyright (C) 2006-2011 Yann Leboulanger <asterix AT lagaule.org>
+##
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+##
+
+
+supported = False
+
+from common import dbus_support
+from common import gajim
+
+def on_suspend(*args, **kwargs):
+ for name, conn in gajim.connections.items():
+ if gajim.account_is_connected(name):
+ conn.old_show = gajim.SHOW_LIST[conn.connected]
+ st = conn.status
+ conn.change_status('offline', _('Machine going to sleep'))
+ conn.status = st
+ conn.time_to_reconnect = 5
+
+if dbus_support.supported:
+ import dbus
+ import dbus.glib
+
+ try:
+ from common.dbus_support import system_bus
+ bus = system_bus.bus()
+ if 'org.freedesktop.UPower' in bus.list_names():
+ up_object = bus.get_object('org.freedesktop.UPower',
+ '/org/freedesktop/UPower')
+ bus.add_signal_receiver(on_suspend, 'Sleeping',
+ 'org.freedesktop.UPower', 'org.freedesktop.UPower',
+ '/org/freedesktop/UPower')
+ supported = True
+ except Exception:
+ pass
\ No newline at end of file
diff --git a/test/unit/test_contacts.py b/test/unit/test_contacts.py
index 957f54e42d3a6388227e886b1a7aafb89d00df72..e0a18431273cec4a592c287a887fab482a9cd936 100644
--- a/test/unit/test_contacts.py
+++ b/test/unit/test_contacts.py
@@ -15,8 +15,8 @@ class TestCommonContact(unittest.TestCase):
def setUp(self):
self.contact = CommonContact(jid='', account="", resource='', show='',
- status='', name='', our_chatstate=None, composing_xep=None,
- chatstate=None, client_caps=None)
+ status='', name='', our_chatstate=None, chatstate=None,
+ client_caps=None)
def test_default_client_supports(self):
'''
@@ -44,7 +44,7 @@ class TestContact(TestCommonContact):
domain model by smoke testing that no attribute values are lost'''
attributes = ["jid", "resource", "show", "status", "name", "our_chatstate",
- "composing_xep", "chatstate", "client_caps", "priority", "sub"]
+ "chatstate", "client_caps", "priority", "sub"]
for attr in attributes:
self.assertTrue(hasattr(self.contact, attr), msg="expected: " + attr)
@@ -60,7 +60,7 @@ class TestGC_Contact(TestCommonContact):
domain model by asserting no attributes have been lost'''
attributes = ["jid", "resource", "show", "status", "name", "our_chatstate",
- "composing_xep", "chatstate", "client_caps", "role", "room_jid"]
+ "chatstate", "client_caps", "role", "room_jid"]
for attr in attributes:
self.assertTrue(hasattr(self.contact, attr), msg="expected: " + attr)
diff --git a/test/unit/test_xmpp_smacks.py b/test/unit/test_xmpp_smacks.py
new file mode 100644
index 0000000000000000000000000000000000000000..df6ab412268ba08ab407448f2f18958326c62291
--- /dev/null
+++ b/test/unit/test_xmpp_smacks.py
@@ -0,0 +1,133 @@
+'''
+Tests for smacks.py Stream Management
+'''
+import unittest
+
+import lib
+lib.setup_env()
+
+from mock import Mock
+
+from common.xmpp import dispatcher_nb
+from common.xmpp import protocol
+from common.xmpp import smacks
+
+class TestDispatcherNB(unittest.TestCase):
+ '''
+ Test class for NonBlocking dispatcher. Tested dispatcher will be plugged
+ into a mock client
+ '''
+ def setUp(self):
+ self.dispatcher = dispatcher_nb.XMPPDispatcher()
+
+ # Setup mock client
+ self.client = Mock()
+ self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one?
+ self.client._caller = Mock()
+ self.client.defaultNamespace = protocol.NS_CLIENT
+ self.client.Connection = Mock() # mock transport
+ self.con = self.client.Connection
+ self.con.sm = smacks.Smacks(self.con)
+
+ def tearDown(self):
+ # Unplug if needed
+ if hasattr(self.dispatcher, '_owner'):
+ self.dispatcher.PlugOut()
+
+ def _simulate_connect(self):
+ self.dispatcher.PlugIn(self.client) # client is owner
+ self.con.sm.set_owner(self.client)
+ self.dispatcher.sm = self.con.sm
+ # Simulate that we have established a connection
+ self.dispatcher.StreamInit()
+ self.dispatcher.ProcessNonBlocking("<stream:stream "
+ "xmlns:stream='http://etherx.jabber.org/streams' "
+ "xmlns='jabber:client'>")
+ self.dispatcher.ProcessNonBlocking("<stream:features> "
+ "<sm xmlns='urn:xmpp:sm:2'> <optional/> </sm> </stream:features>")
+ self.con.sm.negociate()
+ self.dispatcher.ProcessNonBlocking("<enabled xmlns='urn:xmpp:sm:2' "
+ "id='some-long-sm-id' resume='true'/>")
+ assert(self.con.sm.enabled)
+
+ def _simulate_resume(self):
+ self.con.sm.resume_request()
+ # Resuming acknowledging 5 stanzas
+ self.dispatcher.ProcessNonBlocking("<resumed xmlns='urn:xmpp:sm:2' "
+ "id='some-long-sm-id' h='5'/>")
+ assert(self.con.sm.resuming)
+
+ def _send(self, send, r, stanza):
+ for i in range(r):
+ send(stanza)
+ def test_messages(self):
+ message = '<message><body>Helloo </body></message>'
+ iq = '''<iq from='proxy.jabber.ru' to='j.xxxxxxxx.org/Gajim' type='error' id='18'>
+ <query xmlns='http://jabber.org/protocol/bytestreams'/>
+ <error code='403' type='auth'>
+ <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+ </error>
+ </iq>'''
+ presence = '''<presence from='xxxxxxxxx.com/Talk.v1044194B1E2' to='j.xxxxxxxx.org'>
+ <priority>24</priority>
+ <c node="http://www.google.com/xmpp/client/caps" ver="1.0.0.104" ext="share-v1 voice-v1" xmlns="http://jabber.org/protocol/caps"/>
+ <x stamp="20110614T23:17:51" xmlns="jabber:x:delay"/>
+ <status>In love Kakashi Sensei :P</status>
+ <x xmlns="vcard-temp:x:update">
+ <photo>db4b7c52e39ba28562c74542d5988d47f09108a3</photo>
+ </x>
+ </presence> '''
+
+ self._simulate_connect()
+ uqueue = self.con.sm.uqueue
+ self.assertEqual(self.con.sm.out_h, 0)
+ self.assertEqual(self.con.sm.in_h, 0)
+
+ # The server sends 10 stanzas
+ self._send(self.dispatcher.ProcessNonBlocking, 5, message)
+ self._send(self.dispatcher.ProcessNonBlocking, 4, iq)
+ self._send(self.dispatcher.ProcessNonBlocking, 1, presence)
+
+ # The client has recieved 10 stanzas and sent none
+ self.assertEqual(self.con.sm.in_h, 10)
+ self.assertEqual(self.con.sm.out_h, 0)
+
+ m = protocol.Message()
+
+ # The client sends 10 stanzas
+ for i in range(10):
+ m = protocol.Message(body=str(i))
+ self.dispatcher.send(m)
+
+ # Client sends 10 stanzas and put them in the queue
+ self.assertEqual(self.con.sm.out_h, 10)
+ self.assertEqual(len(uqueue), 10)
+
+ # The server acknowledges that it recieved 5 stanzas
+ self.dispatcher.ProcessNonBlocking("<a xmlns='urn:xmpp:sm:2' h='5'/>")
+ # 5 stanzas are removed from the queue, only 5 stanzas are left
+
+ self.assertEqual(len(uqueue), 5)
+
+ # Check for the right order of stanzas in the queue
+ l = ['5', '6', '7', '8', '9']
+ for i in uqueue:
+ self.assertEqual(i.getBody(), l[0])
+ l.pop(0)
+
+ def test_resumption(self):
+ self._simulate_connect()
+
+ m = protocol.Message()
+
+ # The client sends 5 stanzas
+ for i in range(5):
+ m = protocol.Message(body=str(i))
+ self.dispatcher.send(m)
+
+ self._simulate_resume()
+ # No stanzas left
+ self.assertEqual(len(self.con.sm.uqueue), 0)
+
+if __name__ == '__main__':
+ unittest.main()
\ No newline at end of file