[commit-gajim] r7984 - in branches/gajim_0.11: data/glade data/iconsets/sun/16x16 data/iconsets/sun/32x32 data/iconsets/sun/48x48 debian po src src/common - Commits

15 Feb 2007

Author: asterix
Date: 2007-02-15 19:05:38 +0100 (Thu, 15 Feb 2007)
New Revision: 7984
Modified:
   branches/gajim_0.11/data/glade/preferences_window.glade
   branches/gajim_0.11/data/iconsets/sun/16x16/offline.png
   branches/gajim_0.11/data/iconsets/sun/32x32/offline.png
   branches/gajim_0.11/data/iconsets/sun/48x48/offline.png
   branches/gajim_0.11/debian/control
   branches/gajim_0.11/po/be.po
   branches/gajim_0.11/po/bg.po
   branches/gajim_0.11/po/br.po
   branches/gajim_0.11/po/cs.po
   branches/gajim_0.11/po/de.po
   branches/gajim_0.11/po/el.po
   branches/gajim_0.11/po/en_GB.po
   branches/gajim_0.11/po/eo.po
   branches/gajim_0.11/po/es.po
   branches/gajim_0.11/po/eu.po
   branches/gajim_0.11/po/fr.po
   branches/gajim_0.11/po/hr.po
   branches/gajim_0.11/po/it.po
   branches/gajim_0.11/po/nb.po
   branches/gajim_0.11/po/nl.po
   branches/gajim_0.11/po/no.po
   branches/gajim_0.11/po/pl.po
   branches/gajim_0.11/po/pt.po
   branches/gajim_0.11/po/pt_BR.po
   branches/gajim_0.11/po/ru.po
   branches/gajim_0.11/po/sk.po
   branches/gajim_0.11/po/sr.po
   branches/gajim_0.11/po/sv.po
   branches/gajim_0.11/po/zh_CN.po
   branches/gajim_0.11/src/chat_control.py
   branches/gajim_0.11/src/common/connection.py
   branches/gajim_0.11/src/common/dataforms.py
   branches/gajim_0.11/src/config.py
   branches/gajim_0.11/src/conversation_textview.py
   branches/gajim_0.11/src/disco.py
   branches/gajim_0.11/src/gajim.py
   branches/gajim_0.11/src/groupchat_control.py
   branches/gajim_0.11/src/message_control.py
   branches/gajim_0.11/src/message_window.py
   branches/gajim_0.11/src/roster_window.py
Log:
mrege diff from trunk
Modified: branches/gajim_0.11/data/glade/preferences_window.glade
===================================================================

--- branches/gajim_0.11/data/glade/preferences_window.glade	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/data/glade/preferences_window.glade	2007-02-15 18:05:38 UTC (rev 7984)
@@ -2024,7 +2024,7 @@
      </child>
<child>
-	    <widget class="GtkVBox" id="vbox43">
+	    <widget class="GtkVBox" id="status_vbox">
          <property name="border_width">12</property>
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
@@ -2383,18 +2383,19 @@
          </child>
<child>
-		<widget class="GtkEventBox" id="eventbox6">
+		<widget class="GtkEventBox" id="default_status_eventbox">
    	  <property name="visible">True</property>
    	  <property name="tooltip" translatable="yes">An example: If you have enabled status message for away, Gajim won't ask you anymore for a status message when you change your status to away; it will use the default one set here</property>
    	  <property name="visible_window">True</property>
    	  <property name="above_child">False</property>
<child>
-		    <widget class="GtkExpander" id="expander1">
+		    <widget class="GtkExpander" id="default_status_expander">
    	      <property name="visible">True</property>
    	      <property name="can_focus">True</property>
    	      <property name="expanded">False</property>
    	      <property name="spacing">0</property>
+		      <signal name="activate" handler="on_default_status_expander_activate" last_modification_time="Tue, 13 Feb 2007 20:20:14 GMT"/>
<child>
    		<widget class="GtkScrolledWindow" id="scrolledwindow24">
Modified: branches/gajim_0.11/data/iconsets/sun/16x16/offline.png
===================================================================
(Binary files differ)
Modified: branches/gajim_0.11/data/iconsets/sun/32x32/offline.png
===================================================================
(Binary files differ)
Modified: branches/gajim_0.11/data/iconsets/sun/48x48/offline.png
===================================================================
(Binary files differ)
Modified: branches/gajim_0.11/debian/control
===================================================================
--- branches/gajim_0.11/debian/control	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/debian/control	2007-02-15 18:05:38 UTC (rev 7984)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Yann Le Boulanger asterix@lagaule.org
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.3), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext, libxss-dev, intltool, imagemagick, python-central (>= 0.5)
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.3), python2.4-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext, libxss-dev, intltool, imagemagick, python-central (>= 0.5), libdbus-1-dev
 Build-Conflicts: python2.3
 XS-Python-Version: >= 2.4
 Standards-Version: 3.7.2
@@ -10,9 +10,9 @@
 Package: gajim
 Architecture: any
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-glade2 (>= 2.6.0), python-gtk2 (>= 2.6.0), python-pysqlite2
-Recommends: dnsutils, dbus, python-dbus, notification-daemon
-Suggests: python-gnome2, python-gnupginterface, nautilus-sendto, avahi-daemon, python-avahi, network-manager
+Depends: ${python:Depends}, python-glade2 (>= 2.6.0), python-gtk2 (>= 2.6.0), python2.4-pysqlite2 | python2.5
+Recommends: dnsutils, dbus, python-dbus, notification-daemon, python-gnupginterface
+Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager
 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,
Modified: branches/gajim_0.11/po/be.po
===================================================================
--- branches/gajim_0.11/po/be.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/be.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-20 00:01+0300\n"
 "Last-Translator: Ihar Hrachyshka ihar.hrachyshka@gmail.com\n"
 "Language-Team: Belarusian i18n@mova.org\n"
@@ -322,16 +322,16 @@
 msgstr "Кіраванне..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Ключ не выбраны"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Ніякі"
@@ -1289,7 +1289,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Шыфраванне OpenPGP"
@@ -1411,7 +1411,7 @@
 "Заўсёды карыстацца праграмамі, прызначанымі ў KDE\n"
 "Адмысловы"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Размова"
@@ -2515,6 +2515,11 @@
 msgstr "Расейская"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Нямецкая"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Славацкая"
@@ -2526,7 +2531,7 @@
 msgid "Chinese (Ch)"
 msgstr "Кітайская (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2542,44 +2547,40 @@
 "\n"
 "Фарбаванне няправільна напісаных слоў не працуе"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Мова правапісу"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Няма злучэння"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Размовы"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групавой размовы %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не распаўсюджвае ключ OpenPGP і не мае прызначанага ключа"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Шыфраванне дзейнічае"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Шыфраванне адключанае"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2592,12 +2593,12 @@
 msgstr "Няма ў спісе"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Вам адправіў паведамленне "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2636,242 +2637,242 @@
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Атрыманае першае паведамленне"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Атрыманае наступнае паведамленне"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Чалавек далучыўся"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Чалавек адлучыўся"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Паведамленне адпраўленае"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Фарбаванае паведамленне ў групавой размове"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Новы ліст GMail"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з серверам"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Нягледжаныя падзеі"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Назва рахунка ўжо скарыстаная"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Няправільная назва рахунка"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Назва рахунка не павінна быць пустой."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Няправільны Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber ID павінны мець форму "user@servername"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Няправільны элемент"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Хутка прыйду."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Перадалучыцца?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Такога рахунка няма"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Вы павінны стварыць рахунак да рэдагавання асабістых звестак."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не падтрымлівае Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Немагчыма атрымаць сакрэтныя ключы"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Выбар ключоў OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Назва"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Сервер"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Вы пачалі размову ў рахунку %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Зарэгістравацца на %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Чорны спіс"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Прычына"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Мянушка"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Роля"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Забараніць казанне..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2879,11 +2880,11 @@
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2891,11 +2892,11 @@
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Дадаць уладальніка..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2903,11 +2904,11 @@
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2915,7 +2916,7 @@
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2931,101 +2932,101 @@
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддамена)."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Захаваць пароль"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Рахунак "%s" злучаны з серверам"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Прадвызначана"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "?print_status:Няма"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя звесткі"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
 "рахунка."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Няправільны пароль"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Вы павінны ўвесці пароль для новага рахунка."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Паўторны Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Гэты рахунак ужо выкарыстоўваецца ў Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3035,74 +3036,74 @@
 ""Адмысловыя", альбо пазней, выбраўшы элемент "Рахункі" ў меню "Змяніць"
 "" галоўнага вакна."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Новы рахунак паспяхова створаны"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 msgstr "Тэкст пад гэтай рысаю ёсць тэкстам, які Вы яшчэ не бачылі"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Дзеянні для "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "У адрасе слоўніка не хапае "%s", і гэта не Вікі-слоўнік"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "У адрасе пошуку ў Сеціве не хапае "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Учора"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i дзён таму"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
@@ -3937,7 +3938,7 @@
 msgstr "%s цяпер %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4389,107 +4390,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Прыватная размова"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Прыватныя размовы"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Вы выйшлі з пакоя "%s", альбо "%s" сышоў."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Групавая размова"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Групавыя размовы"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, 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:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s змяніў мянушку на %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Мянушка не знойдзеная: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Для гэтай групавой размовы не вызначаная тэма размовы"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s запрошаныя ў %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s не з'яўляецца карэктным JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Такога загаду няма: /%s (калі Вы хочаце адправіць яго, устаўце перад тэкстам "
 ""/say")"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Загады: %s"
@@ -4846,10 +4831,22 @@
 msgstr "Цяперашні стан: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Размовы"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Групавыя размовы"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Прыватныя размовы"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Паведамленні"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6225,7 +6222,7 @@
 msgstr "Няправільны адказ"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6268,27 +6265,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Пароль OpenPGP не вызначаны"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "нябачны"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "адключаны"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Я %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6298,7 +6281,7 @@
 "Тэма: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
@@ -6822,6 +6805,21 @@
 msgid "Error while adding service. %s"
 msgstr "Памылка дадання сервіса. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Прыватная размова"
+
+#~ msgid "Group Chat"
+#~ msgstr "Групавая размова"
+
+#~ msgid "invisible"
+#~ msgstr "нябачны"
+
+#~ msgid "offline"
+#~ msgstr "адключаны"
+
+#~ msgid "I'm %s"
+#~ msgstr "Я %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/bg.po
===================================================================
--- branches/gajim_0.11/po/bg.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/bg.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: Gajim 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-17 18:54+0200\n"
 "Last-Translator: Yavor Doganov yavor@doganov.org\n"
 "Language-Team: Bulgarian dict@fsa-bg.org\n"
@@ -323,16 +323,16 @@
 msgstr "Управление на..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Няма избран ключ"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Няма"
@@ -1293,7 +1293,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Натиснете за вмъкване на емотикона (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP шифриране"
@@ -1417,7 +1417,7 @@
 "Винаги да се използват стандартните програми на Xfce4\n"
 "Персонални"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Разговор"
@@ -2530,6 +2530,11 @@
 msgstr "руски"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "немски"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "словашки"
@@ -2541,7 +2546,7 @@
 msgid "Chinese (Ch)"
 msgstr "китайски"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2557,44 +2562,40 @@
 "\n"
 "Осветяването на неправилно изписаните думи няма да се използва"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Език за проверка на правописа"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Разговори"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s от стая %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Шифрирането е включено"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Шифрирането е изключено"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2607,12 +2608,12 @@
 msgstr "Не е в списъка"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Току-що получихте ново съобщение от „%s“"
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2651,248 +2652,248 @@
 "За да използвате проверката за правопис, трябва да инсталирате %s речник или "
 "да изберете друг език чрез настройването на опцията „speller_language“."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Следващо получено съобщение"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Включване на контакт"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Получена поща от Gmail"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Непрочетени събития"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber ID трябва да бъде във формат „user@server“."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Невалиден формат"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Сега се връщам."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Свързване наново?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Сървърът ви не поддържа визитки"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Сървърът ви не може да запази личната ви информация."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Избор на OpenPGP ключ"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия OpenPGP ключ"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Име"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Сървър"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Имате активни разговори за акаунт „%s“"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Преименувайте го или го премахнете преди да активирате съобщения от/за "
 "локални контакти."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Списък с отлъчени"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Списък с членове"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Списък със собственици"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Списък с администратори"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Причина"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Псевдоним"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Роля"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Отлъчване..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2900,11 +2901,11 @@
 "<b>Кого искате да отлъчите?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Добавяне на член..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2912,11 +2913,11 @@
 "<b>Кого искате да направите член?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2924,11 +2925,11 @@
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2936,7 +2937,7 @@
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2952,99 +2953,99 @@
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ под-домейн."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт „%s“"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Необходима е парола"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Запазване на паролата"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "По подразбиране"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "Всички"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "Без"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Нова стая"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Невалидна парола"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Трябва да въведете парола за новия акаунт."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Дублиран Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Този акаунт вече е конфигуриран в Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3053,23 +3054,23 @@
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3077,52 +3078,52 @@
 "Текстът под този ред е последното, което е казано откакто за последен път "
 "сте обърнали внимание на тази стая"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Действия за „%s“"
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, 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:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Липсва „%s“ в адреса за търсене"
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Вчера"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "Преди %i дни"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -3966,7 +3967,7 @@
 msgstr "%s вече е %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4425,107 +4426,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Личен разговор"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Лични разговори"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Стая"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Стаи"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, 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:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s вече е познат като %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдонимът не е намерен: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Тази стая няма тема"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s е поканен в %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "„%s“ изглежда не е валиден JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Няма такава команда: /%s (ако искате да изпратите това, сложете представка /"
 "say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди: %s"
@@ -4878,10 +4863,22 @@
 msgstr "Сегашното състояние е: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Разговори"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Стаи"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Лични разговори"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Съобщения"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6285,7 +6282,7 @@
 msgstr "Невалиден отговор"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6328,29 +6325,15 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Не беше зададена парола за OpenPGP"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "невидим"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "изключен"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "%s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr ""
 "[Това съобщение е *шифрирано* (вижте JEP:„27“)]\n"
 "[This message is *encrypted* (See: JEP:`27')]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6360,7 +6343,7 @@
 "Тема: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
@@ -6888,6 +6871,21 @@
 msgid "Error while adding service. %s"
 msgstr "Грешка при добавянето на услугата. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Личен разговор"
+
+#~ msgid "Group Chat"
+#~ msgstr "Стая"
+
+#~ msgid "invisible"
+#~ msgstr "невидим"
+
+#~ msgid "offline"
+#~ msgstr "изключен"
+
+#~ msgid "I'm %s"
+#~ msgstr "%s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "13-12-2003T18:30:02Z"
Modified: branches/gajim_0.11/po/br.po
===================================================================
--- branches/gajim_0.11/po/br.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/br.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -331,16 +331,16 @@
 msgstr "Kemmañ..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Alc'hwez ebet diuzet"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Hini ebet"
@@ -1300,7 +1300,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Encryption OpenPGP"
@@ -1419,7 +1419,7 @@
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Flap"
@@ -2559,6 +2559,11 @@
 msgstr ""
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Hollek"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr ""
@@ -2570,7 +2575,7 @@
 msgid "Chinese (Ch)"
 msgstr ""
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2580,46 +2585,42 @@
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr ""
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Flapoù"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "N'eus bet kaset alc'hwezh OpenPGP ebet gant %s, ha n'o peus roet hini ebet "
 "dezhañ"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2632,12 +2633,12 @@
 msgstr "Ket er roll"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "O paouez resev ur gemennadenn nevez digant "%s" emaoc'h"
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2674,73 +2675,73 @@
 "language by setting the speller_language option."
 msgstr ""
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Kemennadenn da-heul"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Darempred luget"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Resevet ar bedadenn"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Rankout a rit lenn an holl zarvoudoù-mañ evit gellout cheñch anv ar gont."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2748,172 +2749,172 @@
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Un ID Jabber a rank bezañ er stumm "anv@anvservijer"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Road direizh"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Ret eo deoc'h adlugañ evit ma vo sevenet an holl gemmoù diouzhtu."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Kont dihegerz"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Rankout a rit bezañ luget evit kemmañ ho titouroù hiniennel."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr ""
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Bez ez eus bet ur gudenn en ur gargañ hoc'h alc'hwezhioù-kuzh OpenPGP."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Anv"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Servijer"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "N'ho peus kont bev ebet"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Roll argas"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Roll an izili"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Roll ar verourien"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Abeg"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Lesanv"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Perzh"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Oc'h argas..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2921,11 +2922,11 @@
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2933,11 +2934,11 @@
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2946,11 +2947,11 @@
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2958,7 +2959,7 @@
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2975,105 +2976,105 @@
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Luget eo ar gont "%s" d'ar servijer"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr ""
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Diskouez an eur:"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Gwiriekait ho peus leuniet an takadoù servijer ha sal-flapiñ pe lamit ar "
 "sined-mañ."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Rankout a rit reiñ un anv-arveriad-ez evit kefluniañ ar gont-mañ."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Rankout a ra an daou c'her-kuzh bezañ heñvel en daou dakad."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Eilañ an ID Jabber"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Kefluniet eo bet ar gont-mañ e-barzh Gajim dija."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3084,24 +3085,24 @@
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3109,53 +3110,53 @@
 "Dindan al linenn e welit ar pezh a zo bet lâret er sal-flapiñ dibaoe ar wech "
 "diwezhañ ho peus taolet ur sell ennañ."
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, fuzzy, python-format
 msgid "_Actions for "%s""
 msgstr "Oberoù evit "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr ""
 "Mankout a ra un "%s" e-barzh URL ar geriaoueg, ha n'eo ket WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Mankout a ra un "%s" e-barzh URL ar webklask"
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Web_klask"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr ""
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Dec'h"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i devezh 'zo"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
@@ -4011,7 +4012,7 @@
 msgstr "%s a zo bremañ %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4474,108 +4475,92 @@
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Flap prevez"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Flapoù prevez"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, fuzzy, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "N'emaoc'h ket er webgaoz "%s" ken, pe neuze eo aet kuit "%s"."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Flap a-stroll"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Flapoù a-stroll"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo argaset gant %(who)s : %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s a zo bremañ %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Darempred %(contact_jid)s bet pedet e-barzh %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ne seblant ket bezañ ur JID a-feson"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "N'eus ket eus an urzhiad: /%s (lakait /say araozañ ma fell deoc'h e gas)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Urzhioù: %s"
@@ -4922,10 +4907,22 @@
 msgstr "Ar stad a zo bremañ: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Flapoù"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Flapoù a-stroll"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Flapoù prevez"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Kemennadennoù"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6285,7 +6282,7 @@
 msgstr "Respont direizh"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6327,28 +6324,14 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "Diwelus"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "Ezlinenn"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "%s on"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6358,7 +6341,7 @@
 "Titl : %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr ""
