Index: kde-croatia/kde4/summit/hr/summit/messages/extragear-network/konversation.po
===================================================================
--- kde-croatia/kde4/summit/hr/summit/messages/extragear-network/konversation.po	(revision 275)
+++ kde-croatia/kde4/summit/hr/summit/messages/extragear-network/konversation.po	(revision 295)
@@ -6,5 +6,5 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-04-27 12:18+0200\n"
+"POT-Creation-Date: 2010-05-07 14:40+0200\n"
 "PO-Revision-Date: 2009-09-17 11:23+0200\n"
 "Last-Translator: Andrej DundoviÄ <adundovi@gmail.com>\n"
@@ -1488,5 +1488,5 @@
 #. i18n: ectx: property (text), widget (QTreeWidget, sortOrder)
 #. +> trunk
-#: src/config/nicklistbehavior_configui.ui:98 src/irc/channel.cpp:2152
+#: src/config/nicklistbehavior_configui.ui:98 src/irc/channel.cpp:2147
 #: src/irc/channelnick.cpp:208 src/irc/channeloptionsdialog.cpp:296
 #: src/irc/inputfilter.cpp:982 src/irc/inputfilter.cpp:986
@@ -1744,7 +1744,7 @@
 #: src/config/settingsdialog.cpp:140 src/config/warnings_config.cpp:137
 #: src/irc/channel.cpp:667 src/irc/channel.cpp:668
-#: src/irc/nicklistview.cpp:166 src/irc/outputfilter.cpp:1492
+#: src/irc/nicklistview.cpp:158 src/irc/outputfilter.cpp:1492
 #: src/irc/outputfilter.cpp:1563 src/irc/query.cpp:88 src/irc/query.cpp:394
-#: src/irc/query.cpp:395 src/viewer/ircview.cpp:1341
+#: src/irc/query.cpp:395 src/viewer/ircview.cpp:1333
 #, fuzzy
 msgid "Ignore"
@@ -2129,6 +2129,6 @@
 #. +> trunk
 #: src/config/warnings_config.cpp:138 src/irc/channel.cpp:692
-#: src/irc/channel.cpp:693 src/irc/nicklistview.cpp:167 src/irc/query.cpp:89
-#: src/irc/query.cpp:420 src/irc/query.cpp:421 src/viewer/ircview.cpp:1342
+#: src/irc/channel.cpp:693 src/irc/nicklistview.cpp:159 src/irc/query.cpp:89
+#: src/irc/query.cpp:420 src/irc/query.cpp:421 src/viewer/ircview.cpp:1334
 msgid "Unignore"
 msgstr ""
@@ -2641,5 +2641,5 @@
 
 #. +> trunk
-#: src/dcc/recipientdialog.cpp:64 src/identitydialog.cpp:70
+#: src/dcc/recipientdialog.cpp:64 src/identitydialog.cpp:66
 #: src/irc/servergroupdialog.cpp:76 src/viewer/editnotifydialog.cpp:72
 #, fuzzy
@@ -2653,5 +2653,5 @@
 
 #. +> trunk
-#: src/dcc/recipientdialog.cpp:65 src/identitydialog.cpp:71
+#: src/dcc/recipientdialog.cpp:65 src/identitydialog.cpp:67
 #: src/irc/servergroupdialog.cpp:77
 #: src/linkaddressbook/addressbook_base.cpp:501
@@ -3050,5 +3050,5 @@
 
 #. +> trunk
-#: src/dcc/transferpanel.cpp:45 src/viewer/viewcontainer.cpp:2129
+#: src/dcc/transferpanel.cpp:45 src/viewer/viewcontainer.cpp:2124
 msgid "DCC Status"
 msgstr ""
@@ -3141,5 +3141,5 @@
 
 #. +> trunk
-#: src/dcc/transferpanel.cpp:432
+#: src/dcc/transferpanel.cpp:446
 #, fuzzy, kde-format
 msgid "You have selected %1 file to execute, are you sure you want to continue?"
@@ -3150,5 +3150,5 @@
 
 #. +> trunk
-#: src/dcc/transferpanel.cpp:435
+#: src/dcc/transferpanel.cpp:449
 #, fuzzy, kde-format
 msgid "Execute %1 file"
@@ -3159,5 +3159,5 @@
 
 #. +> trunk
-#: src/dcc/transferpanel.cpp:575
+#: src/dcc/transferpanel.cpp:589
 #, kde-format
 msgid "Available information for file %1:"
@@ -3165,11 +3165,11 @@
 
 #. +> trunk
-#: src/dcc/transferpanel.cpp:577 src/dcc/transferpanel.cpp:583
-#: src/dcc/transferpanel.cpp:590
+#: src/dcc/transferpanel.cpp:591 src/dcc/transferpanel.cpp:597
+#: src/dcc/transferpanel.cpp:604
 msgid "File Information"
 msgstr ""
 
 #. +> trunk
-#: src/dcc/transferpanel.cpp:590
+#: src/dcc/transferpanel.cpp:604
 msgid "No detailed information for this file found."
 msgstr ""
@@ -3396,5 +3396,5 @@
 
 #. +> trunk
-#: src/dcc/transferview.cpp:303
+#: src/dcc/transferview.cpp:306
 #, fuzzy
 msgid "Columns"
@@ -3614,5 +3614,5 @@
 
 #. +> trunk
-#: src/identitydialog.cpp:59
+#: src/identitydialog.cpp:58
 msgid " minute"
 msgid_plural " minutes"
@@ -3621,16 +3621,10 @@
 
 #. +> trunk
-#: src/identitydialog.cpp:61
-#, fuzzy
-msgid " minutes"
-msgstr " minute"
-
-#. +> trunk
-#: src/identitydialog.cpp:70
+#: src/identitydialog.cpp:66
 msgid "Change identity information"
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:71 src/irc/servergroupdialog.cpp:77
+#: src/identitydialog.cpp:67 src/irc/servergroupdialog.cpp:77
 #: src/viewer/editnotifydialog.cpp:73
 msgid "Discards all changes made"
@@ -3638,37 +3632,37 @@
 
 #. +> trunk
-#: src/identitydialog.cpp:177
+#: src/identitydialog.cpp:173
 msgid "Add Identity"
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:177 src/identitydialog.cpp:200
-#: src/identitydialog.cpp:255
+#: src/identitydialog.cpp:173 src/identitydialog.cpp:196
+#: src/identitydialog.cpp:251
 msgid "Identity name:"
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:191 src/identitydialog.cpp:209
-#: src/identitydialog.cpp:268
+#: src/identitydialog.cpp:187 src/identitydialog.cpp:205
+#: src/identitydialog.cpp:264
 msgid "You need to give the identity a name."
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:200
+#: src/identitydialog.cpp:196
 msgid "Rename Identity"
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:234
+#: src/identitydialog.cpp:230
 msgid "This identity is in use, if you remove it the network settings using it will fall back to the default identity. Should it be deleted anyway?"
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:239
+#: src/identitydialog.cpp:235
 msgid "Are you sure you want to delete all information for this identity?"
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:242
+#: src/identitydialog.cpp:238
 msgid "Delete Identity"
 msgstr ""
@@ -3677,5 +3671,5 @@
 #. i18n: ectx: property (toolTip), widget (QToolButton, m_removeChannelButton)
 #. +> trunk
-#: src/identitydialog.cpp:243 src/irc/servergroupdialogui.ui:147
+#: src/identitydialog.cpp:239 src/irc/servergroupdialogui.ui:147
 #: src/irc/servergroupdialogui.ui:238
 #, fuzzy
@@ -3684,15 +3678,15 @@
 
 #. +> trunk
-#: src/identitydialog.cpp:255
+#: src/identitydialog.cpp:251
 msgid "Duplicate Identity"
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:298
+#: src/identitydialog.cpp:294
 msgid "You must add at least one nick to the identity."
 msgstr ""
 
 #. +> trunk
-#: src/identitydialog.cpp:309
+#: src/identitydialog.cpp:305
 msgid "Please enter a real name."
 msgstr ""
@@ -4030,5 +4024,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:849
+#: src/irc/channel.cpp:844
 #, fuzzy
 msgid "Completion"
@@ -4036,5 +4030,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:849
+#: src/irc/channel.cpp:844
 #, kde-format
 msgid "Possible completions: %1."
@@ -4042,10 +4036,10 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1222
+#: src/irc/channel.cpp:1217
 msgid "Channel Password"
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1237
+#: src/irc/channel.cpp:1232
 #, fuzzy
 msgid "Channel User Limit"
@@ -4053,5 +4047,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1238
+#: src/irc/channel.cpp:1233
 #, fuzzy
 msgid "Enter the new user limit for the channel:"
@@ -4059,5 +4053,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1354 src/irc/channel.cpp:1359
+#: src/irc/channel.cpp:1349 src/irc/channel.cpp:1354
 #: src/irc/inputfilter.cpp:1193 src/irc/inputfilter.cpp:1211
 #: src/irc/inputfilter.cpp:1225 src/irc/inputfilter.cpp:1240
@@ -4068,5 +4062,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1354
+#: src/irc/channel.cpp:1349
 #, kde-format
 msgid "You are now known as %1."
@@ -4074,5 +4068,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1359 src/irc/query.cpp:178
+#: src/irc/channel.cpp:1354 src/irc/query.cpp:178
 #, kde-format
 msgid "%1 is now known as %2."
@@ -4080,5 +4074,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1375 src/irc/channel.cpp:1391
+#: src/irc/channel.cpp:1370 src/irc/channel.cpp:1386
 #: src/irc/invitedialog.cpp:166 src/viewer/ircview.cpp:830
 #, fuzzy
@@ -4087,5 +4081,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1376
+#: src/irc/channel.cpp:1371
 #, kde-format
 msgctxt "%1 is the channel and %2 is our hostmask"
@@ -4094,5 +4088,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1392
+#: src/irc/channel.cpp:1387
 #, kde-format
 msgctxt "%1 is the nick joining and %2 the hostmask of that nick"
@@ -4101,6 +4095,6 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1414 src/irc/channel.cpp:1416 src/irc/channel.cpp:1435
-#: src/irc/channel.cpp:1437 src/irc/query.cpp:686 src/irc/query.cpp:693
+#: src/irc/channel.cpp:1409 src/irc/channel.cpp:1411 src/irc/channel.cpp:1430
+#: src/irc/channel.cpp:1432 src/irc/query.cpp:686 src/irc/query.cpp:693
 #: src/viewer/ircview.cpp:835
 #, fuzzy
@@ -4109,10 +4103,10 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1414
+#: src/irc/channel.cpp:1409
 msgid "You have left this server."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1416
+#: src/irc/channel.cpp:1411
 #, kde-format
 msgctxt "%1 adds the reason"
@@ -4121,11 +4115,11 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1421 src/irc/channel.cpp:1423 src/irc/channel.cpp:1443
-#: src/irc/channel.cpp:1445 src/viewer/ircview.cpp:835
+#: src/irc/channel.cpp:1416 src/irc/channel.cpp:1418 src/irc/channel.cpp:1438
+#: src/irc/channel.cpp:1440 src/viewer/ircview.cpp:835
 msgid "Part"
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1421
+#: src/irc/channel.cpp:1416
 #, kde-format
 msgid "You have left channel %1."
@@ -4133,5 +4127,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1424
+#: src/irc/channel.cpp:1419
 #, kde-format
 msgctxt "%1 adds the channel and %2 the reason"
@@ -4140,5 +4134,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1435 src/irc/query.cpp:686
+#: src/irc/channel.cpp:1430 src/irc/query.cpp:686
 #, kde-format
 msgid "%1 has left this server."
@@ -4146,5 +4140,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1438
+#: src/irc/channel.cpp:1433
 #, kde-format
 msgctxt "%1 adds the nick and %2 the reason"
@@ -4153,5 +4147,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1443
+#: src/irc/channel.cpp:1438
 #, kde-format
 msgid "%1 has left this channel."
@@ -4159,5 +4153,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1446
+#: src/irc/channel.cpp:1441
 #, kde-format
 msgctxt "%1 adds the nick and %2 the reason"
@@ -4166,13 +4160,13 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1500 src/irc/channel.cpp:1502 src/irc/channel.cpp:1509
-#: src/irc/channel.cpp:1514 src/irc/channel.cpp:1535 src/irc/channel.cpp:1537
-#: src/irc/channel.cpp:1544 src/irc/channel.cpp:1549
-#: src/irc/nicklistview.cpp:148 src/viewer/ircview.cpp:1315
+#: src/irc/channel.cpp:1495 src/irc/channel.cpp:1497 src/irc/channel.cpp:1504
+#: src/irc/channel.cpp:1509 src/irc/channel.cpp:1530 src/irc/channel.cpp:1532
+#: src/irc/channel.cpp:1539 src/irc/channel.cpp:1544
+#: src/irc/nicklistview.cpp:140 src/viewer/ircview.cpp:1307
 msgid "Kick"
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1500
+#: src/irc/channel.cpp:1495
 #, kde-format
 msgid "You have kicked yourself from channel %1."
@@ -4180,5 +4174,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1503
+#: src/irc/channel.cpp:1498
 #, kde-format
 msgctxt "%1 adds the channel and %2 the reason"
@@ -4187,5 +4181,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1510
+#: src/irc/channel.cpp:1505
 #, kde-format
 msgctxt "%1 adds the channel, %2 adds the kicker"