@@ -6903,6 +6886,21 @@
 msgid "Error while adding service. %s"
 msgstr "fazi en ur gas %s ( %s )"
+#~ msgid "Private Chat"
+#~ msgstr "Flap prevez"
+
+#~ msgid "Group Chat"
+#~ msgstr "Flap a-stroll"
+
+#~ msgid "invisible"
+#~ msgstr "Diwelus"
+
+#~ msgid "offline"
+#~ msgstr "Ezlinenn"
+
+#~ msgid "I'm %s"
+#~ msgstr "%s on"
+
 #~ msgid "A_fter nickname:"
 #~ msgstr "Da _heul al lesanv:"
Modified: branches/gajim_0.11/po/cs.po
===================================================================
--- branches/gajim_0.11/po/cs.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/cs.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-02-06 21:51+0100\n"
 "Last-Translator: Petr Menšík pihhan@seznam.cz\n"
 "Language-Team:  cs@li.org\n"
@@ -331,16 +331,16 @@
 msgstr "Spravovat..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Žádný"
@@ -1300,7 +1300,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikni pro vložení smajlíku (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Šifrování"
@@ -1421,7 +1421,7 @@
 "Vždy použít výchozí aplikace z XFCE4\n"
 "Vlastní"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Rozhovor"
@@ -2528,6 +2528,11 @@
 msgstr "Ruština"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Němčina"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovenština"
@@ -2539,7 +2544,7 @@
 msgid "Chinese (Ch)"
 msgstr "Čínština"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2555,44 +2560,40 @@
 "\n"
 "Vlastnost zvýrazňování překlepů nebude použita"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Kontrola jazyka"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Rozhovory"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskuze %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s nerozesílá svůj OpenPGP klíč nebo nemá žádný přiřazen"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Šifrování zapnuto"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Šifrování vypnuto"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2605,12 +2606,12 @@
 msgstr "není v seznamu"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Právě jsi obdržela novou zprávu od "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2648,241 +2649,241 @@
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "titulek stavu"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "text stavu"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "První zpráva přijata"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Další zpráva přijata"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "Před změnou jména účtu si musíte přečíst všechny čekající zprávy."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Toto jméno je už použito pro jiný účet. Zvolte jiné, prosím."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber ID musí být ve tvaru "uživatel@jménoserveru"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Hned jsem zpět."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Musíte vytvořit účet před úpravou vašich osobních údajů."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Váš server nepodporuje vizitky."
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Jméno"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otevřel(a) jsi rozhovor z účtu %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím přejmenujte nebo odstraňte před povolením lokálních zpráv."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Ban List"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Seznam členů"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Seznam vlastníků"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Seznam správců"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Důvod"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Přezdívka"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Postavení"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Zakazuji..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2890,37 +2891,37 @@
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát členem?</b>\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát vlastníkem?</b>\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát správcem?</b>\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2937,101 +2938,101 @@
 "uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Uložit heslo"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Účet "%s" se připojil k serveru"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Výchozí"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Všechny"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr ""
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Nová diskuze"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto "
 "záložku."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Neplatné heslo"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Musíte zadat heslo pro nový účet."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Dvakrát použité Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Tento účet už je nastaven v Gajimu."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3040,23 +3041,23 @@
 "Můžete nastavit rozšířené volby účtu po stisknutí tlačítka Rozšířené, nebo "
 "později stisknutím v položce menu Účty v nabídce Úpravy hlavního okna."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3064,52 +3065,52 @@
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Akce pro "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí "%s" a není to WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "URL pro hledání na webu chybí "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Včera"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
@@ -3948,7 +3949,7 @@
 msgstr "%s je nyní %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4402,106 +4403,90 @@
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Soukromý rozhovor"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Soukromé rozhovory"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Už nejsi v místnosti "%s" nebo "%s" odešel(a)."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Diskuze"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Diskuze"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
# FIXME: preklad pro ban? zabanovani je hnusne
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s byl zakázán od %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s se přejmenoval na %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Místnost nemá žádné téma"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevypadá jako platné JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Neznámý příkaz: /%s (pokud to chcete odeslat, napište před to /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Příkazy: %s"
@@ -4848,10 +4833,22 @@
 msgstr "Status je nyní %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Rozhovory"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Diskuze"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Soukromé rozhovory"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Zprávy"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6228,7 +6225,7 @@
 msgstr "Neplatná odpověď"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6271,27 +6268,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "neviditelný"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "odpojen"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Jsem %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Tato zpráva je *zašifrovaná* (Viz :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6301,7 +6284,7 @@
 "Předmět: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
@@ -6825,6 +6808,21 @@
 msgid "Error while adding service. %s"
 msgstr "Chyba při přidávání služby. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Soukromý rozhovor"
+
+#~ msgid "Group Chat"
+#~ msgstr "Diskuze"
+
+#~ msgid "invisible"
+#~ msgstr "neviditelný"
+
+#~ msgid "offline"
+#~ msgstr "odpojen"
+
+#~ msgid "I'm %s"
+#~ msgstr "Jsem %s"
+
 #~ msgid "%s is not a valid loglevel"
 #~ msgstr "%s není platný loglevel"
Modified: branches/gajim_0.11/po/de.po
===================================================================
--- branches/gajim_0.11/po/de.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/de.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-25 17:39+0100\n"
 "Last-Translator: Benjamin Drung benjamin.drung@gmail.com\n"
 "Language-Team: German translators@gajim.org\n"
@@ -323,16 +323,16 @@
 msgstr "_Verwalten..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Kein"
@@ -1297,7 +1297,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klicken Sie, um ein Emoticon einzufügen (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-Verschlüsselung"
@@ -1420,7 +1420,7 @@
 "Immer KDE Standard-Anwendungen verwenden\n"
 "Benutzerdefiniert"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Chat"
@@ -2536,6 +2536,11 @@
 msgstr "Russsich"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Deutsch"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovakisch"
@@ -2547,7 +2552,7 @@
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2563,45 +2568,41 @@
 "\n"
 "Falschgeschriebene Wörter werden nicht hervorgehoben"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 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:856
-msgid "Chats"
-msgstr "Chats"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus Gruppenchat %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s hat keinen OpenPGP-Schlüssel verbreitet und es wurde keiner zugewiesen"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2614,12 +2615,12 @@
 msgstr "Nicht in der Liste"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Sie haben eine neue Nachricht von "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2658,71 +2659,71 @@
 "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
 "um die Rechtschreibprüfung zu nutzen."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "Statusbetreff"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "Statusnachricht"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Nächste empfangene Nachricht"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Gruppenchat Nachrichten-Hervorhebung"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Gruppenchat-Nachricht empfangen"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "E-Mail über Googlemail empfangen"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "Um Kontonamen zu ändern, müssen Sie alle neunen Ereignisse lesen."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Kontoname wird bereits verwendet"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2730,177 +2731,177 @@
 "Dieser Name wird bereits für einen anderen Ihrer Accounts verwendet. Bitte "
 "wählenSie einen anderen Namen."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber ID muss in der Form "user@servername" sein."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Bin gleich zurück."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Jetzt neu einloggen?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 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 neu "
 "einloggen."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 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:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Sie müssen angemeldet sein, um Ihre persönlichen Informationen zu bearbeiten"
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt vCard nicht"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Es gab ein Problem beim Holen ihres geheimen OpenPGP-Schlüssels."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Schlüssel-Auswahl"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP Schlüssel"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Name"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit Account %s einen Chat geöffnet"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 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:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Sperrliste"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Mitgliedsliste"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Listenbesitzer"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Administratorliste"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Grund"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Spitzname"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Rolle"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Verbanne ..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2908,11 +2909,11 @@
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Füge Mitglied hinzu ..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2920,11 +2921,11 @@
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Füge Besitzer hinzu ..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2932,11 +2933,11 @@
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Füge Administrator hinzu ..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2944,7 +2945,7 @@
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2959,100 +2960,100 @@
 "3 domain (die Domain selbst trifft zu, als auch jeder benutzer@domain,\n"
 "jede domain/resource oder Adresse, die eine Subdomain enthält."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Passwort benötigt"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Passwort speichern"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Konto "%s" ist mit Server verbunden"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Standard"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Dieses Lesezeichen hat ungültige Daten"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Bitte Serverfeld und Raumfeld ausfüllen oder Lesezeichen löschen."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Sie müssen einen Benutzernamen angeben, um diesen Account zu konfigurieren."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Sie müssen ein Passwort für das neue Konto eingeben."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Doppelte Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Dieser Kontakt bwurde in Gajim bereits konfiguriert."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3062,23 +3063,23 @@
 "oder durch Klicken des Konto-Menüpunktes im Bearbeiten-Menü des "
 "Hauptfensters erreichen."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3086,52 +3087,52 @@
 "Text unterhalb dieser Linie stellt dar, was seit ihrem letzten Besuch in "
 "diesem Gruppenchat gesagt wurde"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Aktionen für "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "In Wörterbuch URL fehlt ein "%s" und ist nicht Wiktionary"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "In Websuche URL fehlt ein "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Im _Internet suchen"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Gestern"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
@@ -3977,7 +3978,7 @@
 msgstr "%s ist jetzt %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4432,108 +4433,92 @@
 msgid "Please first choose another for your current theme."
 msgstr "Bitte wählen Sie zuerst einen anderen Namen für ihr derzeitiges Theme."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privater Chat"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Private Chats"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr ""
 "Sie sind nicht mehr im Gruppenchat "%s" oder "%s" hat den Gruppenchat "
 "verlassen."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Gruppenchat"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Gruppenchat"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde rausgeschmissen: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s rausgeschmissen: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Gruppenchat betreten"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Dieser Gruppenchat hat kein Thema"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s scheint keine gültige JID zu sein"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Kein Kommando: /%s (wenn Sie dies senden wollen, setzen Sie /say voran)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandos: %s"
@@ -4896,10 +4881,22 @@
 msgstr "Status ist jetzt: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Chats"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Gruppenchat"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Private Chats"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Nachrichten"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6319,7 +6316,7 @@
 msgstr "Ungültige Antwort"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6363,27 +6360,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "unsichtbar"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "abgemeldet"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Ich bin %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6393,7 +6376,7 @@
 "Thema: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt aufgrund eines Unsichtbar-Status"
@@ -6921,6 +6904,21 @@
 msgid "Error while adding service. %s"
 msgstr "Fehler beim Hinzufügen des Dienstes. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Privater Chat"
+
+#~ msgid "Group Chat"
+#~ msgstr "Gruppenchat"
+
+#~ msgid "invisible"
+#~ msgstr "unsichtbar"
+
+#~ msgid "offline"
+#~ msgstr "abgemeldet"
+
+#~ msgid "I'm %s"
+#~ msgstr "Ich bin %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/el.po
===================================================================
--- branches/gajim_0.11/po/el.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/el.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-19 16:09+0200\n"
 "Last-Translator: Stavros Giannouris stavrosg@hellug.gr\n"
 "Language-Team: \n"
@@ -334,16 +334,16 @@
 msgstr "Διαχείριση..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Δεν έχει επιλεχτεί κλειδί"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Κανένα"
@@ -1318,7 +1318,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
@@ -1438,7 +1438,7 @@
 "Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
 "Προσαρμοσμένες ρυθμίσεις"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Κουβέντα"
@@ -2562,6 +2562,11 @@
 msgstr "Ρώσικα"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Γερμανικά"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Σλοβάκικα"
@@ -2573,7 +2578,7 @@
 msgid "Chinese (Ch)"
 msgstr "Κινέζικα (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2589,45 +2594,41 @@
 "\n"
 "Η υπογράμμιση ορθογραφικών λαθών απενεργοποιήθηκε"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr ""
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Συζητήσεις"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2640,12 +2641,12 @@
 msgstr "εκτός λίστας επαφών"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Mόλις λάβατε ένα μήνυμα από "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2682,74 +2683,74 @@
 "language by setting the speller_language option."
 msgstr ""
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Επόμενο μήνυμα ελήφθη"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Αντιγραφή διεύθυνσης email"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2757,182 +2758,182 @@
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή "όνομα_χρήστη@όνομα_διακομιστή"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Μη έγκυρη εγγραφή"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr ""
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το κλειδί OpenPGP σας"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Όνομα"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Εξυπηρετητής"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Λίστα Ban"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Λίστα μελών"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Αιτία"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Ψευδώνυμο"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Ρόλος"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2940,11 +2941,11 @@
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2952,11 +2953,11 @@
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2965,11 +2966,11 @@
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2977,7 +2978,7 @@
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2993,106 +2994,106 @@
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Ο λογαριασμός "%s" είναι συνδεδεμένος με το διακομιστή"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Προεπιλογή"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εκτύπωση όλων των σελίδων"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Εκτύπωση όλων των σελίδων"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε το σελιδοδείκτη."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Διπλότυπο αναγνωριστικό Jabber"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Αυτός ο λογαριασμός έχει ήδη στηθεί στο Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3103,24 +3104,24 @@
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3128,53 +3129,53 @@
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, fuzzy, python-format
 msgid "_Actions for "%s""
 msgstr "Α_ναζήτηση για:"
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "Λείπει ένα "%s" από το URL του λεξικού και δεν είναι WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Λείπει ένα "%s" από το URL της Δικτυακής αναζήτησης"
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Χθες"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "πριν από %i μέρες"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
@@ -4036,7 +4037,7 @@
 msgstr "Ο %s είναι τώρα %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4521,107 +4522,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Προσωπική συζήτηση"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Προσωπικές συζητήσεις"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, fuzzy, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Δεν είστε πια στο δωμάτιο "%s" ή ο/η "%s" έφυγε."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Ομαδική συζήτηση"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Ομαδικές συζητήσεις"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, 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:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Δεν βρέθηκε η εντολή: /%s (εάν θέλετε να το πείτε αυτό βάλτε το /say μπροστά)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Εντολές: %s"
@@ -4981,10 +4966,22 @@
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Συζητήσεις"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Ομαδικές συζητήσεις"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Προσωπικές συζητήσεις"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Μηνύματα"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6370,7 +6367,7 @@
 msgstr "Μη έγκυρη απόκριση"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6412,27 +6409,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Δε δόθηκε φράση πρόσβασης για το OpenPGP"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "αόρατος"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "αποσυνδεδεμένος"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Είμαι %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6442,7 +6425,7 @@
 "Θέμα: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr ""
@@ -6966,6 +6949,21 @@
 msgid "Error while adding service. %s"
 msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Προσωπική συζήτηση"
+
+#~ msgid "Group Chat"
+#~ msgstr "Ομαδική συζήτηση"
+
+#~ msgid "invisible"
+#~ msgstr "αόρατος"
+
+#~ msgid "offline"
+#~ msgstr "αποσυνδεδεμένος"
+
+#~ msgid "I'm %s"
+#~ msgstr "Είμαι %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/en_GB.po
===================================================================
--- branches/gajim_0.11/po/en_GB.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/en_GB.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-21 15:27+1100\n"
 "Last-Translator: Jeff Bailes thepizzaking@gmail.com\n"
 "Language-Team: English en_gb@li.org\n"
@@ -320,16 +320,16 @@
 msgstr "Manage..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "No key selected"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "None"
@@ -1284,7 +1284,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Click to insert an emoticon (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Encryption"
@@ -1405,7 +1405,7 @@
 "Always use XFCE4 default applications\n"
 "Custom"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Chat"
@@ -2515,6 +2515,11 @@
 msgstr "Russian"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "German"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovak"
@@ -2526,7 +2531,7 @@
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2542,44 +2547,40 @@
 "\n"
 "Highlighting misspelt words feature will not be used"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Spelling language"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "A connection is not available"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Your message can not be sent until you are connected."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Chats"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Encryption enabled"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Encryption disabled"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2592,12 +2593,12 @@
 msgstr "Not in Roster"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "You just received a new message from "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2636,71 +2637,71 @@
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "status message title"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "status message text"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "First Message Received"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Next Message Received"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Contact Connected"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Message Sent"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is not usable in this computer"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Unread events"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2708,171 +2709,171 @@
 "This name is already used by another of your accounts. Please choose another "
 "name."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Invalid account name"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "A Jabber ID must be in the form "user@servername"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Invalid entry"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Be right back."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Relogin now?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "No such account available"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "There was a problem retrieving your OpenPGP secret keys."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Name"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Ban List"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Member List"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Owner List"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Administrator List"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Reason"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Nick"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Role"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Banning..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2880,11 +2881,11 @@
 "<b>Whom do you want to ban?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Adding Member..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2892,11 +2893,11 @@
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2904,11 +2905,11 @@
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2916,7 +2917,7 @@
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2932,100 +2933,100 @@
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Password Required"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Save password"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Account "%s" is connected to the server"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Default"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "All"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "None"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "New Group Chat"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Invalid username"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Invalid password"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "You must enter a password for the new account."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Duplicate Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "This account is already configured in Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3035,23 +3036,23 @@
 "later by choosing the Accounts menuitem under the Edit menu from the main "
 "window."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Account name is in use"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3059,52 +3060,52 @@
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Actions for "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Web Search URL is missing an "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Open as _Link"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Yesterday"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i days ago"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
@@ -3943,7 +3944,7 @@
 msgstr "%s is now %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4393,105 +4394,89 @@
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Private Chat"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Private Chats"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "You are no longer in group chat "%s" or "%s" has left."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Group Chat"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Group Chats"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname not found: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "This group chat has no subject"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invited %(contact_jid)s to %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s does not appear to be a valid JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "No such command: /%s (if you want to send this, prefix it with /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Commands: %s"
@@ -4841,10 +4826,22 @@
 msgstr "Status is now: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Chats"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Group Chats"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Private Chats"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Messages"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6225,7 +6222,7 @@
 msgstr "Invalid answer"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6268,27 +6265,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passphrase was not given"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "invisible"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "offline"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "I'm %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[This message is *encrypted* (See :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6298,7 +6281,7 @@
 "Subject: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
@@ -6821,6 +6804,21 @@
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Private Chat"
+
+#~ msgid "Group Chat"
+#~ msgstr "Group Chat"
+
+#~ msgid "invisible"
+#~ msgstr "invisible"
+
+#~ msgid "offline"
+#~ msgstr "offline"
+
+#~ msgid "I'm %s"
+#~ msgstr "I'm %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/eo.po
===================================================================
--- branches/gajim_0.11/po/eo.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/eo.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: gajim 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-29 14:01+0400\n"
 "Last-Translator: Sergio Ĥlutĉin Sergey.Khlutchin@gmail.com\n"
 "Language-Team: Esperanto translation-team-eo@lists.sourceforge.net\n"
@@ -318,16 +318,16 @@
 msgstr "Administri..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Neniu ŝlosilo elektita"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Neniu"
@@ -1286,7 +1286,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klaku por enigi mienon (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Ĉifrado per OpenPGP"
@@ -1407,7 +1407,7 @@
 "Ĉiam uzi defaŭlton de XFCE\n"
 "Propraj"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Babilejo"
@@ -2515,6 +2515,11 @@
 msgstr "Rusa"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Germana"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovaka"
@@ -2526,7 +2531,7 @@
 msgid "Chinese (Ch)"
 msgstr "Ĉina (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2542,44 +2547,40 @@
 "\n"
 "Emfazado de mistajpoj ne funkcios"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Lingvo de literumado"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Konekto mankas"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Via mesaĝo ne povas esti sendita dum vi senkonektas."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Babilejoj"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "Nek %s publicis OpenPGP-ŝlosilon, nek vi enigis ĝin"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Ĉifrado ebligata"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Ĉifrado malebligata"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2592,12 +2593,12 @@
 msgstr "Mankas en kontaktlisto"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Vi ĵus ricevis novan mesaĝon de "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2636,241 +2637,241 @@
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero "speller_language"."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "statmesaĝa titolo"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "statmesaĝa teksto"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Sekva mesaĝo ricevita"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "Por ŝanĝi la nomon de konto, vi devas legi atendantajn eventojn."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber-ID devas esti en la formo "uzulo@servilnomo"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nomo"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Servilo"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Bonvolu renomigi aŭ forigi ĝin antaŭ ebligi lig-lokan komunikadon."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Membra listo"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Listo de mastroj"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Estra listo"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Kialo"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Kaŝnomo"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Rolo"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Malpermesas..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2878,11 +2879,11 @@
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Aligas membron..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2890,11 +2891,11 @@
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2902,11 +2903,11 @@
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2914,7 +2915,7 @@
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2930,101 +2931,101 @@
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Pasvorto necesas"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Konservi pasvorton"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Konto "%s" estas konektita al la servilo"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Defaŭlte"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "Ĉiujn"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "Neniujn"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Nova babilejo"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bonvolu konvinkiĝi, ke kampoj Servilo kaj Babilejo estas plenitaj aŭ forigi "
 "tiun ĉi legosignon."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Vi devas enigi pasvorton por la nova konto."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Ripeta Jabber-ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3033,23 +3034,23 @@
 "Vi povas agordi kromajn kontajn parametrojn alklakinte la butonon "Krome" "
 "aŭ pli poste menueron Kontoj en menuo Administri de la ĉefa fenestro."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3057,52 +3058,52 @@
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Agoj por "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "Vortara URL ne enhavas "%s" kaj ĝi ne estas WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Retserĉila URL ne enhavas "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Hieraŭ"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "Antaŭ %i tagoj"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
@@ -3941,7 +3942,7 @@
 msgstr "%s nun estas %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4392,105 +4393,89 @@
 msgid "Please first choose another for your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privata interparolo"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Privataj interparoloj"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Vi ne plu ĉeestas en babilejo "%s" aŭ "%s" foriris."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Babilejo"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Babilejoj"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Aliĝo de %(nick)s nun estas malpermesa: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Aliĝo de %(nick)s estas malpermesita de %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s nomiĝas %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kaŝnomo ne trovitas: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Tiu ĉi babilejo ne havas temon"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invititas al %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Tio ne estas valida JID: %s"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Ne estas tiu komando: /%s (se vi volas sendi tion, metu /say antaŭen)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Komandoj: %s"
@@ -4835,10 +4820,22 @@
 msgstr "Stato nun estas: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Babilejoj"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Babilejoj"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Privataj interparoloj"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Mesaĝoj"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6213,7 +6210,7 @@
 msgstr "Nekorekta respondo"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6256,27 +6253,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP-pasfrazo ne estis donita"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "nevidebla"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "senkonekta"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Mi estas %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6286,7 +6269,7 @@
 "Temo: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
@@ -6805,6 +6788,21 @@
 msgid "Error while adding service. %s"
 msgstr "eraro dum aldonado de servo %s"
+#~ msgid "Private Chat"
+#~ msgstr "Privata interparolo"
+
+#~ msgid "Group Chat"
+#~ msgstr "Babilejo"
+
+#~ msgid "invisible"
+#~ msgstr "nevidebla"
+
+#~ msgid "offline"
+#~ msgstr "senkonekta"
+
+#~ msgid "I'm %s"
+#~ msgstr "Mi estas %s"
+
 #~ msgid "%s is not a valid loglevel"
 #~ msgstr "%s ne estas valida protokola detalnivelo"
Modified: branches/gajim_0.11/po/es.po
===================================================================
--- branches/gajim_0.11/po/es.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/es.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan membriskhan@gmail.com\n"
 "Language-Team: none\n"
@@ -322,16 +322,16 @@
 msgstr "Gestionar..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Ninguno"
@@ -1307,7 +1307,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Haz click para insertar un emoticono (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Encriptación OpenPGP"
@@ -1430,7 +1430,7 @@
 "Siempre usar las aplicaciones por defecto de XFCE4\n"
 "Personalizado"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Charla"
@@ -2551,6 +2551,11 @@
 msgstr "Ruso"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Alemán"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Eslovaco"
@@ -2562,7 +2567,7 @@
 msgid "Chinese (Ch)"
 msgstr "Chino (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2578,44 +2583,40 @@
 "\n"
 "El resalto de palabras mal escritas no será usado"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Lenguaje del corrector"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Charlas"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s del salón %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s no ha difundido su clave OpenPGP ni tú le has asignado una"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Encriptación activada"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Encriptación desactivada"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2628,12 +2629,12 @@
 msgstr "no está en el roster"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Acabas de recibir un nuevo mensaje de "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2672,73 +2673,73 @@
 "Tienes que instalar el diccionario %s para usar el corrector, o elegir otro "
 "lenguaje definiendo la opción speller_language."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "título del mensaje de estado"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "texto del mensaje de estado"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Primer mensaje recibido"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Nuevo mensaje recibido"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Mensaje enviado"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Resaltado de mensaje de grupo de charla"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Correo de GMail recibido"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Eventos sin leer"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar el nombre de la cuenta, debes leer el resto de\n"
 " eventos pendientes"
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta ya está en uso"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2746,176 +2747,176 @@
 "Este nombre ya está en uso por otra de tus cuentas. Por favor, escoge otro "
 "nombre."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Una ID de Jabber debe estar en la forma "usuario@nombreservidor"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Entrada no válida"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Vuelvo pronto"
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "¿Reconectar ahora?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si quieres que se apliquen todos los cambios instantáneamente, debes "
 "reconectar."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Debes crear una cuenta antes de editar tu información personal"
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sin una conexión, no puedes editar tu información personal"
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Tu servidor no soporta vCard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Tu servidor no puede guardar tu información personal."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Selección de clave OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nombre"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Servidor"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Has abierto una conversación con la cuenta %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Todas las conversaciones y grupos de charla serán cerrados. ¿Deseas "
 "continuar?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "La cuenta local ya existe."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor, renómbralo o elimínalo antes de habilitar la mensajería de enlace "
 "local."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Lista de expulsión"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Lista de miembros"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Lista de propietarios"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Lista de administradores"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr ""
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Motivo"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Alias"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Puesto"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Expulsando..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2923,11 +2924,11 @@
 "<b>¿A quién quieres expulsar?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Añadiendo miembro..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2935,11 +2936,11 @@
 "<b>¿A quién quieres hacer miembro?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Añadiendo propietario..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2948,11 +2949,11 @@
 "<b>¿A quién quieres hacer propietario?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Añadiendo administrador..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2960,7 +2961,7 @@
 "<b>¿A quién quieres hacer administrador?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2976,102 +2977,102 @@
 "usuario@dominio, dominio/recurso o dirección conteniendo\n"
 "un subdominio."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Contraseña requerida"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Guardar contraseña"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "La cuenta "%s" está conectada al servidor"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Si la eliminas, se perderá la conexión con el servidor"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Por defecto"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "Todos"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrate de rellenar los campos de servidor y salón o elimina "
 "este marcador."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Contraseña no válida"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseña para la nueva cuenta"
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "ID de Jabber duplicada"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Esta cuenta ya está configurada en Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3082,24 +3083,24 @@
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3107,52 +3108,52 @@
 "El texto bajo esta línea es lo que ha sido dicho desde la última vez que "
 "prestaste atención a este salón de charla"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Acciones para "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "Falta un "%s" en la URL del Diccionario y no está en WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Falta un "%s" en la URL de la búsqueda web"
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Ayer"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i días"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -4000,7 +4001,7 @@
 msgstr "%s está ahora %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4465,106 +4466,90 @@
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Conversación privada"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Conversaciones privadas"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Ya no estás en el grupo de charla "%s" o bien "%s" ya no existe."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Grupos de charla"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Grupos de charla"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Insertar alias"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s es ahora conocido como %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Este grupo de charla no tiene tema"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s no parece ser un JID válido"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "No existe tal comando: /%s (si quieres enviar esto, usa el prefijo /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
@@ -4917,10 +4902,22 @@
 msgstr "El estado es ahora: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Charlas"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Grupos de charla"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Conversaciones privadas"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Mensajes"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6318,7 +6315,7 @@
 msgstr "Respuesta no válida"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6361,27 +6358,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "No se ha facilitado la clave OpenPGP"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "invisible"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "desconectado"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Estoy %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Este mensaje está *encriptado* (Mira :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6391,7 +6374,7 @@
 "Tema: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "No conseguido debido al estado invisible"
@@ -6930,6 +6913,21 @@
 msgid "Error while adding service. %s"
 msgstr "Error añadiendo el servicio. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Conversación privada"
+
+#~ msgid "Group Chat"
+#~ msgstr "Grupos de charla"
+
+#~ msgid "invisible"
+#~ msgstr "invisible"
+
+#~ msgid "offline"
+#~ msgstr "desconectado"
+
+#~ msgid "I'm %s"
+#~ msgstr "Estoy %s"
+
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo y Julieta</small>"
Modified: branches/gajim_0.11/po/eu.po
===================================================================
--- branches/gajim_0.11/po/eu.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/eu.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2006-12-09 17:38+0100\n"
 "Last-Translator: Urtzi \n"
 "Language-Team: Basque urtzi@altza.net\n"
@@ -324,16 +324,16 @@
 msgstr "Moldatu..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Ezer ez"
@@ -1307,7 +1307,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
@@ -1430,7 +1430,7 @@
 "Beti XFCE4-ren berezko aplikazioak erabili\n"
 "Bezeroa"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Txat"
@@ -2545,6 +2545,11 @@
 msgstr "Rusiera"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Alemaniera"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Eslovakoa"
@@ -2556,7 +2561,7 @@
 msgid "Chinese (Ch)"
 msgstr "Txinera (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2572,44 +2577,40 @@
 "\n"
 "Highlighting misspelled words feature will not be used"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Ortografia hizkuntza"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Txat-ak"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s-ak ez du trasmititu OpenPGP kode bat ez behintzat ezarritakorik"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2622,12 +2623,12 @@
 msgstr "Ez dago zerrendan"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr ""%s" -tik mezu berri bat jaso duzu"
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2666,73 +2667,73 @@
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "egoera mezuaren testua"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Jasotako Hurrengo Mezua"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "GMail posta jasoa"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Kontuko izena aldatzeko,  irakurri gabeko gertaera guztiak irakurri behar "
 "dituzu."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2740,174 +2741,174 @@
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr ""izena@zerbitzaria" Jabber ID-a horrela izan behar da."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Be right back."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Kontu bat sortu behar duzu informazio petsonala editatu baino lehen."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Izena"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Zerbitzaria"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Txat-a %s kontuan ireki duzu"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Mesedez berridatzi edo ezabatu hori  link-local messaging martxan jarri "
 "baino lehen."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Partaide Zerrenda"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Arrazoia"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Izengoitia"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Eginkizuna"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Debekatzen..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2915,11 +2916,11 @@
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2927,11 +2928,11 @@
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2940,11 +2941,11 @@
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2952,7 +2953,7 @@
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2968,102 +2969,102 @@
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Pasahitza behar da"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Gorde pasahitza"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr ""%s"  kontua zerbitzarira konektatu da"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Berezkoa"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "Denak"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Denak"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz edo "
 "talde agenda hau ezabatzeaz"
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Bikoiztutako Jabber ID "
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Kontaktu hau dagoeneko Gajim-en konfiguratua dago."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3071,75 +3072,75 @@
 "window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr " "%s" -rako _aukerak"
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "URL hiztegia galdu egin da "%s" -an eta ez dago WIKTIONARY-an"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "URL bilatzailea ez da aurkizten "%s" -an"
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Atzo"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
@@ -3980,7 +3981,7 @@
 msgstr "%s orain %s dago: (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4439,105 +4440,89 @@
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Txat Pribatua"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Txat Pribatuak"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Ez zaude gela honetan "%s"jadanik edo "%s" joan da."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Txat Taldea"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Txat Taldeak"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s debekatu da %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s orain %s bezala ezaguna da"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Izengoitia aurkitugabea: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Gela honek ez du gairik"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ez du ematen baliozko JID bat denik"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "No such command: /%s (if you want to send this, prefix it with /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Azalpenak: %s"
@@ -4888,10 +4873,22 @@
 msgstr "Egoera orain da: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Txat-ak"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Txat Taldeak"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Txat Pribatuak"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Mezuak"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6277,7 +6274,7 @@
 msgstr "Erantzun baliogabea"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6319,27 +6316,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP pasa-esaldia ez da eman"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "ikusezin"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "deskonektatuta"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "%s naiz"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Mezu hau *enkriptatua" dago (Ikusi: JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6349,7 +6332,7 @@
 "Gaia: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
@@ -6888,6 +6871,21 @@
 msgid "Error while adding service. %s"
 msgstr "Errorea zerbitzarian sartzean.%s"
+#~ msgid "Private Chat"
+#~ msgstr "Txat Pribatua"
+
+#~ msgid "Group Chat"
+#~ msgstr "Txat Taldea"
+
+#~ msgid "invisible"
+#~ msgstr "ikusezin"
+
+#~ msgid "offline"
+#~ msgstr "deskonektatuta"
+
+#~ msgid "I'm %s"
+#~ msgstr "%s naiz"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/fr.po
===================================================================
--- branches/gajim_0.11/po/fr.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/fr.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-02-07 09:32+0100\n"
 "Last-Translator: Yann Le Boulanger asterix@lagaule.org\n"
 "Language-Team: \n"
@@ -325,16 +325,16 @@
 msgstr "Gérer..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Aucun"
@@ -1300,7 +1300,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Cliquer pour insérer un émoticône (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Chiffrement OpenPGP"
@@ -1424,7 +1424,7 @@
 "Toujours utiliser les applications par défaut de XFCE4\n"
 "Personnalisé"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Discussion"
@@ -2540,6 +2540,11 @@
 msgstr "Russe"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Allemand"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovaque"
@@ -2551,7 +2556,7 @@
 msgid "Chinese (Ch)"
 msgstr "Chinois"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2567,45 +2572,41 @@
 "\n"
 "La vérification orthographique ne sera pas utilisée"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Langue du correcteur orthographique"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 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:856
-msgid "Chats"
-msgstr "Discussions"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s du salon de discussion %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s n'a pas envoyé de clé OpenPGP et vous ne lui en avez pas assigné une"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Chiffrement activée"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Chiffrement désactivée"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2618,12 +2619,12 @@
 msgstr "Absent de la liste"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, 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:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2662,247 +2663,247 @@
 "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:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "titre du message d'état"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "texte du message d'état :"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Premier Message Reçu"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Message Suivant Reçu"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Contacte Connecté"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Contacte déconnecté"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Message envoyé"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un salon mis en surbrillance"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Courriel Gmail reçu"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 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:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Événements non lus"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 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:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 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:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 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:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Entrée invalide"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Revient de suite."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 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."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Compte non disponible"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 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:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Votre serveur ne supporte pas les Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Il y a eu un problème durant la récupération de vos clés OpenPGP secrètes."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nom"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Serveur"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les évènements avant de supprimer ce compte."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous avez une conversation ouverte dans le compte %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 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 ?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Ce compte existe déjà localement."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 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."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Liste des bannis"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Liste des membres"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Liste des propriétaires"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Liste des administrateurs"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "Identifiant Jabber"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Raison"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Pseudonyme"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Rôle"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Bannissement de ..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2910,11 +2911,11 @@
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2922,11 +2923,11 @@
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2934,11 +2935,11 @@
 "<b>De qui voulez-vous faire un possesseur ?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2946,7 +2947,7 @@
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2963,100 +2964,100 @@
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Mot de passe requis"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Le compte "%s" est connecté au serveur"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Par défaut"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Tout"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Entrer et sortir seulement"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "Aucun"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Créer un salon de discussion"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 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:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 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:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Vous devez entrer un mot de passe pour enregistrer un nouveau compte."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Identifiant Jabber dupliqué"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Ce compte est déjà configuré dans Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3066,23 +3067,23 @@
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3090,53 +3091,53 @@
 "Le texte sous cette règle correspond à ce qui a été dit depuis la dernière "
 "fois que vous avez consulté ce salon de discussion"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Actions pour "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, 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"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, 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:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Hier"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
@@ -3979,7 +3980,7 @@
 msgstr "%s est maintenant %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4436,106 +4437,90 @@
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Conversation privée"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Conversations privées"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Vous n'êtes plus dans le salon "%s" ou "%s" l'a quitté."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Salon de discussion"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Salons de discussion"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, 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:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, 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:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s est maintenant %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Ce salon de discussion n'a pas de sujet"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr ""
 "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s semble ne pas être un identifiant Jabber valide"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 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)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Commandes : %s"
@@ -4891,10 +4876,22 @@
 msgstr "L'état est maintenant : %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Discussions"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Salons de discussion"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Conversations privées"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Messages"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6313,7 +6310,7 @@
 msgstr "Réponse non valide"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6356,27 +6353,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de passe OpenPGP non renseigné"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "invisible"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "Déconnecté"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Je suis %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Ce message est *chiffré* (Voir : JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6386,7 +6369,7 @@
 "Sujet : %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
@@ -6912,6 +6895,21 @@
 msgid "Error while adding service. %s"
 msgstr "Erreur en ajoutant le service. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Conversation privée"
+
+#~ msgid "Group Chat"
+#~ msgstr "Salon de discussion"
+
+#~ msgid "invisible"
+#~ msgstr "invisible"
+
+#~ msgid "offline"
+#~ msgstr "Déconnecté"
+
+#~ msgid "I'm %s"
+#~ msgstr "Je suis %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/hr.po
===================================================================
--- branches/gajim_0.11/po/hr.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/hr.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2006-12-07 20:05+0100\n"
 "Last-Translator: Adrian C. anrxc@sysphere.org\n"
 "Language-Team: Croatian\n"
@@ -326,16 +326,16 @@
 msgstr "Podesi..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Niti jedan ključ nije odabran"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Ništa"
@@ -1316,7 +1316,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknite da ubacite emoticon (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Enkripcija"
@@ -1438,7 +1438,7 @@
 "Uvijek koristi predefinirane XFCE4 aplikacije\n"
 "Prilagođeno"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Razgovor"
@@ -2554,6 +2554,11 @@
 msgstr "Ruski"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Njemački"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovački"
@@ -2565,7 +2570,7 @@
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2581,44 +2586,40 @@
 "\n"
 "Mogućnost osvjetljavanja krivo napisanih riječi neće biti korištena"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Jezik pravopisa"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslana dok niste spojeni."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Razgovori"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s nije ustupio OpenPGP ključ, niti mu je ikoji dodijeljen"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Enkripcija omogućena"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Enkripcija onemogućena"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2631,12 +2632,12 @@
 msgstr "Nije na Listi Kontakata"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Upravo ste primili novu poruku od "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2675,245 +2676,245 @@
 "Morate instalirati %s rječnik kako biste mogli koristiti provjeru pravopisa, "
 "ili odaberite drugi jezik postavkom odabira speller_language opcije."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "naslov statusne poruke"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "tekst statusne poruke"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Sljedeća Poruka Primljena"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Poruka Poslana"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Primljen Gmail Email"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računalu"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Nepročitani događaji"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da biste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje"
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Ovo ime već koristi vaš drugi račun. Molimo odaberite drugo ime."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Neispravan Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber ID mora biti forme "korisnik@poslužitelj"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Neispravan unos"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Odmah se vraćam."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Prijaviti se odmah?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa poslužiteljom nije moguća izmjena osobnih informacija."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Vaš poslužitelj nije u mogućnosti spremiti vaše osobne informacije."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Došlo je do problema pri dohvaćanju vaših OpenPGP tajnih ključeva."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Ime"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Poslužitelj"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Molimo uklonite ili preimenujte prije omogućivanja poruka lokalne veze."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Ban Lista"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Lista Članova"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Lista Vasnika"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Lista Administratora"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Razlog"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Nadimak"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Uloga"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Zabranjivanje..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2921,11 +2922,11 @@
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2933,11 +2934,11 @@
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2946,11 +2947,11 @@
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2958,7 +2959,7 @@
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2974,102 +2975,102 @@
 "4. domena (sama domena se poklapa, kao i bilo koji korisnik@domena,\n"
 "domena/resurs, ili adresa koja sadrži poddomenu."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Spremiti lozinku"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Račun "%s" je spojen na poslužitelj"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Predefinirano"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Ući i samo napustiti"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "?ispis_statusa:Sve"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molimo obavezno ispunite polja poslužitelja i sobe ili uklonite ovu kljižnu "
 "oznaku."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Morate unesti lozinku za novi račun"
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Dvostruki Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Ovaj račun je već konfiguriran u Gajimu."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3079,24 +3080,24 @@
 "Napredne opcije računa možete podesiti pritiskom na gumb Napredno, ili "
 "kasnije klikom na element Računi pod izbornikom Uredi iz glavnog prozora."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3104,52 +3105,52 @@
 "Tekst niže od ove linije je ono što je rečeno od kad ste zadnji puta "
 "obraćali pozornost na ovaj grupni razovor"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Akcije za "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "URL-u riječnika nedostaje "%s" i nije WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "URL-u Web Pretrage nedostaje "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Jučer"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "Prije %i dana"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -3995,7 +3996,7 @@
 msgstr "%s je sada %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4456,107 +4457,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Molimo vas da prvo odaberete neku drugu temu za trenutnu."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privatni Razgovor"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Privanti Razgovori"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Više niste u grupnom razgovoru "%s" ili je "%s" otišao."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Grupni Razgovor"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Grupni Razgovori"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup od strane %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je od sada poznat kao %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nadimak nije pronađen: %s "
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Ovaj grupni razgovor nema temu"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvali ste %(contact_jid)s na %(room_jid)s"
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ne izgleda kao valjani JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Ne postoji komanda: /%s (ako želite poslati to kao poruku, prefiksirajte je "
 "sa /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Komanda: %s"
@@ -4912,10 +4897,22 @@
 msgstr "Status je trenutno: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Razgovori"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Grupni Razgovori"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Privanti Razgovori"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Poruke"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6311,7 +6308,7 @@
 msgstr "Nepravilan odgovor"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6353,27 +6350,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Lozinka za OpenPGP nije unešena"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "nevidljiv"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "odspojen"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Ja sam %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Ova poruka je *kriptirana* (Vidi :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6383,7 +6366,7 @@
 "Tema: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
@@ -6921,6 +6904,21 @@
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja usluge. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Privatni Razgovor"
+
+#~ msgid "Group Chat"
+#~ msgstr "Grupni Razgovor"
+
+#~ msgid "invisible"
+#~ msgstr "nevidljiv"
+
+#~ msgid "offline"
+#~ msgstr "odspojen"
+
+#~ msgid "I'm %s"
+#~ msgstr "Ja sam %s"
+
 #~ msgid "A_fter nickname:"
 #~ msgstr "Poslije nadimka:"
Modified: branches/gajim_0.11/po/it.po
===================================================================
--- branches/gajim_0.11/po/it.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/it.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-30 17:48+0100\n"
 "Last-Translator: Matteo Dell'Amico della@linux.it\n"
 "Language-Team: Italian\n"
@@ -323,16 +323,16 @@
 msgstr "Gestisci..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Nessuno"
@@ -1295,7 +1295,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Cliccare per inserire un emoticon (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Cifratura OpenPGP"
@@ -1416,7 +1416,7 @@
 "Usa sempre le applicazioni predefinite XFCE4\n"
 "Personalizza"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Chat"
@@ -2526,6 +2526,11 @@
 msgstr "Russo"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Tedesco"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovacco"
@@ -2537,7 +2542,7 @@
 msgid "Chinese (Ch)"
 msgstr "Cinese (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2553,45 +2558,41 @@
 "\n"
 "Non verrà usata la caratteristica di evidenziatura parole scorrette"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Lingua per la correzione ortografica"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Il messaggio non può venire inviato finché non si è connessi."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Chat"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s della chat di gruppo %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s non ha annunciato una chiave OpenPGP e non gliene è stata assegnata una"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Cifratura attivata"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Cifratura disattivata"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2604,12 +2605,12 @@
 msgstr "Non nei contatti"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Hai appena ricevuto un nuovo messaggio da "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2648,250 +2649,250 @@
 "E' necessario installare il dizionario %s per usare il controllo "
 "ortografico, o configurare un'altra lingua nelle opzioni speller_language"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "testo del messaggio di stato"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Prossimo messaggio ricevuto"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Contatto connesso"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Messaggio inviato"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Email GMail ricevuta"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Eventi non letti"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Per cambiare nome account, è necessario leggere tutti gli eventi in attesa."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Questo nome è già usato da un altro account. Scegliere un altro nome."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Un ID Jabber deve essere nella forma "utente@nomeserver"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Voce non valida"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Torno subito."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
 "nuovo login."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "È necessario creare un nuovo account prima di poter modificare le "
 "informazioni personali."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Il server non supporta Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Hai aperto una chat nell'account %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Tutte le finestre di chat e le chat di gruppo saranno chiuse. Desideri "
 "continuare?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Per favore rinominalo o rimuovilo prima di abilitare la messaggistica sulla "
 "rete locale."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Lista membri"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Lista proprietari"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Lista amministratori"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Motivo"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Nickname"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Ruolo"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Sto bloccando..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2899,11 +2900,11 @@
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2911,11 +2912,11 @@
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2923,11 +2924,11 @@
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2935,7 +2936,7 @@
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2952,101 +2953,101 @@
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Password richiesta"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Memorizza password"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "L'account "%s" è connesso al server"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Predefinito"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "Nessuno"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Controllare di avere compilato i campi server e stanza, o eliminare questo "
 "segnalibro."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Nome utente non valido"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Password non valida"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "È necessario inserire una password per il nuovo account."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "ID Jabber duplicato"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Questo account è già configurato in Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3056,23 +3057,23 @@
 "", o farlo più tardi scegliendo la voce "Account" nel menu "Modifica" "
 "della finestra principale."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3080,52 +3081,52 @@
 "Il testo sotto a questa riga è quanto è stato detto dall'ultima volta che si "
 "è prestata attenzione a questa chat di gruppo"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Azioni per "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "Manca un "%s" nell'URL del Dizionario e questo non è WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Manca un "%s" nell'URL di ricerca su web"
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Apri come _Link"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Ieri"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
@@ -3965,7 +3966,7 @@
 msgstr "%s è ora %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4421,105 +4422,89 @@
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Chat privata"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Chat private"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Non sei più nella stanza "%s" o "%s" è uscito."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Chat di gruppo"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Chat di gruppo"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bloccato da %(who)s : %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s è ora conosciuto come %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Questa stanza non ha oggetto"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s non sembra essere un JID valido"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Comando inesistente: /%s (per inviarlo, scrivere /say prima di esso)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandi: %s"
@@ -4876,10 +4861,22 @@
 msgstr "Lo stato ora è: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Chat"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Chat di gruppo"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Chat private"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Messaggi"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6277,7 +6274,7 @@
 msgstr "Risposta non valida"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6320,27 +6317,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Non è stata impostata la passphrase OpenPGP"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "invisibile"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "offline"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Sono %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6350,7 +6333,7 @@
 "Oggetto: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
@@ -6878,6 +6861,21 @@
 msgid "Error while adding service. %s"
 msgstr "Errore durante la creazione del servizio. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Chat privata"
+
+#~ msgid "Group Chat"
+#~ msgstr "Chat di gruppo"
+
+#~ msgid "invisible"
+#~ msgstr "invisibile"
+
+#~ msgid "offline"
+#~ msgstr "offline"
+
+#~ msgid "I'm %s"
+#~ msgstr "Sono %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/nb.po
===================================================================
--- branches/gajim_0.11/po/nb.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/nb.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-22 16:02+0100\n"
 "Last-Translator: Stian B. Barmen stian@barmen.nu\n"
 "Language-Team: \n"
@@ -320,16 +320,16 @@
 msgstr "Behandle..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
@@ -1286,7 +1286,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikk for å sette inn et uttrykksikon (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
@@ -1408,7 +1408,7 @@
 "Alltid bruk XFCE4 standard applikasjoner\n"
 "Egendefinert"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Samtale"
@@ -2516,6 +2516,11 @@
 msgstr "Russisk"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Tysk"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovakisk"
@@ -2527,7 +2532,7 @@
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2543,44 +2548,40 @@
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Samtaler"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2593,12 +2594,12 @@
 msgstr "ikke i kontaktliste"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Du fikk akkurat en ny melding fra "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2637,71 +2638,71 @@
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "status melding tittel"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "status melding tekst"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Neste Melding Motatt"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Melding Sendt"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Uleste hendelser"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2709,172 +2710,172 @@
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "En Jabber ID må skrives som "bruker@servernavn"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Snart tilbake."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Navn"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Listen over Utestengte"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Medlems Liste"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Eier Liste"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Administrator Liste"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Grunn"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Kallenavn"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Rolle"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Utvis..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2882,11 +2883,11 @@
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2894,11 +2895,11 @@
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2906,11 +2907,11 @@
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2918,7 +2919,7 @@
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2934,99 +2935,99 @@
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Krever Passord"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Lagre passord"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Kontoen "%s" er tilkoblet til serveren"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Standard"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Ugyldig passord"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3036,23 +3037,23 @@
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3060,52 +3061,52 @@
 "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
 "i denne gruppe samtalen"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Handlinger for "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en "%s" og den må ikke være WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Web Søk URL mangler en "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "I går"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -3944,7 +3945,7 @@
 msgstr "%s er nå %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4401,107 +4402,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privat Samtale"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Private Samtaler"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Du er ikke lenger i samtalerommet "%s" eller "%s" har dratt."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Gruppe Samtale"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Gruppe Samtaler"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ser ikke ut til å være en gyldig JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say før "
 "teksten)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
@@ -4853,10 +4838,22 @@
 msgstr "Status er nå: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Samtaler"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Gruppe Samtaler"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Private Samtaler"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Meldinger"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6246,7 +6243,7 @@
 msgstr "Ugyldig svar"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6289,27 +6286,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "usynlig"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "frakoblet"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Jeg er %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se: JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6319,7 +6302,7 @@
 "Tittel: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
@@ -6843,6 +6826,21 @@
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Privat Samtale"
+
+#~ msgid "Group Chat"
+#~ msgstr "Gruppe Samtale"
+
+#~ msgid "invisible"
+#~ msgstr "usynlig"
+
+#~ msgid "offline"
+#~ msgstr "frakoblet"
+
+#~ msgid "I'm %s"
+#~ msgstr "Jeg er %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/nl.po
===================================================================
--- branches/gajim_0.11/po/nl.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/nl.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen stephan@kochen.nl\n"
 "Language-Team: none\n"
@@ -328,16 +328,16 @@
 msgstr "Beheer..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Geen"
@@ -1316,7 +1316,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klik om een emoticon in te voegen (Alt+E)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Versleuteling"
@@ -1438,7 +1438,7 @@
 "Gebruik altijd standaard KDE toepassingen\n"
 "Aangepast"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Gesprek"
@@ -2591,6 +2591,11 @@
 msgstr ""
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Algemeen"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr ""
@@ -2602,7 +2607,7 @@
 msgid "Chinese (Ch)"
 msgstr ""
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2618,47 +2623,42 @@
 "\n"
 "De markering van spelfouten zal niet worden gebruikt."
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr ""
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
-#: ../src/chat_control.py:856
-#, fuzzy
-msgid "Chats"
-msgstr "Gesprek"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 "%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s heeft geen OpenPGP sleutel uitgezonden en je hebt er geen toegewezen"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Versleuteling ingeschakeld"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2671,12 +2671,12 @@
 msgstr "niet in het rooster"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Je hebt zojuist een nieuw bericht ontvangen van "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2713,303 +2713,303 @@
 "language by setting the speller_language option."
 msgstr ""
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "titel statusbericht"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "statusbericht"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr ""
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nieuw Bericht"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr ""
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr ""
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Uitnodiging Ontvangen"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr ""
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Een Jabber ID moet in de vorm "gebruiker@servernaam" zijn."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr ""
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr ""
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Account bestaat niet"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Zonder verbinding is het niet mogelijk persoonlijke informatie aan te passen."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr ""
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Naam"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr ""
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Je hebt geen actieve account"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr ""
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr ""
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr ""
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr ""
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -3019,107 +3019,107 @@
 "domain/resource, or address containing a subdomain."
 msgstr ""
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Sla wachtwoord op"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Account "%s" heeft verbinding met de server"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr ""
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Print tijd:"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Zorg ervoor dat de server- en ruimtevelden ingevuld zijn, of verwijder deze "
 "bladwijzer."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Ongeldige Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Deze contact staat al op je rooster"
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3129,24 +3129,24 @@
 "Je kunt geavanceerde accountopties instellen door op de Geavanceerd knop te "
 "drukken, of later via Accounts in het Bewerken menu van het hoofdvenster."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3154,53 +3154,53 @@
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, fuzzy, python-format
 msgid "_Actions for "%s""
 msgstr "Acties voor "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr ""
 ""%s" ontbreekt in de URL van het woordenboek en het is geen WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr ""%s" ontbreekt in de URL van de Web Zoekmachine"
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr ""
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Gisteren"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagen geleden"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
@@ -4062,7 +4062,7 @@
 msgstr "%s is nu %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4543,111 +4543,92 @@
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
-#: ../src/groupchat_control.py:106
-#, fuzzy
-msgid "Private Chat"
-msgstr "Start Gesprek"
-
-#: ../src/groupchat_control.py:106
-#, fuzzy
-msgid "Private Chats"
-msgstr "Start Gesprek"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, fuzzy, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Je bent niet meer in ruimte "%s" of "%s" heeft de ruimte verlaten."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Groupsgesprek"
-
-#: ../src/groupchat_control.py:144
+#: ../src/groupchat_control.py:317
 #, fuzzy
-msgid "Group Chats"
-msgstr "Groupsgesprek"
-
-#: ../src/groupchat_control.py:318
-#, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen door %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s is nu bekend als %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Bijnaam niet gevonden: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Deze ruimte heeft geen onderwerp"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s blijkt geen geldige JID te zijn"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Onbekend commando: /%s (als je deze tekst wil sturen, begin dan met /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Commando's: %s"
@@ -5004,10 +4985,25 @@
#: ../src/message_window.py:273
 #, fuzzy
+msgid "Chats"
+msgstr "Gesprek"
+
+#: ../src/message_window.py:275
+#, fuzzy
+msgid "Group Chats"
+msgstr "Groupsgesprek"
+
+#: ../src/message_window.py:277
+#, fuzzy
+msgid "Private Chats"
+msgstr "Start Gesprek"
+
+#: ../src/message_window.py:279
+#, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
@@ -6386,7 +6382,7 @@
 msgstr "Ongeldig wachtwoord"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6428,28 +6424,14 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP wachtwoord niet opgegeven"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "onzichtbaar"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "offline"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Ik ben %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6459,7 +6441,7 @@
 "Onderwerp: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr ""
@@ -6999,6 +6981,22 @@
 msgstr "fout tijdens versturen"
#, fuzzy
+#~ msgid "Private Chat"
+#~ msgstr "Start Gesprek"
+
+#~ msgid "Group Chat"
+#~ msgstr "Groupsgesprek"
+
+#~ msgid "invisible"
+#~ msgstr "onzichtbaar"
+
+#~ msgid "offline"
+#~ msgstr "offline"
+
+#~ msgid "I'm %s"
+#~ msgstr "Ik ben %s"
+
+#, fuzzy
 #~ msgid "A_fter nickname:"
 #~ msgstr "Na bijnaam:"
Modified: branches/gajim_0.11/po/no.po
===================================================================
--- branches/gajim_0.11/po/no.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/no.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-22 16:02+0100\n"
 "Last-Translator: Stian B. Barmen stian@barmen.nu\n"
 "Language-Team: \n"
@@ -320,16 +320,16 @@
 msgstr "Behandle..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
@@ -1286,7 +1286,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikk for å sette inn et uttrykksikon (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
@@ -1408,7 +1408,7 @@
 "Alltid bruk XFCE4 standard applikasjoner\n"
 "Egendefinert"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Samtale"
@@ -2516,6 +2516,11 @@
 msgstr "Russisk"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Tysk"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovakisk"
@@ -2527,7 +2532,7 @@
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2543,44 +2548,40 @@
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Samtaler"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2593,12 +2594,12 @@
 msgstr "ikke i kontaktliste"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Du fikk akkurat en ny melding fra "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2637,71 +2638,71 @@
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "status melding tittel"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "status melding tekst"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Neste Melding Motatt"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Melding Sendt"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Uleste hendelser"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2709,172 +2710,172 @@
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "En Jabber ID må skrives som "bruker@servernavn"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Snart tilbake."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Navn"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Listen over Utestengte"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Medlems Liste"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Eier Liste"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Administrator Liste"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Grunn"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Kallenavn"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Rolle"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Utvis..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2882,11 +2883,11 @@
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2894,11 +2895,11 @@
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2906,11 +2907,11 @@
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2918,7 +2919,7 @@
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2934,99 +2935,99 @@
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Krever Passord"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Lagre passord"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Kontoen "%s" er tilkoblet til serveren"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Standard"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Ugyldig passord"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3036,23 +3037,23 @@
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3060,52 +3061,52 @@
 "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
 "i denne gruppe samtalen"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Handlinger for "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en "%s" og den må ikke være WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "Web Søk URL mangler en "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "I går"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -3944,7 +3945,7 @@
 msgstr "%s er nå %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4401,107 +4402,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privat Samtale"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Private Samtaler"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Du er ikke lenger i samtalerommet "%s" eller "%s" har dratt."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Gruppe Samtale"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Gruppe Samtaler"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ser ikke ut til å være en gyldig JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say før "
 "teksten)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
@@ -4853,10 +4838,22 @@
 msgstr "Status er nå: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Samtaler"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Gruppe Samtaler"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Private Samtaler"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Meldinger"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6246,7 +6243,7 @@
 msgstr "Ugyldig svar"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6289,27 +6286,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "usynlig"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "frakoblet"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Jeg er %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se: JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6319,7 +6302,7 @@
 "Tittel: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
@@ -6843,6 +6826,21 @@
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Privat Samtale"
+
+#~ msgid "Group Chat"
+#~ msgstr "Gruppe Samtale"
+
+#~ msgid "invisible"
+#~ msgstr "usynlig"
+
+#~ msgid "offline"
+#~ msgstr "frakoblet"
+
+#~ msgid "I'm %s"
+#~ msgstr "Jeg er %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/pl.po
===================================================================
--- branches/gajim_0.11/po/pl.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/pl.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2006-11-08 09:01+0100\n"
 "Last-Translator: Maciej Chojnacki byte@byte.livenet.pl\n"
 "Language-Team: Polish translation-team-pl@lists.sourceforge.net\n"
@@ -322,16 +322,16 @@
 msgstr "Zarządzaj..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Żaden"
@@ -1288,7 +1288,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknij by wstawić emotikon (Alt+E)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Szyfrowanie OpenPGP"
@@ -1412,7 +1412,7 @@
 "Zawsze używaj domyślnych aplikacji XFCE4\n"
 "Własne"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Rozmowa"
@@ -2522,6 +2522,11 @@
 msgstr "rosyjski"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "niemiecki"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "słowacki"
@@ -2533,7 +2538,7 @@
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2549,46 +2554,42 @@
 "\n"
 "Podświedlanie błędów w pisowni nie będzie używane"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Wybierz słownik"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Rozmowy"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pokoju %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ani %s nie przesyła swojego klucza OpenPGP, ani Ty nie przypisałeś mu "
 "żadnego klucza"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2601,12 +2602,12 @@
 msgstr "spoza listy kontaktów"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Właśnie otrzymałeś nową wiadomość od "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2645,247 +2646,247 @@
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "treść informacji o statusie"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Otrzymałeś nową wiadomość"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Posiadasz już konto o tej nazwie. Zmień nazwę konta na unikalną."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber ID musi być postaci "użytkownik@nazwaserwera"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Zaraz wracam."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
 "zalogować się ponownie."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Musisz najpierw stworzyć konto by móc edytować informacje o sobie."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Musisz być połączony, aby móc zmieniać informacje o sobie."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nazwa"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Serwer"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "_Lista uczestników"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "_Lista właścicieli"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "_Administratorzy"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Powód"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Nick"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Funkcja:"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2893,11 +2894,11 @@
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2905,11 +2906,11 @@
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2917,11 +2918,11 @@
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2929,7 +2930,7 @@
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2945,99 +2946,99 @@
 "4. domena (dotyczy domeny a także dowolnego adresu typu użytkownik@domena,\n"
 "domena/zasób lub adresu zawierającego subdomenę)."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Wymagane hasło"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Zapisz hasło"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Konto "%s" jest połączone z serwerem."
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Domyślny"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Musisz wpisać hasło dla nowego konta."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Taki Jabber ID już istnieje!"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Konto o takiej nazwie jest już skonfigurowane."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3046,23 +3047,23 @@
 "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub "
 "później wybierając pozycję Konta z menu Edycja w głównym oknie programu."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3070,52 +3071,52 @@
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju od "
 "momentu gdy ostatni raz zwracałeś/zwracałaś na niego uwagę"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Działania dla wyrażenia "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "W URL-u słownika brakuje "%s" i nie jest to WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "W URL-u Przeszukiwania Sieci brakuje "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Wczoraj"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i dni temu"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -3957,7 +3958,7 @@
 msgstr "%s ma teraz status %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4412,107 +4413,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Rozmowa prywatna"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Rozmowy prywatne"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Nie jesteś już w pokoju "%s" lub "%s" opuścił go."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Pokój"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Czaty"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s występuje teraz jako %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Ten pokój nie ma tematu"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nie wygląda na poprawny JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je znakami: /"
 "say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
@@ -4863,10 +4848,22 @@
 msgstr "Obecny status: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Rozmowy"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Czaty"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Rozmowy prywatne"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Wiadomości"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6281,7 +6278,7 @@
 msgstr "Niepoprawna odpowiedź"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6324,27 +6321,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Nie podano klucza OpenPGP"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "niewidoczny"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "rozłączony"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Jestem %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Ta wiadomość jest zaszyfrowana (zobacz JEP '27']"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6354,7 +6337,7 @@
 "Temat: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
@@ -6882,6 +6865,21 @@
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
+#~ msgid "Private Chat"
+#~ msgstr "Rozmowa prywatna"
+
+#~ msgid "Group Chat"
+#~ msgstr "Pokój"
+
+#~ msgid "invisible"
+#~ msgstr "niewidoczny"
+
+#~ msgid "offline"
+#~ msgstr "rozłączony"
+
+#~ msgid "I'm %s"
+#~ msgstr "Jestem %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/pt.po
===================================================================
--- branches/gajim_0.11/po/pt.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/pt.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca miguelcsf@gmail.com\n"
 "Language-Team: none\n"
@@ -324,16 +324,16 @@
 msgstr "Gerir..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Nenhum"
@@ -1315,7 +1315,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+E)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Encriptação OpenPGP"
@@ -1436,7 +1436,7 @@
 "Usar sempre aplicações KDE padrão\n"
 "Personalizar"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Conversa"
@@ -2595,6 +2595,11 @@
 msgstr ""
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Geral"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr ""
@@ -2606,7 +2611,7 @@
 msgid "Chinese (Ch)"
 msgstr ""
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2622,45 +2627,40 @@
 "\n"
 "A função de destaque de palavras mal soletradas não será usada"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr ""
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
-#: ../src/chat_control.py:856
-#, fuzzy
-msgid "Chats"
-msgstr "Conversa"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s não emitiu uma chave OpenPGP nem você associou uma"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Encriptação activada"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Encriptação desactivada"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2673,12 +2673,12 @@
 msgstr "Fora da lista"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Recebeu uma nova mensagem de "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2715,297 +2715,297 @@
 "language by setting the speller_language option."
 msgstr ""
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "título da mensagem de estado"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "texto da mensagem de estado"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr ""
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nova Mensagem"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr ""
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr ""
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr ""
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Um Jabber ID deve estar no formato "utilizador@nomedoservidor"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Entrada inválida"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr ""
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr ""
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sem ligação, não lhe é possível editar as suas informações pessoais."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr ""
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Servidor"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr ""
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Não tem nenhuma conta activa"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr ""
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr ""
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr ""
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr ""
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -3015,107 +3015,107 @@
 "domain/resource, or address containing a subdomain."
 msgstr ""
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Senha Necessária"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Guardar senha"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Conta "%s" está ligada ao servidor"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr ""
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Mostrar hora:"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, verifique se preencheu os campos servidor e sala ou remova este "
 "bookmark"
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Senha Inválida"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Inválido"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto já se encontra na sua lista de contactos."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3126,24 +3126,24 @@
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3151,52 +3151,52 @@
 "O texto abaixo desta linha é o que foi dito desde que prestou atenção a este "
 "chat pela última vez."
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, fuzzy, python-format
 msgid "_Actions for "%s""
 msgstr "Acções para "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "Falta um "%s" no URL do Dicionário e como tal não é WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "URL de Procura na Web não existe "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr ""
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Ontem"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "Há %i dias atrás"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -4058,7 +4058,7 @@
 msgstr "%s está agora  %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4536,111 +4536,92 @@
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
-#: ../src/groupchat_control.py:106
-#, fuzzy
-msgid "Private Chat"
-msgstr "Iniciar Conversa"
-
-#: ../src/groupchat_control.py:106
-#, fuzzy
-msgid "Private Chats"
-msgstr "Iniciar Conversa"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, fuzzy, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Já não se encontra na sala "%s" ou "%s" saiu."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Chat"
-
-#: ../src/groupchat_control.py:144
+#: ../src/groupchat_control.py:317
 #, fuzzy
-msgid "Group Chats"
-msgstr "Chat"
-
-#: ../src/groupchat_control.py:318
-#, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alcunha não encontrada: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Esta sala não tem assunto"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s não parece ser um JID válido"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Comando inexistente: /%s (se desejar enviar isto, escreva primeiro /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
@@ -4990,10 +4971,25 @@
#: ../src/message_window.py:273
 #, fuzzy
+msgid "Chats"
+msgstr "Conversa"
+
+#: ../src/message_window.py:275
+#, fuzzy
+msgid "Group Chats"
+msgstr "Chat"
+
+#: ../src/message_window.py:277
+#, fuzzy
+msgid "Private Chats"
+msgstr "Iniciar Conversa"
+
+#: ../src/message_window.py:279
+#, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
@@ -6355,7 +6351,7 @@
 msgstr "Senha Inválida"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6397,28 +6393,14 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Palavra-chave do OpenPGP não foi recebida"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "Invisível"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "offline"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Estou %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6428,7 +6410,7 @@
 "Assunto: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr ""
@@ -6968,6 +6950,22 @@
 msgstr "erro ao enviar"
#, fuzzy
+#~ msgid "Private Chat"
+#~ msgstr "Iniciar Conversa"
+
+#~ msgid "Group Chat"
+#~ msgstr "Chat"
+
+#~ msgid "invisible"
+#~ msgstr "Invisível"
+
+#~ msgid "offline"
+#~ msgstr "offline"
+
+#~ msgid "I'm %s"
+#~ msgstr "Estou %s"
+
+#, fuzzy
 #~ msgid "A_fter nickname:"
 #~ msgstr "Depois da alcunha:"
Modified: branches/gajim_0.11/po/pt_BR.po
===================================================================
--- branches/gajim_0.11/po/pt_BR.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/pt_BR.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Gajim 0.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2006-04-14 23:41-0300\n"
 "Last-Translator: Alfredo Saldanha Jr. junix@targetlinux.org\n"
 "Language-Team: none\n"
@@ -327,16 +327,16 @@
 msgstr "Gerenciar..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Nenhum"
@@ -1315,7 +1315,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Criptografia OpenPGP"
@@ -1435,7 +1435,7 @@
 "Sempre usar aplicações padrão KDE\n"
 "Customizar"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Conversa"
@@ -2576,6 +2576,11 @@
 msgstr ""
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Geral"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr ""
@@ -2587,7 +2592,7 @@
 msgid "Chinese (Ch)"
 msgstr ""
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2603,44 +2608,40 @@
 " globalmente em/etc/profile.\n"
 "Caracteristica de destacar palavras erradas não será usada"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr ""
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Conversas"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s não tem a transmissão uma chave de OpenPGP, nem uma foi atribuída"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Criptografia habilitada"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Criptografia desabilitada"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2653,12 +2654,12 @@
 msgstr "Fora da lista"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Você acabou de receber uma nova mensagem de "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2695,72 +2696,72 @@
 "language by setting the speller_language option."
 msgstr ""
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "título da mensagem de status"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "texto da mensagem de status"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Primeira Mensagem Recebida"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Nova Mensagem Recebida"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Contato Conectado"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Contato Desconectou"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Mensagem Enviada"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem Destacada de Conferência"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Mensagem de Conferência Recebida"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Eventos não lidos"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, você deve ler todas os eventos pendentes."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2768,174 +2769,174 @@
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Um Jabber ID deve ter o seguinte formato "usuário@nomedoservidor"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Entrada inválida"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Estou de volta."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Conta não disponível"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Você deve estar conectado para editar suas informações pessoais."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr ""
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de Chave OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Servidor"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você não tem uma conta ativa"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta já está em uso"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Lista de Banidos"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Lista de Membros"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Lista de Donos"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Lista de Administradores"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Razão"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Apelido"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Lista"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Banindo..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2943,11 +2944,11 @@
 "<b>Quem você quer banir?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Adicionando Membro..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2955,11 +2956,11 @@
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Adicionando Proprietário..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2968,11 +2969,11 @@
 "<b>Quem você quer tornar um dono?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Adicionando Administrador..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2980,7 +2981,7 @@
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2996,105 +2997,105 @@
 "4. domínio (o domínio combina por si com qualquer usuario@domínio,\n"
 "domínio/recurso, ou endereço contendo um subdomínio."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Senha é obrigatória"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Salvar senha"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Conta "%s" está conectada ao servidor"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "Default"
 msgstr "Deletar"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Imprimir tempo:"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr ""
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Imprimir tempo:"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Conferência"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, tenha certeza que preencheu os campos servidor e sala ou remova "
 "este bookmark"
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Senha Inválida"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Você deve entrar com uma senha para registrar uma nova conta."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Duplicado"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Esta conta já está configurada no Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3105,24 +3106,24 @@
 "Avançado, ou mais tarde clicando em Contas no item de menu da janela "
 "principal."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3130,52 +3131,52 @@
 "O texto abaixo desta linha é o que foi dito desde a última vez onde você "
 "prestou a atenção a conferência"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, fuzzy, python-format
 msgid "_Actions for "%s""
 msgstr "Ações para "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo da _Wikipedia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "URL do Dicionário não existe "%s" e isto não é WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "URL de Procura na Web não existe "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Procura na Web por isto"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr ""
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Ontem"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -4032,7 +4033,7 @@
 msgstr "%s agora está %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4504,108 +4505,92 @@
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Conversa Privada"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "ConversasPrivada"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Falha ao Enviar uma mensagem privada"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, fuzzy, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Você não esta mais na sala "%s" ou "%s" saiu."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Conferência"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Conferências"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Mudar _Apelido"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s  foi banido: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s  foi banido por %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Esta sala não tem assunto"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Convidado %(contact_jid)s para %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s não parece ser um JID válido"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Comando não encontrado: /%s (se você quer enviar isto, use este prefixo /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
@@ -4957,10 +4942,22 @@
 msgstr "Status agora é: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Conversas"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Conferências"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "ConversasPrivada"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Mensagens"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6344,7 +6341,7 @@
 msgstr "Resposta inválida"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6386,28 +6383,14 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Palavra-chave do OpenPGP não foi recebida"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "invisível"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "desconectado"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Eu estou %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem está criptografada]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6417,7 +6400,7 @@
 "Assunto: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr ""
@@ -6960,6 +6943,21 @@
 msgid "Error while adding service. %s"
 msgstr "erro no envio %s ( %s )"
+#~ msgid "Private Chat"
+#~ msgstr "Conversa Privada"
+
+#~ msgid "Group Chat"
+#~ msgstr "Conferência"
+
+#~ msgid "invisible"
+#~ msgstr "invisível"
+
+#~ msgid "offline"
+#~ msgstr "desconectado"
+
+#~ msgid "I'm %s"
+#~ msgstr "Eu estou %s"
+
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Depois do apelido:"
Modified: branches/gajim_0.11/po/ru.po
===================================================================
--- branches/gajim_0.11/po/ru.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/ru.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2006-11-22 18:17+0300\n"
 "Last-Translator: Alex V. Myltsev avm@altlinux.org\n"
 "Language-Team: Русский ru@li.org\n"
@@ -332,16 +332,16 @@
 msgstr "Управление..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Не выбран ключ"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Нет"
@@ -1310,7 +1310,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Щелкните, чтобы вставить смайлик (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "Шифрование OpenPGP"
@@ -1428,7 +1428,7 @@
 "Всегда использовать приложения XFCE4 по умолчанию\n"
 "Другое"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Чат"
@@ -2541,6 +2541,11 @@
 msgstr "Русский"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "Немецкий"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Словацкий"
@@ -2552,7 +2557,7 @@
 msgid "Chinese (Ch)"
 msgstr "Китайский"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2569,44 +2574,40 @@
 "\n"
 "Выделение слов с опечатками выключено"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Язык проверки орфографии"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Чаты"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s из комнаты %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не выдал OpenPGP ключ или вы не присвоили ему такового"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Шифрование включено"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Шифрование отключено"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2619,12 +2620,12 @@
 msgstr "Не в ростере"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Вы получили новое сообщение от "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2663,73 +2664,73 @@
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "заголовок сообщения сервера"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "текст сообщения сервера"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Получено следующее сообщение"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Контакт подключился"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Получено приглашение"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Непросмотренные события"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2737,175 +2738,175 @@
 "Это имя уже используется в другой вашей учетной записи. Пожалуйста, выберите "
 "другое."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber ID должен иметь формат "имя_пользователя@сервер"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Неверная запись"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Скоро буду."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Чтобы отредактировать личную информацию, нужно подсоединиться к серверу."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Имя"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Сервер"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Черный список"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Список участников"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Список владельцев"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Список администрираторов"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Причина"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Ник"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Обязанность"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Баню..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2913,11 +2914,11 @@
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2925,11 +2926,11 @@
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2938,11 +2939,11 @@
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2950,7 +2951,7 @@
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2966,102 +2967,102 @@
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Требуется пароль"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Сохранить пароль"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Учетная запись "%s" подключена к серверу"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "По умолчанию"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "Все"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Все"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Новая комната"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь, что заполнены поля с именем сервера и комнаты, "
 "либо удалите эту закладку."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Неверный пароль"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Необходимо ввести пароль для новой учетной записи."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковы."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Дублирующийся Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Этот контакт уже настроен в Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3072,24 +3073,24 @@
 "Вы можете настроить ее используя \n"
 ""Настройка->Учетные записи" из главного окна."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3097,52 +3098,52 @@
 "Текст под этой линией был сказан после того, как вы последний раз "
 "заглядывали в эту комнату"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Действия для "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, 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:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "URL Web-поиска отсутствует в "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Открыть как ссылку"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Вчера"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i дней назад"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -3981,7 +3982,7 @@
 msgstr "%s %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4448,107 +4449,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Пожалуйста, выберите сначала другую тему."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Личная беседа"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Личные беседы"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Вы больше не находитесь в комнате "%s" или "%s" вышел."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Комната"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Комнаты"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Вставить ник"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, 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:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил %(nick)s заходить в комнату: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Ник не обнаружен: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "У этой комнаты нет темы"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Пригласил %(contact_jid)s в %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s не является нормальным JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к ней "
 "префикс /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Команды: %s"
@@ -4900,10 +4885,22 @@
 msgstr "Статус установлен в: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Чаты"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Комнаты"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Личные беседы"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Сообщения"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6243,7 +6240,7 @@
 msgstr "Неверный ответ"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6285,27 +6282,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Не задана парольная фраза OpenPGP"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "невидимка"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "отключен"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "%s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Это сообщение *зашифровано*, см. :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6315,7 +6298,7 @@
 "Тема: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr ""
@@ -6851,6 +6834,21 @@
 msgid "Error while adding service. %s"
 msgstr "Ошибка при добавлении службы. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Личная беседа"
+
+#~ msgid "Group Chat"
+#~ msgstr "Комната"
+
+#~ msgid "invisible"
+#~ msgstr "невидимка"
+
+#~ msgid "offline"
+#~ msgstr "отключен"
+
+#~ msgid "I'm %s"
+#~ msgstr "%s"
+
 #~ msgid "A_fter nickname:"
 #~ msgstr "П_осле ника:"
Modified: branches/gajim_0.11/po/sk.po
===================================================================
--- branches/gajim_0.11/po/sk.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/sk.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2006-12-17 16:03+0100\n"
 "Last-Translator: Juraj Michalek juraj.michalek@asinus.org\n"
 "Language-Team: Slovak sk@li.org\n"
@@ -323,16 +323,16 @@
 msgstr "Upraviť..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Nič"
@@ -1299,7 +1299,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknite pre vloženie emotikonu (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP šifrovanie"
@@ -1421,7 +1421,7 @@
 "Vždy použiť aplikácie prostredia XFCE4 ako predvolené\n"
 "Vlastné"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Rozhovor"
@@ -2537,6 +2537,11 @@
 msgstr "Rusky"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "German"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovensky"
@@ -2548,7 +2553,7 @@
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2565,44 +2570,40 @@
 "\n"
 "Zvýrazňovanie zle napísaných slov nebude používané"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Jazyk používaný pri kontrole pravopisu"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený(á)"
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Rozhovory"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskusnej skupiny %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s nezverejnil svoj OpenPGP kľúč, alebo nemá žiadny vytvorený"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Šifrovanie zapnuté"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Šifrovanie vypnuté"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2615,12 +2616,12 @@
 msgstr "Nie je v zozname"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Práve ste prijal(a) novú správu od "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2659,244 +2660,244 @@
 "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
 "nastavením premennej setting the speller_language."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "titulok správy o stave"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "text správy o stave"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Ďalšia prijatá správa správa"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kotakt pripojený"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Správa odoslaná"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správ v diskusnej skupine"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Doručený e-mail na GMail"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený(á) na server"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Neprečítané udalosti"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "Pre zmenu názvu účtu, musíte mať prečítané všetky čakajúce správy."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už používaný"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Toto meno je už použité jednom z vašich účtom. Prosím, zvoľte si iné meno."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Nespravné Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabbe ID musí byť v tvare "používateľ@menoserveru""
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Port musí byť číslo."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Musíte si vytvoriť účet, aby ste mohli meniť osobné informácie."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený na server"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Server nepodporuje Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumožňuje uloženie vašich osobných informácií."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Vznikol problém pri získavaní vášho OpenPGP tajného kľúča."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Meno"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Prečítať všetky správy pred odstránením tohoto účtu."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Máte otvorenú diskusiu pod účtom %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím, premenujte alebo odstráňte to pred zapnutím link-local správ."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Čierna listina"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Zoznam členov"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Zoznam správcov"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Dôvod"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Prezývka"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Rola"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Zakazujem..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2904,11 +2905,11 @@
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2916,11 +2917,11 @@
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2929,11 +2930,11 @@
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2941,7 +2942,7 @@
 "<b>koho chcete určiť za vlastníka?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2957,102 +2958,102 @@
 "4. doména (doména sama o sebe, ľubovoľný používateľ@doména,\n"
 "doména/zdroj, alebo adresa obsahujúca subdoménu."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Heslo je požadované"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Uložiť heslo"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Účet "%s" je pripojený na server"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Predvolené"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?zobrazovaný stav:All"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "?zobrazovaný stav:All"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
 "odstráňte túto záložku."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Musíte vložiť heslo pre nový účet."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí musia zhodovať."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Duplikované Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Tento účet už v Gajime nastavný."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3063,24 +3064,24 @@
 "možnosti, alebo neskôr kliknutím na položku Účty v menu Upraviť, v hlavnom "
 "okne"
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol vytvorený úspešne"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba pri vytváraní účtu"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Názov účtu je už používané"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3088,52 +3089,52 @@
 "Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
 "nasledujúci text"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Akcie pre "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _Slovníku"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "URL Slovníka chýba "%s" a nie je WIKTIONÁRNE"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "URL pre web vyhľadávanie chýba "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Otvoriť ako _odkaz"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Včera"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "Pred %i dňami"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
@@ -3979,7 +3980,7 @@
 msgstr "%s je teraz %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4442,108 +4443,92 @@
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Súkromný rozhovor"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Súkromné rozhovory"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr ""
 "Nie ste už pripojený(á) diskusnej skupine "%s" alebo "%s" odišiel(a)."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Diskusná skupina"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Diskusné skupiny"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s bol vykopnutý - %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s bol zakázaný - %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy(a) ako %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je známy(a) ako %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil(a) do diskusnej skupiny"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Prezývka nenájdená: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Diskusná skupina nemá nastavenú tému"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvaný(á) %(contact_jid)s do %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevyzerá ako správny JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Neznámy príkaz: /%s (ak chcete toto odoslať, zaraďte /say pred to, čo "
 "hovoríte)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Príkazy: %s"
@@ -4899,10 +4884,22 @@
 msgstr "Stav je teraz: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Rozhovory"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Diskusné skupiny"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Súkromné rozhovory"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Správy"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6294,7 +6291,7 @@
 msgstr "Nesprávna odpoveď"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6336,27 +6333,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passfráza nebola zadaná"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "neviditeľný"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "offline"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Som %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Táto správa je *šifrovaná* (See :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6366,7 +6349,7 @@
 "Predmet: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Nie je možné získať, pretože aktuálny stav je: Neviditeľný"
@@ -6909,6 +6892,21 @@
 msgid "Error while adding service. %s"
 msgstr "Chyba pri pridávaní služby. %s"
+#~ msgid "Private Chat"
+#~ msgstr "Súkromný rozhovor"
+
+#~ msgid "Group Chat"
+#~ msgstr "Diskusná skupina"
+
+#~ msgid "invisible"
+#~ msgstr "neviditeľný"
+
+#~ msgid "offline"
+#~ msgstr "offline"
+
+#~ msgid "I'm %s"
+#~ msgstr "Som %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/sr.po
===================================================================
--- branches/gajim_0.11/po/sr.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/sr.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: sr-branch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-12 19:29+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-02-12 21:18+0000\n"
 "Last-Translator: Branko Kokanovic baki@sr22.no-ip.info\n"
 "Language-Team: sr_CS\n"
@@ -324,16 +324,16 @@
 msgstr "Подеси..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Није одабран ниједан кључ"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Ништа"
@@ -1292,7 +1292,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Кликните да убаците смајли (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP енкрипција"
@@ -1415,7 +1415,7 @@
 "Увек користи предефинисане ХФЦЕ4 апликације\n"
 "Прилагођено"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Разговор"
@@ -2539,7 +2539,7 @@
 msgid "Chinese (Ch)"
 msgstr "Кинески (Ch)"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2555,44 +2555,40 @@
 "\n"
 "Могућност бојења лоше написаних речи неће бити коришћена"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Језик за правопис"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "Веза није доступна"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваша порука не може бити послата ако нисте повезани."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Разговори"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_name)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s није емитовао OpenPGP кључ, нити му је иједан додељен"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Енкрипција омогућена"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Енкрипција онемогућена"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2605,12 +2601,12 @@
 msgstr "Није на листи контаката"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr ""%s" Вам је управо послао поруку"
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2649,245 +2645,245 @@
 "Морате инсталирати %s речник како бисте могли користити проверу правописа, "
 "или одаберите други језик поставком speller_language опције."
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "наслов статусне поруке"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "текст статусне поруке"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Примљена Прва Порука"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Следећа Примљена Порука"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Контакт На Вези"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Контакт Отишао Са Везе"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Порука Послата"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "Бојење Порука Са Групног Разговора"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "Примљен Гмаил е-мејл"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP није могуће користити на овом рачунару"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Тренутно сте спојени на сервер"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "За промену имена налога, морате отићи са везе."
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Непрочитани догађаји"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Да бисте променили име налога, морате прво прочитати све догађаје на чекању."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Име Налога Већ У Употреби"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ово име већ користи један од Ваших налога. Молимо Вас, одаберите друго име."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Неисправно име налога"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Име налога не може бити празно."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Име налога не може да садржи белине."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Неисправан џабер ИД"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Џабер ИД мора бити облика "корисник@сервер"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Неисправан унос"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Одмах се враћам."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Отићи са везе и повезати се одмах?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Није доступан такав налог"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "Морате направити Ваш налог пре измена личних информација."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без везе са сервером, није могућа измена личних информација."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не подржава Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може да сачува Ваше личне информације."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Неуспело узимање тајних кључева"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Дошло је до проблема у узимању Ваших OpenPGP тајних кључева."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Одабир OpenPGP Кључева"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Име"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Сервер"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Прочитајте све догађаје на чекању пре уклањања налога."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Отворили сте разговор у рачуну %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Рачун локал већ постоји."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Измени %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Региструј се на %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Листа забрана"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Листа чланова"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Листа власника"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Листа администратора"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "ЏИД"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Разлог"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Надимак"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Улога"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Забрана..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2895,11 +2891,11 @@
 "<b>Кога желите забранити?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Додавање члана..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2907,11 +2903,11 @@
 "<b>Кога желите да поставите чланом?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Додавање власника..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2919,11 +2915,11 @@
 "<b>Кога желите да поставите за власника?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Додавање администратора..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2931,7 +2927,7 @@
 "<b>Кога желите да поставите за администратора?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2947,99 +2943,99 @@
 "4. домен (само се домен поклапа, као и било који корисник@домен,\n"
 "домен/ресурс, или адреса која садржи поддомен."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Уклањање рачуна %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Лозинка захтевана"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Сачувај лозинку"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Рачун "%s" је повезан на сервер"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Подразумевано"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?испис статуса:Све"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "?испис статуса:Ништа"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Овај маркер има неисправне податке"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Неисправно корисничко име"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Морате унети лозинку за нови налог"
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Дуплирај Џабер ИД"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Овај налог је већ конфигурисан у Гајиму."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3048,23 +3044,23 @@
 "Напредна подешавања налога можете подесити притиском на дугме Напредно, или "
 "касније кликом на ставку менија Налози под менијем Уреди из главног прозора."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Ваш нови налог је успешно направљен"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3072,52 +3068,52 @@
 "Текст испод ове линије је оно што је речено од када сте последњи пут "
 "обратили пажњу на овај групни разговор"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "_Акције за налог "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "УРЛ-у Речника недостаје "%s" и није Вики речник"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "УРЛ-у Веб претраге недостаје "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Јуче"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "Пре %i дана"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -3954,7 +3950,7 @@
 msgstr "%s је сада %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4409,107 +4405,91 @@
 msgid "Please first choose another for your current theme."
 msgstr "Молимо Вас да прво одаберете неку другу тему."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Приватни Разговор"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Приватни Разговори"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Више нисте у групном разговору "%s" или је "%s" отишао."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Групни разговор"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Групни разговори"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, 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:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s је од сада познат као %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Надимак није пронађен: %s "
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "Овај групни разговор нема тему"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Позвали сте %(contact_jid)s у собу %(room_jid)s"
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s не личи да је валидан Џабер ИД"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Не постоји команда: /%s (ако желите да пошаљете то као поруку, префиксирајте "
 "је са /say)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Команда: %s"
@@ -4865,10 +4845,22 @@
 msgstr "Статус је тренутно: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Разговори"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Групни разговори"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Приватни Разговори"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Поруке"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Гајим"
@@ -6262,7 +6254,7 @@
 msgstr "Неисправан одговор"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6305,27 +6297,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Лозинка за OpenPGP није унета"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "невидљив"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "није на вези"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Ја сам %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Ова порука је *шифрована* (Погледајте :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6335,7 +6313,7 @@
 "Тема: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
@@ -6857,3 +6835,18 @@
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Грешка приликом додавања сервиса. %s"
+
+#~ msgid "Private Chat"
+#~ msgstr "Приватни Разговор"
+
+#~ msgid "Group Chat"
+#~ msgstr "Групни разговор"
+
+#~ msgid "invisible"
+#~ msgstr "невидљив"
+
+#~ msgid "offline"
+#~ msgstr "није на вези"
+
+#~ msgid "I'm %s"
+#~ msgstr "Ја сам %s"
Modified: branches/gajim_0.11/po/sv.po
===================================================================
--- branches/gajim_0.11/po/sv.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/sv.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2007-01-20 16:54+0100\n"
 "Last-Translator: Oscar Hellström oscar@oscarh.net\n"
 "Language-Team: Swedish sv@li.org\n"
@@ -320,16 +320,16 @@
 msgstr "Hantera..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
@@ -1300,7 +1300,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klicka för att sätta in en känsloikon (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-kryptering"
@@ -1423,7 +1423,7 @@
 "Använd alltid XFCE4s standardprogram\n"
 "Anpassa"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "Chatt"
@@ -2538,6 +2538,11 @@
 msgstr "ryska"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "tyska"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "slovakiska"
@@ -2549,7 +2554,7 @@
 msgid "Chinese (Ch)"
 msgstr "kinesiska"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2565,45 +2570,41 @@
 "\n"
 "Funktionen "markera felstavade ord" kommer inte att användas"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "Stavningsspråk"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "En förbindelse är inte tillgänglig"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förren du är ansluten."
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "Chattar"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname) från gruppchatt %(room_name)"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s har inte sänt ut en OpenPGP-nyckel och du har inte heller tilldelat en"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "Kryptering aktiverad"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "Kryptering deaktiverad"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2616,12 +2617,12 @@
 msgstr "Inte i registret"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "Du mottog just ett meddelande från "%s""
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2660,244 +2661,244 @@
 "Du måste installera %s ordboken för att använda stavningskontroll, eller "
 "välj ett annat språk genom att sätta valet speller_language"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "titel för statusmeddelande"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "text för statusmeddelande"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "Första meddelandet mottaget"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "Nytt meddelande har mottagits"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "Kontakt loggade in"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "Kontakt loggade ut"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "Meddelande skickat"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 #, fuzzy
 msgid "Group Chat Message Highlight"
 msgstr "Gruppchattsmeddelande markerat"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 #, fuzzy
 msgid "Group Chat Message Received"
 msgstr "Gruppchattsmeddelande mottaget"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "E-post mottaget på GMail"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP är oanvändbart på den här datorn"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "Olästa händelser"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "För att ändra kontonamnet måste du läsa alla väntande händelser."
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "Kontonamn används redan"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Ett Jabber-ID måste vara av formen "användare@servernamn"."
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "Ogiltig post"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "Strax tillbaka."
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "Återanslut nu?"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Om du vill att ändringarna skall ske omedelbart måste du återansluta."
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Du måste skapa ditt konto innan du redigerar din personliga information."
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan inte redigera din personliga information utan en förbindelse."
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "Din server stödjer inte Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "Din server kan inte spara din personliga information."
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "Namn"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "Server"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "Läs alla väntande händelser innan du tar bort detta konto."
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har öppnat chatt i kontot %s"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "Kontot Local används redan."
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Byt namn eller ta bort det innan du aktiverar link-local-meddelanden."
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "Bannlista"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "Medlemslista"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "Ägarlista"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "Administratörslista"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "Anledning"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "Smeknamn"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "Roll"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "Bannlyser..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2905,11 +2906,11 @@
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2917,11 +2918,11 @@
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2929,11 +2930,11 @@
 "<b>Vem vill du göra till ägare?</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "Lägger till administratör..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2941,7 +2942,7 @@
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2957,101 +2958,101 @@
 "4. domän (domänen i sig matchar, så gör även alla användare@domän,\n"
 "domän/resurs, eller adress som innehåller en underdomän."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "Lösenord krävs"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv in lösenordet för konto %s"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "Spara lösenord"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "Konto "%s" är anslutet till servern"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "Standard"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:Alla"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Var säker på att fylla i server- och rumfälten eller ta bort det här "
 "bokmärket."
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "Du måste skriva in ett lösenord för det nya kontot."
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "Dubblerat Jabber-ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "Detta kontot är redan konfigurerat i Gajim."
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "Kontot har blivit tillagt"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3061,24 +3062,24 @@
 "Du kan ställa in avancerade alternativ genom att trycka på "Avancerat", "
 "eller senare genom att använda "Redigera->Konton" från huvudfönstret."
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skulle skapas"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3086,52 +3087,52 @@
 "Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
 "denna gruppchatt"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, fuzzy, python-format
 msgid "_Actions for "%s""
 msgstr "Åtgärder för "%s""
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, python-format
 msgid "Dictionary URL is missing an "%s" and it is not WIKTIONARY"
 msgstr "URL för uppslagsbok saknar ett "%s" och det är inte en WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "URL för webbsökning saknar ett "%s""
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "Igår"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagar sen"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
@@ -3992,7 +3993,7 @@
 msgstr "%s är nu %s (%s)"
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4465,108 +4466,92 @@
 msgid "Please first choose another for your current theme."
 msgstr "Vänligen välj ett annat tema först."
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Privat Chatt"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Privat Chatt"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, fuzzy, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "Du är inte längre i rummet "%s" eller "%s" har lämnat."
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Gruppchatt"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Gruppchatt"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Byt smek_namn"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst av %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "I gruppen"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Smeknamnet kunde inte hittas: %s"
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Det här rummet har inget ämne"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s verkar inte vara ett giltigt JID"
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Inget sådant kommondo: /%s (om du vill skicka detta, använd /say som prefix)"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandon: %s"
@@ -4919,10 +4904,22 @@
 msgstr "Status är nu: %(status)s"
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "Chattar"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "Gruppchatt"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "Privat Chatt"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "Meddelanden"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6332,7 +6329,7 @@
 msgstr "Ogiltigt lösenord"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6374,28 +6371,14 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "Lösenordsfras för OpenPGP angavs inte"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "osynlig"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "frånkopplad"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "Jag är %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 #, fuzzy
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Det här meddelandet är krypterat]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6405,7 +6388,7 @@
 "Ämne: %s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "Inte hämtad på grund av osynlig status"
@@ -6952,6 +6935,21 @@
 msgid "Error while adding service. %s"
 msgstr "problem vid sändning %s ( %s )"
+#~ msgid "Private Chat"
+#~ msgstr "Privat Chatt"
+
+#~ msgid "Group Chat"
+#~ msgstr "Gruppchatt"
+
+#~ msgid "invisible"
+#~ msgstr "osynlig"
+
+#~ msgid "offline"
+#~ msgstr "frånkopplad"
+
+#~ msgid "I'm %s"
+#~ msgstr "Jag är %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
Modified: branches/gajim_0.11/po/zh_CN.po
===================================================================
--- branches/gajim_0.11/po/zh_CN.po	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/po/zh_CN.po	2007-02-15 18:05:38 UTC (rev 7984)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 20:05+0100\n"
+"POT-Creation-Date: 2007-02-15 19:03+0100\n"
 "PO-Revision-Date: 2006-12-04 01:07+0800\n"
 "Last-Translator: kangkang kanger@gmail.com\n"
 "Language-Team: sIyU jabber@lzusiyu.org\n"
@@ -317,16 +317,16 @@
 msgstr "管理..."
#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1608
-#: ../src/config.py:3399
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1614
+#: ../src/config.py:3405
 msgid "No key selected"
 msgstr "没有选择钥匙"
#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1188
-#: ../src/config.py:1193 ../src/config.py:1377 ../src/config.py:1598
-#: ../src/config.py:1607 ../src/config.py:1666 ../src/config.py:1740
-#: ../src/config.py:3389 ../src/config.py:3398 ../src/dialogs.py:281
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1194
+#: ../src/config.py:1199 ../src/config.py:1383 ../src/config.py:1604
+#: ../src/config.py:1613 ../src/config.py:1672 ../src/config.py:1746
+#: ../src/config.py:3395 ../src/config.py:3404 ../src/dialogs.py:281
 #: ../src/dialogs.py:283
 msgid "None"
 msgstr "无"
@@ -1292,7 +1292,7 @@
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "点这里插入表情符 (Alt+M)"
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP 加密"
@@ -1412,7 +1412,7 @@
 "总是使用 XFCE4 默认应用\n"
 "自定义"
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:856
+#: ../data/glade/preferences_window.glade.h:29
 msgid "Chat"
 msgstr "聊天"
@@ -2504,6 +2504,11 @@
 msgstr "Russian"
#: ../src/chat_control.py:52
+#, fuzzy
+msgid "Serbian"
+msgstr "German"
+
+#: ../src/chat_control.py:52
 msgid "Slovak"
 msgstr "Slovak"
@@ -2515,7 +2520,7 @@
 msgid "Chinese (Ch)"
 msgstr "中文"
-#: ../src/chat_control.py:208 ../src/dialogs.py:1517
+#: ../src/chat_control.py:207 ../src/dialogs.py:1517
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -2530,44 +2535,40 @@
 "\n"
 "拼写检查功能未启用"
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:246
 msgid "Spelling language"
 msgstr "拼写检查"
#. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:269 ../src/chat_control.py:475
 msgid "A connection is not available"
 msgstr "连接不可用"
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:270 ../src/chat_control.py:476
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
-#: ../src/chat_control.py:856
-msgid "Chats"
-msgstr "聊天"
-
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1034
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "群聊 %(room_name)s 的 %(nickname)s"
#. we talk about a contact here
-#: ../src/chat_control.py:1127
+#: ../src/chat_control.py:1123
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr " %s 没有广播 OpenPGP 公钥或您未指定"
-#: ../src/chat_control.py:1263
+#: ../src/chat_control.py:1259
 msgid "Encryption enabled"
 msgstr "启用加密"
-#: ../src/chat_control.py:1268
+#: ../src/chat_control.py:1264
 msgid "Encryption disabled"
 msgstr "禁用加密"
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1412 ../src/conversation_textview.py:495
+#: ../src/chat_control.py:1408 ../src/conversation_textview.py:497
 #: ../src/dialogs.py:629 ../src/gajim.py:792 ../src/gajim.py:793
 #: ../src/gajim.py:1137 ../src/roster_window.py:332
 #: ../src/roster_window.py:410 ../src/roster_window.py:1497
@@ -2580,12 +2581,12 @@
 msgstr "不在名单中"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
+#: ../src/chat_control.py:1552
 #, python-format
 msgid "You just received a new message from "%s""
 msgstr "收到一条来自 “%s” 的消息"
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1553
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2621,240 +2622,240 @@
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message title"
 msgstr "状态消息标题"
-#: ../src/config.py:1000
+#: ../src/config.py:1006
 msgid "status message text"
 msgstr "状态消息文本"
-#: ../src/config.py:1036
+#: ../src/config.py:1042
 msgid "First Message Received"
 msgstr "最初收到的消息"
-#: ../src/config.py:1037
+#: ../src/config.py:1043
 msgid "Next Message Received"
 msgstr "收到的下一条消息"
-#: ../src/config.py:1038
+#: ../src/config.py:1044
 msgid "Contact Connected"
 msgstr "已连接的联系人"
-#: ../src/config.py:1039
+#: ../src/config.py:1045
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
-#: ../src/config.py:1040
+#: ../src/config.py:1046
 msgid "Message Sent"
 msgstr "消息已发送"
-#: ../src/config.py:1041
+#: ../src/config.py:1047
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
-#: ../src/config.py:1042
+#: ../src/config.py:1048
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
-#: ../src/config.py:1049
+#: ../src/config.py:1055
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
-#: ../src/config.py:1252
+#: ../src/config.py:1258
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP 在本机不可用"
-#: ../src/config.py:1298
+#: ../src/config.py:1304
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
-#: ../src/config.py:1299
+#: ../src/config.py:1305
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
-#: ../src/config.py:1302 ../src/config.py:1896
+#: ../src/config.py:1308 ../src/config.py:1902
 msgid "Unread events"
 msgstr "未读取的事件"
-#: ../src/config.py:1303
+#: ../src/config.py:1309
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
-#: ../src/config.py:1307
+#: ../src/config.py:1313
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
-#: ../src/config.py:1308
+#: ../src/config.py:1314
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
-#: ../src/config.py:1312 ../src/config.py:1316
+#: ../src/config.py:1318 ../src/config.py:1322
 msgid "Invalid account name"
 msgstr "无效的账户名称"
-#: ../src/config.py:1313
+#: ../src/config.py:1319
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
-#: ../src/config.py:1317
+#: ../src/config.py:1323
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
-#: ../src/config.py:1325 ../src/config.py:1331 ../src/config.py:1341
-#: ../src/config.py:2998
+#: ../src/config.py:1331 ../src/config.py:1337 ../src/config.py:1347
+#: ../src/config.py:3004
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
-#: ../src/config.py:1332
+#: ../src/config.py:1338
 msgid "A Jabber ID must be in the form "user@servername"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
-#: ../src/config.py:1391
+#: ../src/config.py:1397
 msgid "Invalid entry"
 msgstr "无效输入"
-#: ../src/config.py:1392
+#: ../src/config.py:1398
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
-#: ../src/config.py:1520 ../src/common/config.py:366
+#: ../src/config.py:1526 ../src/common/config.py:366
 msgid "Be right back."
 msgstr "很快回来。"
-#: ../src/config.py:1530
+#: ../src/config.py:1536
 msgid "Relogin now?"
 msgstr "现在重新登录？"
-#: ../src/config.py:1531
+#: ../src/config.py:1537
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效，您必须重新登录。"
-#: ../src/config.py:1557
+#: ../src/config.py:1563
 msgid "No such account available"
 msgstr "没有有效账户"
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
-#: ../src/config.py:1565 ../src/dialogs.py:1131 ../src/dialogs.py:1317
+#: ../src/config.py:1571 ../src/dialogs.py:1131 ../src/dialogs.py:1317
 #: ../src/disco.py:418 ../src/profile_window.py:323
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
-#: ../src/config.py:1566
+#: ../src/config.py:1572
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
-#: ../src/config.py:1570
+#: ../src/config.py:1576
 msgid "Your server doesn't support Vcard"
 msgstr "您的服务器不支持 Vcard"
-#: ../src/config.py:1571
+#: ../src/config.py:1577
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
-#: ../src/config.py:1595 ../src/config.py:3386
+#: ../src/config.py:1601 ../src/config.py:3392
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
-#: ../src/config.py:1596 ../src/config.py:3387
+#: ../src/config.py:1602 ../src/config.py:3393
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
-#: ../src/config.py:1599 ../src/config.py:3390
+#: ../src/config.py:1605 ../src/config.py:3396
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
-#: ../src/config.py:1600 ../src/config.py:3391
+#: ../src/config.py:1606 ../src/config.py:3397
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
#. Name column
-#: ../src/config.py:1830 ../src/disco.py:742 ../src/disco.py:1497
+#: ../src/config.py:1836 ../src/disco.py:742 ../src/disco.py:1497
 #: ../src/disco.py:1735 ../src/history_window.py:78
 msgid "Name"
 msgstr "名称"
-#: ../src/config.py:1833
+#: ../src/config.py:1839
 msgid "Server"
 msgstr "服务器"
-#: ../src/config.py:1897
+#: ../src/config.py:1903
 msgid "Read all pending events before removing this account."
 msgstr "移除帐号前请阅读所有未决事件。"
-#: ../src/config.py:1934
+#: ../src/config.py:1940
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在账户 %s 打开聊天"
-#: ../src/config.py:1935
+#: ../src/config.py:1941
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
-#: ../src/config.py:1994
+#: ../src/config.py:2000
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
-#: ../src/config.py:1995
+#: ../src/config.py:2001
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
-#: ../src/config.py:2229
+#: ../src/config.py:2235
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
-#: ../src/config.py:2231
+#: ../src/config.py:2237
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
#. list at the beginning
-#: ../src/config.py:2297
+#: ../src/config.py:2303
 msgid "Ban List"
 msgstr "封禁名单"
-#: ../src/config.py:2298
+#: ../src/config.py:2304
 msgid "Member List"
 msgstr "成员列表"
-#: ../src/config.py:2299
+#: ../src/config.py:2305
 msgid "Owner List"
 msgstr "房主列表"
-#: ../src/config.py:2300
+#: ../src/config.py:2306
 msgid "Administrator List"
 msgstr "管理员列表"
#. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2333 ../src/disco.py:749 ../src/history_manager.py:154
+#: ../src/config.py:2339 ../src/disco.py:749 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
-#: ../src/config.py:2341
+#: ../src/config.py:2347
 msgid "Reason"
 msgstr "原因"
-#: ../src/config.py:2346
+#: ../src/config.py:2352
 msgid "Nick"
 msgstr "昵称"
-#: ../src/config.py:2350
+#: ../src/config.py:2356
 msgid "Role"
 msgstr "角色"
-#: ../src/config.py:2371
+#: ../src/config.py:2377
 msgid "Banning..."
 msgstr "封禁..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2862,11 +2863,11 @@
 "<b>想做封禁谁？</b>\n"
 "\n"
-#: ../src/config.py:2375
+#: ../src/config.py:2381
 msgid "Adding Member..."
 msgstr "正在添加成员..."
-#: ../src/config.py:2376
+#: ../src/config.py:2382
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2874,11 +2875,11 @@
 "<b>想要将谁加为成员？</b>\n"
 "\n"
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Adding Owner..."
 msgstr "添加房主..."
-#: ../src/config.py:2379
+#: ../src/config.py:2385
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -2887,11 +2888,11 @@
 "<b>想要将谁加为房主？</b>\n"
 "\n"
-#: ../src/config.py:2381
+#: ../src/config.py:2387
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2899,7 +2900,7 @@
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
-#: ../src/config.py:2383
+#: ../src/config.py:2389
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2915,100 +2916,100 @@
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
-#: ../src/config.py:2488
+#: ../src/config.py:2494
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
-#: ../src/config.py:2505 ../src/roster_window.py:2734
+#: ../src/config.py:2511 ../src/roster_window.py:2734
 msgid "Password Required"
 msgstr "需要密码"
-#: ../src/config.py:2506 ../src/roster_window.py:2730
+#: ../src/config.py:2512 ../src/roster_window.py:2730
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
-#: ../src/config.py:2507 ../src/roster_window.py:2735
+#: ../src/config.py:2513 ../src/roster_window.py:2735
 msgid "Save password"
 msgstr "保存密码"
-#: ../src/config.py:2521
+#: ../src/config.py:2527
 #, python-format
 msgid "Account "%s" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
-#: ../src/config.py:2522
+#: ../src/config.py:2528
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "Default"
 msgstr "默认"
-#: ../src/config.py:2607
+#: ../src/config.py:2613
 msgid "?print_status:All"
 msgstr "?print_status:全部"
-#: ../src/config.py:2608
+#: ../src/config.py:2614
 msgid "Enter and leave only"
 msgstr "只是登录和离开"
-#: ../src/config.py:2609
+#: ../src/config.py:2615
 #, fuzzy
 msgid "?print_status:None"
 msgstr "?print_status:全部"
-#: ../src/config.py:2677
+#: ../src/config.py:2683
 msgid "New Group Chat"
 msgstr "新群聊"
-#: ../src/config.py:2710
+#: ../src/config.py:2716
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
-#: ../src/config.py:2711
+#: ../src/config.py:2717
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
-#: ../src/config.py:2973
+#: ../src/config.py:2979
 msgid "Invalid username"
 msgstr "无效用户名"
-#: ../src/config.py:2974
+#: ../src/config.py:2980
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
-#: ../src/config.py:2984 ../src/dialogs.py:1336
+#: ../src/config.py:2990 ../src/dialogs.py:1336
 msgid "Invalid password"
 msgstr "无效密码"
-#: ../src/config.py:2985
+#: ../src/config.py:2991
 msgid "You must enter a password for the new account."
 msgstr "必须为新账户输入密码。"
-#: ../src/config.py:2989 ../src/dialogs.py:1341
+#: ../src/config.py:2995 ../src/dialogs.py:1341
 msgid "Passwords do not match"
 msgstr "密码不符"
-#: ../src/config.py:2990 ../src/dialogs.py:1342
+#: ../src/config.py:2996 ../src/dialogs.py:1342
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
-#: ../src/config.py:3009
+#: ../src/config.py:3015
 msgid "Duplicate Jabber ID"
 msgstr "复制 Jabber ID"
-#: ../src/config.py:3010
+#: ../src/config.py:3016
 msgid "This account is already configured in Gajim."
 msgstr "此帐号已在 Gajim 中配置过。"
-#: ../src/config.py:3027
+#: ../src/config.py:3033
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
-#: ../src/config.py:3028 ../src/config.py:3063
+#: ../src/config.py:3034 ../src/config.py:3069
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3018,75 +3019,75 @@
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
-#: ../src/config.py:3062
+#: ../src/config.py:3068
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
-#: ../src/config.py:3080
+#: ../src/config.py:3086
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
-#: ../src/config.py:3138
+#: ../src/config.py:3144
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
-#: ../src/config.py:3139
+#: ../src/config.py:3145
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:275
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:344
 #, python-format
 msgid "_Actions for "%s""
 msgstr "“%s”的动作(_A)"
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:356
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:361
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:377
 #, 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:388
+#: ../src/conversation_textview.py:390
 #, python-format
 msgid "Web Search URL is missing an "%s""
 msgstr "网站搜索地址缺少 “%s”"
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:393
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:399
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)："
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Yesterday"
 msgstr "昨天"
#. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:764
 #, python-format
 msgid "%i days ago"
 msgstr "%i 天前"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
@@ -3918,7 +3919,7 @@
 msgstr "%s 正在 %s (%s)."
#. No status message
-#: ../src/gajim.py:1014 ../src/groupchat_control.py:952
+#: ../src/gajim.py:1014 ../src/groupchat_control.py:951
 #: ../src/roster_window.py:1220
 #, python-format
 msgid "%s is now %s"
@@ -4366,105 +4367,89 @@
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "私聊"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "私聊"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat "%s" or "%s" has left."
 msgstr "您不再在群聊“%s”中或“%s”已离开。"
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "群聊"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "群聊"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "插入昵称"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:836
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:840
 #, 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:848
+#: ../src/groupchat_control.py:847
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:851
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
-#: ../src/groupchat_control.py:860
+#: ../src/groupchat_control.py:859
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:861
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s 现在成了 %s"
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:944
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:949
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入群聊"
-#: ../src/groupchat_control.py:1072 ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183 ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1071 ../src/groupchat_control.py:1089
+#: ../src/groupchat_control.py:1182 ../src/groupchat_control.py:1199
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "昵称未找到： %s "
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1105
 msgid "This group chat has no subject"
 msgstr "这个群聊没有主题"
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126 ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1125 ../src/groupchat_control.py:1153
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr " %s 可能不是有效的 JID "
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1236
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "没有此命令：/%s ( 如果想送出，请用请用前缀 /say )"
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1259
 #, python-format
 msgid "Commands: %s"
 msgstr "命令： %s "
@@ -4793,10 +4778,22 @@
 msgstr "现在状态： %(status)s "
#: ../src/message_window.py:273
+msgid "Chats"
+msgstr "聊天"
+
+#: ../src/message_window.py:275
+msgid "Group Chats"
+msgstr "群聊"
+
+#: ../src/message_window.py:277
+msgid "Private Chats"
+msgstr "私聊"
+
+#: ../src/message_window.py:279
 msgid "Messages"
 msgstr "消息"
-#: ../src/message_window.py:274
+#: ../src/message_window.py:280
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
@@ -6111,7 +6108,7 @@
 msgstr "无效答案"
#: ../src/common/connection.py:412 ../src/common/connection.py:447
-#: ../src/common/connection.py:905
+#: ../src/common/connection.py:899
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to "%s""
@@ -6153,27 +6150,13 @@
 msgid "OpenPGP passphrase was not given"
 msgstr "未获得 OpenPGP 密文"
-#. do not show I'm invisible!
-#: ../src/common/connection.py:643
-msgid "invisible"
-msgstr "隐身"
-
-#: ../src/common/connection.py:644
-msgid "offline"
-msgstr "离线"
-
-#: ../src/common/connection.py:645
-#, python-format
-msgid "I'm %s"
-msgstr "我是 %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:730
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:786
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6183,7 +6166,7 @@
 "主题：%s\n"
 "%s"
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:925
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态不获取"
@@ -6711,6 +6694,21 @@
 msgid "Error while adding service. %s"
 msgstr "添加服务错误。 %s"
+#~ msgid "Private Chat"
+#~ msgstr "私聊"
+
+#~ msgid "Group Chat"
+#~ msgstr "群聊"
+
+#~ msgid "invisible"
+#~ msgstr "隐身"
+
+#~ msgid "offline"
+#~ msgstr "离线"
+
+#~ msgid "I'm %s"
+#~ msgstr "我是 %s"
+
 #~ msgid "A_fter nickname:"
 #~ msgstr "在昵称后：(_F)"
Modified: branches/gajim_0.11/src/chat_control.py
===================================================================
--- branches/gajim_0.11/src/chat_control.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/chat_control.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -117,10 +117,10 @@
    event_keymod):
    	pass # Derived should implement this rather than connecting to the event itself.
-	def __init__(self, type_id, parent_win, widget_name, display_names, contact,
-	acct, resource = None):
+	def __init__(self, type_id, parent_win, widget_name, contact, acct, 
+	resource = None):
    	MessageControl.__init__(self, type_id, parent_win, widget_name,
-			display_names,	contact, acct, resource = resource);
+			contact, acct, resource = resource);
    	# when/if we do XHTML we will put formatting buttons back
    	widget = self.xml.get_widget('emoticons_button')
    	id = widget.connect('clicked', self.on_emoticons_button_clicked)
@@ -170,8 +170,7 @@
    	# the following vars are used to keep history of user's messages
    	self.sent_history = []
    	self.sent_history_pos = 0
-		self.typing_new = False
-		self.orig_msg = ''
+		self.orig_msg = None
# Emoticons menu
    	# set image no matter if user wants at this time emoticons or not
@@ -541,10 +540,8 @@
    	else:
    		self.sent_history.append(message)
    		self.sent_history_pos = size + 1
+		self.orig_msg = None
-		self.typing_new = True
-		self.orig_msg = ''
-
    def print_conversation_line(self, text, kind, name, tim,
    	other_tags_for_name = [], other_tags_for_time = [], 
    	other_tags_for_text = [], count_as_new = True,
@@ -786,14 +783,13 @@
def sent_messages_scroll(self, direction, conv_buf):
    	size = len(self.sent_history) 
-		if self.typing_new:
-			#user was typing something and then went into history, so save
-			#whatever is already typed
+		if self.orig_msg is None:
+			# user was typing something and then went into history, so save
+			# whatever is already typed
    		start_iter = conv_buf.get_start_iter()
    		end_iter = conv_buf.get_end_iter()
    		self.orig_msg = conv_buf.get_text(start_iter, end_iter, 0).decode(
    			'utf-8')
-			self.typing_new = False
    	if direction == 'up':
    		if self.sent_history_pos == 0:
    			return
@@ -802,7 +798,7 @@
    	elif direction == 'down':
    		if self.sent_history_pos >= size - 1:
    			conv_buf.set_text(self.orig_msg);
-				self.typing_new = True
+				self.orig_msg = None
    			self.sent_history_pos = size
    			return
@@ -853,7 +849,7 @@
    
    def __init__(self, parent_win, contact, acct, resource = None):
    	ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
-			'chat_child_vbox', (_('Chat'), _('Chats')), contact, acct, resource)
+			'chat_child_vbox', contact, acct, resource)
    		
    	# for muc use:
    	# widget = self.xml.get_widget('muc_window_actions_button')
Modified: branches/gajim_0.11/src/common/connection.py
===================================================================
--- branches/gajim_0.11/src/common/connection.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/common/connection.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -637,12 +637,6 @@
    	if not msg:
    		msg = ''
    	keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-		if keyID and USE_GPG and not msg:
-			lowered_uf_status_msg = helpers.get_uf_show(show).lower()
-			# do not show I'm invisible!
-			if lowered_uf_status_msg == _('invisible').lower():
-				lowered_uf_status_msg = _('offline').lower()
-			msg = _("I'm %s") % lowered_uf_status_msg
    	signed = ''
    	if not auto and not show == 'offline':
    		signed = self.get_signed_msg(msg)
@@ -1057,7 +1051,7 @@
    		t.setTagData('password', password)
    	self.connection.send(p)
-		#last date/time in history to avoid duplicate
+		# last date/time in history to avoid duplicate
    	if not self.last_history_line.has_key(room_jid): 
    		# Not in memory, get it from DB
    		last_log = gajim.logger.get_last_date_that_has_logs(room_jid,
@@ -1086,13 +1080,6 @@
    		to = room_jid)
    	self.connection.send(iq)
-	def change_gc_nick(self, room_jid, nick):
-		if not self.connection:
-			return
-		p = common.xmpp.Presence(to = '%s/%s' % (room_jid, nick))
-		p = self.add_sha(p)
-		self.connection.send(p)
-
    def send_gc_status(self, nick, jid, show, status):
    	if not self.connection:
    		return
Modified: branches/gajim_0.11/src/common/dataforms.py
===================================================================
--- branches/gajim_0.11/src/common/dataforms.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/common/dataforms.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -366,16 +366,16 @@
    	# TODO: the same code is in TextMultiField. join them
    	def fget(self):
    		value = u''
-			for valuenode in self.getTags('value'):
+			for valuenode in self.getTags('instructions'):
    			value += '\n' + valuenode.getData()
    		return value[1:]
    	def fset(self, value):
    		fdel(self)
    		if value == '': return
    		for line in value.split('\n'):
-				self.addChild('value').setData(line)
+				self.addChild('instructions').setData(line)
    	def fdel(self):
-			for value in self.getTags('value'):
+			for value in self.getTags('instructions'):
    			self.delChild(value)
    	return locals()
Modified: branches/gajim_0.11/src/config.py
===================================================================
--- branches/gajim_0.11/src/config.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/config.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -761,7 +761,7 @@
def on_reset_colors_button_clicked(self, widget):
    	for i in ('inmsgcolor', 'outmsgcolor', 'statusmsgcolor', 'urlmsgcolor'):
-			gajim.config.set(i, gajim.interface.default_values[i])
+			gajim.config.set(i, gajim.interface.default_colors[i])
self.xml.get_widget('incoming_msg_colorbutton').set_color(\
    		gtk.gdk.color_parse(gajim.config.get('inmsgcolor')))
@@ -901,6 +901,12 @@
    		model[iter][3])
    	gajim.config.set_per('defaultstatusmsg', status, 'message', message)
+	def on_default_status_expander_activate(self, expander):
+		eventbox = self.xml.get_widget('default_status_eventbox')
+		vbox = self.xml.get_widget('status_vbox')
+		vbox.set_child_packing(eventbox, not expander.get_expanded(), True, 0,
+			gtk.PACK_START)
+
    def save_status_messages(self, model):
    	for msg in gajim.config.get_per('statusmsg'):
    		gajim.config.del_per('statusmsg', msg)
Modified: branches/gajim_0.11/src/conversation_textview.py
===================================================================
--- branches/gajim_0.11/src/conversation_textview.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/conversation_textview.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -35,6 +35,10 @@
 class ConversationTextview:
    '''Class for the conversation textview (where user reads already said messages)
    for chat/groupchat windows'''
+	
+	path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png')
+	FOCUS_OUT_LINE_PIXBUF = gtk.gdk.pixbuf_new_from_file(path_to_file)
+
    def __init__(self, account, used_in_history_window = False):
    	'''if used_in_history_window is True, then we do not show
    	Clear menuitem in context menu'''
@@ -138,11 +142,8 @@
    	self.focus_out_end_iter_offset = None
self.line_tooltip = tooltips.BaseTooltip()
-		
-		path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png')
-		self.focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file)
    	# use it for hr too
-		self.tv.focus_out_line_pixbuf = self.focus_out_line_pixbuf
+		self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF
def del_handlers(self):
    	for i in self.handlers.keys():
@@ -239,7 +240,8 @@
    		# add the new focus out line
    		end_iter = buffer.get_end_iter()
    		buffer.insert(end_iter, '\n')
-			buffer.insert_pixbuf(end_iter, self.focus_out_line_pixbuf)
+			buffer.insert_pixbuf(end_iter, 
+				ConversationTextview.FOCUS_OUT_LINE_PIXBUF)
end_iter = buffer.get_end_iter()
    		before_img_iter = end_iter.copy()
Modified: branches/gajim_0.11/src/disco.py
===================================================================
--- branches/gajim_0.11/src/disco.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/disco.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -1724,9 +1724,9 @@
    def _create_treemodel(self):
    	''' Create treemodel for the window. '''
    	# JID, node, name (with description) - pango markup, dont have info?, subscribed?
-		model = gtk.ListStore(str, str, str, bool, bool)
-		model.set_sort_column_id(3, gtk.SORT_ASCENDING)
-		self.window.services_treeview.set_model(model)
+		self.model = gtk.ListStore(str, str, str, bool, bool)
+		self.model.set_sort_column_id(3, gtk.SORT_ASCENDING)
+		self.window.services_treeview.set_model(self.model)
# Name column
    	# Pango markup for name and description, description printed with
@@ -1748,14 +1748,14 @@
self.window.services_treeview.set_headers_visible(True)
-	def _add_item(self, model, jid, node, item, force):
+	def _add_item(self, jid, node, item, force):
    	''' Called when we got basic information about new node from query.
    	Show the item. '''
    	name = item.get('name', '')
if self.subscriptions is not None:
    		dunno = False
-			subscribed = name in self.subscriptions
+			subscribed = node in self.subscriptions
    	else:
    		dunno = True
    		subscribed = False
@@ -1763,7 +1763,7 @@
    	name = gtkgui_helpers.escape_for_pango_markup(name)
    	name = '<b>%s</b>' % name
-		model.append((jid, node, name, dunno, subscribed))
+		self.model.append((jid, node, name, dunno, subscribed))
def _add_actions(self):
    	self.post_button = gtk.Button(label=_('New post'), use_underline=True)
@@ -1845,33 +1845,26 @@
    def _subscriptionsCB(self, conn, request):
    	''' We got the subscribed groups list stanza. Now, if we already
    	have items on the list, we should actualize them. '''
-		print 0
    	try:
    		subscriptions = request.getTag('pubsub').getTag('subscriptions')
    	except:
    		return
-		print 1
    	groups = set()
    	for child in subscriptions.getTags('subscription'):
-			print 2, repr(child), str(child)
    		groups.add(child['node'])
-		print 3, groups
self.subscriptions = groups
# try to setup existing items in model
    	model = self.window.services_treeview.get_model()
-		print 4
    	for row in model:
-			print 5
    		# 1 = group node
    		# 3 = insensitive checkbox for subscribed
    		# 4 = subscribed?
    		groupnode = row[1]
    		row[3]=False
    		row[4]=groupnode in groups
-		print 6
# we now know subscriptions, update button states
    	self.update_actions()
Modified: branches/gajim_0.11/src/gajim.py
===================================================================
--- branches/gajim_0.11/src/gajim.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/gajim.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -2009,7 +2009,7 @@
    	self.emoticons_menu = None
    	# handler when an emoticon is clicked in emoticons_menu
    	self.emoticon_menuitem_clicked = None
-		self.default_values = {
+		self.default_colors = {
    		'inmsgcolor': gajim.config.get('inmsgcolor'),
    		'outmsgcolor': gajim.config.get('outmsgcolor'),
    		'statusmsgcolor': gajim.config.get('statusmsgcolor'),
@@ -2212,7 +2212,7 @@
    			# NORMALLY]
    			try:
    				cli.set_restart_command(argv)
-				except TypeError:
+				except AttributeError:
    				cli.set_restart_command(len(argv), argv)
    	
    check_paths.check_and_possibly_create_paths()
Modified: branches/gajim_0.11/src/groupchat_control.py
===================================================================
--- branches/gajim_0.11/src/groupchat_control.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/groupchat_control.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -103,7 +103,6 @@
    	self.room_name = room_ctrl.name
    	ChatControl.__init__(self, parent_win, contact, acct)
    	self.TYPE_ID = 'pm'
-		self.display_names = (_('Private Chat'), _('Private Chats'))
def send_message(self, message):
    	'''call this function to send our message'''
@@ -138,11 +137,14 @@
class GroupchatControl(ChatControlBase):
    TYPE_ID = message_control.TYPE_GC
+	# alphanum sorted
+	MUC_CMDS = ['ban', 'chat', 'query', 'clear', 'close', 'compact',
+		'help', 'invite', 'join', 'kick', 'leave', 'me', 'msg', 'nick',
+		'part', 'names', 'say', 'topic']
def __init__(self, parent_win, contact, acct):
    	ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
-					'muc_child_vbox', (_('Group Chat'), _('Group Chats')),
-					contact, acct);
+					'muc_child_vbox', contact, acct);
widget = self.xml.get_widget('muc_window_actions_button')
    	id = widget.connect('clicked', self.on_actions_button_clicked)
@@ -189,14 +191,11 @@
    		gajim.config.get('hide_groupchat_occupants_list'))
self._last_selected_contact = None # None or holds jid, account tuple
-		# alphanum sorted
-		self.muc_cmds = ['ban', 'chat', 'query', 'clear', 'close', 'compact',
-			'help', 'invite', 'join', 'kick', 'leave', 'me', 'msg', 'nick',
-			'part', 'names', 'say', 'topic']
+
    	# muc attention flag (when we are mentioned in a muc)
    	# if True, the room has mentioned us
    	self.attention_flag = False
-		self.room_creation = time.time()
+		self.room_creation = int(time.time()) # Use int to reduce mem usage
    	self.nick_hits = []
    	self.cmd_hits = []
    	self.last_key_tabs = False
@@ -1049,7 +1048,7 @@
    		if len(message_array) and message_array[0] != self.nick:
    			nick = message_array[0]
    			nick = helpers.parse_resource(nick)
-				gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
+				gajim.connections[self.account].join_gc(nick, self.room_jid, None)
    			self.clear(self.msg_textview)
    		else:
    			self.get_command_help(command)
@@ -1257,7 +1256,8 @@
def get_command_help(self, command):
    	if command == 'help':
-			self.print_conversation(_('Commands: %s') % self.muc_cmds, 'info')
+			self.print_conversation(_('Commands: %s') % GroupchatControl.MUC_CMDS,
+				'info')
    	elif command == 'ban':
    		s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the group chat.'
    			' The nickname of an occupant may be substituted, but not if it '
@@ -1329,7 +1329,7 @@
    	def on_ok(widget):
    		nick = instance.input_entry.get_text().decode('utf-8')
    		nick = helpers.parse_resource(nick)
-			gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
+			gajim.connections[self.account].join_gc(nick, self.room_jid, None)
    		self.nick = nick
    	instance = dialogs.InputDialog(title, prompt, proposed_nick,
    		is_modal = False, ok_handler = on_ok)
@@ -1505,7 +1505,7 @@
    		if text.startswith('/') and len(splitted_text) == 1:
    			text = splitted_text[0]
    			if len(text) == 1: # user wants to cycle all commands
-					self.cmd_hits = self.muc_cmds
+					self.cmd_hits = GroupchatControl.MUC_CMDS
    			else:
    				# cycle possible commands depending on what the user typed
    				if self.last_key_tabs and len(self.cmd_hits) and \
@@ -1514,7 +1514,7 @@
    					self.cmd_hits.pop(0)
    				else: # find possible commands
    					self.cmd_hits = []
-						for cmd in self.muc_cmds:
+						for cmd in GroupchatControl.MUC_CMDS:
    						if cmd.startswith(text.lstrip('/')):
    							self.cmd_hits.append(cmd)
    			if len(self.cmd_hits):
Modified: branches/gajim_0.11/src/message_control.py
===================================================================
--- branches/gajim_0.11/src/message_control.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/message_control.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -25,16 +25,13 @@
 class MessageControl:
    '''An abstract base widget that can embed in the gtk.Notebook of a MessageWindow'''
-	def __init__(self, type_id, parent_win, widget_name, display_names, contact, account, resource = None):
-		'''The display_names argument is a two element tuple containing the desired
-		display name (pretty string) for the control in both singular and plural form'''
+	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 = {} 
    	self.type_id = type_id
    	self.parent_win = parent_win
    	self.widget_name = widget_name
-		self.display_names = display_names
    	self.contact = contact
    	self.account = account
    	self.hide_chat_buttons_current = False
Modified: branches/gajim_0.11/src/message_window.py
===================================================================
--- branches/gajim_0.11/src/message_window.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/message_window.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -264,11 +264,17 @@
    			name += '/' + control.resource
window_mode = gajim.interface.msg_win_mgr.mode
+
    	if self.get_num_controls() == 1:
    		label = name
    	elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
    		# Show the plural form since number of tabs > 1
-			label = control.display_names[1]
+			if self.type == 'chat':
+				label = _('Chats')
+			elif self.type == 'gc':
+				label = _('Group Chats')
+			else:
+				label = _('Private Chats')
    	else:
    		label = _('Messages')
    	title = _('%s - Gajim') % label
Modified: branches/gajim_0.11/src/roster_window.py
===================================================================
--- branches/gajim_0.11/src/roster_window.py	2007-02-15 15:59:55 UTC (rev 7983)
+++ branches/gajim_0.11/src/roster_window.py	2007-02-15 18:05:38 UTC (rev 7984)
@@ -2812,7 +2812,7 @@
    		if status == 'online' and gajim.interface.sleeper.getState() != \
    		common.sleepy.STATE_UNKNOWN:
    			gajim.sleeper_state[account] = 'online'
-			else:
+			elif gajim.sleeper_state[account] not in ('autoaway', 'autoxa'):
    			gajim.sleeper_state[account] = 'off'
    	gajim.connections[account].change_status(status, txt, auto)

    