@@ -4194,5 +4188,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1515
+#: src/irc/channel.cpp:1510
 #, kde-format
 msgctxt "%1 adds the channel, %2 the kicker and %3 the reason"
@@ -4201,5 +4195,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1535
+#: src/irc/channel.cpp:1530
 #, kde-format
 msgid "You have kicked %1 from the channel."
@@ -4207,5 +4201,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1538
+#: src/irc/channel.cpp:1533
 #, kde-format
 msgctxt "%1 adds the kicked nick and %2 the reason"
@@ -4214,5 +4208,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1545
+#: src/irc/channel.cpp:1540
 #, kde-format
 msgctxt "%1 adds the kicked nick, %2 adds the kicker"
@@ -4221,5 +4215,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1550
+#: src/irc/channel.cpp:1545
 #, kde-format
 msgctxt "%1 adds the kicked nick, %2 the kicker and %3 the reason"
@@ -4228,5 +4222,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1622
+#: src/irc/channel.cpp:1617
 #, kde-format
 msgid "%1 nick"
@@ -4236,5 +4230,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1623
+#: src/irc/channel.cpp:1618
 #, kde-format
 msgid " (%1 op)"
@@ -4244,5 +4238,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1630 src/irc/channel.cpp:1649 src/irc/channel.cpp:1653
+#: src/irc/channel.cpp:1625 src/irc/channel.cpp:1644 src/irc/channel.cpp:1648
 #: src/irc/inputfilter.cpp:1109 src/irc/inputfilter.cpp:1125
 #: src/irc/inputfilter.cpp:1132
@@ -4251,5 +4245,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1630
+#: src/irc/channel.cpp:1625
 #, kde-format
 msgid "The channel topic is \"%1\"."
@@ -4257,5 +4251,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1640
+#: src/irc/channel.cpp:1635
 #, fuzzy
 msgid "unknown"
@@ -4263,5 +4257,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1649
+#: src/irc/channel.cpp:1644
 #, kde-format
 msgid "You set the channel topic to \"%1\"."
@@ -4269,5 +4263,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1653
+#: src/irc/channel.cpp:1648
 #, kde-format
 msgid "%1 sets the channel topic to \"%2\"."
@@ -4275,22 +4269,22 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1746
+#: src/irc/channel.cpp:1741
 msgid "You give channel owner privileges to yourself."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1743
+#, kde-format
+msgid "You give channel owner privileges to %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1748
 #, kde-format
-msgid "You give channel owner privileges to %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1753
-#, kde-format
 msgid "%1 gives channel owner privileges to you."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1755
+#: src/irc/channel.cpp:1750
 #, kde-format
 msgid "%1 gives channel owner privileges to %2."
@@ -4298,22 +4292,22 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1763
+#: src/irc/channel.cpp:1758
 msgid "You take channel owner privileges from yourself."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1760
+#, kde-format
+msgid "You take channel owner privileges from %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1765
 #, kde-format
-msgid "You take channel owner privileges from %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1770
-#, kde-format
 msgid "%1 takes channel owner privileges from you."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1772
+#: src/irc/channel.cpp:1767
 #, kde-format
 msgid "%1 takes channel owner privileges from %2."
@@ -4321,22 +4315,22 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1788
+#: src/irc/channel.cpp:1783
 msgid "You give channel admin privileges to yourself."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1785
+#, kde-format
+msgid "You give channel admin privileges to %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1790
 #, kde-format
-msgid "You give channel admin privileges to %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1795
-#, kde-format
 msgid "%1 gives channel admin privileges to you."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1797
+#: src/irc/channel.cpp:1792
 #, kde-format
 msgid "%1 gives channel admin privileges to %2."
@@ -4344,22 +4338,22 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1805
+#: src/irc/channel.cpp:1800
 msgid "You take channel admin privileges from yourself."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1802
+#, kde-format
+msgid "You take channel admin privileges from %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1807
 #, kde-format
-msgid "You take channel admin privileges from %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1812
-#, kde-format
 msgid "%1 takes channel admin privileges from you."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1814
+#: src/irc/channel.cpp:1809
 #, kde-format
 msgid "%1 takes channel admin privileges from %2."
@@ -4367,22 +4361,22 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1830
+#: src/irc/channel.cpp:1825
 msgid "You give channel operator privileges to yourself."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1827
+#, kde-format
+msgid "You give channel operator privileges to %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1832
 #, kde-format
-msgid "You give channel operator privileges to %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1837
-#, kde-format
 msgid "%1 gives channel operator privileges to you."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1839
+#: src/irc/channel.cpp:1834
 #, kde-format
 msgid "%1 gives channel operator privileges to %2."
@@ -4390,22 +4384,22 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1847
+#: src/irc/channel.cpp:1842
 msgid "You take channel operator privileges from yourself."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1844
+#, kde-format
+msgid "You take channel operator privileges from %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1849
 #, kde-format
-msgid "You take channel operator privileges from %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1854
-#, kde-format
 msgid "%1 takes channel operator privileges from you."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1856
+#: src/irc/channel.cpp:1851
 #, kde-format
 msgid "%1 takes channel operator privileges from %2."
@@ -4413,22 +4407,22 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1872
+#: src/irc/channel.cpp:1867
 msgid "You give channel halfop privileges to yourself."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1869
+#, kde-format
+msgid "You give channel halfop privileges to %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1874
 #, kde-format
-msgid "You give channel halfop privileges to %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1879
-#, kde-format
 msgid "%1 gives channel halfop privileges to you."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1881
+#: src/irc/channel.cpp:1876
 #, kde-format
 msgid "%1 gives channel halfop privileges to %2."
@@ -4436,22 +4430,22 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:1889
+#: src/irc/channel.cpp:1884
 msgid "You take channel halfop privileges from yourself."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1886
+#, kde-format
+msgid "You take channel halfop privileges from %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1891
 #, kde-format
-msgid "You take channel halfop privileges from %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1896
-#, kde-format
 msgid "%1 takes channel halfop privileges from you."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:1898
+#: src/irc/channel.cpp:1893
 #, kde-format
 msgid "%1 takes channel halfop privileges from %2."
@@ -4459,6 +4453,18 @@
 
 #. +> trunk
+#: src/irc/channel.cpp:1910
+msgid "You give yourself permission to talk."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:1911
+#, kde-format
+msgid "You give %1 permission to talk."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1915
-msgid "You give yourself permission to talk."
+#, kde-format
+msgid "%1 gives you permission to talk."
 msgstr ""
 
@@ -4466,22 +4472,22 @@
 #: src/irc/channel.cpp:1916
 #, kde-format
-msgid "You give %1 permission to talk."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1920
-#, kde-format
-msgid "%1 gives you permission to talk."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1921
-#, kde-format
 msgid "%1 gives %2 permission to talk."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1923
+msgid "You take the permission to talk from yourself."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:1924
+#, kde-format
+msgid "You take the permission to talk from %1."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1928
-msgid "You take the permission to talk from yourself."
+#, kde-format
+msgid "%1 takes the permission to talk from you."
 msgstr ""
 
@@ -4489,22 +4495,21 @@
 #: src/irc/channel.cpp:1929
 #, kde-format
-msgid "You take the permission to talk from %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1933
-#, kde-format
-msgid "%1 takes the permission to talk from you."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1934
-#, kde-format
 msgid "%1 takes the permission to talk from %2."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1941
+msgid "You set the channel mode to 'no colors allowed'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:1942
+#, kde-format
+msgid "%1 sets the channel mode to 'no colors allowed'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1946
-msgid "You set the channel mode to 'no colors allowed'."
+msgid "You set the channel mode to 'allow color codes'."
 msgstr ""
 
@@ -4512,21 +4517,21 @@
 #: src/irc/channel.cpp:1947
 #, kde-format
-msgid "%1 sets the channel mode to 'no colors allowed'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1951
-msgid "You set the channel mode to 'allow color codes'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1952
-#, kde-format
 msgid "%1 sets the channel mode to 'allow color codes'."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1954
+msgid "You set the channel mode to 'invite only'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:1955
+#, kde-format
+msgid "%1 sets the channel mode to 'invite only'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1959
-msgid "You set the channel mode to 'invite only'."
+msgid "You remove the 'invite only' mode from the channel."
 msgstr ""
 
@@ -4534,21 +4539,21 @@
 #: src/irc/channel.cpp:1960
 #, kde-format
-msgid "%1 sets the channel mode to 'invite only'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1964
-msgid "You remove the 'invite only' mode from the channel."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1965
-#, kde-format
 msgid "%1 removes the 'invite only' mode from the channel."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1968
+msgid "You set the channel mode to 'moderated'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:1969
+#, kde-format
+msgid "%1 sets the channel mode to 'moderated'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1973
-msgid "You set the channel mode to 'moderated'."
+msgid "You set the channel mode to 'unmoderated'."
 msgstr ""
 
@@ -4556,21 +4561,21 @@
 #: src/irc/channel.cpp:1974
 #, kde-format
-msgid "%1 sets the channel mode to 'moderated'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1978
-msgid "You set the channel mode to 'unmoderated'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1979
-#, kde-format
 msgid "%1 sets the channel mode to 'unmoderated'."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1982
+msgid "You set the channel mode to 'no messages from outside'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:1983
+#, kde-format
+msgid "%1 sets the channel mode to 'no messages from outside'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:1987
-msgid "You set the channel mode to 'no messages from outside'."
+msgid "You set the channel mode to 'allow messages from outside'."
 msgstr ""
 
@@ -4578,21 +4583,21 @@
 #: src/irc/channel.cpp:1988
 #, kde-format
-msgid "%1 sets the channel mode to 'no messages from outside'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1992
-msgid "You set the channel mode to 'allow messages from outside'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:1993
-#, kde-format
 msgid "%1 sets the channel mode to 'allow messages from outside'."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:1996
+msgid "You set the channel mode to 'private'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:1997
+#, kde-format
+msgid "%1 sets the channel mode to 'private'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2001
-msgid "You set the channel mode to 'private'."
+msgid "You set the channel mode to 'public'."
 msgstr ""
 
@@ -4600,21 +4605,21 @@
 #: src/irc/channel.cpp:2002
 #, kde-format
-msgid "%1 sets the channel mode to 'private'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2006
-msgid "You set the channel mode to 'public'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2007
-#, kde-format
 msgid "%1 sets the channel mode to 'public'."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:2011
+msgid "You set the channel mode to 'secret'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2012
+#, kde-format
+msgid "%1 sets the channel mode to 'secret'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2016
-msgid "You set the channel mode to 'secret'."
+msgid "You set the channel mode to 'visible'."
 msgstr ""
 
@@ -4622,21 +4627,21 @@
 #: src/irc/channel.cpp:2017
 #, kde-format
-msgid "%1 sets the channel mode to 'secret'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2021
-msgid "You set the channel mode to 'visible'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2022
-#, kde-format
 msgid "%1 sets the channel mode to 'visible'."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:2028
+msgid "You switch on 'topic protection'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2029
+#, kde-format
+msgid "%1 switches on 'topic protection'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2033
-msgid "You switch on 'topic protection'."
+msgid "You switch off 'topic protection'."
 msgstr ""
 
@@ -4644,22 +4649,22 @@
 #: src/irc/channel.cpp:2034
 #, kde-format
-msgid "%1 switches on 'topic protection'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2038
-msgid "You switch off 'topic protection'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2039
-#, kde-format
 msgid "%1 switches off 'topic protection'."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:2042
+#, kde-format
+msgid "You set the channel key to '%1'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2043
+#, kde-format
+msgid "%1 sets the channel key to '%2'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2047
-#, kde-format
-msgid "You set the channel key to '%1'."
+msgid "You remove the channel key."
 msgstr ""
 
@@ -4667,20 +4672,9 @@
 #: src/irc/channel.cpp:2048
 #, kde-format
-msgid "%1 sets the channel key to '%2'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2052
-msgid "You remove the channel key."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2053
-#, kde-format
 msgid "%1 removes the channel key."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:2061
+#: src/irc/channel.cpp:2056
 #, kde-format
 msgid "You set the channel limit to 1 nick."
@@ -4690,5 +4684,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:2062
+#: src/irc/channel.cpp:2057
 #, kde-format
 msgid "%2 sets the channel limit to 1 nick."
@@ -4698,10 +4692,10 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:2066
+#: src/irc/channel.cpp:2061
 msgid "You remove the channel limit."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:2067
+#: src/irc/channel.cpp:2062
 #, kde-format
 msgid "%1 removes the channel limit."
@@ -4709,7 +4703,19 @@
 
 #. +> trunk
+#: src/irc/channel.cpp:2072
+#, kde-format
+msgid "You set a ban on %1."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2073
+#, kde-format
+msgid "%1 sets a ban on %2."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2077
 #, kde-format
-msgid "You set a ban on %1."
+msgid "You remove the ban on %1."
 msgstr ""
 
@@ -4717,23 +4723,23 @@
 #: src/irc/channel.cpp:2078
 #, kde-format
-msgid "%1 sets a ban on %2."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2082
-#, kde-format
-msgid "You remove the ban on %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2083
-#, kde-format
 msgid "%1 removes the ban on %2."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:2085
+#, kde-format
+msgid "You set a ban exception on %1."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2086
+#, kde-format
+msgid "%1 sets a ban exception on %2."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2090
 #, kde-format
-msgid "You set a ban exception on %1."
+msgid "You remove the ban exception on %1."
 msgstr ""
 
@@ -4741,23 +4747,23 @@
 #: src/irc/channel.cpp:2091
 #, kde-format
-msgid "%1 sets a ban exception on %2."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2095
-#, kde-format
-msgid "You remove the ban exception on %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2096
-#, kde-format
 msgid "%1 removes the ban exception on %2."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:2098
+#, kde-format
+msgid "You set invitation mask %1."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2099
+#, kde-format
+msgid "%1 sets invitation mask %2."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2103
 #, kde-format
-msgid "You set invitation mask %1."
+msgid "You remove the invitation mask %1."
 msgstr ""
 
@@ -4765,23 +4771,23 @@
 #: src/irc/channel.cpp:2104
 #, kde-format
-msgid "%1 sets invitation mask %2."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2108
-#, kde-format
-msgid "You remove the invitation mask %1."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2109
-#, kde-format
 msgid "%1 removes the invitation mask %2."
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:2112
+#, kde-format
+msgid "You set the channel mode '%1'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2113
+#, kde-format
+msgid "%1 sets the channel mode '%2'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2117
 #, kde-format
-msgid "You set the channel mode '%1'."
+msgid "You set channel mode +%1"
 msgstr ""
 
@@ -4789,23 +4795,23 @@
 #: src/irc/channel.cpp:2118
 #, kde-format
-msgid "%1 sets the channel mode '%2'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2122
-#, kde-format
-msgid "You set channel mode +%1"
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2123
-#, kde-format
 msgid "%1 sets channel mode +%2"
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:2125
+#, kde-format
+msgid "You remove the channel mode '%1'."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2126
+#, kde-format
+msgid "%1 removes the channel mode '%2'."
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2130
 #, kde-format
-msgid "You remove the channel mode '%1'."
+msgid "You set channel mode -%1"
 msgstr ""
 
@@ -4813,22 +4819,40 @@
 #: src/irc/channel.cpp:2131
 #, kde-format
-msgid "%1 removes the channel mode '%2'."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2135
-#, kde-format
-msgid "You set channel mode -%1"
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2136
-#, kde-format
 msgid "%1 sets channel mode -%2"
 msgstr ""
 
 #. +> trunk
+#: src/irc/channel.cpp:2540
+msgid "You have to be an operator to change this."
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2542
+#, kde-format
+msgid "Topic can be changed by channel operator only.  %1"
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2543
+#, kde-format
+msgid "No messages to channel from clients on the outside.  %1"
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2544
+#, kde-format
+msgid "Secret channel.  %1"
+msgstr ""
+
+#. +> trunk
 #: src/irc/channel.cpp:2545
-msgid "You have to be an operator to change this."
+#, kde-format
+msgid "Invite only channel.  %1"
+msgstr ""
+
+#. +> trunk
+#: src/irc/channel.cpp:2546
+#, kde-format
+msgid "Private channel.  %1"
 msgstr ""
 
@@ -4836,49 +4860,19 @@
 #: src/irc/channel.cpp:2547
 #, kde-format
-msgid "Topic can be changed by channel operator only.  %1"
+msgid "Moderated channel.  %1"
 msgstr ""
 
 #. +> trunk
 #: src/irc/channel.cpp:2548
-#, kde-format
-msgid "No messages to channel from clients on the outside.  %1"
+msgid "Protect channel with a password."
 msgstr ""
 
 #. +> trunk
 #: src/irc/channel.cpp:2549
-#, kde-format
-msgid "Secret channel.  %1"
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2550
-#, kde-format
-msgid "Invite only channel.  %1"
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2551
-#, kde-format
-msgid "Private channel.  %1"
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2552
-#, kde-format
-msgid "Moderated channel.  %1"
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2553
-msgid "Protect channel with a password."
-msgstr ""
-
-#. +> trunk
-#: src/irc/channel.cpp:2554
 msgid "Set user limit to channel."
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:2684
+#: src/irc/channel.cpp:2679
 #, kde-format
 msgid "Do you want to leave %1?"
@@ -4886,10 +4880,10 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:2685
+#: src/irc/channel.cpp:2680
 msgid "Leave Channel"
 msgstr ""
 
 #. +> trunk
-#: src/irc/channel.cpp:2686
+#: src/irc/channel.cpp:2681
 #, fuzzy
 msgid "Leave"
@@ -4897,5 +4891,5 @@
 
 #. +> trunk
-#: src/irc/channel.cpp:2819 src/irc/query.cpp:614
+#: src/irc/channel.cpp:2814 src/irc/query.cpp:614
 #: src/viewer/statuspanel.cpp:343
 #, kde-format
@@ -4937,5 +4931,5 @@
 #. +> trunk
 #: src/irc/channellistpanel.cpp:145 src/irc/channellistpanelui.ui:14
-#: src/viewer/viewcontainer.cpp:2433 src/viewer/viewcontainer.cpp:2491
+#: src/viewer/viewcontainer.cpp:2428 src/viewer/viewcontainer.cpp:2486
 msgid "Channel List"
 msgstr ""
@@ -5016,5 +5010,5 @@
 
 #. +> trunk
-#: src/irc/channellistpanel.cpp:565
+#: src/irc/channellistpanel.cpp:561
 #, kde-format
 msgid "Channel List for %1"
@@ -6110,95 +6104,95 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:127 src/viewer/ircview.cpp:1298
+#: src/irc/nicklistview.cpp:125 src/viewer/ircview.cpp:1296
 msgid "Take Op"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:131
+#: src/irc/nicklistview.cpp:127
 msgid "Give HalfOp"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:132
+#: src/irc/nicklistview.cpp:128
 msgid "Take HalfOp"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:133 src/viewer/ircview.cpp:1303
+#: src/irc/nicklistview.cpp:129 src/viewer/ircview.cpp:1299
 msgid "Give Voice"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:137 src/viewer/ircview.cpp:1308
+#: src/irc/nicklistview.cpp:131 src/viewer/ircview.cpp:1302
 msgid "Take Voice"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:141 src/viewer/ircview.cpp:1292
+#: src/irc/nicklistview.cpp:133 src/viewer/ircview.cpp:1292
 msgid "Modes"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:149 src/viewer/ircview.cpp:1317
+#: src/irc/nicklistview.cpp:141 src/viewer/ircview.cpp:1309
 msgid "Kickban"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:150 src/viewer/ircview.cpp:1319
+#: src/irc/nicklistview.cpp:142 src/viewer/ircview.cpp:1311
 msgid "Ban Nickname"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:152 src/viewer/ircview.cpp:1322
+#: src/irc/nicklistview.cpp:144 src/viewer/ircview.cpp:1314
 msgid "Ban *!*@*.host"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:153 src/viewer/ircview.cpp:1324
+#: src/irc/nicklistview.cpp:145 src/viewer/ircview.cpp:1316
 msgid "Ban *!*@domain"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:154 src/viewer/ircview.cpp:1326
+#: src/irc/nicklistview.cpp:146 src/viewer/ircview.cpp:1318
 msgid "Ban *!user@*.host"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:155 src/viewer/ircview.cpp:1328
+#: src/irc/nicklistview.cpp:147 src/viewer/ircview.cpp:1320
 msgid "Ban *!user@domain"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:157 src/viewer/ircview.cpp:1331
+#: src/irc/nicklistview.cpp:149 src/viewer/ircview.cpp:1323
 msgid "Kickban *!*@*.host"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:158 src/viewer/ircview.cpp:1333
+#: src/irc/nicklistview.cpp:150 src/viewer/ircview.cpp:1325
 msgid "Kickban *!*@domain"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:159 src/viewer/ircview.cpp:1335
+#: src/irc/nicklistview.cpp:151 src/viewer/ircview.cpp:1327
 msgid "Kickban *!user@*.host"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:160 src/viewer/ircview.cpp:1337
+#: src/irc/nicklistview.cpp:152 src/viewer/ircview.cpp:1329
 msgid "Kickban *!user@domain"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:161 src/viewer/ircview.cpp:1314
+#: src/irc/nicklistview.cpp:153 src/viewer/ircview.cpp:1306
 msgid "Kick / Ban"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:171 src/irc/nicksonline.cpp:65
+#: src/irc/nicklistview.cpp:163 src/irc/nicksonline.cpp:65
 msgid "Open &Query"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:172
+#: src/irc/nicklistview.cpp:164
 msgid ""
 "<qt>"
@@ -6210,10 +6204,10 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:173
+#: src/irc/nicklistview.cpp:165
 msgid "Open DCC &Chat"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:174
+#: src/irc/nicklistview.cpp:166
 msgid ""
 "<qt>"
@@ -6225,5 +6219,5 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:175
+#: src/irc/nicklistview.cpp:167
 #, fuzzy
 msgid "Open DCC &Whiteboard"
@@ -6231,5 +6225,5 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:176
+#: src/irc/nicklistview.cpp:168
 msgid ""
 "<qt>"
@@ -6241,6 +6235,6 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:179 src/irc/query.cpp:93
-#: src/viewer/ircview.cpp:1356
+#: src/irc/nicklistview.cpp:171 src/irc/query.cpp:93
+#: src/viewer/ircview.cpp:1348
 #, fuzzy
 msgid "Send &File..."
@@ -6248,10 +6242,10 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:181
+#: src/irc/nicklistview.cpp:173
 msgid "<qt>Send a file to this person.  If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page.</qt>"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:183 src/irc/nicksonline.cpp:62
+#: src/irc/nicklistview.cpp:175 src/irc/nicksonline.cpp:62
 #: src/linkaddressbook/addressbook_base.cpp:501
 msgid "&Send Email..."
@@ -6259,16 +6253,16 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:189
+#: src/irc/nicklistview.cpp:181
 msgid "Address Book Associations"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:194 src/irc/query.cpp:97
-#: src/viewer/ircview.cpp:1362
+#: src/irc/nicklistview.cpp:186 src/irc/query.cpp:97
+#: src/viewer/ircview.cpp:1354
 msgid "Add to Watched Nicks"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:263
+#: src/irc/nicklistview.cpp:255
 msgid ""
 "<qt>"
@@ -6279,5 +6273,5 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:267
+#: src/irc/nicklistview.cpp:259
 msgid ""
 "<qt>"
@@ -6319,5 +6313,5 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:463
+#: src/irc/nicklistview.cpp:455
 #, fuzzy
 msgid "Edit Contact..."
@@ -6325,30 +6319,30 @@
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:469
+#: src/irc/nicklistview.cpp:461
 msgid "Choose/Change Associations..."
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:471
+#: src/irc/nicklistview.cpp:463
 msgid "Choose Contact..."
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:473
+#: src/irc/nicklistview.cpp:465
 msgid "Change Association..."
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:476
+#: src/irc/nicklistview.cpp:468
 msgid "Create New Contact..."
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicklistview.cpp:480
+#: src/irc/nicklistview.cpp:472
 msgid "Delete Association"
 msgstr ""
 
 #. +> trunk
-#: src/irc/nicksonline.cpp:42 src/viewer/viewcontainer.cpp:2501
+#: src/irc/nicksonline.cpp:42 src/viewer/viewcontainer.cpp:2496
 msgid "Watched Nicks Online"
 msgstr ""
@@ -7359,5 +7353,5 @@
 #. +> trunk
 #: src/irc/servergroupdialogui.ui:71 src/irc/serverlistdialogui.ui:162
-#: src/viewer/ircinput.cpp:504
+#: src/viewer/ircinput.cpp:502
 #, fuzzy
 msgid "&Edit..."
@@ -7561,6 +7555,6 @@
 
 #. +> trunk
-#: src/konsolepanel.cpp:27 src/viewer/viewcontainer.cpp:2077
-#: src/viewer/viewcontainer.cpp:2078
+#: src/konsolepanel.cpp:27 src/viewer/viewcontainer.cpp:2072
+#: src/viewer/viewcontainer.cpp:2073
 #, fuzzy
 msgid "Konsole"
@@ -8195,5 +8189,17 @@
 
 #. +> trunk
-#: src/main.cpp:86
+#: src/main.cpp:83
+#, fuzzy
+#| msgid "(c) Martin Heni   "
+msgid "Martin Blumenstingl"
+msgstr "(c) Martin Heni   "
+
+#. +> trunk
+#: src/main.cpp:83
+msgid "KStatusNotifierItem support, KIdleTime support, other enhancements"
+msgstr ""
+
+#. +> trunk
+#: src/main.cpp:87
 #, fuzzy
 msgid "irc:// URL or server hostname"
@@ -8201,35 +8207,35 @@
 
 #. +> trunk
-#: src/main.cpp:87
+#: src/main.cpp:88
 msgid "Server to connect"
 msgstr "PosluÅŸitelj za spajanje"
 
 #. +> trunk
-#: src/main.cpp:88
+#: src/main.cpp:89
 msgid "Port to use"
 msgstr "Port za koriÅ¡tenje"
 
 #. +> trunk
-#: src/main.cpp:89
+#: src/main.cpp:90
 msgid "Channel to join after connection"
 msgstr "Kanal kojem se pridruÅŸuje nakon spajanja"
 
 #. +> trunk
-#: src/main.cpp:90
+#: src/main.cpp:91
 msgid "Nickname to use"
 msgstr "Nadimak za koriÅ¡tenje"
 
 #. +> trunk
-#: src/main.cpp:91
+#: src/main.cpp:92
 msgid "Password for connection"
 msgstr ""
 
 #. +> trunk
-#: src/main.cpp:92
+#: src/main.cpp:93
 msgid "Use SSL for connection"
 msgstr ""
 
 #. +> trunk
-#: src/main.cpp:93
+#: src/main.cpp:94
 msgid "Disable auto-connecting to any IRC networks"
 msgstr ""
@@ -8297,6 +8303,6 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:184 src/mainwindow.cpp:738
-#: src/viewer/viewcontainer.cpp:586
+#: src/mainwindow.cpp:184 src/mainwindow.cpp:734
+#: src/viewer/viewcontainer.cpp:581
 msgid "&Open Logfile"
 msgstr ""
@@ -8308,5 +8314,5 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:193 src/viewer/viewcontainer.cpp:607
+#: src/mainwindow.cpp:193 src/viewer/viewcontainer.cpp:602
 msgid "&Channel Settings..."
 msgstr ""
@@ -8318,5 +8324,5 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:201 src/viewer/viewcontainer.cpp:577
+#: src/mainwindow.cpp:201 src/viewer/viewcontainer.cpp:572
 msgid "Channel &List"
 msgstr ""
@@ -8369,10 +8375,10 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:281 src/viewer/viewcontainer.cpp:214
+#: src/mainwindow.cpp:281 src/viewer/viewcontainer.cpp:212
 msgid "Move Tab Up"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:292 src/viewer/viewcontainer.cpp:222
+#: src/mainwindow.cpp:292 src/viewer/viewcontainer.cpp:220
 msgid "Move Tab Down"
 msgstr ""
@@ -8380,5 +8386,5 @@
 #. +> trunk
 #: src/mainwindow.cpp:303 src/mainwindow.cpp:333
-#: src/viewer/viewcontainer.cpp:323
+#: src/viewer/viewcontainer.cpp:321
 #, fuzzy
 msgid "Move Tab Right"
@@ -8387,5 +8393,5 @@
 #. +> trunk
 #: src/mainwindow.cpp:312 src/mainwindow.cpp:324
-#: src/viewer/viewcontainer.cpp:315
+#: src/viewer/viewcontainer.cpp:313
 #, fuzzy
 msgid "Move Tab Left"
@@ -8398,5 +8404,5 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:353 src/mainwindow.cpp:744
+#: src/mainwindow.cpp:353 src/mainwindow.cpp:740
 #, fuzzy
 msgid "Enable Notifications"
@@ -8461,5 +8467,5 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:422 src/viewer/ircview.cpp:1396
+#: src/mainwindow.cpp:422 src/viewer/ircview.cpp:1388
 #: src/viewer/topiclabel.cpp:128
 msgid "&Join Channel..."
@@ -8467,40 +8473,40 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:442 src/mainwindow.cpp:746
+#: src/mainwindow.cpp:438 src/mainwindow.cpp:742
 msgid "&IRC Color..."
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:446
+#: src/mainwindow.cpp:442
 msgid "Set the color of your current IRC message"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:451 src/mainwindow.cpp:748
+#: src/mainwindow.cpp:447 src/mainwindow.cpp:744
 msgid "&Marker Line"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:454
+#: src/mainwindow.cpp:450
 msgid "Insert a horizontal line into the current tab that only you can see"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:459 src/mainwindow.cpp:747
+#: src/mainwindow.cpp:455 src/mainwindow.cpp:743
 msgid "Special &Character..."
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:463
+#: src/mainwindow.cpp:459
 msgid "Insert any character into your current IRC message"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:468
+#: src/mainwindow.cpp:464
 msgid "Close &All Open Queries"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:477
+#: src/mainwindow.cpp:473
 #, fuzzy
 msgid "Show Nicklist"
@@ -8508,5 +8514,5 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:483
+#: src/mainwindow.cpp:479
 #, fuzzy
 msgid "Bookmarks"
@@ -8514,30 +8520,30 @@
 
 #. +> trunk
-#: src/mainwindow.cpp:534
+#: src/mainwindow.cpp:530
 msgid "<qt>You have active DCC file transfers. Are you sure you want to quit <b>Konversation</b>?</qt>"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:535 src/mainwindow.cpp:545
+#: src/mainwindow.cpp:531 src/mainwindow.cpp:541
 msgid "Confirm Quit"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:544
+#: src/mainwindow.cpp:540
 msgid "<qt>Are you sure you want to quit <b>Konversation</b>?</qt>"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:577
+#: src/mainwindow.cpp:573
 msgid "<p>Closing the main window will keep Konversation running in the system tray. Use <b>Quit</b> from the <b>Konversation</b> menu to quit the application.</p>"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:579
+#: src/mainwindow.cpp:575
 msgid "Docking in System Tray"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:695
+#: src/mainwindow.cpp:691
 #, kde-format
 msgid "<qt>This will hide the menu bar completely. You can show it again by typing %1.</qt>"
@@ -8545,40 +8551,40 @@
 
 #. +> trunk
+#: src/mainwindow.cpp:726
+msgid "Toggle Notifications"
+msgstr ""
+
+#. +> trunk
+#: src/mainwindow.cpp:727
+msgid "Toggle Away Globally"
+msgstr ""
+
+#. +> trunk
+#: src/mainwindow.cpp:728
+msgid "Insert &IRC Color..."
+msgstr ""
+
+#. +> trunk
+#: src/mainwindow.cpp:729
+msgid "Insert Special &Character..."
+msgstr ""
+
+#. +> trunk
 #: src/mainwindow.cpp:730
-msgid "Toggle Notifications"
-msgstr ""
-
-#. +> trunk
-#: src/mainwindow.cpp:731
-msgid "Toggle Away Globally"
+msgid "Insert &Marker Line"
 msgstr ""
 
 #. +> trunk
 #: src/mainwindow.cpp:732
-msgid "Insert &IRC Color..."
-msgstr ""
-
-#. +> trunk
-#: src/mainwindow.cpp:733
-msgid "Insert Special &Character..."
-msgstr ""
-
-#. +> trunk
-#: src/mainwindow.cpp:734
-msgid "Insert &Marker Line"
-msgstr ""
-
-#. +> trunk
-#: src/mainwindow.cpp:736
 msgid "&Channel List"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:745
+#: src/mainwindow.cpp:741
 msgid "Set &Away Globally"
 msgstr ""
 
 #. +> trunk
-#: src/mainwindow.cpp:757
+#: src/mainwindow.cpp:753
 msgid "Server List"
 msgstr ""
@@ -8960,5 +8966,5 @@
 #. +> trunk
 #: src/urlcatcher.cpp:148 src/urlcatcherui.ui:14
-#: src/viewer/viewcontainer.cpp:2089
+#: src/viewer/viewcontainer.cpp:2084
 msgid "URL Catcher"
 msgstr ""
@@ -9094,6 +9100,6 @@
 
 #. +> trunk
-#: src/urlcatcher.cpp:474 src/viewer/ircview.cpp:1548
-#: src/viewer/topiclabel.cpp:332
+#: src/urlcatcher.cpp:474 src/viewer/ircview.cpp:1536
+#: src/viewer/topiclabel.cpp:328
 msgid "Save link as"
 msgstr ""
@@ -9268,5 +9274,5 @@
 
 #. +> trunk
-#: src/viewer/ircinput.cpp:492
+#: src/viewer/ircinput.cpp:490
 #, kde-format
 msgid "1 byte"
@@ -9276,5 +9282,5 @@
 
 #. +> trunk
-#: src/viewer/ircinput.cpp:493
+#: src/viewer/ircinput.cpp:491
 #, kde-format
 msgid "1 line"
@@ -9284,5 +9290,5 @@
 
 #. +> trunk
-#: src/viewer/ircinput.cpp:499
+#: src/viewer/ircinput.cpp:497
 #, kde-format
 msgctxt "%1 is, for instance, '200 bytes'.  %2 is, for instance, '7 lines'.  Both are localised (see the two previous messages)."
@@ -9291,10 +9297,10 @@
 
 #. +> trunk
-#: src/viewer/ircinput.cpp:502
+#: src/viewer/ircinput.cpp:500
 msgid "Large Paste Warning"
 msgstr ""
 
 #. +> trunk
-#: src/viewer/ircinput.cpp:503
+#: src/viewer/ircinput.cpp:501
 #, fuzzy
 msgid "Paste"
@@ -9302,5 +9308,5 @@
 
 #. +> trunk
-#: src/viewer/ircview.cpp:194 src/viewer/topiclabel.cpp:143
+#: src/viewer/ircview.cpp:194 src/viewer/topiclabel.cpp:139
 #, fuzzy
 msgid "Copy Link Address"
@@ -9308,10 +9314,10 @@
 
 #. +> trunk
-#: src/viewer/ircview.cpp:201 src/viewer/topiclabel.cpp:144
+#: src/viewer/ircview.cpp:201 src/viewer/topiclabel.cpp:140
 msgid "Add to Bookmarks"
 msgstr ""
 
 #. +> trunk
-#: src/viewer/ircview.cpp:208 src/viewer/topiclabel.cpp:145
+#: src/viewer/ircview.cpp:208 src/viewer/topiclabel.cpp:141
 #, fuzzy
 msgid "Save Link As..."
@@ -9331,25 +9337,25 @@
 
 #. +> trunk
-#: src/viewer/ircview.cpp:233 src/viewer/viewcontainer.cpp:551
+#: src/viewer/ircview.cpp:233 src/viewer/viewcontainer.cpp:546
 msgid "Find Text..."
 msgstr ""
 
 #. +> trunk
-#: src/viewer/ircview.cpp:1349
+#: src/viewer/ircview.cpp:1341
 msgid "Open Query"
 msgstr ""
 
 #. +> trunk
-#: src/viewer/ircview.cpp:1403 src/viewer/topiclabel.cpp:134
+#: src/viewer/ircview.cpp:1391 src/viewer/topiclabel.cpp:130
 msgid "Get &user list"
 msgstr ""
 
 #. +> trunk
-#: src/viewer/ircview.cpp:1405 src/viewer/topiclabel.cpp:135
+#: src/viewer/ircview.cpp:1393 src/viewer/topiclabel.cpp:131
 msgid "Get &topic"
 msgstr ""
 
 #. +> trunk
-#: src/viewer/ircview.cpp:1619
+#: src/viewer/ircview.cpp:1607
 #, kde-format
 msgid "Open a query with %1"
@@ -9357,5 +9363,5 @@
 
 #. +> trunk
-#: src/viewer/ircview.cpp:1640 src/viewer/topiclabel.cpp:277
+#: src/viewer/ircview.cpp:1628 src/viewer/topiclabel.cpp:273
 #, kde-format
 msgid "Join the channel %1"
@@ -9448,5 +9454,5 @@
 
 #. +> trunk
-#: src/viewer/rawlog.cpp:25 src/viewer/viewcontainer.cpp:2215
+#: src/viewer/rawlog.cpp:25 src/viewer/viewcontainer.cpp:2210
 msgid "Raw Log"
 msgstr ""
@@ -9543,10 +9549,10 @@
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:553
+#: src/viewer/viewcontainer.cpp:548
 msgid "Search for text in the current tab"
 msgstr ""
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:571
+#: src/viewer/viewcontainer.cpp:566
 #, kde-format
 msgid "Channel &List for %1"
@@ -9554,5 +9560,5 @@
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:591
+#: src/viewer/viewcontainer.cpp:586
 #, kde-format
 msgid "&Open Logfile for %1"
@@ -9560,5 +9566,5 @@
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:602
+#: src/viewer/viewcontainer.cpp:597
 #, kde-format
 msgid "&Channel Settings for %1..."
@@ -9566,15 +9572,15 @@
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:1610
+#: src/viewer/viewcontainer.cpp:1605
 msgid "Rename Tab"
 msgstr "Preimenuj karticu"
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:1611
+#: src/viewer/viewcontainer.cpp:1606
 msgid "Enter new tab name:"
 msgstr "Unesite novo ime kartice:"
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:1683
+#: src/viewer/viewcontainer.cpp:1678
 #, fuzzy, kde-format
 msgctxt "Default encoding"
@@ -9583,20 +9589,20 @@
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:1717
+#: src/viewer/viewcontainer.cpp:1712
 msgid "&Rename Tab..."
 msgstr "&Preimenuj karticuÂ âŠ"
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:1873
+#: src/viewer/viewcontainer.cpp:1868
 msgid "You can only search in text fields."
 msgstr ""
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:1874
+#: src/viewer/viewcontainer.cpp:1869
 msgid "Find Text Information"
 msgstr ""
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:2068
+#: src/viewer/viewcontainer.cpp:2063
 #, kde-format
 msgid "Logfile of %1"
@@ -9604,17 +9610,21 @@
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:2459
+#: src/viewer/viewcontainer.cpp:2454
 msgid "Using this function may result in a lot of network traffic. If your connection is not fast enough, it is possible that your client will be disconnected by the server."
 msgstr ""
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:2463
+#: src/viewer/viewcontainer.cpp:2458
 msgid "Channel List Warning"
 msgstr ""
 
 #. +> trunk
-#: src/viewer/viewcontainer.cpp:2487
+#: src/viewer/viewcontainer.cpp:2482
 msgid "To know which server to display the channel list for, the list can only be opened from a query, channel or status window."
 msgstr ""
+
+#, fuzzy
+#~ msgid " minutes"
+#~ msgstr " minute"
 
 #, fuzzy
