Binary files /tmp/GWKmhqZErY/language-pack-sc-base-14.04+20140707/data/extra.tar and /tmp/0RJfw3191m/language-pack-sc-base-14.04+20150804/data/extra.tar differ
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/apport.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/apport.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/apport.po	2014-07-09 09:30:13.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/apport.po	2015-08-14 07:58:52.000000000 +0000
@@ -7,203 +7,422 @@
 msgstr ""
 "Project-Id-Version: apport\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-05-16 23:11+0000\n"
+"POT-Creation-Date: 2015-05-15 17:56+0000\n"
 "PO-Revision-Date: 2010-08-01 10:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Sardinian <sc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:24+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:24+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:429
-#: ../debian/tmp/usr/share/apport/apport-kde.py:169
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:177 ../kde/apport-kde.py:169
-#: ../gtk/apport-gtk.py:177 ../bin/apport-cli.py:178
-#: ../debian/tmp/usr/bin/apport-cli.py:178
+#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:468 ../kde/apport-kde.py:503
+#: ../kde/apport-kde.py:522 ../debian/tmp/usr/share/apport/apport-kde.py:468
+#: ../debian/tmp/usr/share/apport/apport-kde.py:503
+#: ../debian/tmp/usr/share/apport/apport-kde.py:522
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1
+msgid "Apport"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:4 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4
+msgid "Crash report"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5
+msgid "<big><b>Sorry, an internal error happened.</b></big>"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:6 ../kde/apport-kde.py:240 ../gtk/apport-gtk.py:300
+#: ../debian/tmp/usr/share/apport/apport-kde.py:240
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:300
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6
+msgid "If you notice further problems, try restarting the computer."
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:7 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7
+msgid "Send an error report to help fix this problem"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8
+msgid "Ignore future problems of this program version"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:291 ../gtk/apport-gtk.py:204
+#: ../gtk/apport-gtk.py:573 ../debian/tmp/usr/share/apport/apport-kde.py:291
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:573
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9
+msgid "Show Details"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:10 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10
+msgid "_Examine locally"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:233 ../gtk/apport-gtk.py:287
+#: ../debian/tmp/usr/share/apport/apport-kde.py:233
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:287
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11
+msgid "Leave Closed"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:12 ../kde/apport-kde.py:230 ../kde/apport-kde.py:243
+#: ../gtk/apport-gtk.py:216 ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303
+#: ../debian/tmp/usr/share/apport/apport-kde.py:230
+#: ../debian/tmp/usr/share/apport/apport-kde.py:243
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:216
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:284
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:303
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12
+msgid "Continue"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:13 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13
+msgid "<big><b>Collecting problem information</b></big>"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14
+msgid ""
+"Information is being collected that may help the developers fix the problem "
+"you report."
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/bin/apport-cli.py:251
+#: ../kde/apport-kde.py:434 ../bin/apport-cli.py:251
+#: ../debian/tmp/usr/share/apport/apport-kde.py:434
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15
+msgid "Uploading problem information"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:16 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16
+msgid "<big><b>Uploading problem information</b></big>"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:17 ../kde/apport-kde.py:435
+#: ../debian/tmp/usr/share/apport/apport-kde.py:435
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17
+msgid ""
+"The collected information is being sent to the bug tracking system. This "
+"might take a few minutes."
+msgstr ""
+
+#: ../data/apportcheckresume.py:73
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73
+msgid ""
+"This occured during a previous suspend and prevented it from resuming "
+"properly."
+msgstr ""
+
+#: ../data/apportcheckresume.py:75
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75
+msgid ""
+"This occured during a previous hibernate and prevented it from resuming "
+"properly."
+msgstr ""
+
+#: ../data/apportcheckresume.py:80
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80
+msgid ""
+"The resume processing hung very near the end and will have appeared to have "
+"completed normally."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:74 ../bin/apport-cli.py:74
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:81 ../bin/apport-cli.py:81
+msgid "What would you like to do? Your options are:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:85 ../bin/apport-cli.py:85
+#, python-format
+msgid "Please choose (%s):"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:148 ../bin/apport-cli.py:148
+#, python-format
+msgid "(%i bytes)"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:150 ../kde/apport-kde.py:362
+#: ../bin/apport-cli.py:150 ../gtk/apport-gtk.py:142
+#: ../debian/tmp/usr/share/apport/apport-kde.py:362
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:142
+msgid "(binary data)"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:178 ../kde/apport-kde.py:185
+#: ../bin/apport-cli.py:178 ../gtk/apport-gtk.py:177
+#: ../debian/tmp/usr/share/apport/apport-kde.py:185
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:177
 msgid "Send problem report to the developers?"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437
-#: ../debian/tmp/usr/share/apport/apport-kde.py:177
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:186 ../kde/apport-kde.py:177
-#: ../gtk/apport-gtk.py:186
+#: ../debian/tmp/usr/bin/apport-cli.py:179 ../bin/apport-cli.py:179
+msgid ""
+"After the problem report has been sent, please fill out the form in the\n"
+"automatically opened web browser."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:182 ../bin/apport-cli.py:182
+#, python-format
+msgid "&Send report (%s)"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:186 ../bin/apport-cli.py:186
+msgid "&Examine locally"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:190 ../bin/apport-cli.py:190
+msgid "&View report"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:191 ../bin/apport-cli.py:191
+msgid "&Keep report file for sending later or copying to somewhere else"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:192 ../bin/apport-cli.py:192
+msgid "Cancel and &ignore future crashes of this program version"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:194
+#: ../debian/tmp/usr/bin/apport-cli.py:271
+#: ../debian/tmp/usr/bin/apport-cli.py:303
+#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:194
+#: ../bin/apport-cli.py:271 ../bin/apport-cli.py:303 ../bin/apport-cli.py:324
+msgid "&Cancel"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:222 ../bin/apport-cli.py:222
+msgid "Problem report file:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:228
+#: ../debian/tmp/usr/bin/apport-cli.py:233 ../bin/apport-cli.py:228
+#: ../bin/apport-cli.py:233
+msgid "&Confirm"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:232 ../bin/apport-cli.py:232
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:238 ../kde/apport-kde.py:406
+#: ../bin/apport-cli.py:238 ../debian/tmp/usr/share/apport/apport-kde.py:406
+msgid "Collecting problem information"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:239 ../bin/apport-cli.py:239
+msgid ""
+"The collected information can be sent to the developers to improve the\n"
+"application. This might take a few minutes."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:252 ../bin/apport-cli.py:252
+msgid ""
+"The collected information is being sent to the bug tracking system.\n"
+"This might take a few minutes."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:302 ../bin/apport-cli.py:302
+msgid "&Done"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:308 ../bin/apport-cli.py:308
+msgid "none"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:309 ../bin/apport-cli.py:309
+#, python-format
+msgid "Selected: %s. Multiple choices:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325
+msgid "Choices:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:339 ../bin/apport-cli.py:339
+msgid "Path to file (Enter to cancel):"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:345 ../bin/apport-cli.py:345
+msgid "File does not exist."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:347 ../bin/apport-cli.py:347
+msgid "This is a directory."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:353 ../bin/apport-cli.py:353
+msgid "To continue, you must visit the following URL:"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355
+msgid ""
+"You can launch a browser now, or copy this URL into a browser on another "
+"computer."
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:357 ../bin/apport-cli.py:357
+msgid "Launch a browser now"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371
+msgid "No pending crash reports. Try --help for more information."
+msgstr ""
+
+#: ../kde/apport-kde.py:193 ../gtk/apport-gtk.py:186
+#: ../debian/tmp/usr/share/apport/apport-kde.py:193
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:186
 msgid "Send"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:110
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:254
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300
-#: ../debian/tmp/usr/share/apport/apport-kde.py:183
-#: ../debian/tmp/usr/share/apport/apport-kde.py:224
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:165 ../kde/apport-kde.py:183
-#: ../kde/apport-kde.py:224 ../gtk/apport-gtk.py:165
+#: ../kde/apport-kde.py:199 ../kde/apport-kde.py:237 ../gtk/apport-gtk.py:165
+#: ../debian/tmp/usr/share/apport/apport-kde.py:199
+#: ../debian/tmp/usr/share/apport/apport-kde.py:237
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:165
 #, python-format
 msgid "Sorry, %s has experienced an internal error."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:191
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:257 ../kde/apport-kde.py:191
-#: ../gtk/apport-gtk.py:257
+#: ../kde/apport-kde.py:207 ../gtk/apport-gtk.py:257
+#: ../debian/tmp/usr/share/apport/apport-kde.py:207
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:257
 #, python-format
 msgid "Package: %s"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137
-#: ../debian/tmp/usr/share/apport/apport-kde.py:197
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:264 ../kde/apport-kde.py:197
-#: ../gtk/apport-gtk.py:264
+#: ../kde/apport-kde.py:213 ../gtk/apport-gtk.py:264
+#: ../debian/tmp/usr/share/apport/apport-kde.py:213
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:264
 msgid "Sorry, a problem occurred while installing software."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:204
+#: ../kde/apport-kde.py:219 ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292
+#: ../debian/tmp/usr/share/apport/apport-kde.py:219
 #: ../debian/tmp/usr/share/apport/apport-gtk.py:273
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:292 ../kde/apport-kde.py:204
-#: ../gtk/apport-gtk.py:273 ../gtk/apport-gtk.py:292
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:292
 #, python-format
 msgid "The application %s has experienced an internal error."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:208
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:276 ../kde/apport-kde.py:208
-#: ../gtk/apport-gtk.py:276
+#: ../kde/apport-kde.py:222 ../gtk/apport-gtk.py:276
+#: ../debian/tmp/usr/share/apport/apport-kde.py:222
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:276
 #, python-format
 msgid "The application %s has closed unexpectedly."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:115
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:141
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:153
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:186
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:262
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:332
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:115
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:144
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:157
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:192
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:310
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:350
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:479
-#: ../debian/tmp/usr/share/apport/apport-kde.py:217
-#: ../debian/tmp/usr/share/apport/apport-kde.py:230
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:216
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:284
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:303 ../kde/apport-kde.py:217
-#: ../kde/apport-kde.py:230 ../gtk/apport-gtk.py:216 ../gtk/apport-gtk.py:284
-#: ../gtk/apport-gtk.py:303 ../gtk/apport-gtk.ui.h:10
-msgid "Continue"
+#: ../kde/apport-kde.py:234 ../kde/apport-kde.py:380 ../gtk/apport-gtk.py:229
+#: ../gtk/apport-gtk.py:288 ../debian/tmp/usr/share/apport/apport-kde.py:234
+#: ../debian/tmp/usr/share/apport/apport-kde.py:380
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:229
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:288
+msgid "Relaunch"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:220
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:287 ../kde/apport-kde.py:220
-#: ../gtk/apport-gtk.py:287 ../gtk/apport-gtk.ui.h:9
-msgid "Leave Closed"
+#: ../kde/apport-kde.py:244 ../gtk/apport-gtk.py:304
+#: ../debian/tmp/usr/share/apport/apport-kde.py:244
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:304
+msgid "Ignore future problems of this type"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273
-#: ../debian/tmp/usr/share/apport/apport-kde.py:221
-#: ../debian/tmp/usr/share/apport/apport-kde.py:368
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:229
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:288 ../kde/apport-kde.py:221
-#: ../kde/apport-kde.py:368 ../gtk/apport-gtk.py:229 ../gtk/apport-gtk.py:288
-msgid "Relaunch"
+#: ../kde/apport-kde.py:288 ../gtk/apport-gtk.py:577
+#: ../debian/tmp/usr/share/apport/apport-kde.py:288
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:577
+msgid "Hide Details"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:256
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:302
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:342
-#: ../debian/tmp/usr/share/apport/apport-kde.py:227
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:300 ../kde/apport-kde.py:227
-#: ../gtk/apport-gtk.py:300 ../gtk/apport-gtk.ui.h:4
-msgid "If you notice further problems, try restarting the computer."
+#: ../kde/apport-kde.py:314 ../debian/tmp/usr/share/apport/apport-kde.py:314
+msgid "Username:"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:231
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:304 ../kde/apport-kde.py:231
-#: ../gtk/apport-gtk.py:304
-msgid "Ignore future problems of this type"
+#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315
+msgid "Password:"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:275
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:577 ../kde/apport-kde.py:275
-#: ../gtk/apport-gtk.py:577
-msgid "Hide Details"
+#: ../kde/apport-kde.py:405 ../debian/tmp/usr/share/apport/apport-kde.py:405
+msgid "Collecting Problem Information"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:278
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 ../kde/apport-kde.py:278
-#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:573 ../gtk/apport-gtk.ui.h:7
-msgid "Show Details"
+#: ../kde/apport-kde.py:407 ../debian/tmp/usr/share/apport/apport-kde.py:407
+msgid ""
+"The collected information can be sent to the developers to improve the "
+"application. This might take a few minutes."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:301 ../kde/apport-kde.py:301
-msgid "Username:"
+#: ../kde/apport-kde.py:433 ../debian/tmp/usr/share/apport/apport-kde.py:433
+msgid "Uploading Problem Information"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:302 ../kde/apport-kde.py:302
-msgid "Password:"
+#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
+msgid "See man page for details."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:349
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:142 ../kde/apport-kde.py:349
-#: ../gtk/apport-gtk.py:142 ../bin/apport-cli.py:150
-#: ../debian/tmp/usr/bin/apport-cli.py:150
-msgid "(binary data)"
+#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
+msgid "specify the log file name produced by valgrind"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:393 ../kde/apport-kde.py:393
-msgid "Collecting Problem Information"
+#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46
+msgid ""
+"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
+"create it"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:394 ../kde/apport-kde.py:394
-#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238
-msgid "Collecting problem information"
+#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50
+msgid ""
+"do  not  create  or reuse a sandbox directory for additional debug symbols "
+"but rely only on installed debug symbols."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:395 ../kde/apport-kde.py:395
+#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
 msgid ""
-"The collected information can be sent to the developers to improve the "
-"application. This might take a few minutes."
+"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
+"it"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:421 ../kde/apport-kde.py:421
-msgid "Uploading Problem Information"
+#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
+msgid ""
+"report download/install progress when installing packages into sandbox"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:422
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../kde/apport-kde.py:422
-#: ../bin/apport-cli.py:251 ../gtk/apport-gtk.ui.h:13
-#: ../debian/tmp/usr/bin/apport-cli.py:251
-msgid "Uploading problem information"
+#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62
+msgid ""
+"the executable that is run under valgrind's memcheck tool  for memory leak "
+"detection"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:423
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../kde/apport-kde.py:423
-#: ../gtk/apport-gtk.ui.h:15
+#: ../bin/apport-valgrind.py:66 ../bin/apport-retrace.py:61
+#: ../debian/tmp/usr/bin/apport-retrace.py:61
+#: ../debian/tmp/usr/bin/apport-valgrind.py:66
 msgid ""
-"The collected information is being sent to the bug tracking system. This "
-"might take a few minutes."
+"Install an extra package into the sandbox (can be specified multiple times)"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-kde.py:457
-#: ../debian/tmp/usr/share/apport/apport-kde.py:493
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../kde/apport-kde.py:457
-#: ../kde/apport-kde.py:493 ../gtk/apport-gtk.ui.h:1
-msgid "Apport"
+#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
+#, python-format
+msgid "Error: %s is not an executable. Stopping."
+msgstr ""
+
+#: ../kde/apport-kde-mimelnk.desktop.in.h:1
+msgid "Apport crash file"
+msgstr ""
+
+#: ../data/kernel_oops.py:30 ../debian/tmp/usr/share/apport/kernel_oops.py:30
+msgid "Your system might become unstable now and might need to be restarted."
+msgstr ""
+
+#: ../kde/apport-kde-mime.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1
+#: ../gtk/apport-gtk.desktop.in.h:1
+msgid "Report a problem..."
+msgstr ""
+
+#: ../kde/apport-kde-mime.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2
+#: ../gtk/apport-gtk.desktop.in.h:2
+msgid "Report a malfunction to the developers"
 msgstr ""
 
 #: ../apport/ui.py:124
@@ -244,9 +463,9 @@
 msgid "Sorry, the program \"%s\" closed unexpectedly"
 msgstr "Nos dispiaghet; su programa \"%s\" s'est serradu de botu."
 
-#: ../apport/ui.py:272 ../apport/ui.py:1298
+#: ../apport/ui.py:272 ../apport/ui.py:1308
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:272
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1298
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1308
 #, python-format
 msgid "Problem in %s"
 msgstr "Problema in %s"
@@ -260,19 +479,17 @@
 "Sa computadora tua no tenet bastante memòria lìbera pro analizare su "
 "problema automaticamente e pro imbiare un avisu a sos tècnicos."
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:276
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1049
 #: ../apport/ui.py:321 ../apport/ui.py:329 ../apport/ui.py:456
-#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1104
-#: ../apport/ui.py:1270 ../apport/ui.py:1274
+#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1114
+#: ../apport/ui.py:1280 ../apport/ui.py:1284
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:321
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:329
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:456
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:459
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:660
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1104
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1270
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1274
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1114
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1280
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1284
 msgid "Invalid problem report"
 msgstr "Avisu de problema no vàlidu"
 
@@ -499,106 +716,107 @@
 msgid "Print the Apport version number."
 msgstr ""
 
-#: ../apport/ui.py:889
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:889
+#: ../apport/ui.py:888
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:888
 msgid ""
 "This will launch apport-retrace in a terminal window to examine the crash."
 msgstr ""
 
-#: ../apport/ui.py:890
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:890
+#: ../apport/ui.py:889
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:889
 msgid "Run gdb session"
 msgstr ""
 
-#: ../apport/ui.py:891
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:891
+#: ../apport/ui.py:890
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:890
 msgid "Run gdb session without downloading debug symbols"
 msgstr ""
 
 #. TRANSLATORS: %s contains the crash report file name
-#: ../apport/ui.py:893
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:893
+#: ../apport/ui.py:892
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:892
 #, python-format
 msgid "Update %s with fully symbolic stack trace"
 msgstr ""
 
-#: ../apport/ui.py:969 ../apport/ui.py:979
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:969
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:979
+#: ../apport/ui.py:968 ../apport/ui.py:978
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:968
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:978
 msgid ""
 "This problem report applies to a program which is not installed any more."
 msgstr ""
 
-#: ../apport/ui.py:994
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:994
+#: ../apport/ui.py:993
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:993
 #, python-format
 msgid ""
 "The problem happened with the program %s which changed since the crash "
 "occurred."
 msgstr ""
 
-#: ../apport/ui.py:1036 ../apport/ui.py:1276
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1036
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1276
+#: ../apport/ui.py:1040 ../apport/ui.py:1071 ../apport/ui.py:1286
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1040
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1071
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1286
 msgid "This problem report is damaged and cannot be processed."
 msgstr "S'avisu de su problema s'est guastadu e no podet èssere protzessadu."
 
 #. package does not exist
-#: ../apport/ui.py:1039
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1039
+#: ../apport/ui.py:1043
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1043
 msgid "The report belongs to a package that is not installed."
 msgstr "S'avisu benit dae unu pachete no installadu"
 
-#: ../apport/ui.py:1042
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1042
+#: ../apport/ui.py:1046
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1046
 msgid "An error occurred while attempting to process this problem report:"
 msgstr ""
 
-#: ../apport/ui.py:1105
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1105
+#: ../apport/ui.py:1115
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1115
 msgid "Could not determine the package or source package name."
 msgstr ""
 
-#: ../apport/ui.py:1123
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1123
+#: ../apport/ui.py:1133
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1133
 msgid "Unable to start web browser"
 msgstr ""
 
-#: ../apport/ui.py:1124
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1124
+#: ../apport/ui.py:1134
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1134
 #, python-format
 msgid "Unable to start web browser to open %s."
 msgstr ""
 
-#: ../apport/ui.py:1224
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1224
+#: ../apport/ui.py:1234
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1234
 #, python-format
 msgid "Please enter your account information for the %s bug tracking system"
 msgstr ""
 
-#: ../apport/ui.py:1236
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1236
+#: ../apport/ui.py:1246
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1246
 msgid "Network problem"
 msgstr ""
 
-#: ../apport/ui.py:1238
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1238
+#: ../apport/ui.py:1248
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1248
 msgid ""
 "Cannot connect to crash database, please check your Internet connection."
 msgstr ""
 
-#: ../apport/ui.py:1265
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1265
+#: ../apport/ui.py:1275
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1275
 msgid "Memory exhaustion"
 msgstr ""
 
-#: ../apport/ui.py:1266
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1266
+#: ../apport/ui.py:1276
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1276
 msgid "Your system does not have enough memory to process this crash report."
 msgstr ""
 
-#: ../apport/ui.py:1301
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1301
+#: ../apport/ui.py:1311
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1311
 #, python-format
 msgid ""
 "The problem cannot be reported:\n"
@@ -609,352 +827,65 @@
 "\n"
 "%s"
 
-#: ../apport/ui.py:1357 ../apport/ui.py:1364
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1357
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1364
+#: ../apport/ui.py:1367 ../apport/ui.py:1374
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1367
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1374
 msgid "Problem already known"
 msgstr ""
 
-#: ../apport/ui.py:1358
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1358
+#: ../apport/ui.py:1368
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1368
 msgid ""
 "This problem was already reported in the bug report displayed in the web "
 "browser. Please check if you can add any further information that might be "
 "helpful for the developers."
 msgstr ""
 
-#: ../apport/ui.py:1365
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1365
+#: ../apport/ui.py:1375
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1375
 msgid "This problem was already reported to developers. Thank you!"
 msgstr ""
 
-#: ../data/apportcheckresume.py:73
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73
-msgid ""
-"This occured during a previous suspend and prevented it from resuming "
-"properly."
-msgstr ""
-
-#: ../data/apportcheckresume.py:75
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75
-msgid ""
-"This occured during a previous hibernate and prevented it from resuming "
-"properly."
-msgstr ""
-
-#: ../data/apportcheckresume.py:80
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80
-msgid ""
-"The resume processing hung very near the end and will have appeared to have "
-"completed normally."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2
-msgid "Crash report"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3
-msgid "<big><b>Sorry, an internal error happened.</b></big>"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5
-msgid "Send an error report to help fix this problem"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6
-msgid "Ignore future problems of this program version"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8
-msgid "_Examine locally"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11
-msgid "<big><b>Collecting problem information</b></big>"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12
-msgid ""
-"Information is being collected that may help the developers fix the problem "
-"you report."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14
-msgid "<big><b>Uploading problem information</b></big>"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37
-msgid "See man page for details."
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:43 ../bin/apport-valgrind.py:43
-msgid "specify the log file name produced by valgrind"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:46 ../bin/apport-valgrind.py:46
-msgid ""
-"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
-"create it"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:50 ../bin/apport-valgrind.py:50
-msgid ""
-"do  not  create  or reuse a sandbox directory for additional debug symbols "
-"but rely only on installed debug symbols."
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:54 ../bin/apport-valgrind.py:54
-msgid ""
-"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
-"it"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:58 ../bin/apport-valgrind.py:58
-msgid ""
-"report download/install progress when installing packages into sandbox"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:62 ../bin/apport-valgrind.py:62
-msgid ""
-"the executable that is run under valgrind's memcheck tool  for memory leak "
-"detection"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:59
-#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-valgrind.py:66
-msgid ""
-"Install an extra package into the sandbox (can be specified multiple times)"
-msgstr ""
-
-#: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97
-#, python-format
-msgid "Error: %s is not an executable. Stopping."
-msgstr ""
-
-#: ../bin/apport-cli.py:74 ../debian/tmp/usr/bin/apport-cli.py:74
-msgid "Press any key to continue..."
-msgstr ""
-
-#: ../bin/apport-cli.py:81 ../debian/tmp/usr/bin/apport-cli.py:81
-msgid "What would you like to do? Your options are:"
-msgstr ""
-
-#: ../bin/apport-cli.py:85 ../debian/tmp/usr/bin/apport-cli.py:85
-#, python-format
-msgid "Please choose (%s):"
-msgstr ""
-
-#: ../bin/apport-cli.py:148 ../debian/tmp/usr/bin/apport-cli.py:148
-#, python-format
-msgid "(%i bytes)"
-msgstr ""
-
-#: ../bin/apport-cli.py:179 ../debian/tmp/usr/bin/apport-cli.py:179
-msgid ""
-"After the problem report has been sent, please fill out the form in the\n"
-"automatically opened web browser."
-msgstr ""
-
-#: ../bin/apport-cli.py:182 ../debian/tmp/usr/bin/apport-cli.py:182
-#, python-format
-msgid "&Send report (%s)"
-msgstr ""
-
-#: ../bin/apport-cli.py:186 ../debian/tmp/usr/bin/apport-cli.py:186
-msgid "&Examine locally"
-msgstr ""
-
-#: ../bin/apport-cli.py:190 ../debian/tmp/usr/bin/apport-cli.py:190
-msgid "&View report"
-msgstr ""
-
-#: ../bin/apport-cli.py:191 ../debian/tmp/usr/bin/apport-cli.py:191
-msgid "&Keep report file for sending later or copying to somewhere else"
-msgstr ""
-
-#: ../bin/apport-cli.py:192 ../debian/tmp/usr/bin/apport-cli.py:192
-msgid "Cancel and &ignore future crashes of this program version"
-msgstr ""
-
-#: ../bin/apport-cli.py:194 ../bin/apport-cli.py:271 ../bin/apport-cli.py:303
-#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:194
-#: ../debian/tmp/usr/bin/apport-cli.py:271
-#: ../debian/tmp/usr/bin/apport-cli.py:303
-#: ../debian/tmp/usr/bin/apport-cli.py:324
-msgid "&Cancel"
-msgstr ""
-
-#: ../bin/apport-cli.py:222 ../debian/tmp/usr/bin/apport-cli.py:222
-msgid "Problem report file:"
-msgstr ""
-
-#: ../bin/apport-cli.py:228 ../bin/apport-cli.py:233
-#: ../debian/tmp/usr/bin/apport-cli.py:228
-#: ../debian/tmp/usr/bin/apport-cli.py:233
-msgid "&Confirm"
-msgstr ""
-
-#: ../bin/apport-cli.py:232 ../debian/tmp/usr/bin/apport-cli.py:232
-#, python-format
-msgid "Error: %s"
-msgstr ""
-
-#: ../bin/apport-cli.py:239 ../debian/tmp/usr/bin/apport-cli.py:239
-msgid ""
-"The collected information can be sent to the developers to improve the\n"
-"application. This might take a few minutes."
-msgstr ""
-
-#: ../bin/apport-cli.py:252 ../debian/tmp/usr/bin/apport-cli.py:252
-msgid ""
-"The collected information is being sent to the bug tracking system.\n"
-"This might take a few minutes."
-msgstr ""
-
-#: ../bin/apport-cli.py:302 ../debian/tmp/usr/bin/apport-cli.py:302
-msgid "&Done"
-msgstr ""
-
-#: ../bin/apport-cli.py:308 ../debian/tmp/usr/bin/apport-cli.py:308
-msgid "none"
-msgstr ""
-
-#: ../bin/apport-cli.py:309 ../debian/tmp/usr/bin/apport-cli.py:309
-#, python-format
-msgid "Selected: %s. Multiple choices:"
-msgstr ""
-
-#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325
-msgid "Choices:"
-msgstr ""
-
-#: ../bin/apport-cli.py:339 ../debian/tmp/usr/bin/apport-cli.py:339
-msgid "Path to file (Enter to cancel):"
-msgstr ""
-
-#: ../bin/apport-cli.py:345 ../debian/tmp/usr/bin/apport-cli.py:345
-msgid "File does not exist."
-msgstr ""
-
-#: ../bin/apport-cli.py:347 ../debian/tmp/usr/bin/apport-cli.py:347
-msgid "This is a directory."
-msgstr ""
-
-#: ../bin/apport-cli.py:353 ../debian/tmp/usr/bin/apport-cli.py:353
-msgid "To continue, you must visit the following URL:"
-msgstr ""
-
-#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355
-msgid ""
-"You can launch a browser now, or copy this URL into a browser on another "
-"computer."
-msgstr ""
-
-#: ../bin/apport-cli.py:357 ../debian/tmp/usr/bin/apport-cli.py:357
-msgid "Launch a browser now"
-msgstr ""
-
-#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371
-msgid "No pending crash reports. Try --help for more information."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148
-msgid "Package: apport 1.2.3~0ubuntu1"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:180
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:221
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:184
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:225
-msgid "The application Apport has closed unexpectedly."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263
-msgid "The application Apport has stopped responding."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:265
-msgid "You can wait to see if it wakes up, or close or relaunch it."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:276
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:228 ../gtk/apport-gtk.py:228
-msgid "Force Closed"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340
-msgid "Sorry, the application apport has stopped unexpectedly."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357
-msgid "Sorry, apport has closed unexpectedly."
-msgstr ""
-
-#: ../data/general-hooks/ubuntu.py:130
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130
-msgid ""
-"An Ubuntu package has a file conflict with a package that is not a genuine "
-"Ubuntu package"
-msgstr ""
-
-#: ../data/general-hooks/ubuntu.py:147
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:147
-msgid ""
-"Your system was initially configured with grub version 2, but you have "
-"removed it from your system in favor of grub 1 without configuring it.  To "
-"ensure your bootloader configuration is updated whenever a new kernel is "
-"available, open a terminal and run:\n"
-"\n"
-"      sudo apt-get install grub-pc\n"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091
-msgid "Problem in bash"
-msgstr ""
-
 #: ../bin/apport-retrace.py:31 ../debian/tmp/usr/bin/apport-retrace.py:31
 msgid "%prog [options] <apport problem report | crash ID>"
 msgstr ""
 
-#: ../bin/apport-retrace.py:33 ../debian/tmp/usr/bin/apport-retrace.py:33
+#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34
 msgid "Do not put the new traces into the report, but write them to stdout."
 msgstr ""
 
-#: ../bin/apport-retrace.py:35 ../debian/tmp/usr/bin/apport-retrace.py:35
+#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36
 msgid ""
 "Start an interactive gdb session with the report's core dump (-o ignored; "
 "does not rewrite report)"
 msgstr ""
 
-#: ../bin/apport-retrace.py:37 ../debian/tmp/usr/bin/apport-retrace.py:37
+#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38
 msgid ""
 "Write modified report to given file instead of changing the original report"
 msgstr ""
 
-#: ../bin/apport-retrace.py:39 ../debian/tmp/usr/bin/apport-retrace.py:39
+#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41
 msgid "Remove the core dump from the report after stack trace regeneration"
 msgstr ""
 
-#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41
+#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43
 msgid "Override report's CoreFile"
 msgstr ""
 
-#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43
+#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45
 msgid "Override report's ExecutablePath"
 msgstr ""
 
-#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45
+#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47
 msgid "Override report's ProcMaps"
 msgstr ""
 
-#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47
+#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49
 msgid "Rebuild report's Package information"
 msgstr ""
 
-#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49
+#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51
 msgid ""
 "Build a temporary sandbox and download/install the necessary packages and "
 "debug symbols in there; without this option it assumes that the necessary "
@@ -964,39 +895,39 @@
 "be able to retrace crashes that happened on the currently running release."
 msgstr ""
 
-#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51
+#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53
 msgid ""
 "Report download/install progress when installing packages into sandbox"
 msgstr ""
 
-#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53
+#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55
 msgid "Prepend timestamps to log messages, for batch operation"
 msgstr ""
 
-#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55
+#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57
 msgid "Cache directory for packages downloaded in the sandbox"
 msgstr ""
 
-#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57
+#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59
 msgid ""
 "Directory for unpacked packages. Future runs will assume that any already "
 "downloaded package is also extracted to this sandbox."
 msgstr ""
 
-#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61
+#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63
 msgid ""
 "Path to a file with the crash database authentication information. This is "
 "used when specifying a crash ID to upload the retraced stack traces (only if "
 "neither -g, -o, nor -s are specified)"
 msgstr ""
 
-#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63
+#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-retrace.py:65
 msgid ""
 "Display retraced stack traces and ask for confirmation before sending them "
 "to the crash database."
 msgstr ""
 
-#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-retrace.py:65
+#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67
 msgid ""
 "Path to the duplicate sqlite database (default: no duplicate checking)"
 msgstr ""
@@ -1016,72 +947,110 @@
 msgstr ""
 
 #. translators: don't translate y/n, apport currently only checks for "y"
-#: ../bin/apport-retrace.py:114 ../debian/tmp/usr/bin/apport-retrace.py:114
+#: ../bin/apport-retrace.py:109 ../debian/tmp/usr/bin/apport-retrace.py:109
 msgid "OK to send these as attachments? [y/n]"
 msgstr ""
 
-#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1
-#: ../kde/apport-kde-mime.desktop.in.h:1
-msgid "Report a problem..."
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:148
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:144
+msgid "Package: apport 1.2.3~0ubuntu1"
 msgstr ""
 
-#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2
-#: ../kde/apport-kde-mime.desktop.in.h:2
-msgid "Report a malfunction to the developers"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:184
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:225
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:180
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:221
+msgid "The application Apport has closed unexpectedly."
 msgstr ""
 
-#: ../kde/apport-kde-mimelnk.desktop.in.h:1
-msgid "Apport crash file"
+#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22
+#, python-format
+msgid "Usage: %s <report> <target directory>"
+msgstr ""
+
+#: ../debian/tmp/usr/bin/apport-unpack.py:46 ../bin/apport-unpack.py:46
+msgid "Destination directory exists and is not empty."
+msgstr ""
+
+#: ../apport/com.ubuntu.apport.policy.in.h:1
+msgid "Collect system information"
+msgstr ""
+
+#: ../apport/com.ubuntu.apport.policy.in.h:2
+msgid ""
+"Authentication is required to collect system information for this problem "
+"report"
+msgstr ""
+
+#: ../apport/com.ubuntu.apport.policy.in.h:3
+msgid "System problem reports"
+msgstr ""
+
+#: ../apport/com.ubuntu.apport.policy.in.h:4
+msgid ""
+"Please enter your password to access problem reports of system programs"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:157 ../gtk/apport-gtk.py:157
+#: ../gtk/apport-gtk.py:157 ../debian/tmp/usr/share/apport/apport-gtk.py:157
 #, python-format
 msgid "Sorry, the application %s has stopped unexpectedly."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:160 ../gtk/apport-gtk.py:160
+#: ../gtk/apport-gtk.py:160 ../debian/tmp/usr/share/apport/apport-gtk.py:160
 #, python-format
 msgid "Sorry, %s has closed unexpectedly."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:238 ../gtk/apport-gtk.py:238
+#: ../gtk/apport-gtk.py:228 ../debian/tmp/usr/share/apport/apport-gtk.py:228
+msgid "Force Closed"
+msgstr ""
+
+#: ../gtk/apport-gtk.py:238 ../debian/tmp/usr/share/apport/apport-gtk.py:238
 #, python-format
 msgid "The application %s has stopped responding."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:242 ../gtk/apport-gtk.py:242
+#: ../gtk/apport-gtk.py:242 ../debian/tmp/usr/share/apport/apport-gtk.py:242
 #, python-format
 msgid "The program \"%s\" has stopped responding."
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/kernel_oops.py:30 ../data/kernel_oops.py:30
-msgid "Your system might become unstable now and might need to be restarted."
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1069
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1080
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1091
+msgid "Problem in bash"
 msgstr ""
 
-#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22
-#, python-format
-msgid "Usage: %s <report> <target directory>"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263
+msgid "The application Apport has stopped responding."
 msgstr ""
 
-#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46
-msgid "Destination directory exists and is not empty."
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:265
+msgid "You can wait to see if it wakes up, or close or relaunch it."
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:1
-msgid "Collect system information"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340
+msgid "Sorry, the application apport has stopped unexpectedly."
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:2
-msgid ""
-"Authentication is required to collect system information for this problem "
-"report"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357
+msgid "Sorry, apport has closed unexpectedly."
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:3
-msgid "System problem reports"
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:133
+#: ../data/general-hooks/ubuntu.py:133
+msgid ""
+"An Ubuntu package has a file conflict with a package that is not a genuine "
+"Ubuntu package"
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:4
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:150
+#: ../data/general-hooks/ubuntu.py:150
 msgid ""
-"Please enter your password to access problem reports of system programs"
+"Your system was initially configured with grub version 2, but you have "
+"removed it from your system in favor of grub 1 without configuring it.  To "
+"ensure your bootloader configuration is updated whenever a new kernel is "
+"available, open a terminal and run:\n"
+"\n"
+"      sudo apt-get install grub-pc\n"
 msgstr ""
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/bootloader.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/bootloader.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/bootloader.po	2014-07-09 09:30:13.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/bootloader.po	2015-08-14 07:58:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:13+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:16+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. ok button label
 #. txt_ok
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/ecryptfs-utils.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/ecryptfs-utils.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/ecryptfs-utils.po	2014-07-09 09:30:13.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/ecryptfs-utils.po	2015-08-14 07:58:53.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ecryptfs-utils\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-01-28 14:03+0000\n"
+"POT-Creation-Date: 2015-03-04 23:13+0000\n"
 "PO-Revision-Date: 2010-08-01 10:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Sardinian <sc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:55+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:47+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. Name
 #: ../src/desktop/ecryptfs-record-passphrase:1
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/example-content.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/example-content.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/example-content.po	2014-07-09 09:30:13.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/example-content.po	2015-08-14 07:58:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:19+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:21+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../data/examples.desktop.in.h:1
 msgid "Examples"
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/human-theme.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/human-theme.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/human-theme.po	2014-07-09 09:30:13.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/human-theme.po	2015-08-14 07:58:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:25+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:25+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../index.theme.in.h:1
 msgid "Ubuntu default theme"
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/indicator-datetime.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/indicator-datetime.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/indicator-datetime.po	2014-07-09 09:30:13.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/indicator-datetime.po	2015-08-14 07:58:53.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 14:37+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:19+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
 #: ../src/formatter.cpp:234
@@ -39,7 +39,7 @@
 #. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
 #. This format string is used for showing, on a 24-hour clock, events/appointments that happen today.
 #. en_US example: "%H:%M" --> "13:00"
-#: ../src/formatter.cpp:243 ../src/utils.c:341
+#: ../src/formatter.cpp:243 ../src/utils.c:344
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -132,18 +132,16 @@
 msgid "%s (has alarms)"
 msgstr ""
 
-#: ../src/snap.cpp:272
+#: ../src/snap.cpp:132
 #, c-format
 msgid "Alarm %s"
 msgstr ""
 
-#. / alarm popup dialog's button to show the active alarm
-#: ../src/snap.cpp:286
+#: ../src/snap.cpp:101
 msgid "Show"
 msgstr ""
 
-#. / alarm popup dialog's button to shut up the alarm
-#: ../src/snap.cpp:289
+#: ../src/snap.cpp:102
 msgid "Dismiss"
 msgstr ""
 
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/language-selector.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/language-selector.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/language-selector.po	2014-07-09 09:30:12.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/language-selector.po	2015-08-14 07:58:52.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: language-selector\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-07-01 15:35+0000\n"
+"POT-Creation-Date: 2014-09-18 20:16+0000\n"
 "PO-Revision-Date: 2013-06-10 05:22+0000\n"
 "Last-Translator: Dàriu Piga <Unknown>\n"
 "Language-Team: Sardinian <sc@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Launchpad-Export-Date: 2014-07-07 12:57+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:05+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. Hack for Chinese langpack split
 #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically.
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/lightdm.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/lightdm.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/lightdm.po	2014-07-09 09:30:13.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/lightdm.po	2015-08-14 07:58:53.000000000 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: lightdm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-04-29 20:15+0000\n"
+"POT-Creation-Date: 2015-06-18 22:46+0000\n"
 "PO-Revision-Date: 2012-11-27 18:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Sardinian <sc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 14:47+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:27+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
+
+#: ../debian/config-error-dialog.sh:16
+#, sh-format
+msgid "Error found when loading $CONFIG_FILE:"
+msgstr ""
+
+#: ../debian/config-error-dialog.sh:17
+msgid ""
+"As a result the session will not be configured correctly.\n"
+"You should fix the problem as soon as feasible."
+msgstr ""
 
 #: ../debian/guest-session-auto.sh:22
 msgid "Temporary Guest Session"
@@ -36,54 +47,59 @@
 msgstr ""
 
 #. Help string for command line --config flag
-#: ../src/lightdm.c:979
+#: ../src/lightdm.c:1162
 msgid "Use configuration file"
 msgstr "Imprea file de configuratzione"
 
 #. Help string for command line --debug flag
-#: ../src/lightdm.c:982
+#: ../src/lightdm.c:1165
 msgid "Print debugging messages"
 msgstr "Imprenta is messàgios de debug"
 
 #. Help string for command line --test-mode flag
-#: ../src/lightdm.c:985
+#: ../src/lightdm.c:1168
 msgid "Run as unprivileged user, skipping things that require root access"
 msgstr ""
 "In esecutzione comente impitadore sena privilègios, sarto is cosas chi "
 "tenent bisòngiu de s'atzessu de root"
 
 #. Help string for command line --pid-file flag
-#: ../src/lightdm.c:988
+#: ../src/lightdm.c:1171
 msgid "File to write PID into"
 msgstr "File pro iscrìere su PID a intro"
 
 #. Help string for command line --log-dir flag
-#: ../src/lightdm.c:991
+#: ../src/lightdm.c:1174
 msgid "Directory to write logs to"
 msgstr ""
 
 #. Help string for command line --run-dir flag
-#: ../src/lightdm.c:994
+#: ../src/lightdm.c:1177
 msgid "Directory to store running state"
 msgstr ""
 
 #. Help string for command line --cache-dir flag
-#: ../src/lightdm.c:997
+#: ../src/lightdm.c:1180
 msgid "Directory to cache information"
 msgstr ""
 
+#. Help string for command line --show-config flag
+#: ../src/lightdm.c:1183
+msgid "Show combined configuration"
+msgstr ""
+
 #. Help string for command line --version flag
-#: ../src/lightdm.c:1000
+#: ../src/lightdm.c:1186
 msgid "Show release version"
 msgstr ""
 
 #. Arguments and description for --help test
-#: ../src/lightdm.c:1019
+#: ../src/lightdm.c:1205
 msgid "- Display Manager"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/lightdm.c:1029
+#: ../src/lightdm.c:1215
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/ltsp-login.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/ltsp-login.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/ltsp-login.po	2014-07-09 09:30:12.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/ltsp-login.po	2015-08-14 07:58:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:02+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:08+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ltsp-login.sh:17
 #, sh-format
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/pidgin.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/pidgin.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/pidgin.po	2014-07-09 09:30:13.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/pidgin.po	2015-08-14 07:58:52.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-05-20 17:40+0000\n"
+"POT-Creation-Date: 2014-10-27 16:57+0000\n"
 "PO-Revision-Date: 2010-05-23 08:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Sardinian <sc@li.org>\n"
@@ -15,13 +15,13 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Launchpad-Export-Date: 2014-07-07 13:54+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:46+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:66 ../finch/finch.c:336 ../finch/finch.c:365
-#: ../finch/finch.c:454
+#: ../finch/finch.c:66 ../finch/finch.c:335 ../finch/finch.c:364
+#: ../finch/finch.c:459
 msgid "Finch"
 msgstr ""
 
@@ -43,7 +43,7 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../finch/finch.c:363 ../pidgin/gtkmain.c:719
+#: ../finch/finch.c:362 ../pidgin/gtkmain.c:723
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -60,11 +60,11 @@
 #: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/chat.c:812
 #: ../libpurple/protocols/jabber/chat.c:823
-#: ../libpurple/protocols/jabber/jabber.c:2352
-#: ../libpurple/protocols/jabber/jutil.c:708
+#: ../libpurple/protocols/jabber/jabber.c:2360
+#: ../libpurple/protocols/jabber/jutil.c:710
 #: ../libpurple/protocols/mxit/login.c:526
 #: ../libpurple/protocols/mxit/protocol.c:2543
-#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1472
+#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1451
 #: ../pidgin/plugins/disco/xmppdisco.c:514
 #: ../pidgin/plugins/disco/xmppdisco.c:519
@@ -111,7 +111,7 @@
 msgstr ""
 
 #: ../finch/gntaccount.c:570 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1576 ../pidgin/gtkblist.c:5127
+#: ../pidgin/gtkaccount.c:1583 ../pidgin/gtkblist.c:5127
 msgid "Modify Account"
 msgstr ""
 
@@ -149,10 +149,10 @@
 #: ../finch/gntblist.c:1583 ../finch/gntblist.c:2762 ../finch/gntblist.c:2813
 #: ../finch/gntblist.c:2887 ../finch/gntblist.c:2949 ../finch/gntcertmgr.c:91
 #: ../finch/gntplugin.c:534 ../finch/gntpounce.c:473 ../finch/gntpounce.c:681
-#: ../finch/gntprefs.c:266 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
+#: ../finch/gntprefs.c:268 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
 #: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
-#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1222
-#: ../libpurple/account.c:1585 ../libpurple/account.c:1620
+#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1281
+#: ../libpurple/account.c:1644 ../libpurple/account.c:1679
 #: ../libpurple/conversation.c:1311 ../libpurple/conversation.c:2147
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:336
 #: ../libpurple/protocols/gg/gg.c:391 ../libpurple/protocols/gg/gg.c:456
@@ -160,11 +160,11 @@
 #: ../libpurple/protocols/jabber/buddy.c:2214
 #: ../libpurple/protocols/jabber/buddy.c:2263
 #: ../libpurple/protocols/jabber/chat.c:922
-#: ../libpurple/protocols/jabber/jabber.c:1467
-#: ../libpurple/protocols/jabber/jabber.c:1478
-#: ../libpurple/protocols/jabber/jabber.c:2558
-#: ../libpurple/protocols/jabber/jabber.c:3422
-#: ../libpurple/protocols/jabber/si.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:2566
+#: ../libpurple/protocols/jabber/jabber.c:3430
+#: ../libpurple/protocols/jabber/si.c:1580
 #: ../libpurple/protocols/jabber/usernick.c:83
 #: ../libpurple/protocols/jabber/xdata.c:404
 #: ../libpurple/protocols/msn/msn.c:452 ../libpurple/protocols/msn/msn.c:577
@@ -175,21 +175,21 @@
 #: ../libpurple/protocols/mxit/actions.c:412
 #: ../libpurple/protocols/mxit/login.c:365
 #: ../libpurple/protocols/mxit/login.c:711
-#: ../libpurple/protocols/myspace/user.c:824
-#: ../libpurple/protocols/myspace/user.c:885
-#: ../libpurple/protocols/oscar/oscar.c:5220
-#: ../libpurple/protocols/oscar/peer.c:1071
-#: ../libpurple/protocols/sametime/sametime.c:3471
-#: ../libpurple/protocols/sametime/sametime.c:3557
-#: ../libpurple/protocols/sametime/sametime.c:5456
-#: ../libpurple/protocols/sametime/sametime.c:5546
-#: ../libpurple/protocols/sametime/sametime.c:5671
+#: ../libpurple/protocols/myspace/user.c:826
+#: ../libpurple/protocols/myspace/user.c:887
+#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/peer.c:1066
+#: ../libpurple/protocols/sametime/sametime.c:3435
+#: ../libpurple/protocols/sametime/sametime.c:3521
+#: ../libpurple/protocols/sametime/sametime.c:5420
+#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:5635
 #: ../libpurple/protocols/silc/buddy.c:459
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1199
+#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:622
 #: ../libpurple/protocols/silc/chat.c:756
-#: ../libpurple/protocols/silc/ops.c:1832
+#: ../libpurple/protocols/silc/ops.c:1831
 #: ../libpurple/protocols/silc/silc.c:1063
 #: ../libpurple/protocols/silc/silc.c:1271
 #: ../libpurple/protocols/silc10/buddy.c:468
@@ -201,41 +201,41 @@
 #: ../libpurple/protocols/silc10/silc.c:761
 #: ../libpurple/protocols/silc10/silc.c:967
 #: ../libpurple/protocols/yahoo/libymsg.c:1369
-#: ../libpurple/protocols/yahoo/libymsg.c:4575
-#: ../libpurple/protocols/yahoo/libymsg.c:4586
+#: ../libpurple/protocols/yahoo/libymsg.c:4562
+#: ../libpurple/protocols/yahoo/libymsg.c:4573
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:589
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:600
-#: ../pidgin/gtkaccount.c:1945 ../pidgin/gtkaccount.c:2480
+#: ../pidgin/gtkaccount.c:1952 ../pidgin/gtkaccount.c:2487
 #: ../pidgin/gtkblist.c:705 ../pidgin/gtkblist.c:3582
-#: ../pidgin/gtkblist.c:7331 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:900 ../pidgin/gtkdialogs.c:1039
-#: ../pidgin/gtkdialogs.c:1131 ../pidgin/gtkdialogs.c:1151
-#: ../pidgin/gtkdialogs.c:1175 ../pidgin/gtkdialogs.c:1197
-#: ../pidgin/gtkdialogs.c:1245 ../pidgin/gtkdialogs.c:1286
-#: ../pidgin/gtkdialogs.c:1342 ../pidgin/gtkdialogs.c:1381
-#: ../pidgin/gtkdialogs.c:1408 ../pidgin/gtkimhtmltoolbar.c:451
+#: ../pidgin/gtkblist.c:7334 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:913 ../pidgin/gtkdialogs.c:1052
+#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1258 ../pidgin/gtkdialogs.c:1299
+#: ../pidgin/gtkdialogs.c:1355 ../pidgin/gtkdialogs.c:1394
+#: ../pidgin/gtkdialogs.c:1421 ../pidgin/gtkimhtmltoolbar.c:451
 #: ../pidgin/gtklog.c:324 ../pidgin/gtkplugin.c:308 ../pidgin/gtkpounce.c:1141
-#: ../pidgin/gtkprivacy.c:497 ../pidgin/gtkprivacy.c:513
-#: ../pidgin/gtkprivacy.c:538 ../pidgin/gtkprivacy.c:552
+#: ../pidgin/gtkprivacy.c:498 ../pidgin/gtkprivacy.c:514
+#: ../pidgin/gtkprivacy.c:539 ../pidgin/gtkprivacy.c:553
 #: ../pidgin/gtkrequest.c:301 ../pidgin/gtksavedstatuses.c:317
-#: ../pidgin/gtkstatusbox.c:1611 ../pidgin/gtkutils.c:1620
-#: ../pidgin/gtkutils.c:1640 ../pidgin/plugins/disco/gtkdisco.c:246
+#: ../pidgin/gtkstatusbox.c:1611 ../pidgin/gtkutils.c:1628
+#: ../pidgin/gtkutils.c:1648 ../pidgin/plugins/disco/gtkdisco.c:246
 msgid "Cancel"
 msgstr "Annudda"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:658 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:341
-#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:266
+#: ../finch/gntaccount.c:658 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:342
+#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:268
 #: ../finch/gntsound.c:1078 ../finch/gntstatus.c:490 ../finch/gntstatus.c:600
-#: ../libpurple/account.c:1619 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/account.c:1678 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:680 ../pidgin/gtkblist.c:705
 #: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:826
 #: ../pidgin/gtkrequest.c:307
 msgid "Save"
 msgstr ""
 
-#: ../finch/gntaccount.c:711 ../pidgin/gtkaccount.c:1936
+#: ../finch/gntaccount.c:711 ../pidgin/gtkaccount.c:1943
 #: ../pidgin/gtksavedstatuses.c:305 ../pidgin/gtkstatusbox.c:1605
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -249,14 +249,14 @@
 #: ../finch/gntaccount.c:717 ../finch/gntaccount.c:832
 #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:680 ../finch/gntpounce.c:743
 #: ../finch/gntstatus.c:146 ../finch/gntstatus.c:212
-#: ../pidgin/gtkaccount.c:1944 ../pidgin/gtklog.c:323
+#: ../pidgin/gtkaccount.c:1951 ../pidgin/gtklog.c:323
 #: ../pidgin/gtkpounce.c:1140 ../pidgin/gtkrequest.c:304
 #: ../pidgin/gtksavedstatuses.c:316 ../pidgin/gtkstatusbox.c:1610
 msgid "Delete"
 msgstr "Fulianchedhu!"
 
 #: ../finch/gntaccount.c:793 ../finch/gntblist.c:2628 ../finch/gntui.c:99
-#: ../pidgin/gtkaccount.c:2341
+#: ../pidgin/gtkaccount.c:2348
 msgid "Accounts"
 msgstr ""
 
@@ -267,13 +267,13 @@
 #. Add button
 #: ../finch/gntaccount.c:823 ../finch/gntaccount.c:1013
 #: ../finch/gntblist.c:699 ../finch/gntblist.c:806 ../finch/gntblist.c:854
-#: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:452
+#: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:456
 #: ../finch/gntpounce.c:727 ../finch/gntroomlist.c:276
 #: ../finch/gntstatus.c:201 ../libpurple/protocols/gg/gg.c:455
-#: ../libpurple/protocols/sametime/sametime.c:5545
+#: ../libpurple/protocols/sametime/sametime.c:5509
 #: ../libpurple/protocols/silc/chat.c:621
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2479
-#: ../pidgin/gtkblist.c:7330 ../pidgin/gtkconv.c:1692
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2486
+#: ../pidgin/gtkblist.c:7333 ../pidgin/gtkconv.c:1692
 #: ../pidgin/gtkrequest.c:305
 msgid "Add"
 msgstr ""
@@ -283,12 +283,12 @@
 msgid "Modify"
 msgstr "Cambiai"
 
-#: ../finch/gntaccount.c:936 ../pidgin/gtkaccount.c:2426
+#: ../finch/gntaccount.c:936 ../pidgin/gtkaccount.c:2433
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr ""
 
-#: ../finch/gntaccount.c:1009 ../pidgin/gtkaccount.c:2478
+#: ../finch/gntaccount.c:1009 ../pidgin/gtkaccount.c:2485
 msgid "Add buddy to your list?"
 msgstr ""
 
@@ -298,17 +298,17 @@
 msgstr ""
 
 #: ../finch/gntaccount.c:1094 ../finch/gntaccount.c:1097
-#: ../finch/gntaccount.c:1124 ../pidgin/gtkaccount.c:2611
+#: ../finch/gntaccount.c:1124 ../pidgin/gtkaccount.c:2618
 msgid "Authorize buddy?"
 msgstr ""
 
 #: ../finch/gntaccount.c:1101 ../finch/gntaccount.c:1128
-#: ../pidgin/gtkaccount.c:2612
+#: ../pidgin/gtkaccount.c:2619
 msgid "Authorize"
 msgstr ""
 
 #: ../finch/gntaccount.c:1102 ../finch/gntaccount.c:1129
-#: ../pidgin/gtkaccount.c:2613
+#: ../pidgin/gtkaccount.c:2620
 msgid "Deny"
 msgstr ""
 
@@ -334,7 +334,7 @@
 #: ../finch/gntblist.c:319 ../pidgin/gtkprefs.c:422 ../pidgin/gtkprefs.c:543
 #: ../pidgin/gtkprefs.c:551
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#: ../pidgin/plugins/vvconfig.c:87
+#: ../pidgin/plugins/vvconfig.c:93
 msgid "Default"
 msgstr ""
 
@@ -358,21 +358,21 @@
 msgid "Error adding buddy"
 msgstr ""
 
-#: ../finch/gntblist.c:678 ../libpurple/protocols/jabber/jabber.c:1401
-#: ../libpurple/protocols/jabber/jabber.c:1403
-#: ../libpurple/protocols/oscar/oscar.c:3023
-#: ../libpurple/protocols/silc/buddy.c:1552
-#: ../libpurple/protocols/silc/ops.c:1209
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc/ops.c:1348
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../finch/gntblist.c:678 ../libpurple/protocols/jabber/jabber.c:1409
+#: ../libpurple/protocols/jabber/jabber.c:1411
+#: ../libpurple/protocols/oscar/oscar.c:3020
+#: ../libpurple/protocols/silc/buddy.c:1546
+#: ../libpurple/protocols/silc/ops.c:1208
+#: ../libpurple/protocols/silc/ops.c:1211
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/silc/ops.c:1350
 #: ../libpurple/protocols/silc/silc.c:1245
 #: ../libpurple/protocols/silc10/buddy.c:1559
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:941 ../pidgin/gtkaccount.c:2018
+#: ../libpurple/protocols/silc10/silc.c:941 ../pidgin/gtkaccount.c:2025
 #: ../pidgin/gtksavedstatuses.c:951
 msgid "Username"
 msgstr ""
@@ -391,7 +391,7 @@
 
 #: ../finch/gntblist.c:691 ../finch/gntblist.c:785 ../finch/gntblist.c:1794
 #: ../finch/gntblist.c:2743 ../finch/gntblist.c:2799 ../finch/gntblist.c:2874
-#: ../finch/gntblist.c:2934 ../finch/gntnotify.c:192 ../finch/gntstatus.c:578
+#: ../finch/gntblist.c:2934 ../finch/gntnotify.c:195 ../finch/gntstatus.c:578
 #: ../libpurple/plugins/idle.c:149 ../libpurple/plugins/idle.c:186
 #: ../pidgin/gtkblist.c:3779 ../pidgin/gtknotify.c:712
 #: ../pidgin/gtkpounce.c:1292 ../pidgin/plugins/gevolution/gevolution.c:456
@@ -400,14 +400,14 @@
 
 #: ../finch/gntblist.c:697 ../finch/gntblist.c:1259
 #: ../libpurple/protocols/silc/buddy.c:730
-#: ../libpurple/protocols/silc/buddy.c:1035
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/buddy.c:1029
+#: ../libpurple/protocols/silc/buddy.c:1074
+#: ../libpurple/protocols/silc/buddy.c:1184
 #: ../libpurple/protocols/silc10/buddy.c:737
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/libymsg.c:4383 ../pidgin/gtkblist.c:7093
+#: ../libpurple/protocols/yahoo/libymsg.c:4370 ../pidgin/gtkblist.c:7096
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:451
 msgid "Add Buddy"
 msgstr ""
@@ -416,18 +416,18 @@
 msgid "Please enter buddy information."
 msgstr ""
 
-#: ../finch/gntblist.c:753 ../libpurple/blist.c:1495
+#: ../finch/gntblist.c:753 ../libpurple/blist.c:1496
 msgid "Chats"
 msgstr ""
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:791 ../finch/gntblist.c:2738 ../finch/gntblist.c:2794
 #: ../finch/gntblist.c:2929 ../finch/gntroomlist.c:300
-#: ../libpurple/protocols/jabber/jabber.c:1424
-#: ../libpurple/protocols/jabber/jabber.c:1428
-#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2411
-#: ../libpurple/protocols/msn/msn.c:2476 ../libpurple/protocols/msn/msn.c:2503
-#: ../pidgin/gtkplugin.c:765 ../pidgin/gtkroomlist.c:740
+#: ../libpurple/protocols/jabber/jabber.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1436
+#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2410
+#: ../libpurple/protocols/msn/msn.c:2475 ../libpurple/protocols/msn/msn.c:2502
+#: ../pidgin/gtkplugin.c:767 ../pidgin/gtkroomlist.c:740
 #: ../pidgin/plugins/disco/gtkdisco.c:554
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:131
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:122
@@ -435,14 +435,14 @@
 msgstr ""
 
 #: ../finch/gntblist.c:794 ../finch/gntblist.c:1735
-#: ../libpurple/protocols/gg/gg.c:1569 ../libpurple/protocols/msn/msn.c:2237
+#: ../libpurple/protocols/gg/gg.c:1569 ../libpurple/protocols/msn/msn.c:2236
 #: ../libpurple/protocols/mxit/profile.c:206
 #: ../libpurple/protocols/silc/chat.c:612
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1178 ../pidgin/gtkdialogs.c:1150
-#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1196
+#: ../libpurple/protocols/zephyr/zephyr.c:804
+#: ../libpurple/protocols/zephyr/zephyr.c:1188 ../pidgin/gtkdialogs.c:1163
+#: ../pidgin/gtkdialogs.c:1187 ../pidgin/gtkdialogs.c:1209
 #: ../pidgin/gtkrequest.c:308
 msgid "Alias"
 msgstr ""
@@ -456,7 +456,7 @@
 msgid "Auto-join"
 msgstr ""
 
-#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7271
+#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7274
 msgid "Add Chat"
 msgstr ""
 
@@ -473,8 +473,8 @@
 msgstr ""
 
 #: ../finch/gntblist.c:852 ../finch/gntblist.c:1263
-#: ../libpurple/protocols/sametime/sametime.c:5455
-#: ../libpurple/protocols/sametime/sametime.c:5543 ../pidgin/gtkblist.c:7327
+#: ../libpurple/protocols/sametime/sametime.c:5419
+#: ../libpurple/protocols/sametime/sametime.c:5507 ../pidgin/gtkblist.c:7330
 msgid "Add Group"
 msgstr ""
 
@@ -498,11 +498,11 @@
 msgid "Edit Settings"
 msgstr ""
 
-#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1003
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1011
 msgid "Information"
 msgstr ""
 
-#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1003
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1011
 msgid "Retrieving..."
 msgstr ""
 
@@ -517,7 +517,7 @@
 msgstr ""
 
 #: ../finch/gntblist.c:1347 ../finch/gntconv.c:641
-#: ../libpurple/protocols/jabber/si.c:1584
+#: ../libpurple/protocols/jabber/si.c:1580
 #: ../libpurple/protocols/oscar/userinfo.c:58 ../pidgin/gtkconv.c:1631
 msgid "Send File"
 msgstr ""
@@ -573,7 +573,7 @@
 msgstr ""
 
 #. Buddy List
-#: ../finch/gntblist.c:1711 ../finch/gntblist.c:3126 ../finch/gntprefs.c:259
+#: ../finch/gntblist.c:1711 ../finch/gntblist.c:3126 ../finch/gntprefs.c:261
 #: ../finch/gntui.c:100 ../pidgin/gtkblist.c:5768
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "Buddy List"
@@ -594,22 +594,22 @@
 #. General
 #: ../finch/gntblist.c:1787 ../libpurple/protocols/gg/gg.c:307
 #: ../libpurple/protocols/gg/gg.c:801 ../libpurple/protocols/gg/gg.c:873
-#: ../libpurple/protocols/gg/gg.c:2346
+#: ../libpurple/protocols/gg/gg.c:2404
 #: ../libpurple/protocols/jabber/buddy.c:353
 #: ../libpurple/protocols/jabber/buddy.c:1050
 #: ../libpurple/protocols/jabber/buddy.c:2004
 #: ../libpurple/protocols/jabber/buddy.c:2197
-#: ../libpurple/protocols/jabber/jabber.c:1321
-#: ../libpurple/protocols/jabber/jabber.c:2375
-#: ../libpurple/protocols/jabber/jabber.c:2399
-#: ../libpurple/protocols/jabber/jabber.c:2415
-#: ../libpurple/protocols/jabber/jabber.c:2431
-#: ../libpurple/protocols/jabber/jabber.c:2445
-#: ../libpurple/protocols/msn/msn.c:2244 ../libpurple/protocols/msn/msn.c:2414
-#: ../libpurple/protocols/silc/buddy.c:1549
-#: ../libpurple/protocols/silc/ops.c:1015
-#: ../libpurple/protocols/silc/ops.c:1198
-#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1329
+#: ../libpurple/protocols/jabber/jabber.c:2383
+#: ../libpurple/protocols/jabber/jabber.c:2407
+#: ../libpurple/protocols/jabber/jabber.c:2423
+#: ../libpurple/protocols/jabber/jabber.c:2439
+#: ../libpurple/protocols/jabber/jabber.c:2453
+#: ../libpurple/protocols/msn/msn.c:2243 ../libpurple/protocols/msn/msn.c:2413
+#: ../libpurple/protocols/silc/buddy.c:1543
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1335
 #: ../libpurple/protocols/silc10/buddy.c:1555
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
@@ -621,17 +621,17 @@
 
 #. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1809 ../finch/gntprefs.c:262
+#: ../finch/gntblist.c:1809 ../finch/gntprefs.c:264
 #: ../libpurple/protocols/bonjour/bonjour.c:370
 #: ../libpurple/protocols/jabber/buddy.c:748
-#: ../libpurple/protocols/jabber/jabber.c:2240
+#: ../libpurple/protocols/jabber/jabber.c:2248
 #: ../libpurple/protocols/msn/msn.c:1071 ../libpurple/protocols/msn/msn.c:1088
 #: ../libpurple/protocols/msn/msn.c:1095 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/oscar/userinfo.c:499
-#: ../libpurple/protocols/yahoo/libymsg.c:4102
+#: ../libpurple/protocols/oscar/userinfo.c:500
+#: ../libpurple/protocols/yahoo/libymsg.c:4089
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:709 ../pidgin/gtkblist.c:3831
-#: ../pidgin/gtkblist.c:4286 ../pidgin/gtkprefs.c:2709
+#: ../pidgin/gtkblist.c:4286 ../pidgin/gtkprefs.c:2714
 msgid "Idle"
 msgstr ""
 
@@ -648,7 +648,7 @@
 msgstr ""
 
 #: ../finch/gntblist.c:2596 ../finch/gntplugin.c:354 ../finch/gntui.c:105
-#: ../pidgin/gtkplugin.c:720
+#: ../pidgin/gtkplugin.c:722
 msgid "Plugins"
 msgstr ""
 
@@ -674,26 +674,26 @@
 #. Not masked?
 #. No hints?
 #: ../finch/gntblist.c:2761 ../finch/gntblist.c:2812 ../finch/gntblist.c:2948
-#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:83
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1221
-#: ../libpurple/account.c:1584 ../libpurple/protocols/gg/gg.c:335
+#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:85
+#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1280
+#: ../libpurple/account.c:1643 ../libpurple/protocols/gg/gg.c:335
 #: ../libpurple/protocols/gg/gg.c:390
-#: ../libpurple/protocols/jabber/jabber.c:2557
+#: ../libpurple/protocols/jabber/jabber.c:2565
 #: ../libpurple/protocols/jabber/xdata.c:403
 #: ../libpurple/protocols/msn/msn.c:451 ../libpurple/protocols/msn/msn.c:576
 #: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/msn.c:671
 #: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/mxit/login.c:365
-#: ../libpurple/protocols/myspace/user.c:823
-#: ../libpurple/protocols/myspace/user.c:884
-#: ../libpurple/protocols/oscar/oscar.c:5219
+#: ../libpurple/protocols/myspace/user.c:825
+#: ../libpurple/protocols/myspace/user.c:886
+#: ../libpurple/protocols/oscar/oscar.c:5214
 #: ../libpurple/protocols/silc/buddy.c:458
-#: ../libpurple/protocols/silc/buddy.c:1198
+#: ../libpurple/protocols/silc/buddy.c:1192
 #: ../libpurple/protocols/silc/chat.c:451
 #: ../libpurple/protocols/silc/chat.c:488
 #: ../libpurple/protocols/silc/chat.c:755
-#: ../libpurple/protocols/silc/ops.c:1305
-#: ../libpurple/protocols/silc/ops.c:1831
+#: ../libpurple/protocols/silc/ops.c:1304
+#: ../libpurple/protocols/silc/ops.c:1830
 #: ../libpurple/protocols/silc/silc.c:1062
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
@@ -704,22 +704,22 @@
 #: ../libpurple/protocols/silc10/ops.c:1909
 #: ../libpurple/protocols/silc10/silc.c:760
 #: ../libpurple/protocols/yahoo/libymsg.c:1368
-#: ../libpurple/protocols/yahoo/libymsg.c:4574
-#: ../libpurple/protocols/yahoo/libymsg.c:4585
+#: ../libpurple/protocols/yahoo/libymsg.c:4561
+#: ../libpurple/protocols/yahoo/libymsg.c:4572
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:588
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkblist.c:3581
-#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:899
-#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1130
-#: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1619
-#: ../pidgin/gtkutils.c:1639
+#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:912
+#: ../pidgin/gtkdialogs.c:1051 ../pidgin/gtkdialogs.c:1143
+#: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1627
+#: ../pidgin/gtkutils.c:1647
 msgid "OK"
 msgstr ""
 
-#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:894
+#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:907
 msgid "New Instant Message"
 msgstr ""
 
-#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:896
+#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:909
 msgid ""
 "Please enter the username or alias of the person you would like to IM."
 msgstr ""
@@ -736,11 +736,11 @@
 msgid "Please enter the name of the chat you want to join."
 msgstr ""
 
-#: ../finch/gntblist.c:2886 ../finch/gntnotify.c:461
+#: ../finch/gntblist.c:2886 ../finch/gntnotify.c:465
 msgid "Join"
 msgstr "Partetzipa"
 
-#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1127
+#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1140
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
@@ -806,7 +806,7 @@
 
 #: ../finch/gntblist.c:3080 ../libpurple/protocols/oscar/userinfo.c:52
 #: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/util.c:560
+#: ../libpurple/protocols/silc/util.c:509
 #: ../libpurple/protocols/silc10/silc.c:704
 #: ../libpurple/protocols/silc10/util.c:553
 #: ../pidgin/plugins/disco/gtkdisco.c:482
@@ -903,20 +903,20 @@
 msgid "Hostname"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:455 ../pidgin/gtkconv.c:1668
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:459 ../pidgin/gtkconv.c:1668
 #: ../pidgin/gtkdebug.c:940
 msgid "Info"
 msgstr ""
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:200
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:203
 #: ../finch/gntplugin.c:222 ../finch/gntplugin.c:415 ../finch/gntpounce.c:752
 #: ../finch/gntroomlist.c:277 ../finch/gntstatus.c:218
-#: ../libpurple/protocols/msn/msn.c:794
+#: ../libpurple/certificate.c:2212 ../libpurple/protocols/msn/msn.c:794
 #: ../libpurple/protocols/mxit/splashscreen.c:207
 #: ../libpurple/protocols/mxit/splashscreen.c:211
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2453
+#: ../libpurple/protocols/silc/util.c:335
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2460
 #: ../pidgin/gtkblist.c:5874 ../pidgin/gtkrequest.c:303
 msgid "Close"
 msgstr ""
@@ -1021,7 +1021,7 @@
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:616 ../finch/gntprefs.c:192
+#: ../finch/gntconv.c:616 ../finch/gntprefs.c:194
 msgid "Show Timestamps"
 msgstr ""
 
@@ -1082,27 +1082,27 @@
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
 
-#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8081
+#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8084
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8084
+#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8087
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8087
+#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8090
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8090
+#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8093
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8096
+#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8099
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
@@ -1144,12 +1144,12 @@
 "default"
 msgstr ""
 
-#: ../finch/gntdebug.c:275 ../pidgin/gtkconv.c:994 ../pidgin/gtkdebug.c:230
-#: ../pidgin/gtkft.c:519 ../pidgin/gtkutils.c:3339
+#: ../finch/gntdebug.c:276 ../pidgin/gtkconv.c:994 ../pidgin/gtkdebug.c:230
+#: ../pidgin/gtkft.c:519 ../pidgin/gtkutils.c:3347
 msgid "Unable to open file."
 msgstr ""
 
-#: ../finch/gntdebug.c:315 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:755
+#: ../finch/gntdebug.c:316 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:755
 msgid "Debug Window"
 msgstr ""
 
@@ -1157,15 +1157,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #. 
-#: ../finch/gntdebug.c:336 ../pidgin/gtkdebug.c:835 ../pidgin/gtkdebug.c:837
+#: ../finch/gntdebug.c:337 ../pidgin/gtkdebug.c:835 ../pidgin/gtkdebug.c:837
 msgid "Clear"
 msgstr ""
 
-#: ../finch/gntdebug.c:347
+#: ../finch/gntdebug.c:348
 msgid "Filter:"
 msgstr ""
 
-#: ../finch/gntdebug.c:353 ../pidgin/gtkdebug.c:849 ../pidgin/gtkdebug.c:851
+#: ../finch/gntdebug.c:354 ../pidgin/gtkdebug.c:849 ../pidgin/gtkdebug.c:851
 msgid "Pause"
 msgstr ""
 
@@ -1211,18 +1211,18 @@
 #: ../libpurple/protocols/jabber/buddy.c:770
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/jabber.c:2225
+#: ../libpurple/protocols/jabber/jabber.c:2233
 #: ../libpurple/protocols/msn/msn.c:1081 ../libpurple/protocols/msn/msn.c:1090
 #: ../libpurple/protocols/msn/msn.c:1094 ../libpurple/protocols/msn/msn.c:1097
 #: ../libpurple/protocols/mxit/mxit.c:342
 #: ../libpurple/protocols/mxit/profile.c:235
 #: ../libpurple/protocols/novell/novell.c:2858
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2319
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:2317
 #: ../libpurple/protocols/oscar/userinfo.c:303
-#: ../libpurple/protocols/sametime/sametime.c:3346
-#: ../libpurple/protocols/sametime/sametime.c:4197
-#: ../libpurple/protocols/yahoo/libymsg.c:4258 ../pidgin/gtkblist.c:3876
+#: ../libpurple/protocols/sametime/sametime.c:3310
+#: ../libpurple/protocols/sametime/sametime.c:4161
+#: ../libpurple/protocols/yahoo/libymsg.c:4245 ../pidgin/gtkblist.c:3876
 #: ../pidgin/gtkblist.c:3890 ../pidgin/gtkblist.c:3892
 #: ../pidgin/gtksavedstatuses.c:970 ../pidgin/gtksavedstatuses.c:1120
 msgid "Status"
@@ -1345,7 +1345,7 @@
 msgid "System Log"
 msgstr ""
 
-#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:339
+#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:341
 msgid "Calling..."
 msgstr ""
 
@@ -1354,23 +1354,23 @@
 msgstr ""
 
 #. Number of actions
-#: ../finch/gntmedia.c:161 ../libpurple/certificate.c:1405
+#: ../finch/gntmedia.c:161 ../libpurple/certificate.c:1375
 msgid "Accept"
 msgstr ""
 
-#: ../finch/gntmedia.c:162 ../libpurple/certificate.c:1406
+#: ../finch/gntmedia.c:162 ../libpurple/certificate.c:1376
 msgid "Reject"
 msgstr ""
 
-#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:970 ../pidgin/gtkmedia.c:972
+#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:1144 ../pidgin/gtkmedia.c:1146
 msgid "Call in progress."
 msgstr ""
 
-#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:949
+#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:1123
 msgid "The call has been terminated."
 msgstr ""
 
-#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:635
+#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:640
 #, c-format
 msgid "%s wishes to start an audio session with you."
 msgstr ""
@@ -1380,7 +1380,7 @@
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
 
-#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:965
+#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:1139
 msgid "You have rejected the call."
 msgstr ""
 
@@ -1388,65 +1388,65 @@
 msgid "call: Make an audio call."
 msgstr ""
 
-#: ../finch/gntnotify.c:183
+#: ../finch/gntnotify.c:186
 msgid "Emails"
 msgstr ""
 
-#: ../finch/gntnotify.c:189 ../finch/gntnotify.c:252
+#: ../finch/gntnotify.c:192 ../finch/gntnotify.c:256
 msgid "You have mail!"
 msgstr ""
 
-#: ../finch/gntnotify.c:192 ../pidgin/gtknotify.c:719
+#: ../finch/gntnotify.c:195 ../pidgin/gtknotify.c:719
 msgid "Sender"
 msgstr ""
 
-#: ../finch/gntnotify.c:192 ../pidgin/gtknotify.c:726
+#: ../finch/gntnotify.c:195 ../pidgin/gtknotify.c:726
 msgid "Subject"
 msgstr ""
 
-#: ../finch/gntnotify.c:223
+#: ../finch/gntnotify.c:226
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../finch/gntnotify.c:252 ../pidgin/gtknotify.c:1596
+#: ../finch/gntnotify.c:256 ../pidgin/gtknotify.c:1596
 msgid "New Mail"
 msgstr ""
 
-#: ../finch/gntnotify.c:358 ../pidgin/gtknotify.c:1155
+#: ../finch/gntnotify.c:362 ../pidgin/gtknotify.c:1155
 #, c-format
 msgid "Info for %s"
 msgstr ""
 
-#: ../finch/gntnotify.c:359 ../pidgin/gtknotify.c:1156
+#: ../finch/gntnotify.c:363 ../pidgin/gtknotify.c:1156
 msgid "Buddy Information"
 msgstr ""
 
-#: ../finch/gntnotify.c:449 ../libpurple/protocols/mxit/login.c:711
+#: ../finch/gntnotify.c:453 ../libpurple/protocols/mxit/login.c:711
 #: ../libpurple/protocols/mxit/splashscreen.c:211
 msgid "Continue"
 msgstr ""
 
-#: ../finch/gntnotify.c:458 ../pidgin/gtkconv.c:1618
+#: ../finch/gntnotify.c:462 ../pidgin/gtkconv.c:1618
 #: ../pidgin/gtknotify.c:1638
 msgid "IM"
 msgstr ""
 
-#: ../finch/gntnotify.c:464 ../libpurple/conversation.c:2146
-#: ../libpurple/protocols/sametime/sametime.c:3556
+#: ../finch/gntnotify.c:468 ../libpurple/conversation.c:2146
+#: ../libpurple/protocols/sametime/sametime.c:3520
 msgid "Invite"
 msgstr ""
 
-#: ../finch/gntnotify.c:467
+#: ../finch/gntnotify.c:471
 msgid "(none)"
 msgstr ""
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#: ../finch/gntnotify.c:493 ../finch/plugins/gnttinyurl.c:370
+#: ../finch/gntnotify.c:498 ../finch/plugins/gnttinyurl.c:370
 msgid "URI"
 msgstr ""
 
@@ -1515,8 +1515,8 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:265
-#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2830
+#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:267
+#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2835
 msgid "Preferences"
 msgstr ""
 
@@ -1702,66 +1702,66 @@
 msgid "Based on keyboard use"
 msgstr ""
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2714
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2719
 msgid "From last sent message"
 msgstr ""
 
-#: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1349 ../pidgin/gtkprefs.c:1357
-#: ../pidgin/gtkprefs.c:2713 ../pidgin/gtkprefs.c:2749
+#: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:2718 ../pidgin/gtkprefs.c:2754
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:310
 msgid "Never"
 msgstr ""
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:187
 msgid "Show Idle Time"
 msgstr ""
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:188
 msgid "Show Offline Buddies"
 msgstr ""
 
-#: ../finch/gntprefs.c:193
+#: ../finch/gntprefs.c:195
 msgid "Notify buddies when you are typing"
 msgstr ""
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:157
+#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:157
 msgid "Log format"
 msgstr ""
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
+#: ../finch/gntprefs.c:202 ../finch/plugins/gnthistory.c:147
 msgid "Log IMs"
 msgstr ""
 
-#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:148
+#: ../finch/gntprefs.c:203 ../finch/plugins/gnthistory.c:148
 msgid "Log chats"
 msgstr ""
 
-#: ../finch/gntprefs.c:202
+#: ../finch/gntprefs.c:204
 msgid "Log status change events"
 msgstr ""
 
-#: ../finch/gntprefs.c:208
+#: ../finch/gntprefs.c:210
 msgid "Report Idle time"
 msgstr ""
 
-#: ../finch/gntprefs.c:209
+#: ../finch/gntprefs.c:211
 msgid "Change status when idle"
 msgstr ""
 
-#: ../finch/gntprefs.c:210
+#: ../finch/gntprefs.c:212
 msgid "Minutes before changing status"
 msgstr ""
 
-#: ../finch/gntprefs.c:211
+#: ../finch/gntprefs.c:213
 msgid "Change status to"
 msgstr ""
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2801
+#: ../finch/gntprefs.c:262 ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:2806
 msgid "Conversations"
 msgstr ""
 
-#: ../finch/gntprefs.c:261 ../finch/plugins/gnthistory.c:155
-#: ../pidgin/gtkprefs.c:2225 ../pidgin/gtkprefs.c:2802
+#: ../finch/gntprefs.c:263 ../finch/plugins/gnthistory.c:155
+#: ../pidgin/gtkprefs.c:2231 ../pidgin/gtkprefs.c:2807
 msgid "Logging"
 msgstr ""
 
@@ -1777,11 +1777,11 @@
 msgid "Not implemented yet."
 msgstr ""
 
-#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1584
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1610
 msgid "Save File..."
 msgstr ""
 
-#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1585
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1611
 msgid "Open File..."
 msgstr ""
 
@@ -1798,7 +1798,7 @@
 msgstr ""
 
 #. Create the window.
-#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7277
+#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7280
 #: ../pidgin/gtkroomlist.c:531
 msgid "Room List"
 msgstr ""
@@ -1858,8 +1858,8 @@
 #: ../finch/gntsound.c:739 ../finch/gntsound.c:825 ../pidgin/gtkpounce.c:178
 #: ../pidgin/gtkpounce.c:189 ../pidgin/gtkpounce.c:318
 #: ../pidgin/gtkpounce.c:696 ../pidgin/gtkpounce.c:958
-#: ../pidgin/gtkprefs.c:941 ../pidgin/gtkprefs.c:2351
-#: ../pidgin/gtkprefs.c:2449 ../pidgin/gtkprefs.c:2646
+#: ../pidgin/gtkprefs.c:947 ../pidgin/gtkprefs.c:2357
+#: ../pidgin/gtkprefs.c:2455 ../pidgin/gtkprefs.c:2652
 msgid "(default)"
 msgstr ""
 
@@ -1875,7 +1875,7 @@
 msgid "Profiles"
 msgstr ""
 
-#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2513
+#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2519
 msgid "Automatic"
 msgstr ""
 
@@ -1883,7 +1883,7 @@
 msgid "Console Beep"
 msgstr ""
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2517
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2523
 msgid "Command"
 msgstr ""
 
@@ -1907,7 +1907,7 @@
 msgstr ""
 
 #. Sound options
-#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2503
+#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2509
 msgid "Sound Options"
 msgstr ""
 
@@ -1915,19 +1915,19 @@
 msgid "Sounds when conversation has focus"
 msgstr ""
 
-#: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1347
-#: ../pidgin/gtkprefs.c:1359 ../pidgin/gtkprefs.c:2548
+#: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1353
+#: ../pidgin/gtkprefs.c:1365 ../pidgin/gtkprefs.c:2554
 #: ../pidgin/plugins/timestamp_format.c:58
 #: ../pidgin/plugins/timestamp_format.c:67
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Always"
 msgstr ""
 
-#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2546
+#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2552
 msgid "Only when available"
 msgstr ""
 
-#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2547
+#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2553
 msgid "Only when not available"
 msgstr ""
 
@@ -1936,12 +1936,12 @@
 msgstr ""
 
 #. Sound events
-#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2575
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2581
 msgid "Sound Events"
 msgstr ""
 
 #: ../finch/gntsound.c:1043 ../pidgin/gtknotify.c:1675
-#: ../pidgin/gtkprefs.c:2629
+#: ../pidgin/gtkprefs.c:2635
 msgid "Event"
 msgstr ""
 
@@ -2001,13 +2001,13 @@
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1620
 #: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/gg/gg.c:1634
-#: ../libpurple/protocols/irc/irc.c:274
-#: ../libpurple/protocols/jabber/jabber.c:2372
-#: ../libpurple/protocols/jabber/jabber.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:2412
-#: ../libpurple/protocols/jabber/jabber.c:2428
-#: ../libpurple/protocols/jabber/jabber.c:2442
-#: ../libpurple/protocols/jabber/jabber.c:2457
+#: ../libpurple/protocols/irc/irc.c:276
+#: ../libpurple/protocols/jabber/jabber.c:2380
+#: ../libpurple/protocols/jabber/jabber.c:2404
+#: ../libpurple/protocols/jabber/jabber.c:2420
+#: ../libpurple/protocols/jabber/jabber.c:2436
+#: ../libpurple/protocols/jabber/jabber.c:2450
+#: ../libpurple/protocols/jabber/jabber.c:2465
 #: ../libpurple/protocols/msn/msn.c:1150 ../libpurple/protocols/msn/msn.c:1156
 #: ../libpurple/protocols/msn/msn.c:1162 ../libpurple/protocols/msn/msn.c:1168
 #: ../libpurple/protocols/msn/msn.c:1173 ../libpurple/protocols/msn/msn.c:1178
@@ -2017,29 +2017,29 @@
 #: ../libpurple/protocols/novell/novell.c:2964
 #: ../libpurple/protocols/novell/novell.c:2970
 #: ../libpurple/protocols/novell/novell.c:2976
-#: ../libpurple/protocols/oscar/oscar.c:4763
-#: ../libpurple/protocols/oscar/oscar.c:4772
-#: ../libpurple/protocols/oscar/oscar.c:4780
-#: ../libpurple/protocols/oscar/oscar.c:4788
-#: ../libpurple/protocols/oscar/oscar.c:4796
-#: ../libpurple/protocols/oscar/oscar.c:4804
-#: ../libpurple/protocols/oscar/oscar.c:4813
-#: ../libpurple/protocols/oscar/oscar.c:4821
-#: ../libpurple/protocols/oscar/oscar.c:4828
-#: ../libpurple/protocols/oscar/oscar.c:4840
-#: ../libpurple/protocols/oscar/oscar.c:4847
-#: ../libpurple/protocols/oscar/oscar.c:4854
-#: ../libpurple/protocols/sametime/sametime.c:3369
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/sametime/sametime.c:3381
-#: ../libpurple/protocols/sametime/sametime.c:3460
-#: ../libpurple/protocols/silc/buddy.c:1563
+#: ../libpurple/protocols/oscar/oscar.c:4758
+#: ../libpurple/protocols/oscar/oscar.c:4767
+#: ../libpurple/protocols/oscar/oscar.c:4775
+#: ../libpurple/protocols/oscar/oscar.c:4783
+#: ../libpurple/protocols/oscar/oscar.c:4791
+#: ../libpurple/protocols/oscar/oscar.c:4799
+#: ../libpurple/protocols/oscar/oscar.c:4808
+#: ../libpurple/protocols/oscar/oscar.c:4816
+#: ../libpurple/protocols/oscar/oscar.c:4823
+#: ../libpurple/protocols/oscar/oscar.c:4835
+#: ../libpurple/protocols/oscar/oscar.c:4842
+#: ../libpurple/protocols/oscar/oscar.c:4849
+#: ../libpurple/protocols/sametime/sametime.c:3333
+#: ../libpurple/protocols/sametime/sametime.c:3339
+#: ../libpurple/protocols/sametime/sametime.c:3345
+#: ../libpurple/protocols/sametime/sametime.c:3424
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc10/buddy.c:1571
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/libymsg.c:5098
-#: ../libpurple/protocols/yahoo/libymsg.c:5104
-#: ../libpurple/protocols/yahoo/libymsg.c:5113
-#: ../libpurple/protocols/zephyr/zephyr.c:2340 ../pidgin/gtknotify.c:1683
+#: ../libpurple/protocols/simple/simple.c:252
+#: ../libpurple/protocols/yahoo/libymsg.c:5085
+#: ../libpurple/protocols/yahoo/libymsg.c:5091
+#: ../libpurple/protocols/yahoo/libymsg.c:5100
+#: ../libpurple/protocols/zephyr/zephyr.c:2355 ../pidgin/gtknotify.c:1683
 #: ../pidgin/gtksavedstatuses.c:496 ../pidgin/gtksavedstatuses.c:985
 msgid "Message"
 msgstr ""
@@ -2094,7 +2094,7 @@
 msgid "Certificates"
 msgstr ""
 
-#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2806
+#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2811
 msgid "Sounds"
 msgstr ""
 
@@ -2270,12 +2270,12 @@
 #: ../finch/plugins/grouping.c:46 ../finch/plugins/grouping.c:143
 #: ../libpurple/protocols/gg/gg.c:755
 #: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/jabber/jutil.c:702
+#: ../libpurple/protocols/jabber/jutil.c:704
 #: ../libpurple/protocols/mxit/roster.c:53
 #: ../libpurple/protocols/novell/novell.c:2851
-#: ../libpurple/protocols/oscar/oscar.c:4686
+#: ../libpurple/protocols/oscar/oscar.c:4681
 #: ../libpurple/protocols/oscar/userinfo.c:279
-#: ../libpurple/protocols/yahoo/libymsg.c:4104 ../libpurple/status.c:162
+#: ../libpurple/protocols/yahoo/libymsg.c:4091 ../libpurple/status.c:162
 #: ../pidgin/gtkblist.c:3876 ../pidgin/gtkblist.c:4263
 #: ../pidgin/gtkdocklet.c:564 ../pidgin/gtkstatusbox.c:1100
 #: ../pidgin/plugins/themeedit-icon.c:67
@@ -2331,169 +2331,170 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:972
+#: ../libpurple/account.c:1026
 msgid "accounts"
 msgstr ""
 
-#: ../libpurple/account.c:1167 ../libpurple/protocols/jabber/auth.c:106
+#: ../libpurple/account.c:1226 ../libpurple/protocols/jabber/auth.c:106
 #: ../libpurple/protocols/jabber/auth_cyrus.c:150
 #: ../libpurple/protocols/silc/silc.c:475
 msgid "Password is required to sign on."
 msgstr ""
 
-#: ../libpurple/account.c:1201
+#: ../libpurple/account.c:1260
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr ""
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1267
 msgid "Enter Password"
 msgstr ""
 
-#: ../libpurple/account.c:1213
+#: ../libpurple/account.c:1272
 msgid "Save password"
 msgstr ""
 
-#: ../libpurple/account.c:1250 ../libpurple/connection.c:119
+#: ../libpurple/account.c:1309 ../libpurple/connection.c:119
 #: ../libpurple/connection.c:197
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1251 ../libpurple/connection.c:122
+#: ../libpurple/account.c:1310 ../libpurple/connection.c:122
 msgid "Connection Error"
 msgstr ""
 
-#: ../libpurple/account.c:1505 ../libpurple/protocols/jabber/jabber.c:2510
+#: ../libpurple/account.c:1564 ../libpurple/protocols/jabber/jabber.c:2518
 msgid "New passwords do not match."
 msgstr ""
 
-#: ../libpurple/account.c:1518
+#: ../libpurple/account.c:1577
 msgid "Fill out all fields completely."
 msgstr ""
 
-#: ../libpurple/account.c:1550
+#: ../libpurple/account.c:1609
 msgid "Original password"
 msgstr ""
 
-#: ../libpurple/account.c:1558
+#: ../libpurple/account.c:1617
 msgid "New password"
 msgstr ""
 
-#: ../libpurple/account.c:1566
+#: ../libpurple/account.c:1625
 msgid "New password (again)"
 msgstr ""
 
-#: ../libpurple/account.c:1573
+#: ../libpurple/account.c:1632
 #, c-format
 msgid "Change password for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1581
+#: ../libpurple/account.c:1640
 msgid "Please enter your current password and your new password."
 msgstr ""
 
-#: ../libpurple/account.c:1612
+#: ../libpurple/account.c:1671
 #, c-format
 msgid "Change user information for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1615
+#: ../libpurple/account.c:1674
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:587
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:598
 msgid "Set User Info"
 msgstr ""
 
-#: ../libpurple/account.c:1869
+#: ../libpurple/account.c:1928
 msgid "This protocol does not support setting a public alias."
 msgstr ""
 
-#: ../libpurple/account.c:1909
+#: ../libpurple/account.c:1968
 msgid "This protocol does not support fetching the public alias."
 msgstr ""
 
-#: ../libpurple/account.c:2207 ../libpurple/protocols/gg/gg.c:772
+#: ../libpurple/account.c:2266 ../libpurple/protocols/gg/gg.c:772
 #: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/jutil.c:719
+#: ../libpurple/protocols/jabber/jutil.c:721
 #: ../libpurple/protocols/msn/oim.c:732
 #: ../libpurple/protocols/mxit/profile.c:46
 #: ../libpurple/protocols/mxit/profile.c:239
 #: ../libpurple/protocols/novell/novell.c:2854 ../pidgin/gtkft.c:162
-#: ../pidgin/plugins/disco/gtkdisco.c:470 ../pidgin/plugins/vvconfig.c:147
+#: ../pidgin/plugins/disco/gtkdisco.c:470 ../pidgin/plugins/vvconfig.c:160
 msgid "Unknown"
 msgstr ""
 
-#. Changing this string?  Look in add_purple_buddy_to_groups
-#: ../libpurple/blist.c:585 ../libpurple/blist.c:1599
-#: ../libpurple/blist.c:1847 ../libpurple/blist.c:1849
-#: ../libpurple/protocols/jabber/roster.c:117
-#: ../libpurple/protocols/jabber/roster.c:256
-#: ../libpurple/protocols/myspace/myspace.c:3484 ../pidgin/gtkblist.c:6955
+#: ../libpurple/blist.c:282 ../libpurple/blist.c:586 ../libpurple/blist.c:1600
+#: ../libpurple/blist.c:1848 ../libpurple/blist.c:1850
+#: ../libpurple/protocols/jabber/facebook_roster.c:124
+#: ../libpurple/protocols/jabber/roster.c:143
+#: ../libpurple/protocols/jabber/roster.c:271
+#: ../libpurple/protocols/jabber/roster.c:541
+#: ../libpurple/protocols/myspace/myspace.c:3484 ../pidgin/gtkblist.c:6958
 #: ../pidgin/plugins/gevolution/gevo-util.c:73
 #: ../pidgin/plugins/gevolution/gevolution.c:106
 msgid "Buddies"
 msgstr ""
 
-#: ../libpurple/blist.c:612
+#: ../libpurple/blist.c:613
 msgid "buddy list"
 msgstr ""
 
-#: ../libpurple/certificate.c:94
+#: ../libpurple/certificate.c:50
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
 
-#: ../libpurple/certificate.c:98
+#: ../libpurple/certificate.c:54
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
 
-#: ../libpurple/certificate.c:102
+#: ../libpurple/certificate.c:58
 msgid ""
 "The certificate is not valid yet.  Check that your computer's date and time "
 "are accurate."
 msgstr ""
 
-#: ../libpurple/certificate.c:106
+#: ../libpurple/certificate.c:62
 msgid ""
 "The certificate has expired and should not be considered valid.  Check that "
 "your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#: ../libpurple/certificate.c:112
+#: ../libpurple/certificate.c:68
 msgid "The certificate presented is not issued to this domain."
 msgstr ""
 
-#: ../libpurple/certificate.c:115
+#: ../libpurple/certificate.c:71
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
 
-#: ../libpurple/certificate.c:119
+#: ../libpurple/certificate.c:75
 msgid "The certificate chain presented is invalid."
 msgstr ""
 
-#: ../libpurple/certificate.c:122
+#: ../libpurple/certificate.c:78
 msgid "The certificate has been revoked."
 msgstr ""
 
-#: ../libpurple/certificate.c:126
+#: ../libpurple/certificate.c:82
 msgid "An unknown certificate error occurred."
 msgstr ""
 
-#: ../libpurple/certificate.c:697
+#: ../libpurple/certificate.c:653
 msgid "(DOES NOT MATCH)"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:701
+#: ../libpurple/certificate.c:657
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr ""
 
-#: ../libpurple/certificate.c:702
+#: ../libpurple/certificate.c:658
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2501,52 +2502,52 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:707
+#: ../libpurple/certificate.c:663
 msgid "Single-use Certificate Verification"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1087
+#: ../libpurple/certificate.c:1053
 msgid "Certificate Authorities"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1259
+#: ../libpurple/certificate.c:1229
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1390
+#: ../libpurple/certificate.c:1360
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1396
+#: ../libpurple/certificate.c:1366
 msgid "SSL Certificate Verification"
 msgstr ""
 
-#: ../libpurple/certificate.c:1407
+#: ../libpurple/certificate.c:1377
 msgid "_View Certificate..."
 msgstr ""
 
-#: ../libpurple/certificate.c:1436 ../libpurple/certificate.c:1455
+#: ../libpurple/certificate.c:1406 ../libpurple/certificate.c:1425
 #, c-format
 msgid "The certificate for %s could not be validated."
 msgstr ""
 
 #. TODO: Probably wrong.
-#: ../libpurple/certificate.c:1442
+#: ../libpurple/certificate.c:1412
 msgid "SSL Certificate Error"
 msgstr ""
 
-#: ../libpurple/certificate.c:1443
+#: ../libpurple/certificate.c:1413
 msgid "Unable to validate certificate"
 msgstr ""
 
-#: ../libpurple/certificate.c:1467
+#: ../libpurple/certificate.c:1437
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
@@ -2554,7 +2555,7 @@
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:2188
+#: ../libpurple/certificate.c:2166
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2566,7 +2567,8 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:2200
+#: ../libpurple/certificate.c:2144 ../libpurple/certificate.c:2203
+#: ../libpurple/certificate.c:2208
 msgid "Certificate Information"
 msgstr ""
 
@@ -2595,13 +2597,14 @@
 #: ../libpurple/protocols/jabber/buddy.c:2138
 #: ../libpurple/protocols/msn/servconn.c:149
 #: ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msn/session.c:413
 #: ../libpurple/protocols/msn/session.c:417
 #: ../libpurple/protocols/oscar/family_chatnav.c:66
 #: ../libpurple/protocols/oscar/family_icbm.c:64
 #: ../libpurple/protocols/oscar/family_icbm.c:65
-#: ../libpurple/protocols/yahoo/libymsg.c:2022
-#: ../libpurple/protocols/yahoo/libymsg.c:2031
-#: ../libpurple/protocols/yahoo/libymsg.c:2406
+#: ../libpurple/protocols/yahoo/libymsg.c:2021
+#: ../libpurple/protocols/yahoo/libymsg.c:2032
+#: ../libpurple/protocols/yahoo/libymsg.c:2391
 msgid "Unknown error"
 msgstr ""
 
@@ -2618,8 +2621,8 @@
 msgid "The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:227 ../libpurple/protocols/bonjour/jabber.c:305
-#: ../libpurple/protocols/bonjour/jabber.c:351
+#: ../libpurple/conversation.c:227 ../libpurple/protocols/bonjour/jabber.c:306
+#: ../libpurple/protocols/bonjour/jabber.c:352
 msgid "Unable to send message."
 msgstr ""
 
@@ -2695,55 +2698,55 @@
 msgid "No name"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:616
+#: ../libpurple/dnsquery.c:618
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:621
+#: ../libpurple/dnsquery.c:623
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:654 ../libpurple/dnsquery.c:785
+#: ../libpurple/dnsquery.c:656 ../libpurple/dnsquery.c:787
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:657 ../libpurple/dnsquery.c:799
-#: ../libpurple/dnsquery.c:851 ../libpurple/dnsquery.c:862
+#: ../libpurple/dnsquery.c:659 ../libpurple/dnsquery.c:801
+#: ../libpurple/dnsquery.c:853 ../libpurple/dnsquery.c:864
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:681
+#: ../libpurple/dnsquery.c:683
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:685
+#: ../libpurple/dnsquery.c:687
 #, c-format
 msgid "Resolver process exited without answering our request"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:749
+#: ../libpurple/dnsquery.c:751
 #, c-format
 msgid "Error converting %s to punycode: %d"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:824
+#: ../libpurple/dnsquery.c:826
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:825 ../libpurple/protocols/oscar/oscar.c:1124
+#: ../libpurple/dnsquery.c:827 ../libpurple/protocols/oscar/oscar.c:1122
 #: ../libpurple/protocols/oscar/util.c:69
 msgid "Unknown reason"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:899
+#: ../libpurple/dnsquery.c:901
 msgid "Aborting DNS lookup in Tor Proxy mode."
 msgstr ""
 
@@ -2817,215 +2820,215 @@
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libpurple/ft.c:661
+#: ../libpurple/ft.c:663
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:688
+#: ../libpurple/ft.c:690
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: ../libpurple/ft.c:699
+#: ../libpurple/ft.c:701
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libpurple/ft.c:887
+#: ../libpurple/ft.c:889
 #, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
 msgstr ""
 
-#: ../libpurple/ft.c:892
+#: ../libpurple/ft.c:894
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libpurple/ft.c:897
+#: ../libpurple/ft.c:899
 msgid "File transfer complete"
 msgstr ""
 
-#: ../libpurple/ft.c:1511
+#: ../libpurple/ft.c:1518
 #, c-format
 msgid "You cancelled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1516
+#: ../libpurple/ft.c:1523
 msgid "File transfer cancelled"
 msgstr ""
 
-#: ../libpurple/ft.c:1574
+#: ../libpurple/ft.c:1581
 #, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1579
+#: ../libpurple/ft.c:1586
 #, c-format
 msgid "%s cancelled the file transfer"
 msgstr ""
 
-#: ../libpurple/ft.c:1636
+#: ../libpurple/ft.c:1643
 #, c-format
 msgid "File transfer to %s failed."
 msgstr ""
 
-#: ../libpurple/ft.c:1638
+#: ../libpurple/ft.c:1645
 #, c-format
 msgid "File transfer from %s failed."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
+#: ../libpurple/data/gconf/purple.schemas.in.h:1
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
+#: ../libpurple/data/gconf/purple.schemas.in.h:2
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
+#: ../libpurple/data/gconf/purple.schemas.in.h:3
 msgid "The handler for \"aim\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
+#: ../libpurple/data/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
+#: ../libpurple/data/gconf/purple.schemas.in.h:5
 msgid "Run the command in a terminal"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
+#: ../libpurple/data/gconf/purple.schemas.in.h:6
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
+#: ../libpurple/data/gconf/purple.schemas.in.h:7
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
+#: ../libpurple/data/gconf/purple.schemas.in.h:8
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
+#: ../libpurple/data/gconf/purple.schemas.in.h:9
 msgid "The handler for \"gg\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
+#: ../libpurple/data/gconf/purple.schemas.in.h:10
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
+#: ../libpurple/data/gconf/purple.schemas.in.h:11
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
+#: ../libpurple/data/gconf/purple.schemas.in.h:12
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
+#: ../libpurple/data/gconf/purple.schemas.in.h:13
 msgid "The handler for \"icq\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
+#: ../libpurple/data/gconf/purple.schemas.in.h:14
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
+#: ../libpurple/data/gconf/purple.schemas.in.h:15
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
+#: ../libpurple/data/gconf/purple.schemas.in.h:16
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
+#: ../libpurple/data/gconf/purple.schemas.in.h:17
 msgid "The handler for \"irc\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
+#: ../libpurple/data/gconf/purple.schemas.in.h:18
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
+#: ../libpurple/data/gconf/purple.schemas.in.h:19
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
+#: ../libpurple/data/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
+#: ../libpurple/data/gconf/purple.schemas.in.h:21
 msgid "The handler for \"msnim\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
+#: ../libpurple/data/gconf/purple.schemas.in.h:22
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
+#: ../libpurple/data/gconf/purple.schemas.in.h:23
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
+#: ../libpurple/data/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
+#: ../libpurple/data/gconf/purple.schemas.in.h:25
 msgid "The handler for \"sip\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:26
+#: ../libpurple/data/gconf/purple.schemas.in.h:26
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
+#: ../libpurple/data/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
+#: ../libpurple/data/gconf/purple.schemas.in.h:28
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
+#: ../libpurple/data/gconf/purple.schemas.in.h:29
 msgid "The handler for \"xmpp\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
+#: ../libpurple/data/gconf/purple.schemas.in.h:30
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
+#: ../libpurple/data/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
+#: ../libpurple/data/gconf/purple.schemas.in.h:32
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
+#: ../libpurple/data/gconf/purple.schemas.in.h:33
 msgid "The handler for \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
+#: ../libpurple/data/gconf/purple.schemas.in.h:34
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
 
@@ -3081,38 +3084,38 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:880
+#: ../libpurple/media/backend-fs2.c:1019
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:889
+#: ../libpurple/media/backend-fs2.c:1028
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:919
+#: ../libpurple/media/backend-fs2.c:1062
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:922
+#: ../libpurple/media/backend-fs2.c:1065
 msgid "A non-recoverable Farstream error has occurred."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1191
+#: ../libpurple/media/backend-fs2.c:1331
 msgid "Error with your microphone"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1194
+#: ../libpurple/media/backend-fs2.c:1334
 msgid "Error with your webcam"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1201
+#: ../libpurple/media/backend-fs2.c:1341
 msgid "Conference error"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1610
+#: ../libpurple/media/backend-fs2.c:1757
 #, c-format
 msgid "Error creating session: %s"
 msgstr ""
@@ -3200,11 +3203,11 @@
 #: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:226
 #: ../libpurple/protocols/mxit/actions.c:502
 #: ../libpurple/protocols/oscar/authorization.c:99
-#: ../libpurple/protocols/oscar/oscar.c:1224
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#: ../libpurple/protocols/oscar/oscar.c:5277
-#: ../libpurple/protocols/oscar/oscar.c:5334 ../libpurple/request.h:1498
+#: ../libpurple/protocols/oscar/oscar.c:1222
+#: ../libpurple/protocols/oscar/oscar.c:4932
+#: ../libpurple/protocols/oscar/oscar.c:4989
+#: ../libpurple/protocols/oscar/oscar.c:5272
+#: ../libpurple/protocols/oscar/oscar.c:5329 ../libpurple/request.h:1498
 #: ../libpurple/request.h:1508 ../libpurple/request.h:1521
 msgid "_Cancel"
 msgstr ""
@@ -3252,8 +3255,8 @@
 msgid "Escape the filenames"
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2487
-#: ../libpurple/protocols/msn/msn.c:2517
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2486
+#: ../libpurple/protocols/msn/msn.c:2516
 msgid "Notes"
 msgstr ""
 
@@ -3482,114 +3485,114 @@
 msgid "(UTC)"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1561
+#: ../libpurple/plugins/log_reader.c:1567
 msgid "User is offline."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1567
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "Auto-response sent:"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1582
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1588
+#: ../libpurple/plugins/log_reader.c:1591
 #: ../libpurple/plugins/statenotify.c:93
 #, c-format
 msgid "%s has signed off."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1612
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1622
 msgid "You were disconnected from the server."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1630
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1645
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1650
 msgid "Message could not be sent."
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2726
-#: ../libpurple/plugins/log_reader.c:2882
+#: ../libpurple/plugins/log_reader.c:2751
+#: ../libpurple/plugins/log_reader.c:2907
 msgid "Adium"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2739
-#: ../libpurple/plugins/log_reader.c:2887
+#: ../libpurple/plugins/log_reader.c:2764
+#: ../libpurple/plugins/log_reader.c:2912
 msgid "Fire"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2751
-#: ../libpurple/plugins/log_reader.c:2891
+#: ../libpurple/plugins/log_reader.c:2776
+#: ../libpurple/plugins/log_reader.c:2916
 msgid "Messenger Plus!"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2765
-#: ../libpurple/plugins/log_reader.c:2896
+#: ../libpurple/plugins/log_reader.c:2790
+#: ../libpurple/plugins/log_reader.c:2921
 msgid "QIP"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2777
-#: ../libpurple/plugins/log_reader.c:2900
+#: ../libpurple/plugins/log_reader.c:2802
+#: ../libpurple/plugins/log_reader.c:2925
 msgid "MSN Messenger"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2789
-#: ../libpurple/plugins/log_reader.c:2904
+#: ../libpurple/plugins/log_reader.c:2814
+#: ../libpurple/plugins/log_reader.c:2929
 msgid "Trillian"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2801
-#: ../libpurple/plugins/log_reader.c:2908
+#: ../libpurple/plugins/log_reader.c:2826
+#: ../libpurple/plugins/log_reader.c:2933
 msgid "aMSN"
 msgstr ""
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2864
+#: ../libpurple/plugins/log_reader.c:2889
 msgid "General Log Reading Configuration"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:2868
+#: ../libpurple/plugins/log_reader.c:2893
 msgid "Fast size calculations"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:2872
+#: ../libpurple/plugins/log_reader.c:2897
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2878
+#: ../libpurple/plugins/log_reader.c:2903
 msgid "Log Directory"
 msgstr ""
 
@@ -3599,19 +3602,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2937
+#: ../libpurple/plugins/log_reader.c:2962
 msgid "Log Reader"
 msgstr ""
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2941
+#: ../libpurple/plugins/log_reader.c:2966
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2945
+#: ../libpurple/plugins/log_reader.c:2970
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -3697,7 +3700,7 @@
 #: ../libpurple/protocols/msn/msn.c:1123 ../libpurple/protocols/msn/msn.c:1126
 #: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:307
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
 #: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:298
@@ -3709,7 +3712,7 @@
 #: ../libpurple/protocols/msn/msn.c:1123 ../libpurple/protocols/msn/msn.c:1126
 #: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:319
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:310
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
 #: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:299
@@ -3759,14 +3762,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:671
+#: ../libpurple/plugins/perl/perl.c:674
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:673 ../libpurple/plugins/perl/perl.c:674
+#: ../libpurple/plugins/perl/perl.c:676 ../libpurple/plugins/perl/perl.c:677
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
@@ -3842,8 +3845,8 @@
 msgstr ""
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1148
-#: ../libpurple/plugins/ssl/ssl-nss.c:921
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1232
+#: ../libpurple/plugins/ssl/ssl-nss.c:1199
 msgid "X.509 Certificates"
 msgstr ""
 
@@ -3853,7 +3856,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1224
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1308
 msgid "GNUTLS"
 msgstr ""
 
@@ -3861,8 +3864,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1227
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1229
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1311
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1313
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -3872,7 +3875,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:998
+#: ../libpurple/plugins/ssl/ssl-nss.c:1275
 msgid "NSS"
 msgstr ""
 
@@ -3880,8 +3883,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:1001
-#: ../libpurple/plugins/ssl/ssl-nss.c:1003
+#: ../libpurple/plugins/ssl/ssl-nss.c:1278
+#: ../libpurple/plugins/ssl/ssl-nss.c:1280
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -3997,14 +4000,14 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:386
 #: ../libpurple/protocols/bonjour/bonjour.c:736
 #: ../libpurple/protocols/gg/gg.c:302
-#: ../libpurple/protocols/jabber/jabber.c:1322
+#: ../libpurple/protocols/jabber/jabber.c:1330
 msgid "First name"
 msgstr ""
 
 #: ../libpurple/protocols/bonjour/bonjour.c:388
 #: ../libpurple/protocols/bonjour/bonjour.c:739
 #: ../libpurple/protocols/gg/gg.c:297
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/protocols/jabber/jabber.c:1331
 msgid "Last name"
 msgstr ""
 
@@ -4015,12 +4018,12 @@
 #: ../libpurple/protocols/jabber/buddy.c:1127
 #: ../libpurple/protocols/jabber/buddy.c:1140
 #: ../libpurple/protocols/jabber/buddy.c:2006
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1328
 #: ../libpurple/protocols/mxit/actions.c:294
-#: ../libpurple/protocols/silc/ops.c:1054
+#: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/silc.c:1010
 #: ../libpurple/protocols/silc/silc.c:1251
-#: ../libpurple/protocols/silc/util.c:562
+#: ../libpurple/protocols/silc/util.c:511
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/silc.c:706
 #: ../libpurple/protocols/silc10/silc.c:947
@@ -4067,16 +4070,16 @@
 msgid "Bonjour"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:398
+#: ../libpurple/protocols/bonjour/jabber.c:401
 #, c-format
 msgid "%s has closed the conversation."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:488
-#: ../libpurple/protocols/bonjour/jabber.c:553
-#: ../libpurple/protocols/bonjour/jabber.c:598
-#: ../libpurple/protocols/bonjour/jabber.c:875
-#: ../libpurple/protocols/bonjour/jabber.c:896
+#: ../libpurple/protocols/bonjour/jabber.c:491
+#: ../libpurple/protocols/bonjour/jabber.c:556
+#: ../libpurple/protocols/bonjour/jabber.c:601
+#: ../libpurple/protocols/bonjour/jabber.c:874
+#: ../libpurple/protocols/bonjour/jabber.c:895
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
@@ -4084,13 +4087,13 @@
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:96 ../libpurple/proxy.c:2359
-#: ../libpurple/proxy.c:2427
+#: ../libpurple/protocols/gg/gg.c:96 ../libpurple/proxy.c:2330
+#: ../libpurple/proxy.c:2398
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:97 ../libpurple/proxy.c:2359
-#: ../libpurple/proxy.c:2427
+#: ../libpurple/protocols/gg/gg.c:97 ../libpurple/proxy.c:2330
+#: ../libpurple/proxy.c:2398
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -4130,15 +4133,15 @@
 msgid "Save buddylist..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:197 ../libpurple/protocols/gg/gg.c:2193
+#: ../libpurple/protocols/gg/gg.c:197 ../libpurple/protocols/gg/gg.c:2233
 msgid "Load buddylist from file..."
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:312 ../libpurple/protocols/gg/gg.c:805
 #: ../libpurple/protocols/gg/gg.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1325
-#: ../libpurple/protocols/oscar/userinfo.c:462
-#: ../libpurple/protocols/oscar/userinfo.c:470
+#: ../libpurple/protocols/jabber/jabber.c:1333
+#: ../libpurple/protocols/oscar/userinfo.c:463
+#: ../libpurple/protocols/oscar/userinfo.c:471
 msgid "City"
 msgstr ""
 
@@ -4147,13 +4150,13 @@
 msgstr ""
 
 #. gender
-#: ../libpurple/protocols/gg/gg.c:320 ../libpurple/protocols/msn/msn.c:2416
+#: ../libpurple/protocols/gg/gg.c:320 ../libpurple/protocols/msn/msn.c:2415
 #: ../libpurple/protocols/mxit/actions.c:245
 #: ../libpurple/protocols/mxit/login.c:349
 #: ../libpurple/protocols/mxit/profile.c:217
 #: ../libpurple/protocols/mxit/profile.c:327
 #: ../libpurple/protocols/myspace/user.c:131
-#: ../libpurple/protocols/oscar/userinfo.c:423
+#: ../libpurple/protocols/oscar/userinfo.c:424
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1090
 msgid "Gender"
 msgstr ""
@@ -4167,7 +4170,7 @@
 #: ../libpurple/protocols/mxit/actions.c:247
 #: ../libpurple/protocols/mxit/login.c:351
 #: ../libpurple/protocols/mxit/profile.c:217
-#: ../libpurple/protocols/oscar/userinfo.c:423
+#: ../libpurple/protocols/oscar/userinfo.c:424
 msgid "Male"
 msgstr ""
 
@@ -4175,7 +4178,7 @@
 #: ../libpurple/protocols/mxit/actions.c:246
 #: ../libpurple/protocols/mxit/login.c:350
 #: ../libpurple/protocols/mxit/profile.c:217
-#: ../libpurple/protocols/oscar/userinfo.c:423
+#: ../libpurple/protocols/oscar/userinfo.c:424
 msgid "Female"
 msgstr ""
 
@@ -4204,7 +4207,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:386 ../libpurple/protocols/gg/gg.c:387
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2223
 msgid "Change status broadcasting"
 msgstr ""
 
@@ -4224,12 +4227,12 @@
 #. 0
 #. Global
 #: ../libpurple/protocols/gg/gg.c:759
-#: ../libpurple/protocols/jabber/jutil.c:703
+#: ../libpurple/protocols/jabber/jutil.c:705
 #: ../libpurple/protocols/msn/state.c:35 ../libpurple/protocols/msn/state.c:36
 #: ../libpurple/protocols/msn/state.c:43 ../libpurple/protocols/msn/state.c:44
 #: ../libpurple/protocols/mxit/roster.c:54
 #: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/yahoo/libymsg.c:4106 ../libpurple/status.c:163
+#: ../libpurple/protocols/yahoo/libymsg.c:4093 ../libpurple/status.c:163
 #: ../pidgin/gtkdocklet.c:548 ../pidgin/gtkstatusbox.c:1096
 #: ../pidgin/plugins/themeedit-icon.c:63
 msgid "Available"
@@ -4237,20 +4240,20 @@
 
 #. 2
 #: ../libpurple/protocols/gg/gg.c:763
-#: ../libpurple/protocols/jabber/jabber.c:2394
-#: ../libpurple/protocols/jabber/jutil.c:704
+#: ../libpurple/protocols/jabber/jabber.c:2402
+#: ../libpurple/protocols/jabber/jutil.c:706
 #: ../libpurple/protocols/mxit/roster.c:56
 msgid "Chatty"
 msgstr ""
 
 #. 3
 #: ../libpurple/protocols/gg/gg.c:766
-#: ../libpurple/protocols/jabber/jabber.c:2440
-#: ../libpurple/protocols/jabber/jutil.c:707
+#: ../libpurple/protocols/jabber/jabber.c:2448
+#: ../libpurple/protocols/jabber/jutil.c:709
 #: ../libpurple/protocols/mxit/roster.c:57
 #: ../libpurple/protocols/oscar/oscar.c:159
-#: ../libpurple/protocols/oscar/oscar.c:4846
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/oscar/oscar.c:4841
+#: ../libpurple/protocols/sametime/sametime.c:3344
 msgid "Do Not Disturb"
 msgstr ""
 
@@ -4258,25 +4261,25 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:769 ../libpurple/protocols/irc/irc.c:595
+#: ../libpurple/protocols/gg/gg.c:769 ../libpurple/protocols/irc/irc.c:597
 #: ../libpurple/protocols/irc/msgs.c:427
-#: ../libpurple/protocols/jabber/jutil.c:705
+#: ../libpurple/protocols/jabber/jutil.c:707
 #: ../libpurple/protocols/mxit/roster.c:55
 #: ../libpurple/protocols/novell/novell.c:2842
 #: ../libpurple/protocols/oscar/oscar.c:165
-#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/yahoo/libymsg.c:4984
-#: ../libpurple/protocols/yahoo/libymsg.c:5071 ../libpurple/status.c:166
-#: ../pidgin/gtkdocklet.c:552 ../pidgin/gtkprefs.c:2745
+#: ../libpurple/protocols/yahoo/libymsg.c:4971
+#: ../libpurple/protocols/yahoo/libymsg.c:5058 ../libpurple/status.c:166
+#: ../pidgin/gtkdocklet.c:552 ../pidgin/gtkprefs.c:2750
 #: ../pidgin/gtkstatusbox.c:1097 ../pidgin/plugins/themeedit-icon.c:64
 msgid "Away"
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:867
-#: ../libpurple/protocols/oscar/oscar.c:2295
-#: ../libpurple/protocols/oscar/oscar.c:2318
-#: ../libpurple/protocols/oscar/userinfo.c:400
+#: ../libpurple/protocols/oscar/oscar.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:2316
+#: ../libpurple/protocols/oscar/userinfo.c:401
 msgid "UIN"
 msgstr ""
 
@@ -4288,8 +4291,8 @@
 #: ../libpurple/protocols/mxit/actions.c:251
 #: ../libpurple/protocols/mxit/profile.c:220
 #: ../libpurple/protocols/mxit/profile.c:323
-#: ../libpurple/protocols/oscar/userinfo.c:411
-#: ../libpurple/protocols/silc/ops.c:1003
+#: ../libpurple/protocols/oscar/userinfo.c:412
+#: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc10/ops.c:1024
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:544
 msgid "First Name"
@@ -4300,7 +4303,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:860 ../libpurple/protocols/gg/gg.c:925
-#: ../libpurple/protocols/oscar/oscar.c:3012
+#: ../libpurple/protocols/oscar/oscar.c:3009
 msgid "Unable to display the search results."
 msgstr ""
 
@@ -4329,11 +4332,11 @@
 #. * we're ready for it (session key, userid, username all setup).
 #: ../libpurple/protocols/gg/gg.c:1496
 #: ../libpurple/protocols/myspace/myspace.c:1159
-#: ../libpurple/protocols/sametime/sametime.c:1578
+#: ../libpurple/protocols/sametime/sametime.c:1577
 msgid "Connected"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1505 ../libpurple/protocols/gg/gg.c:1759
+#: ../libpurple/protocols/gg/gg.c:1505 ../libpurple/protocols/gg/gg.c:1735
 #: ../libpurple/protocols/silc/silc.c:375
 #: ../libpurple/protocols/silc/silc.c:422
 #: ../libpurple/protocols/silc10/silc.c:164
@@ -4355,36 +4358,36 @@
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/gg/gg.c:1755 ../libpurple/protocols/irc/irc.c:361
-#: ../libpurple/protocols/jabber/jabber.c:1741
+#: ../libpurple/protocols/gg/gg.c:1731 ../libpurple/protocols/irc/irc.c:363
+#: ../libpurple/protocols/jabber/jabber.c:1749
 #: ../libpurple/protocols/msn/session.c:432
 #: ../libpurple/protocols/myspace/myspace.c:2206
 #: ../libpurple/protocols/novell/novell.c:2198
 #: ../libpurple/protocols/oscar/oscar.c:834
-#: ../libpurple/protocols/sametime/sametime.c:3769
-#: ../libpurple/protocols/simple/simple.c:1960
-#: ../libpurple/protocols/yahoo/libymsg.c:3910
-#: ../libpurple/protocols/zephyr/zephyr.c:1581 ../pidgin/gtkstatusbox.c:716
+#: ../libpurple/protocols/sametime/sametime.c:3733
+#: ../libpurple/protocols/simple/simple.c:1962
+#: ../libpurple/protocols/yahoo/libymsg.c:3897
+#: ../libpurple/protocols/zephyr/zephyr.c:1593 ../pidgin/gtkstatusbox.c:716
 msgid "Connecting"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2086
+#: ../libpurple/protocols/gg/gg.c:2126
 msgid "Chat error"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2087
+#: ../libpurple/protocols/gg/gg.c:2127
 msgid "This chat name is already in use"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2170
+#: ../libpurple/protocols/gg/gg.c:2210
 msgid "Not connected to the server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2179
+#: ../libpurple/protocols/gg/gg.c:2219
 msgid "Find buddies..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2189
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Save buddylist to file..."
 msgstr ""
 
@@ -4399,44 +4402,44 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2297
+#: ../libpurple/protocols/gg/gg.c:2347
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2298
+#: ../libpurple/protocols/gg/gg.c:2348
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2347
+#: ../libpurple/protocols/gg/gg.c:2405
 msgid "Gadu-Gadu User"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2351
+#: ../libpurple/protocols/gg/gg.c:2409
 msgid "GG server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2363
-#: ../libpurple/protocols/oscar/oscar.c:5742
+#: ../libpurple/protocols/gg/gg.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:5737
 msgid "Don't use encryption"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2364
+#: ../libpurple/protocols/gg/gg.c:2422
 #: ../libpurple/protocols/jabber/libxmpp.c:277
-#: ../libpurple/protocols/oscar/oscar.c:5740
+#: ../libpurple/protocols/oscar/oscar.c:5735
 msgid "Use encryption if available"
 msgstr ""
 
 #. TODO
-#: ../libpurple/protocols/gg/gg.c:2368
+#: ../libpurple/protocols/gg/gg.c:2426
 #: ../libpurple/protocols/jabber/libxmpp.c:276
-#: ../libpurple/protocols/oscar/oscar.c:5741
+#: ../libpurple/protocols/oscar/oscar.c:5736
 msgid "Require encryption"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2371
+#: ../libpurple/protocols/gg/gg.c:2429
 #: ../libpurple/protocols/jabber/libxmpp.c:286
-#: ../libpurple/protocols/oscar/oscar.c:5766
+#: ../libpurple/protocols/oscar/oscar.c:5761
 msgid "Connection security"
 msgstr ""
 
@@ -4447,34 +4450,34 @@
 msgid "Unknown command: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/cmds.c:536
-#: ../libpurple/protocols/jabber/jabber.c:2863
+#: ../libpurple/protocols/irc/cmds.c:581
+#: ../libpurple/protocols/jabber/jabber.c:2871
 #: ../libpurple/protocols/silc/silc.c:1590
 #: ../libpurple/protocols/silc10/silc.c:1299
 #, c-format
 msgid "current topic is: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/cmds.c:540
-#: ../libpurple/protocols/jabber/jabber.c:2867
+#: ../libpurple/protocols/irc/cmds.c:585
+#: ../libpurple/protocols/jabber/jabber.c:2875
 #: ../libpurple/protocols/silc/silc.c:1594
 #: ../libpurple/protocols/silc10/silc.c:1303
 msgid "No topic is set"
 msgstr ""
 
-#: ../libpurple/protocols/irc/dcc_send.c:304
-#: ../libpurple/protocols/irc/dcc_send.c:345
+#: ../libpurple/protocols/irc/dcc_send.c:300
+#: ../libpurple/protocols/irc/dcc_send.c:341
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1216
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1977
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2074
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1948
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2045
 msgid "File Transfer Failed"
 msgstr ""
 
-#: ../libpurple/protocols/irc/dcc_send.c:305
-#: ../libpurple/protocols/irc/dcc_send.c:346
+#: ../libpurple/protocols/irc/dcc_send.c:301
+#: ../libpurple/protocols/irc/dcc_send.c:342
 msgid "Unable to open a listening port."
 msgstr ""
 
@@ -4501,124 +4504,124 @@
 #. * PurpleHTTPConnection reports it is fully sent.
 #. 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:174
-#: ../libpurple/protocols/irc/irc.c:693 ../libpurple/protocols/irc/irc.c:724
+#: ../libpurple/protocols/irc/irc.c:131 ../libpurple/protocols/irc/irc.c:176
+#: ../libpurple/protocols/irc/irc.c:695 ../libpurple/protocols/irc/irc.c:726
 #: ../libpurple/protocols/jabber/bosh.c:1044
 #: ../libpurple/protocols/jabber/bosh.c:1100
 #: ../libpurple/protocols/jabber/jabber.c:408
 #: ../libpurple/protocols/jabber/jabber.c:444
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:729
+#: ../libpurple/protocols/jabber/jabber.c:673
+#: ../libpurple/protocols/jabber/jabber.c:731
 #: ../libpurple/protocols/myspace/myspace.c:2070
 #: ../libpurple/protocols/oscar/flap_connection.c:474
 #: ../libpurple/protocols/sametime/sametime.c:412
-#: ../libpurple/protocols/sametime/sametime.c:1779
-#: ../libpurple/protocols/simple/simple.c:433
-#: ../libpurple/protocols/yahoo/libymsg.c:3376
-#: ../libpurple/protocols/yahoo/libymsg.c:3530
-#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:948
-#: ../libpurple/proxy.c:1544 ../libpurple/proxy.c:1658
-#: ../libpurple/proxy.c:1893 ../libpurple/proxy.c:1969
+#: ../libpurple/protocols/sametime/sametime.c:1778
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/yahoo/libymsg.c:3363
+#: ../libpurple/protocols/yahoo/libymsg.c:3517
+#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:934
+#: ../libpurple/proxy.c:1517 ../libpurple/proxy.c:1631
+#: ../libpurple/proxy.c:1871 ../libpurple/proxy.c:1947
 #, c-format
 msgid "Lost connection with server: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:289
+#: ../libpurple/protocols/irc/irc.c:291
 msgid "View MOTD"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:301 ../libpurple/protocols/silc/chat.c:34
+#: ../libpurple/protocols/irc/irc.c:303 ../libpurple/protocols/silc/chat.c:34
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:307
-#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:594
+#: ../libpurple/protocols/irc/irc.c:309
+#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:601
 msgid "_Password:"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:340
+#: ../libpurple/protocols/irc/irc.c:342
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:371
+#: ../libpurple/protocols/irc/irc.c:373
 #: ../libpurple/protocols/jabber/bosh.c:995
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1072
 #: ../libpurple/protocols/novell/novell.c:2213
-#: ../libpurple/protocols/yahoo/libymsg.c:2188
+#: ../libpurple/protocols/yahoo/libymsg.c:2189
 msgid "SSL support unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:384
+#: ../libpurple/protocols/irc/irc.c:386
 #: ../libpurple/protocols/jabber/bosh.c:1001
-#: ../libpurple/protocols/jabber/jabber.c:794
-#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:796
+#: ../libpurple/protocols/jabber/jabber.c:881
 #: ../libpurple/protocols/msn/msn.c:1379
 #: ../libpurple/protocols/msn/servconn.c:143
-#: ../libpurple/protocols/mxit/http.c:332
+#: ../libpurple/protocols/mxit/http.c:338
 #: ../libpurple/protocols/myspace/myspace.c:2224
 #: ../libpurple/protocols/novell/novell.c:1743
 #: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:1051
-#: ../libpurple/protocols/oscar/oscar.c:1172
-#: ../libpurple/protocols/sametime/sametime.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:1049
+#: ../libpurple/protocols/oscar/oscar.c:1170
+#: ../libpurple/protocols/sametime/sametime.c:3737
 #: ../libpurple/protocols/silc/silc.c:451
-#: ../libpurple/protocols/simple/simple.c:482
-#: ../libpurple/protocols/simple/simple.c:1860
-#: ../libpurple/protocols/yahoo/libymsg.c:3583
-#: ../libpurple/protocols/yahoo/libymsg.c:3771
-#: ../libpurple/protocols/yahoo/libymsg.c:3856
+#: ../libpurple/protocols/simple/simple.c:487
+#: ../libpurple/protocols/simple/simple.c:1862
+#: ../libpurple/protocols/yahoo/libymsg.c:3570
+#: ../libpurple/protocols/yahoo/libymsg.c:3758
+#: ../libpurple/protocols/yahoo/libymsg.c:3843
+#: ../libpurple/protocols/yahoo/libymsg.c:3865
 #: ../libpurple/protocols/yahoo/libymsg.c:3878
-#: ../libpurple/protocols/yahoo/libymsg.c:3891
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2074
-#: ../libpurple/protocols/yahoo/yahoochat.c:1530
-#: ../libpurple/protocols/yahoo/yahoochat.c:1556
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2045
+#: ../libpurple/protocols/yahoo/yahoochat.c:1505
+#: ../libpurple/protocols/yahoo/yahoochat.c:1531
 #: ../libpurple/protocols/yahoo/ycht.c:549
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Unable to connect"
 msgstr ""
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/irc/irc.c:475
+#: ../libpurple/protocols/irc/irc.c:477
 #: ../libpurple/protocols/myspace/myspace.c:2163
 #: ../libpurple/protocols/oscar/flap_connection.c:479
-#: ../libpurple/protocols/sametime/sametime.c:1804
-#: ../libpurple/protocols/simple/simple.c:452
-#: ../libpurple/protocols/simple/simple.c:1740
-#: ../libpurple/protocols/yahoo/libymsg.c:3465
-#: ../libpurple/protocols/yahoo/libymsg.c:3491
+#: ../libpurple/protocols/sametime/sametime.c:1803
+#: ../libpurple/protocols/simple/simple.c:457
+#: ../libpurple/protocols/simple/simple.c:1742
+#: ../libpurple/protocols/yahoo/libymsg.c:3452
+#: ../libpurple/protocols/yahoo/libymsg.c:3478
 #, c-format
 msgid "Unable to connect: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:702 ../libpurple/protocols/irc/irc.c:733
-#: ../libpurple/protocols/jabber/jabber.c:669
-#: ../libpurple/protocols/jabber/jabber.c:727
+#: ../libpurple/protocols/irc/irc.c:704 ../libpurple/protocols/irc/irc.c:735
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:729
 #: ../libpurple/protocols/myspace/myspace.c:2079
 #: ../libpurple/protocols/oscar/flap_connection.c:472
-#: ../libpurple/protocols/sametime/sametime.c:1771
-#: ../libpurple/protocols/yahoo/libymsg.c:3383
-#: ../libpurple/protocols/yahoo/libymsg.c:3537
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:937
-#: ../libpurple/proxy.c:1532 ../libpurple/proxy.c:1646
-#: ../libpurple/proxy.c:1882 ../libpurple/proxy.c:1957
+#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/yahoo/libymsg.c:3370
+#: ../libpurple/protocols/yahoo/libymsg.c:3524
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:923
+#: ../libpurple/proxy.c:1505 ../libpurple/proxy.c:1619
+#: ../libpurple/proxy.c:1860 ../libpurple/proxy.c:1935
 msgid "Server closed the connection"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:869
+#: ../libpurple/protocols/irc/irc.c:871
 #: ../libpurple/protocols/silc/chat.c:1405
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1613
+#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "Users"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:872
-#: ../libpurple/protocols/sametime/sametime.c:3457
+#: ../libpurple/protocols/irc/irc.c:874
+#: ../libpurple/protocols/sametime/sametime.c:3421
 #: ../libpurple/protocols/silc/chat.c:1408
-#: ../libpurple/protocols/silc/ops.c:1405
+#: ../libpurple/protocols/silc/ops.c:1404
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1622
+#: ../libpurple/protocols/yahoo/yahoochat.c:1597
 msgid "Topic"
 msgstr ""
 
@@ -4630,50 +4633,50 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:1016
+#: ../libpurple/protocols/irc/irc.c:1018
 msgid "IRC Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:1017
+#: ../libpurple/protocols/irc/irc.c:1019
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr ""
 
 #. set up account ID as user:server
-#: ../libpurple/protocols/irc/irc.c:1042 ../libpurple/protocols/irc/msgs.c:448
-#: ../libpurple/protocols/msn/msn.c:3025
-#: ../libpurple/protocols/oscar/oscar.c:5754
-#: ../libpurple/protocols/sametime/sametime.c:5783
-#: ../libpurple/protocols/silc/ops.c:1261
-#: ../libpurple/protocols/silc/ops.c:1355
+#: ../libpurple/protocols/irc/irc.c:1044 ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/msn/msn.c:3024
+#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/sametime/sametime.c:5747
+#: ../libpurple/protocols/silc/ops.c:1260
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2164
+#: ../libpurple/protocols/simple/simple.c:2166
 msgid "Server"
 msgstr ""
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:1045 ../libpurple/protocols/msn/msn.c:3030
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/sametime/sametime.c:5792
+#: ../libpurple/protocols/irc/irc.c:1047 ../libpurple/protocols/msn/msn.c:3029
+#: ../libpurple/protocols/oscar/oscar.c:5752
+#: ../libpurple/protocols/sametime/sametime.c:5756
 #: ../libpurple/protocols/silc/silc.c:2196
 #: ../libpurple/protocols/silc10/silc.c:1910
 msgid "Port"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1048
+#: ../libpurple/protocols/irc/irc.c:1050
 msgid "Encodings"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1051
+#: ../libpurple/protocols/irc/irc.c:1053
 msgid "Auto-detect incoming UTF-8"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1054 ../libpurple/protocols/irc/msgs.c:439
+#: ../libpurple/protocols/irc/irc.c:1056 ../libpurple/protocols/irc/msgs.c:439
 msgid "Ident name"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1057 ../libpurple/protocols/irc/msgs.c:431
+#: ../libpurple/protocols/irc/irc.c:1059 ../libpurple/protocols/irc/msgs.c:431
 #: ../libpurple/protocols/silc/silc.c:1249
 #: ../libpurple/protocols/silc10/silc.c:945
 msgid "Real name"
@@ -4683,15 +4686,15 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #. 
-#: ../libpurple/protocols/irc/irc.c:1065
+#: ../libpurple/protocols/irc/irc.c:1067
 msgid "Use SSL"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1069
+#: ../libpurple/protocols/irc/irc.c:1071
 msgid "Authenticate with SASL"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1073
+#: ../libpurple/protocols/irc/irc.c:1075
 msgid "Allow plaintext SASL auth over unencrypted connection"
 msgstr ""
 
@@ -4736,8 +4739,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:420
-#: ../libpurple/protocols/oscar/userinfo.c:401
-#: ../libpurple/protocols/silc/ops.c:1434
+#: ../libpurple/protocols/oscar/userinfo.c:402
+#: ../libpurple/protocols/silc/ops.c:1433
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr ""
@@ -4751,7 +4754,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:454
-#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1279
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr ""
@@ -4857,7 +4860,7 @@
 #. Remove user from channel
 #: ../libpurple/protocols/irc/msgs.c:1035
 #: ../libpurple/protocols/jabber/presence.c:747
-#: ../libpurple/protocols/silc/ops.c:726
+#: ../libpurple/protocols/silc/ops.c:724
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
@@ -4870,7 +4873,7 @@
 
 #: ../libpurple/protocols/irc/msgs.c:1148
 #: ../libpurple/protocols/irc/msgs.c:1149
-#: ../libpurple/protocols/jabber/jabber.c:2885
+#: ../libpurple/protocols/jabber/jabber.c:2893
 msgid "Invalid nickname"
 msgstr ""
 
@@ -4927,7 +4930,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:1364
-#: ../libpurple/protocols/silc/ops.c:1105
+#: ../libpurple/protocols/silc/ops.c:1104
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr ""
@@ -5066,7 +5069,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:158
-#: ../libpurple/protocols/jabber/jabber.c:3616
+#: ../libpurple/protocols/jabber/jabber.c:3624
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
@@ -5184,9 +5187,9 @@
 #: ../libpurple/protocols/jabber/adhoccommands.c:161
 #: ../libpurple/protocols/jabber/auth.c:199
 #: ../libpurple/protocols/jabber/auth_scram.c:73
-#: ../libpurple/protocols/jabber/jabber.c:1161
-#: ../libpurple/protocols/jabber/jabber.c:1196
-#: ../libpurple/protocols/jabber/jabber.c:2723
+#: ../libpurple/protocols/jabber/jabber.c:1169
+#: ../libpurple/protocols/jabber/jabber.c:1204
+#: ../libpurple/protocols/jabber/jabber.c:2731
 msgid "Unknown Error"
 msgstr ""
 
@@ -5278,8 +5281,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/auth_cyrus.c:472
-#: ../libpurple/protocols/jabber/jabber.c:542
-#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:544
+#: ../libpurple/protocols/jabber/jabber.c:702
 #, c-format
 msgid "SASL error: %s"
 msgstr ""
@@ -5322,7 +5325,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/auth_scram.c:71
-#: ../libpurple/protocols/jabber/jabber.c:2788
+#: ../libpurple/protocols/jabber/jabber.c:2796
 msgid "Resource Constraint"
 msgstr ""
 
@@ -5365,21 +5368,21 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/bosh.c:990
-#: ../libpurple/protocols/jabber/jabber.c:1059
+#: ../libpurple/protocols/jabber/jabber.c:1067
 msgid "Unable to establish SSL connection"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:350
 #: ../libpurple/protocols/jabber/buddy.c:1024
-#: ../libpurple/protocols/sametime/sametime.c:4175
-#: ../libpurple/protocols/silc/ops.c:999
+#: ../libpurple/protocols/sametime/sametime.c:4139
+#: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:351
 #: ../libpurple/protocols/jabber/buddy.c:1035
-#: ../libpurple/protocols/silc/ops.c:1011
+#: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr ""
@@ -5390,7 +5393,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:354
-#: ../libpurple/protocols/jabber/jabber.c:1329
+#: ../libpurple/protocols/jabber/jabber.c:1337
 msgid "URL"
 msgstr ""
 
@@ -5452,9 +5455,9 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:365
 #: ../libpurple/protocols/jabber/buddy.c:1163
-#: ../libpurple/protocols/msn/msn.c:2504
+#: ../libpurple/protocols/msn/msn.c:2503
 #: ../libpurple/protocols/novell/novell.c:1492
-#: ../libpurple/protocols/silc/ops.c:1023
+#: ../libpurple/protocols/silc/ops.c:1022
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr ""
@@ -5468,18 +5471,18 @@
 #. birthday (required)
 #: ../libpurple/protocols/jabber/buddy.c:367
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#: ../libpurple/protocols/msn/msn.c:2485
+#: ../libpurple/protocols/msn/msn.c:2484
 #: ../libpurple/protocols/mxit/actions.c:239
 #: ../libpurple/protocols/mxit/login.c:343
 #: ../libpurple/protocols/mxit/profile.c:214
-#: ../libpurple/protocols/oscar/userinfo.c:444
+#: ../libpurple/protocols/oscar/userinfo.c:445
 msgid "Birthday"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:368
 #: ../libpurple/protocols/jabber/buddy.c:1167
 #: ../libpurple/protocols/jabber/chat.c:911 ../pidgin/gtkblist.c:3888
-#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:571
+#: ../pidgin/gtkplugin.c:592 ../pidgin/plugins/disco/gtkdisco.c:571
 msgid "Description"
 msgstr ""
 
@@ -5507,18 +5510,18 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:773
-#: ../libpurple/protocols/jabber/jabber.c:2371
-#: ../libpurple/protocols/jabber/jabber.c:2395
-#: ../libpurple/protocols/jabber/jabber.c:2411
-#: ../libpurple/protocols/jabber/jabber.c:2427
-#: ../libpurple/protocols/jabber/jabber.c:2441
+#: ../libpurple/protocols/jabber/jabber.c:2379
+#: ../libpurple/protocols/jabber/jabber.c:2403
+#: ../libpurple/protocols/jabber/jabber.c:2419
+#: ../libpurple/protocols/jabber/jabber.c:2435
+#: ../libpurple/protocols/jabber/jabber.c:2449
 msgid "Priority"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/jabber.c:3360
+#: ../libpurple/protocols/jabber/jabber.c:3368
 #: ../libpurple/protocols/jabber/libxmpp.c:265
-#: ../libpurple/protocols/jabber/si.c:1571
+#: ../libpurple/protocols/jabber/si.c:1567
 msgid "Resource"
 msgstr ""
 
@@ -5536,17 +5539,17 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:1039
-#: ../libpurple/protocols/silc/ops.c:1007
+#: ../libpurple/protocols/silc/ops.c:1006
 #: ../libpurple/protocols/silc10/ops.c:1028
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:547
 msgid "Middle Name"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1324
-#: ../libpurple/protocols/oscar/userinfo.c:461
-#: ../libpurple/protocols/oscar/userinfo.c:469
-#: ../libpurple/protocols/silc/ops.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1332
+#: ../libpurple/protocols/oscar/userinfo.c:462
+#: ../libpurple/protocols/oscar/userinfo.c:470
+#: ../libpurple/protocols/silc/ops.c:1042
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr ""
@@ -5618,7 +5621,7 @@
 #: ../libpurple/protocols/mxit/actions.c:255
 #: ../libpurple/protocols/mxit/profile.c:221
 #: ../libpurple/protocols/mxit/profile.c:325
-#: ../libpurple/protocols/oscar/userinfo.c:412
+#: ../libpurple/protocols/oscar/userinfo.c:413
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:545
 msgid "Last Name"
 msgstr ""
@@ -5655,8 +5658,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:2202
 #: ../libpurple/protocols/novell/novell.c:1496
-#: ../libpurple/protocols/oscar/userinfo.c:413
-#: ../libpurple/protocols/oscar/userinfo.c:417
+#: ../libpurple/protocols/oscar/userinfo.c:414
+#: ../libpurple/protocols/oscar/userinfo.c:418
 msgid "Email Address"
 msgstr ""
 
@@ -5667,7 +5670,7 @@
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/sametime/sametime.c:5670
+#: ../libpurple/protocols/sametime/sametime.c:5634
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:476
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -5690,8 +5693,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/chat.c:44
-#: ../libpurple/protocols/oscar/oscar.c:4406
-#: ../libpurple/protocols/yahoo/yahoochat.c:1162
+#: ../libpurple/protocols/oscar/oscar.c:4401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1137
 msgid "_Room:"
 msgstr ""
 
@@ -5760,7 +5763,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:813
 #: ../libpurple/protocols/jabber/chat.c:824
-#: ../libpurple/protocols/silc/ops.c:1472
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr ""
@@ -5795,7 +5798,7 @@
 msgid "Roles:"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:252 ../libpurple/util.c:4212
+#: ../libpurple/protocols/jabber/jabber.c:252 ../libpurple/util.c:4236
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
@@ -5803,223 +5806,223 @@
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:621
+#: ../libpurple/protocols/jabber/jabber.c:623
 msgid "Ping timed out"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:945
-#: ../libpurple/protocols/jabber/jabber.c:983
-#: ../libpurple/protocols/jabber/jabber.c:3031
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/jabber/jabber.c:991
+#: ../libpurple/protocols/jabber/jabber.c:3039
 msgid "Invalid XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:954
+#: ../libpurple/protocols/jabber/jabber.c:962
 msgid "Invalid XMPP ID. Username portion must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/jabber/jabber.c:971
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Malformed BOSH URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1145
+#: ../libpurple/protocols/jabber/jabber.c:1153
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1159
 #, c-format
 msgid "Registration to %s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1154
-#: ../libpurple/protocols/jabber/jabber.c:1155
+#: ../libpurple/protocols/jabber/jabber.c:1162
+#: ../libpurple/protocols/jabber/jabber.c:1163
 msgid "Registration Successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1163
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "Registration Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1195
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1189
-#: ../libpurple/protocols/jabber/jabber.c:1190
+#: ../libpurple/protocols/jabber/jabber.c:1197
+#: ../libpurple/protocols/jabber/jabber.c:1198
 msgid "Unregistration Successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1198
-#: ../libpurple/protocols/jabber/jabber.c:1199
+#: ../libpurple/protocols/jabber/jabber.c:1206
+#: ../libpurple/protocols/jabber/jabber.c:1207
 msgid "Unregistration Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1326
-#: ../libpurple/protocols/oscar/userinfo.c:463
-#: ../libpurple/protocols/oscar/userinfo.c:471
+#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/protocols/oscar/userinfo.c:464
+#: ../libpurple/protocols/oscar/userinfo.c:472
 msgid "State"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1327
+#: ../libpurple/protocols/jabber/jabber.c:1335
 msgid "Postal code"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1328
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/silc/ops.c:1047
 #: ../libpurple/protocols/silc/silc.c:1012
-#: ../libpurple/protocols/silc/util.c:564
+#: ../libpurple/protocols/silc/util.c:513
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:708
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1330 ../pidgin/gtknotify.c:1691
+#: ../libpurple/protocols/jabber/jabber.c:1338 ../pidgin/gtknotify.c:1691
 msgid "Date"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1359
-#: ../libpurple/protocols/jabber/jabber.c:1360
+#: ../libpurple/protocols/jabber/jabber.c:1367
+#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Already Registered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1410
-#: ../libpurple/protocols/jabber/jabber.c:1414
-#: ../libpurple/protocols/jabber/jabber.c:2543
+#: ../libpurple/protocols/jabber/jabber.c:1418
+#: ../libpurple/protocols/jabber/jabber.c:1422
+#: ../libpurple/protocols/jabber/jabber.c:2551
 msgid "Password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1454
 msgid "Unregister"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1461
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1464
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1464
-#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1472
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Register New XMPP Account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1474
+#: ../libpurple/protocols/jabber/jabber.c:1485
 #: ../pidgin/plugins/disco/gtkdisco.c:307
 #: ../pidgin/plugins/disco/gtkdisco.c:688
 msgid "Register"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1481
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1474
+#: ../libpurple/protocols/jabber/jabber.c:1482
 #, c-format
 msgid "Register New Account at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Change Registration"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
-#: ../libpurple/protocols/jabber/jabber.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Error unregistering account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Account successfully unregistered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/jabber/jabber.c:1753
 msgid "Initializing Stream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/jabber/jabber.c:1758
 msgid "Initializing SSL/TLS"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/jabber/jabber.c:1762
 #: ../libpurple/protocols/msn/session.c:438
 msgid "Authenticating"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/jabber/jabber.c:1766
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/jabber/jabber.c:1928
+#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Server doesn't support blocking"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2181
-#: ../libpurple/protocols/jabber/jabber.c:2701
-#: ../libpurple/protocols/jabber/jabber.c:2744
-#: ../libpurple/protocols/jabber/jabber.c:2782
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/jabber/jabber.c:2189
+#: ../libpurple/protocols/jabber/jabber.c:2709
+#: ../libpurple/protocols/jabber/jabber.c:2752
+#: ../libpurple/protocols/jabber/jabber.c:2790
+#: ../libpurple/protocols/oscar/oscar.c:4679
 #: ../libpurple/protocols/oscar/userinfo.c:272
 msgid "Not Authorized"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
-#: ../libpurple/protocols/jabber/jabber.c:2316
-#: ../libpurple/protocols/jabber/jabber.c:2373
-#: ../libpurple/protocols/jabber/jabber.c:2397
-#: ../libpurple/protocols/jabber/jabber.c:2413
-#: ../libpurple/protocols/jabber/jabber.c:2429
-#: ../libpurple/protocols/jabber/jabber.c:2443
+#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2381
+#: ../libpurple/protocols/jabber/jabber.c:2405
+#: ../libpurple/protocols/jabber/jabber.c:2421
+#: ../libpurple/protocols/jabber/jabber.c:2437
+#: ../libpurple/protocols/jabber/jabber.c:2451
 #: ../libpurple/protocols/mxit/mxit.c:350
 #: ../libpurple/protocols/mxit/profile.c:243
 #: ../libpurple/protocols/mxit/profile.c:245
 #: ../libpurple/protocols/oscar/userinfo.c:298
-#: ../libpurple/protocols/silc/buddy.c:1569
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1563
+#: ../libpurple/protocols/silc/ops.c:1223
 #: ../libpurple/protocols/silc10/buddy.c:1577
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
+#: ../libpurple/protocols/jabber/jabber.c:2334
 #: ../libpurple/protocols/msn/msn.c:1046
 msgid "Now Listening"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2333
+#: ../libpurple/protocols/jabber/jabber.c:2341
 #: ../libpurple/protocols/mxit/roster.c:252
 msgid "Both"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2335
+#: ../libpurple/protocols/jabber/jabber.c:2343
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2337
+#: ../libpurple/protocols/jabber/jabber.c:2345
 msgid "From"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2340
+#: ../libpurple/protocols/jabber/jabber.c:2348
 msgid "To"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2342
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2344
+#: ../libpurple/protocols/jabber/jabber.c:2352
 #: ../libpurple/protocols/mxit/profile.c:245
 #: ../libpurple/protocols/mxit/roster.c:262 ../pidgin/gtkblist.c:3542
 #: ../pidgin/gtkblist.c:3544 ../pidgin/plugins/gevolution/eds-utils.c:73
@@ -6028,35 +6031,35 @@
 msgstr ""
 
 #. subscription type
-#: ../libpurple/protocols/jabber/jabber.c:2347
+#: ../libpurple/protocols/jabber/jabber.c:2355
 #: ../libpurple/protocols/mxit/mxit.c:354
 #: ../libpurple/protocols/mxit/profile.c:252
 msgid "Subscription"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2374
-#: ../libpurple/protocols/jabber/jabber.c:2398
-#: ../libpurple/protocols/jabber/jabber.c:2414
-#: ../libpurple/protocols/jabber/jabber.c:2430
-#: ../libpurple/protocols/jabber/jabber.c:2444
+#: ../libpurple/protocols/jabber/jabber.c:2382
+#: ../libpurple/protocols/jabber/jabber.c:2406
+#: ../libpurple/protocols/jabber/jabber.c:2422
+#: ../libpurple/protocols/jabber/jabber.c:2438
+#: ../libpurple/protocols/jabber/jabber.c:2452
 msgid "Mood Text"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2376
-#: ../libpurple/protocols/jabber/jabber.c:2400
-#: ../libpurple/protocols/jabber/jabber.c:2416
-#: ../libpurple/protocols/jabber/jabber.c:2432
+#: ../libpurple/protocols/jabber/jabber.c:2384
+#: ../libpurple/protocols/jabber/jabber.c:2408
+#: ../libpurple/protocols/jabber/jabber.c:2424
+#: ../libpurple/protocols/jabber/jabber.c:2440
 msgid "Allow Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2383
+#: ../libpurple/protocols/jabber/jabber.c:2391
 #: ../libpurple/protocols/mxit/roster.c:86
-#: ../libpurple/protocols/oscar/oscar.c:4865
+#: ../libpurple/protocols/oscar/oscar.c:4860
 msgid "Mood Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2384
-#: ../libpurple/protocols/oscar/oscar.c:4866
+#: ../libpurple/protocols/jabber/jabber.c:2392
+#: ../libpurple/protocols/oscar/oscar.c:4861
 msgid "Mood Comment"
 msgstr ""
 
@@ -6066,335 +6069,335 @@
 #. saveable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/jabber/jabber.c:2463
+#: ../libpurple/protocols/jabber/jabber.c:2471
 #: ../libpurple/protocols/msn/msn.c:1196
 #: ../libpurple/protocols/myspace/myspace.c:501
 msgid "Tune Artist"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2464
+#: ../libpurple/protocols/jabber/jabber.c:2472
 #: ../libpurple/protocols/msn/msn.c:1198
 #: ../libpurple/protocols/myspace/myspace.c:502
 msgid "Tune Title"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2465
+#: ../libpurple/protocols/jabber/jabber.c:2473
 #: ../libpurple/protocols/msn/msn.c:1197
 msgid "Tune Album"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2466
+#: ../libpurple/protocols/jabber/jabber.c:2474
 msgid "Tune Genre"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2467
+#: ../libpurple/protocols/jabber/jabber.c:2475
 msgid "Tune Comment"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2468
+#: ../libpurple/protocols/jabber/jabber.c:2476
 msgid "Tune Track"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2469
+#: ../libpurple/protocols/jabber/jabber.c:2477
 msgid "Tune Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2470
+#: ../libpurple/protocols/jabber/jabber.c:2478
 msgid "Tune Year"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2471
+#: ../libpurple/protocols/jabber/jabber.c:2479
 msgid "Tune URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2484
+#: ../libpurple/protocols/jabber/jabber.c:2492
 msgid "Password Changed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2485
+#: ../libpurple/protocols/jabber/jabber.c:2493
 msgid "Your password has been changed."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2491
-#: ../libpurple/protocols/jabber/jabber.c:2492
+#: ../libpurple/protocols/jabber/jabber.c:2499
+#: ../libpurple/protocols/jabber/jabber.c:2500
 msgid "Error changing password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2549
+#: ../libpurple/protocols/jabber/jabber.c:2557
 msgid "Password (again)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2555
-#: ../libpurple/protocols/jabber/jabber.c:2556
+#: ../libpurple/protocols/jabber/jabber.c:2563
+#: ../libpurple/protocols/jabber/jabber.c:2564
 msgid "Change XMPP Password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2556
+#: ../libpurple/protocols/jabber/jabber.c:2564
 msgid "Please enter your new password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2570
-#: ../libpurple/protocols/oscar/oscar.c:5485
+#: ../libpurple/protocols/jabber/jabber.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:5480
 #: ../libpurple/protocols/silc/silc.c:1333
 #: ../libpurple/protocols/silc10/silc.c:1029
-#: ../libpurple/protocols/yahoo/libymsg.c:4439
-#: ../libpurple/protocols/yahoo/libymsg.c:4595
+#: ../libpurple/protocols/yahoo/libymsg.c:4426
+#: ../libpurple/protocols/yahoo/libymsg.c:4582
 msgid "Set User Info..."
 msgstr ""
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:2575
-#: ../libpurple/protocols/oscar/oscar.c:5496
+#: ../libpurple/protocols/jabber/jabber.c:2583
+#: ../libpurple/protocols/oscar/oscar.c:5491
 #: ../libpurple/protocols/silc/silc.c:1329
 #: ../libpurple/protocols/silc10/silc.c:1025
 msgid "Change Password..."
 msgstr ""
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:2580
+#: ../libpurple/protocols/jabber/jabber.c:2588
 msgid "Search for Users..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2680
+#: ../libpurple/protocols/jabber/jabber.c:2688
 msgid "Bad Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2683
+#: ../libpurple/protocols/jabber/jabber.c:2691
 msgid "Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2685
+#: ../libpurple/protocols/jabber/jabber.c:2693
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2687
+#: ../libpurple/protocols/jabber/jabber.c:2695
 msgid "Forbidden"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2689
+#: ../libpurple/protocols/jabber/jabber.c:2697
 msgid "Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2691
-#: ../libpurple/protocols/jabber/jabber.c:2772
+#: ../libpurple/protocols/jabber/jabber.c:2699
+#: ../libpurple/protocols/jabber/jabber.c:2780
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2693
+#: ../libpurple/protocols/jabber/jabber.c:2701
 msgid "Item Not Found"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2695
+#: ../libpurple/protocols/jabber/jabber.c:2703
 msgid "Malformed XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2697
+#: ../libpurple/protocols/jabber/jabber.c:2705
 msgid "Not Acceptable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2699
+#: ../libpurple/protocols/jabber/jabber.c:2707
 msgid "Not Allowed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2703
+#: ../libpurple/protocols/jabber/jabber.c:2711
 msgid "Payment Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2705
+#: ../libpurple/protocols/jabber/jabber.c:2713
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2709
+#: ../libpurple/protocols/jabber/jabber.c:2717
 msgid "Registration Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2711
+#: ../libpurple/protocols/jabber/jabber.c:2719
 msgid "Remote Server Not Found"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2713
+#: ../libpurple/protocols/jabber/jabber.c:2721
 msgid "Remote Server Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2715
+#: ../libpurple/protocols/jabber/jabber.c:2723
 msgid "Server Overloaded"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2717
+#: ../libpurple/protocols/jabber/jabber.c:2725
 msgid "Service Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2719
+#: ../libpurple/protocols/jabber/jabber.c:2727
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2721
+#: ../libpurple/protocols/jabber/jabber.c:2729
 msgid "Unexpected Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2729
+#: ../libpurple/protocols/jabber/jabber.c:2737
 msgid "Authorization Aborted"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2731
+#: ../libpurple/protocols/jabber/jabber.c:2739
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2733
+#: ../libpurple/protocols/jabber/jabber.c:2741
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2735
+#: ../libpurple/protocols/jabber/jabber.c:2743
 msgid "Invalid Authorization Mechanism"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2738
+#: ../libpurple/protocols/jabber/jabber.c:2746
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2746
+#: ../libpurple/protocols/jabber/jabber.c:2754
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2749
+#: ../libpurple/protocols/jabber/jabber.c:2757
 msgid "Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2757
+#: ../libpurple/protocols/jabber/jabber.c:2765
 msgid "Bad Format"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2759
+#: ../libpurple/protocols/jabber/jabber.c:2767
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2762
+#: ../libpurple/protocols/jabber/jabber.c:2770
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2764
+#: ../libpurple/protocols/jabber/jabber.c:2772
 #: ../libpurple/protocols/msn/msn.c:232
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2766
+#: ../libpurple/protocols/jabber/jabber.c:2774
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2768
+#: ../libpurple/protocols/jabber/jabber.c:2776
 msgid "Host Unknown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2770
+#: ../libpurple/protocols/jabber/jabber.c:2778
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2774
+#: ../libpurple/protocols/jabber/jabber.c:2782
 msgid "Invalid ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2776
+#: ../libpurple/protocols/jabber/jabber.c:2784
 msgid "Invalid Namespace"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2778
+#: ../libpurple/protocols/jabber/jabber.c:2786
 msgid "Invalid XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2780
+#: ../libpurple/protocols/jabber/jabber.c:2788
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2784
+#: ../libpurple/protocols/jabber/jabber.c:2792
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2786
+#: ../libpurple/protocols/jabber/jabber.c:2794
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2790
+#: ../libpurple/protocols/jabber/jabber.c:2798
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2792
+#: ../libpurple/protocols/jabber/jabber.c:2800
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2794
+#: ../libpurple/protocols/jabber/jabber.c:2802
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2796
+#: ../libpurple/protocols/jabber/jabber.c:2804
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2798
+#: ../libpurple/protocols/jabber/jabber.c:2806
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2800
+#: ../libpurple/protocols/jabber/jabber.c:2808
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2802
+#: ../libpurple/protocols/jabber/jabber.c:2810
 msgid "Unsupported Version"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2804
+#: ../libpurple/protocols/jabber/jabber.c:2812
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2806
+#: ../libpurple/protocols/jabber/jabber.c:2814
 msgid "Stream Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2916
+#: ../libpurple/protocols/jabber/jabber.c:2924
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2936
+#: ../libpurple/protocols/jabber/jabber.c:2944
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2946
+#: ../libpurple/protocols/jabber/jabber.c:2954
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2971
+#: ../libpurple/protocols/jabber/jabber.c:2979
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2981
+#: ../libpurple/protocols/jabber/jabber.c:2989
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3063
+#: ../libpurple/protocols/jabber/jabber.c:3071
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3100
+#: ../libpurple/protocols/jabber/jabber.c:3108
 #, c-format
 msgid "Unable to ping user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3122
+#: ../libpurple/protocols/jabber/jabber.c:3130
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3129
+#: ../libpurple/protocols/jabber/jabber.c:3137
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3153
+#: ../libpurple/protocols/jabber/jabber.c:3161
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
@@ -6403,136 +6406,136 @@
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:3200
-#: ../libpurple/protocols/yahoo/libymsg.c:5520
+#: ../libpurple/protocols/jabber/jabber.c:3208
+#: ../libpurple/protocols/yahoo/libymsg.c:5507
 msgid "Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3201
-#: ../libpurple/protocols/yahoo/libymsg.c:5521
+#: ../libpurple/protocols/jabber/jabber.c:3209
+#: ../libpurple/protocols/yahoo/libymsg.c:5508
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3201
-#: ../libpurple/protocols/yahoo/libymsg.c:5521
+#: ../libpurple/protocols/jabber/jabber.c:3209
+#: ../libpurple/protocols/yahoo/libymsg.c:5508
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3316
+#: ../libpurple/protocols/jabber/jabber.c:3324
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3318
+#: ../libpurple/protocols/jabber/jabber.c:3326
 #, c-format
 msgid "Unable to initiate media with %s: user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3320
+#: ../libpurple/protocols/jabber/jabber.c:3328
 #, c-format
 msgid "Unable to initiate media with %s: resource is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3322
+#: ../libpurple/protocols/jabber/jabber.c:3330
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3325
-#: ../libpurple/protocols/jabber/jabber.c:3326
+#: ../libpurple/protocols/jabber/jabber.c:3333
+#: ../libpurple/protocols/jabber/jabber.c:3334
 msgid "Media Initiation Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3410
+#: ../libpurple/protocols/jabber/jabber.c:3418
 #, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3420
-#: ../libpurple/protocols/jabber/si.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:3428
+#: ../libpurple/protocols/jabber/si.c:1579
 msgid "Select a Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3421
+#: ../libpurple/protocols/jabber/jabber.c:3429
 msgid "Initiate Media"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3591
+#: ../libpurple/protocols/jabber/jabber.c:3599
 msgid "Account does not support PEP, can't set mood"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3604
+#: ../libpurple/protocols/jabber/jabber.c:3612
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3610
+#: ../libpurple/protocols/jabber/jabber.c:3618
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3623
+#: ../libpurple/protocols/jabber/jabber.c:3631
 msgid "part [message]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3630
+#: ../libpurple/protocols/jabber/jabber.c:3638
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3638
+#: ../libpurple/protocols/jabber/jabber.c:3646
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3646
+#: ../libpurple/protocols/jabber/jabber.c:3654
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3654
+#: ../libpurple/protocols/jabber/jabber.c:3662
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3662
+#: ../libpurple/protocols/jabber/jabber.c:3670
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3670
+#: ../libpurple/protocols/jabber/jabber.c:3678
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3678
+#: ../libpurple/protocols/jabber/jabber.c:3686
 msgid "join: &lt;room[@server]&gt; [password]:  Join a chat."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3686
+#: ../libpurple/protocols/jabber/jabber.c:3694
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3693
+#: ../libpurple/protocols/jabber/jabber.c:3701
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3701
+#: ../libpurple/protocols/jabber/jabber.c:3709
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3709
+#: ../libpurple/protocols/jabber/jabber.c:3717
 #: ../libpurple/protocols/yahoo/libyahoo.c:53
 #: ../libpurple/protocols/yahoo/libyahoojp.c:50
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3716
+#: ../libpurple/protocols/jabber/jabber.c:3724
 msgid "mood: Set current user mood"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jutil.c:706
+#: ../libpurple/protocols/jabber/jutil.c:708
 #: ../pidgin/plugins/themeedit-icon.c:65
 msgid "Extended Away"
 msgstr ""
@@ -6553,8 +6556,8 @@
 msgstr ""
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:261 ../pidgin/gtkaccount.c:570
-#: ../pidgin/gtkaccount.c:574
+#: ../libpurple/protocols/jabber/libxmpp.c:261 ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:581
 msgid "Domain"
 msgstr ""
 
@@ -6568,7 +6571,7 @@
 
 #: ../libpurple/protocols/jabber/libxmpp.c:296
 #: ../libpurple/protocols/myspace/myspace.c:3633
-#: ../libpurple/protocols/simple/simple.c:2170
+#: ../libpurple/protocols/simple/simple.c:2172
 msgid "Connect port"
 msgstr ""
 
@@ -6697,38 +6700,38 @@
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1446
-#: ../libpurple/protocols/jabber/si.c:1487
+#: ../libpurple/protocols/jabber/si.c:1442
+#: ../libpurple/protocols/jabber/si.c:1483
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
 #. not success
-#: ../libpurple/protocols/jabber/si.c:1447
-#: ../libpurple/protocols/jabber/si.c:1448
-#: ../libpurple/protocols/jabber/si.c:1488
-#: ../libpurple/protocols/jabber/si.c:1489
-#: ../libpurple/protocols/jabber/si.c:1559
+#: ../libpurple/protocols/jabber/si.c:1443
+#: ../libpurple/protocols/jabber/si.c:1444
+#: ../libpurple/protocols/jabber/si.c:1484
+#: ../libpurple/protocols/jabber/si.c:1485
+#: ../libpurple/protocols/jabber/si.c:1555
 #: ../libpurple/protocols/mxit/protocol.c:2251
 msgid "File Send Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1552
+#: ../libpurple/protocols/jabber/si.c:1548
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1554
+#: ../libpurple/protocols/jabber/si.c:1550
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1556
+#: ../libpurple/protocols/jabber/si.c:1552
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1569
+#: ../libpurple/protocols/jabber/si.c:1565
 #, c-format
 msgid ""
 "Please select the resource of %s to which you would like to send a file"
@@ -6750,9 +6753,9 @@
 #: ../libpurple/protocols/mxit/roster.c:138
 #: ../libpurple/protocols/mxit/roster.c:202
 #: ../libpurple/protocols/oscar/family_locate.c:415
-#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/buddy.c:1504
 #: ../libpurple/protocols/silc/silc.c:987
-#: ../libpurple/protocols/silc/util.c:527
+#: ../libpurple/protocols/silc/util.c:476
 #: ../libpurple/protocols/silc10/buddy.c:1517
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:519
@@ -6764,9 +6767,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/usermood.c:39
-#: ../libpurple/protocols/silc/buddy.c:1526
+#: ../libpurple/protocols/silc/buddy.c:1520
 #: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/util.c:543
+#: ../libpurple/protocols/silc/util.c:492
 #: ../libpurple/protocols/silc10/buddy.c:1533
 #: ../libpurple/protocols/silc10/silc.c:699
 #: ../libpurple/protocols/silc10/util.c:535
@@ -6778,9 +6781,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/usermood.c:41
-#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/buddy.c:1508
 #: ../libpurple/protocols/silc/silc.c:991
-#: ../libpurple/protocols/silc/util.c:531
+#: ../libpurple/protocols/silc/util.c:480
 #: ../libpurple/protocols/silc10/buddy.c:1521
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:523
@@ -6790,9 +6793,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:42
 #: ../libpurple/protocols/mxit/roster.c:148
 #: ../libpurple/protocols/mxit/roster.c:222
-#: ../libpurple/protocols/silc/buddy.c:1522
+#: ../libpurple/protocols/silc/buddy.c:1516
 #: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc/util.c:539
+#: ../libpurple/protocols/silc/util.c:488
 #: ../libpurple/protocols/silc10/buddy.c:1529
 #: ../libpurple/protocols/silc10/silc.c:695
 #: ../libpurple/protocols/silc10/util.c:531
@@ -6886,9 +6889,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:63
 #: ../libpurple/protocols/mxit/roster.c:139
 #: ../libpurple/protocols/mxit/roster.c:204
-#: ../libpurple/protocols/silc/buddy.c:1524
+#: ../libpurple/protocols/silc/buddy.c:1518
 #: ../libpurple/protocols/silc/silc.c:1001
-#: ../libpurple/protocols/silc/util.c:541
+#: ../libpurple/protocols/silc/util.c:490
 #: ../libpurple/protocols/silc10/buddy.c:1531
 #: ../libpurple/protocols/silc10/silc.c:697
 #: ../libpurple/protocols/silc10/util.c:533
@@ -6924,9 +6927,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:70
 #: ../libpurple/protocols/mxit/roster.c:141
 #: ../libpurple/protocols/mxit/roster.c:208
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1500
 #: ../libpurple/protocols/silc/silc.c:983
-#: ../libpurple/protocols/silc/util.c:523
+#: ../libpurple/protocols/silc/util.c:472
 #: ../libpurple/protocols/silc10/buddy.c:1513
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:515
@@ -6992,9 +6995,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:83
 #: ../libpurple/protocols/mxit/roster.c:143
 #: ../libpurple/protocols/mxit/roster.c:212
-#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/buddy.c:1510
 #: ../libpurple/protocols/silc/silc.c:993
-#: ../libpurple/protocols/silc/util.c:533
+#: ../libpurple/protocols/silc/util.c:482
 #: ../libpurple/protocols/silc10/buddy.c:1523
 #: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:525
@@ -7002,9 +7005,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/usermood.c:84
-#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/buddy.c:1506
 #: ../libpurple/protocols/silc/silc.c:989
-#: ../libpurple/protocols/silc/util.c:529
+#: ../libpurple/protocols/silc/util.c:478
 #: ../libpurple/protocols/silc10/buddy.c:1519
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:521
@@ -7074,9 +7077,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:100
 #: ../libpurple/protocols/mxit/roster.c:144
 #: ../libpurple/protocols/mxit/roster.c:214
-#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/buddy.c:1502
 #: ../libpurple/protocols/silc/silc.c:985
-#: ../libpurple/protocols/silc/util.c:525
+#: ../libpurple/protocols/silc/util.c:474
 #: ../libpurple/protocols/silc10/buddy.c:1515
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/util.c:517
@@ -7115,9 +7118,9 @@
 #: ../libpurple/protocols/mxit/roster.c:147
 #: ../libpurple/protocols/mxit/roster.c:220
 #: ../libpurple/protocols/oscar/family_locate.c:428
-#: ../libpurple/protocols/silc/buddy.c:1520
+#: ../libpurple/protocols/silc/buddy.c:1514
 #: ../libpurple/protocols/silc/silc.c:997
-#: ../libpurple/protocols/silc/util.c:537
+#: ../libpurple/protocols/silc/util.c:486
 #: ../libpurple/protocols/silc10/buddy.c:1527
 #: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:529
@@ -7201,20 +7204,20 @@
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/contact.c:1070
-#: ../libpurple/protocols/msn/contact.c:1166
+#: ../libpurple/protocols/msn/contact.c:1073
+#: ../libpurple/protocols/msn/contact.c:1169
 #: ../libpurple/protocols/msn/userlist.c:523
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr ""
 
-#: ../libpurple/protocols/msn/contact.c:1071
-#: ../libpurple/protocols/msn/contact.c:1167
+#: ../libpurple/protocols/msn/contact.c:1074
+#: ../libpurple/protocols/msn/contact.c:1170
 msgid "Buddy Add error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/contact.c:1072
-#: ../libpurple/protocols/msn/contact.c:1168
+#: ../libpurple/protocols/msn/contact.c:1075
+#: ../libpurple/protocols/msn/contact.c:1171
 msgid "The username specified does not exist."
 msgstr ""
 
@@ -7264,7 +7267,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/zephyr/zephyr.c:759
+#: ../libpurple/protocols/zephyr/zephyr.c:763
 msgid "User is offline"
 msgstr ""
 
@@ -7414,7 +7417,7 @@
 
 #: ../libpurple/protocols/msn/error.c:228
 #: ../libpurple/protocols/silc/silc.c:340
-#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1796
+#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1774
 msgid "Authentication failed"
 msgstr ""
 
@@ -7647,26 +7650,26 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1130
-#: ../libpurple/protocols/yahoo/libymsg.c:4273
+#: ../libpurple/protocols/yahoo/libymsg.c:4260
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:548
 msgid "Home Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1134
-#: ../libpurple/protocols/yahoo/libymsg.c:4274
+#: ../libpurple/protocols/yahoo/libymsg.c:4261
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:549
 msgid "Work Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1138
-#: ../libpurple/protocols/yahoo/libymsg.c:4275
+#: ../libpurple/protocols/yahoo/libymsg.c:4262
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:550
 msgid "Mobile Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1161 ../libpurple/protocols/msn/state.c:39
-#: ../libpurple/protocols/yahoo/libymsg.c:4082
-#: ../libpurple/protocols/yahoo/libymsg.c:5108
+#: ../libpurple/protocols/yahoo/libymsg.c:4069
+#: ../libpurple/protocols/yahoo/libymsg.c:5095
 msgid "Be Right Back"
 msgstr ""
 
@@ -7674,25 +7677,25 @@
 #: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/novell/novell.c:2975
 #: ../libpurple/protocols/oscar/family_locate.c:409
-#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:58
 #: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:48
-#: ../libpurple/protocols/yahoo/libymsg.c:4084
-#: ../libpurple/protocols/yahoo/libymsg.c:5112
+#: ../libpurple/protocols/yahoo/libymsg.c:4071
+#: ../libpurple/protocols/yahoo/libymsg.c:5099
 #: ../pidgin/plugins/themeedit-icon.c:66
 msgid "Busy"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1172
-#: ../libpurple/protocols/yahoo/libymsg.c:4092
-#: ../libpurple/protocols/yahoo/libymsg.c:5126
+#: ../libpurple/protocols/yahoo/libymsg.c:4079
+#: ../libpurple/protocols/yahoo/libymsg.c:5113
 msgid "On the Phone"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1177
-#: ../libpurple/protocols/yahoo/libymsg.c:4096
-#: ../libpurple/protocols/yahoo/libymsg.c:5132
+#: ../libpurple/protocols/yahoo/libymsg.c:4083
+#: ../libpurple/protocols/yahoo/libymsg.c:5119
 msgid "Out to Lunch"
 msgstr ""
 
@@ -7753,243 +7756,243 @@
 "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msn/msn.c:1781
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/oscar/oscar.c:3698
-#: ../libpurple/protocols/oscar/oscar.c:4169
-#: ../libpurple/protocols/oscar/oscar.c:4184
+#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/oscar/oscar.c:4164
+#: ../libpurple/protocols/oscar/oscar.c:4179
 msgid "Unable to Add"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2344 ../libpurple/protocols/msn/msn.c:2686
+#: ../libpurple/protocols/msn/msn.c:2343 ../libpurple/protocols/msn/msn.c:2685
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 msgid "Error retrieving profile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2408 ../pidgin/plugins/convcolors.c:387
+#: ../libpurple/protocols/msn/msn.c:2407 ../pidgin/plugins/convcolors.c:387
 msgid "General"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2415
+#: ../libpurple/protocols/msn/msn.c:2414
 #: ../libpurple/protocols/mxit/profile.c:329
 #: ../libpurple/protocols/myspace/user.c:127
-#: ../libpurple/protocols/oscar/userinfo.c:449
+#: ../libpurple/protocols/oscar/userinfo.c:450
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1080
 msgid "Age"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2417
+#: ../libpurple/protocols/msn/msn.c:2416
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1095
 msgid "Occupation"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2418
+#: ../libpurple/protocols/msn/msn.c:2417
 #: ../libpurple/protocols/myspace/user.c:135
 #: ../libpurple/protocols/novell/novell.c:1486
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1075
-#: ../libpurple/protocols/zephyr/zephyr.c:807
-#: ../libpurple/protocols/zephyr/zephyr.c:1186
+#: ../libpurple/protocols/zephyr/zephyr.c:814
+#: ../libpurple/protocols/zephyr/zephyr.c:1196
 msgid "Location"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2423 ../libpurple/protocols/msn/msn.c:2615
-#: ../libpurple/protocols/msn/msn.c:2621 ../libpurple/protocols/msn/msn.c:2628
+#: ../libpurple/protocols/msn/msn.c:2422 ../libpurple/protocols/msn/msn.c:2614
+#: ../libpurple/protocols/msn/msn.c:2620 ../libpurple/protocols/msn/msn.c:2627
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2429 ../libpurple/protocols/msn/msn.c:2549
-#: ../libpurple/protocols/msn/msn.c:2555 ../libpurple/protocols/msn/msn.c:2562
-#: ../libpurple/protocols/msn/msn.c:2570 ../libpurple/protocols/msn/msn.c:2577
+#: ../libpurple/protocols/msn/msn.c:2428 ../libpurple/protocols/msn/msn.c:2548
+#: ../libpurple/protocols/msn/msn.c:2554 ../libpurple/protocols/msn/msn.c:2561
+#: ../libpurple/protocols/msn/msn.c:2569 ../libpurple/protocols/msn/msn.c:2576
 msgid "A Little About Me"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2446
+#: ../libpurple/protocols/msn/msn.c:2445
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2448
+#: ../libpurple/protocols/msn/msn.c:2447
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
 msgid "Marital Status"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2449
+#: ../libpurple/protocols/msn/msn.c:2448
 msgid "Interests"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2450
+#: ../libpurple/protocols/msn/msn.c:2449
 msgid "Pets"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2451
+#: ../libpurple/protocols/msn/msn.c:2450
 msgid "Hometown"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2452
+#: ../libpurple/protocols/msn/msn.c:2451
 msgid "Places Lived"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2453
+#: ../libpurple/protocols/msn/msn.c:2452
 msgid "Fashion"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2454
+#: ../libpurple/protocols/msn/msn.c:2453
 msgid "Humor"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2455
+#: ../libpurple/protocols/msn/msn.c:2454
 msgid "Music"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2456 ../libpurple/protocols/msn/msn.c:2637
-#: ../libpurple/protocols/msn/msn.c:2643
+#: ../libpurple/protocols/msn/msn.c:2455 ../libpurple/protocols/msn/msn.c:2636
+#: ../libpurple/protocols/msn/msn.c:2642
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
 msgid "Favorite Quote"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2473
+#: ../libpurple/protocols/msn/msn.c:2472
 msgid "Contact Info"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2474
+#: ../libpurple/protocols/msn/msn.c:2473
 msgid "Personal"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2477
+#: ../libpurple/protocols/msn/msn.c:2476
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2478
+#: ../libpurple/protocols/msn/msn.c:2477
 msgid "Home Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2479
+#: ../libpurple/protocols/msn/msn.c:2478
 msgid "Home Phone 2"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2480
-#: ../libpurple/protocols/oscar/userinfo.c:459
+#: ../libpurple/protocols/msn/msn.c:2479
+#: ../libpurple/protocols/oscar/userinfo.c:460
 msgid "Home Address"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2481
+#: ../libpurple/protocols/msn/msn.c:2480
 msgid "Personal Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2482
+#: ../libpurple/protocols/msn/msn.c:2481
 msgid "Home Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2483
+#: ../libpurple/protocols/msn/msn.c:2482
 msgid "Personal Email"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2484
+#: ../libpurple/protocols/msn/msn.c:2483
 msgid "Personal IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2486
+#: ../libpurple/protocols/msn/msn.c:2485
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:2502
+#: ../libpurple/protocols/msn/msn.c:2501
 msgid "Work"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2505
-#: ../libpurple/protocols/oscar/userinfo.c:477
+#: ../libpurple/protocols/msn/msn.c:2504
+#: ../libpurple/protocols/oscar/userinfo.c:478
 msgid "Company"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2506
+#: ../libpurple/protocols/msn/msn.c:2505
 #: ../libpurple/protocols/novell/novell.c:1488
 msgid "Department"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2507
+#: ../libpurple/protocols/msn/msn.c:2506
 msgid "Profession"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2508
+#: ../libpurple/protocols/msn/msn.c:2507
 msgid "Work Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2509
+#: ../libpurple/protocols/msn/msn.c:2508
 msgid "Work Phone 2"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2510
-#: ../libpurple/protocols/oscar/userinfo.c:467
+#: ../libpurple/protocols/msn/msn.c:2509
+#: ../libpurple/protocols/oscar/userinfo.c:468
 msgid "Work Address"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2511
+#: ../libpurple/protocols/msn/msn.c:2510
 msgid "Work Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2512
+#: ../libpurple/protocols/msn/msn.c:2511
 msgid "Work Pager"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2513
+#: ../libpurple/protocols/msn/msn.c:2512
 msgid "Work Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2514
+#: ../libpurple/protocols/msn/msn.c:2513
 msgid "Work Email"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2515
+#: ../libpurple/protocols/msn/msn.c:2514
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2516
+#: ../libpurple/protocols/msn/msn.c:2515
 msgid "Start Date"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2586 ../libpurple/protocols/msn/msn.c:2592
-#: ../libpurple/protocols/msn/msn.c:2599 ../libpurple/protocols/msn/msn.c:2606
+#: ../libpurple/protocols/msn/msn.c:2585 ../libpurple/protocols/msn/msn.c:2591
+#: ../libpurple/protocols/msn/msn.c:2598 ../libpurple/protocols/msn/msn.c:2605
 msgid "Favorite Things"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2651
+#: ../libpurple/protocols/msn/msn.c:2650
 msgid "Last Updated"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2662
-#: ../libpurple/protocols/silc/ops.c:1039
+#: ../libpurple/protocols/msn/msn.c:2661
+#: ../libpurple/protocols/silc/ops.c:1038
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2688
+#: ../libpurple/protocols/msn/msn.c:2687
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2689
+#: ../libpurple/protocols/msn/msn.c:2688
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2693
+#: ../libpurple/protocols/msn/msn.c:2692
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2701
+#: ../libpurple/protocols/msn/msn.c:2700
 #: ../libpurple/protocols/myspace/user.c:194
 #: ../libpurple/protocols/myspace/user.c:197
-#: ../libpurple/protocols/oscar/userinfo.c:535
+#: ../libpurple/protocols/oscar/userinfo.c:536
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
 msgid "View web profile"
 msgstr ""
@@ -8003,31 +8006,31 @@
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/protocols/msn/msn.c:2999 ../libpurple/protocols/msn/msn.c:3000
+#: ../libpurple/protocols/msn/msn.c:2998 ../libpurple/protocols/msn/msn.c:2999
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3034
+#: ../libpurple/protocols/msn/msn.c:3033
 msgid "Use HTTP Method"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3039
+#: ../libpurple/protocols/msn/msn.c:3038
 msgid "HTTP Method Server"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3044
+#: ../libpurple/protocols/msn/msn.c:3043
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3049
+#: ../libpurple/protocols/msn/msn.c:3048
 msgid "Allow direct connections"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3054
+#: ../libpurple/protocols/msn/msn.c:3053
 msgid "Allow connecting from multiple locations"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3062
+#: ../libpurple/protocols/msn/msn.c:3061
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -8039,44 +8042,44 @@
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:824
+#: ../libpurple/protocols/msn/notification.c:833
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:832
-#: ../libpurple/protocols/msn/notification.c:879
+#: ../libpurple/protocols/msn/notification.c:841
+#: ../libpurple/protocols/msn/notification.c:888
 #, c-format
 msgid "Unknown error (%d): %s"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:836
-#: ../libpurple/protocols/msn/notification.c:860
-#: ../libpurple/protocols/sametime/sametime.c:4472
+#: ../libpurple/protocols/msn/notification.c:845
+#: ../libpurple/protocols/msn/notification.c:869
+#: ../libpurple/protocols/sametime/sametime.c:4436
 msgid "Unable to add user"
 msgstr ""
 
 #. Unknown error!
-#: ../libpurple/protocols/msn/notification.c:859
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/yahoo/libymsg.c:2142
+#: ../libpurple/protocols/msn/notification.c:868
+#: ../libpurple/protocols/msn/notification.c:914
+#: ../libpurple/protocols/yahoo/libymsg.c:2143
 #, c-format
 msgid "Unknown error (%d)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:883
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:892
+#: ../libpurple/protocols/msn/notification.c:915
 msgid "Unable to remove user"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1210
+#: ../libpurple/protocols/msn/notification.c:1219
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1212
+#: ../libpurple/protocols/msn/notification.c:1221
 msgid "Mobile message was not sent because an unknown error occurred."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:2234
+#: ../libpurple/protocols/msn/notification.c:2243
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8297,7 +8300,7 @@
 #. (reference: "libpurple/request.h")
 #: ../libpurple/protocols/mxit/actions.c:224
 #: ../libpurple/protocols/mxit/actions.c:313
-#: ../libpurple/protocols/oscar/userinfo.c:527
+#: ../libpurple/protocols/oscar/userinfo.c:528
 msgid "Profile"
 msgstr ""
 
@@ -8423,7 +8426,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/mxit/actions.c:501
-#: ../libpurple/protocols/oscar/oscar.c:5333
+#: ../libpurple/protocols/oscar/oscar.c:5328
 msgid "_Search"
 msgstr ""
 
@@ -8463,16 +8466,16 @@
 msgstr ""
 
 #. file read error
-#: ../libpurple/protocols/mxit/filexfer.c:178
+#: ../libpurple/protocols/mxit/filexfer.c:177
 msgid "Unable to access the local file"
 msgstr ""
 
 #. file write error
-#: ../libpurple/protocols/mxit/filexfer.c:456
+#: ../libpurple/protocols/mxit/filexfer.c:455
 msgid "Unable to save the file"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/http.c:281
+#: ../libpurple/protocols/mxit/http.c:287
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
@@ -8861,8 +8864,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/mxit/roster.c:210
-#: ../libpurple/protocols/silc/buddy.c:1518
-#: ../libpurple/protocols/silc/util.c:535
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/util.c:484
 #: ../libpurple/protocols/silc10/buddy.c:1525
 #: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
@@ -9096,8 +9099,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/myspace/user.c:120
-#: ../libpurple/protocols/zephyr/zephyr.c:794
-#: ../libpurple/protocols/zephyr/zephyr.c:1174
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1184
 msgid "User"
 msgstr ""
 
@@ -9117,45 +9120,45 @@
 msgid "Client Version"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:632
-#: ../libpurple/protocols/myspace/user.c:786
+#: ../libpurple/protocols/myspace/user.c:634
+#: ../libpurple/protocols/myspace/user.c:788
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:806
+#: ../libpurple/protocols/myspace/user.c:808
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:807
+#: ../libpurple/protocols/myspace/user.c:809
 msgid "This username is available. Would you like to set it?"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:808
+#: ../libpurple/protocols/myspace/user.c:810
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:819
-#: ../libpurple/protocols/myspace/user.c:880
+#: ../libpurple/protocols/myspace/user.c:821
+#: ../libpurple/protocols/myspace/user.c:882
 msgid "MySpaceIM - Please Set a Username"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:820
+#: ../libpurple/protocols/myspace/user.c:822
 msgid "This username is unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:821
+#: ../libpurple/protocols/myspace/user.c:823
 msgid "Please try another username:"
 msgstr ""
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:870
+#: ../libpurple/protocols/myspace/user.c:872
 msgid "No username set"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:881
+#: ../libpurple/protocols/myspace/user.c:883
 msgid "Please enter a username to check its availability:"
 msgstr ""
 
@@ -9166,7 +9169,7 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 #: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:217
+#: ../libpurple/protocols/myspace/zap.c:216
 msgid "Zap"
 msgstr ""
 
@@ -9365,9 +9368,9 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1893
 #: ../libpurple/protocols/oscar/clientlogin.c:487
-#: ../libpurple/protocols/oscar/oscar.c:1096
-#: ../libpurple/protocols/simple/simple.c:1127
-#: ../libpurple/protocols/yahoo/libymsg.c:2108
+#: ../libpurple/protocols/oscar/oscar.c:1094
+#: ../libpurple/protocols/simple/simple.c:1132
+#: ../libpurple/protocols/yahoo/libymsg.c:2109
 msgid "Incorrect password"
 msgstr ""
 
@@ -9554,7 +9557,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:1510
-#: ../libpurple/protocols/sametime/sametime.c:4169
+#: ../libpurple/protocols/sametime/sametime.c:4133
 msgid "User ID"
 msgstr ""
 
@@ -9647,8 +9650,8 @@
 
 #: ../libpurple/protocols/oscar/authorization.c:87
 #: ../libpurple/protocols/oscar/authorization.c:97
-#: ../libpurple/protocols/oscar/oscar.c:1964
-#: ../libpurple/protocols/oscar/oscar.c:4373
+#: ../libpurple/protocols/oscar/oscar.c:1962
+#: ../libpurple/protocols/oscar/oscar.c:4368
 #: ../libpurple/protocols/yahoo/libymsg.c:1367
 msgid "No reason given."
 msgstr ""
@@ -9661,9 +9664,9 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #. 
 #: ../libpurple/protocols/oscar/authorization.c:98
-#: ../libpurple/protocols/oscar/oscar.c:1223
-#: ../libpurple/protocols/oscar/oscar.c:4936
-#: ../libpurple/protocols/oscar/oscar.c:5276 ../libpurple/request.h:1498
+#: ../libpurple/protocols/oscar/oscar.c:1221
+#: ../libpurple/protocols/oscar/oscar.c:4931
+#: ../libpurple/protocols/oscar/oscar.c:5271 ../libpurple/request.h:1498
 msgid "_OK"
 msgstr ""
 
@@ -9684,7 +9687,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/clientlogin.c:283
-#: ../libpurple/protocols/oscar/oscar.c:1298
+#: ../libpurple/protocols/oscar/oscar.c:1296
 msgid ""
 "You required encryption in your account settings, but one of the servers "
 "doesn't support it."
@@ -9831,7 +9834,7 @@
 msgid "Watching a movie"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6820
+#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6823
 #: ../pidgin/gtkstatusbox.c:714
 msgid "Typing"
 msgstr ""
@@ -9924,9 +9927,10 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/flap_connection.c:477
-#: ../libpurple/proxy.c:1561 ../libpurple/proxy.c:1591
-#: ../libpurple/proxy.c:1671 ../libpurple/proxy.c:1742
-#: ../libpurple/proxy.c:1843 ../libpurple/proxy.c:1982
+#: ../libpurple/proxy.c:1534 ../libpurple/proxy.c:1564
+#: ../libpurple/proxy.c:1644 ../libpurple/proxy.c:1715
+#: ../libpurple/proxy.c:1725 ../libpurple/proxy.c:1821
+#: ../libpurple/proxy.c:1960
 msgid "Received invalid data on connection with server"
 msgstr ""
 
@@ -9967,7 +9971,7 @@
 #: ../libpurple/protocols/oscar/libicq.c:162
 #: ../libpurple/protocols/yahoo/libyahoo.c:326
 #: ../libpurple/protocols/yahoo/libyahoojp.c:222
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr ""
 
@@ -10009,17 +10013,17 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:157
-#: ../libpurple/protocols/oscar/oscar.c:4771
+#: ../libpurple/protocols/oscar/oscar.c:4766
 msgid "Free For Chat"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:161
-#: ../libpurple/protocols/oscar/oscar.c:4853
+#: ../libpurple/protocols/oscar/oscar.c:4848
 msgid "Not Available"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:163
-#: ../libpurple/protocols/oscar/oscar.c:4839
+#: ../libpurple/protocols/oscar/oscar.c:4834
 msgid "Occupied"
 msgstr ""
 
@@ -10028,28 +10032,28 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:169
-#: ../libpurple/protocols/yahoo/libymsg.c:4100 ../libpurple/status.c:165
+#: ../libpurple/protocols/yahoo/libymsg.c:4087 ../libpurple/status.c:165
 #: ../pidgin/gtkdocklet.c:560 ../pidgin/gtkstatusbox.c:1099
 msgid "Invisible"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:171
-#: ../libpurple/protocols/oscar/oscar.c:4779
+#: ../libpurple/protocols/oscar/oscar.c:4774
 msgid "Evil"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:173
-#: ../libpurple/protocols/oscar/oscar.c:4787
+#: ../libpurple/protocols/oscar/oscar.c:4782
 msgid "Depression"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:175
-#: ../libpurple/protocols/oscar/oscar.c:4795
+#: ../libpurple/protocols/oscar/oscar.c:4790
 msgid "At home"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:177
-#: ../libpurple/protocols/oscar/oscar.c:4803
+#: ../libpurple/protocols/oscar/oscar.c:4798
 msgid "At work"
 msgstr ""
 
@@ -10096,7 +10100,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:896
 #: ../libpurple/protocols/oscar/oscar.c:937
-#: ../libpurple/protocols/oscar/oscar.c:1010
+#: ../libpurple/protocols/oscar/oscar.c:1008
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -10106,35 +10110,35 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1014
+#: ../libpurple/protocols/oscar/oscar.c:1012
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1057
-#: ../libpurple/protocols/oscar/oscar.c:1176
+#: ../libpurple/protocols/oscar/oscar.c:1055
+#: ../libpurple/protocols/oscar/oscar.c:1174
 msgid "Received authorization"
 msgstr ""
 
 #. Unregistered username
 #. the username does not exist
-#: ../libpurple/protocols/oscar/oscar.c:1090
-#: ../libpurple/protocols/yahoo/libymsg.c:2119
-#: ../libpurple/protocols/yahoo/libymsg.c:2410
+#: ../libpurple/protocols/oscar/oscar.c:1088
+#: ../libpurple/protocols/yahoo/libymsg.c:2120
+#: ../libpurple/protocols/yahoo/libymsg.c:2395
 msgid "Username does not exist"
 msgstr ""
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1100
+#: ../libpurple/protocols/oscar/oscar.c:1098
 msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1105
+#: ../libpurple/protocols/oscar/oscar.c:1103
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
 #. username connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:1107
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
@@ -10142,40 +10146,40 @@
 msgstr ""
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:1112
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:1119
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1204
+#: ../libpurple/protocols/oscar/oscar.c:1202
 msgid "The SecurID key entered is invalid"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1220
+#: ../libpurple/protocols/oscar/oscar.c:1218
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1221
+#: ../libpurple/protocols/oscar/oscar.c:1219
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1259
+#: ../libpurple/protocols/oscar/oscar.c:1257
 msgid "Password sent"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1350
+#: ../libpurple/protocols/oscar/oscar.c:1348
 msgid "Unable to initialize connection"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1964
+#: ../libpurple/protocols/oscar/oscar.c:1962
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10183,17 +10187,17 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1965
+#: ../libpurple/protocols/oscar/oscar.c:1963
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:1972
+#: ../libpurple/protocols/oscar/oscar.c:1970
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1980
+#: ../libpurple/protocols/oscar/oscar.c:1978
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10202,7 +10206,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1988
+#: ../libpurple/protocols/oscar/oscar.c:1986
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10211,7 +10215,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1996
+#: ../libpurple/protocols/oscar/oscar.c:1994
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -10220,39 +10224,39 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2030
+#: ../libpurple/protocols/oscar/oscar.c:2028
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2038
+#: ../libpurple/protocols/oscar/oscar.c:2036
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2043 ../pidgin/gtkroomlist.c:325
+#: ../libpurple/protocols/oscar/oscar.c:2041 ../pidgin/gtkroomlist.c:325
 #: ../pidgin/plugins/disco/gtkdisco.c:694
 msgid "_Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2044
+#: ../libpurple/protocols/oscar/oscar.c:2042
 msgid "_Decline"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2192
+#: ../libpurple/protocols/oscar/oscar.c:2190
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:2199
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2210
+#: ../libpurple/protocols/oscar/oscar.c:2208
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10261,7 +10265,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2219
+#: ../libpurple/protocols/oscar/oscar.c:2217
 #, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
@@ -10270,7 +10274,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2226
 #, c-format
 msgid ""
 "You missed %hu message from %s because your warning level is too high."
@@ -10279,130 +10283,130 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2237
+#: ../libpurple/protocols/oscar/oscar.c:2235
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2435
 msgid "Your AIM connection may be lost."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2773
+#: ../libpurple/protocols/oscar/oscar.c:2771
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2841
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2844
+#: ../libpurple/protocols/oscar/oscar.c:2842
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2978
+#: ../libpurple/protocols/oscar/oscar.c:2975
 msgid "Pop-Up Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3018
+#: ../libpurple/protocols/oscar/oscar.c:3015
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3049
+#: ../libpurple/protocols/oscar/oscar.c:3046
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3070
+#: ../libpurple/protocols/oscar/oscar.c:3067
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3072
+#: ../libpurple/protocols/oscar/oscar.c:3069
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3105
+#: ../libpurple/protocols/oscar/oscar.c:3102
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3107
+#: ../libpurple/protocols/oscar/oscar.c:3104
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3109
+#: ../libpurple/protocols/oscar/oscar.c:3106
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3111
+#: ../libpurple/protocols/oscar/oscar.c:3108
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3113
+#: ../libpurple/protocols/oscar/oscar.c:3110
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3115
+#: ../libpurple/protocols/oscar/oscar.c:3112
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3117
+#: ../libpurple/protocols/oscar/oscar.c:3114
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3119
+#: ../libpurple/protocols/oscar/oscar.c:3116
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3125
+#: ../libpurple/protocols/oscar/oscar.c:3122
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3127
+#: ../libpurple/protocols/oscar/oscar.c:3124
 msgid "Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3315
+#: ../libpurple/protocols/oscar/oscar.c:3312
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3542
+#: ../libpurple/protocols/oscar/oscar.c:3539
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3543
+#: ../libpurple/protocols/oscar/oscar.c:3540
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3557
+#: ../libpurple/protocols/oscar/oscar.c:3554
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -10413,11 +10417,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3562
+#: ../libpurple/protocols/oscar/oscar.c:3559
 msgid "Profile too long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3591
+#: ../libpurple/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -10428,11 +10432,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3596
+#: ../libpurple/protocols/oscar/oscar.c:3593
 msgid "Away message too long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3696
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
@@ -10440,64 +10444,64 @@
 "numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Unable to Retrieve Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3833
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
-#: ../libpurple/protocols/oscar/oscar.c:4018
-#: ../libpurple/protocols/oscar/oscar.c:4242
+#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4237
+#: ../libpurple/protocols/oscar/oscar.c:4238
 #: ../libpurple/protocols/oscar/oscar.c:4243
-#: ../libpurple/protocols/oscar/oscar.c:4248
 msgid "Orphans"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4167
+#: ../libpurple/protocols/oscar/oscar.c:4162
 #, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4167
-#: ../libpurple/protocols/oscar/oscar.c:4182
+#: ../libpurple/protocols/oscar/oscar.c:4162
+#: ../libpurple/protocols/oscar/oscar.c:4177
 msgid "(no name)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4181
+#: ../libpurple/protocols/oscar/oscar.c:4176
 #, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4298
+#: ../libpurple/protocols/oscar/oscar.c:4293
 #, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4306
+#: ../libpurple/protocols/oscar/oscar.c:4301
 msgid "Authorization Given"
 msgstr ""
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:4369
+#: ../libpurple/protocols/oscar/oscar.c:4364
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4370
+#: ../libpurple/protocols/oscar/oscar.c:4365
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:4373
+#: ../libpurple/protocols/oscar/oscar.c:4368
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10505,204 +10509,204 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4374
+#: ../libpurple/protocols/oscar/oscar.c:4369
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4412
+#: ../libpurple/protocols/oscar/oscar.c:4407
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4528
+#: ../libpurple/protocols/oscar/oscar.c:4523
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4765
+#: ../libpurple/protocols/oscar/oscar.c:4760
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4812
+#: ../libpurple/protocols/oscar/oscar.c:4807
 msgid "Lunch"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4933
+#: ../libpurple/protocols/oscar/oscar.c:4928
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4934
+#: ../libpurple/protocols/oscar/oscar.c:4929
 msgid "Buddy Comment:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4983
+#: ../libpurple/protocols/oscar/oscar.c:4978
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4987
+#: ../libpurple/protocols/oscar/oscar.c:4982
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4993
-#: ../libpurple/protocols/oscar/peer.c:1070
+#: ../libpurple/protocols/oscar/oscar.c:4988
+#: ../libpurple/protocols/oscar/peer.c:1065
 msgid "C_onnect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5031
+#: ../libpurple/protocols/oscar/oscar.c:5026
 msgid "You closed the connection."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5091
+#: ../libpurple/protocols/oscar/oscar.c:5086
 msgid "Get AIM Info"
 msgstr ""
 
 #. We only do this if the user is in our buddy list
-#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:5095
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5103
 msgid "Get X-Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5121
 msgid "End Direct IM Session"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5132
+#: ../libpurple/protocols/oscar/oscar.c:5127
 msgid "Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5150
+#: ../libpurple/protocols/oscar/oscar.c:5145
 msgid "Re-request Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5209
+#: ../libpurple/protocols/oscar/oscar.c:5204
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5207
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "ICQ Privacy Options"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5274
+#: ../libpurple/protocols/oscar/oscar.c:5269
 msgid "Change Address To:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5307
+#: ../libpurple/protocols/oscar/oscar.c:5302
 msgid "you are not waiting for authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5310
+#: ../libpurple/protocols/oscar/oscar.c:5305
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/oscar/oscar.c:5306
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5328
+#: ../libpurple/protocols/oscar/oscar.c:5323
 msgid "Find Buddy by Email"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5329
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Search for a buddy by email address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5330
+#: ../libpurple/protocols/oscar/oscar.c:5325
 msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5491
+#: ../libpurple/protocols/oscar/oscar.c:5486
 msgid "Set User Info (web)..."
 msgstr ""
 
 #. This only happens when connecting with the old-style BUCP login
-#: ../libpurple/protocols/oscar/oscar.c:5503
+#: ../libpurple/protocols/oscar/oscar.c:5498
 msgid "Change Password (web)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../libpurple/protocols/oscar/oscar.c:5505
 msgid "Configure IM Forwarding (web)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:5520
+#: ../libpurple/protocols/oscar/oscar.c:5515
 msgid "Set Privacy Options..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5524
+#: ../libpurple/protocols/oscar/oscar.c:5519
 msgid "Show Visible List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5527
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Show Invisible List"
 msgstr ""
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5528
 msgid "Confirm Account"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5537
+#: ../libpurple/protocols/oscar/oscar.c:5532
 msgid "Display Currently Registered Email Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/oscar/oscar.c:5536
 msgid "Change Currently Registered Email Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5543
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/oscar/oscar.c:5549
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5769
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Use clientLogin"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5769
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5779
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "Allow multiple simultaneous logins"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:720
+#: ../libpurple/protocols/oscar/peer.c:715
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:805
+#: ../libpurple/protocols/oscar/peer.c:800
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:879
+#: ../libpurple/protocols/oscar/peer.c:874
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1058
+#: ../libpurple/protocols/oscar/peer.c:1053
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1062
+#: ../libpurple/protocols/oscar/peer.c:1057
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -10710,7 +10714,7 @@
 msgstr ""
 
 #. Label
-#: ../libpurple/protocols/oscar/userinfo.c:43 ../pidgin/gtkutils.c:2302
+#: ../libpurple/protocols/oscar/userinfo.c:43 ../pidgin/gtkutils.c:2310
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:331
 msgid "Buddy Icon"
 msgstr ""
@@ -10805,8 +10809,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/userinfo.c:344
-#: ../libpurple/protocols/oscar/userinfo.c:408
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:720 ../pidgin/gtkprefs.c:1742
+#: ../libpurple/protocols/oscar/userinfo.c:409
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:720 ../pidgin/gtkprefs.c:1748
 msgid "IP Address"
 msgstr ""
 
@@ -10823,53 +10827,53 @@
 msgid "User information not available: %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:420
-#: ../libpurple/protocols/silc/util.c:592
+#: ../libpurple/protocols/oscar/userinfo.c:421
+#: ../libpurple/protocols/silc/util.c:541
 #: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:451
+#: ../libpurple/protocols/oscar/userinfo.c:452
 msgid "Personal Web Page"
 msgstr ""
 
 #. aim_userinfo_t
 #. use_html_status
-#: ../libpurple/protocols/oscar/userinfo.c:455
+#: ../libpurple/protocols/oscar/userinfo.c:456
 msgid "Additional Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:464
-#: ../libpurple/protocols/oscar/userinfo.c:472
+#: ../libpurple/protocols/oscar/userinfo.c:465
+#: ../libpurple/protocols/oscar/userinfo.c:473
 msgid "Zip Code"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:475
+#: ../libpurple/protocols/oscar/userinfo.c:476
 msgid "Work Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:478
+#: ../libpurple/protocols/oscar/userinfo.c:479
 msgid "Division"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:479
+#: ../libpurple/protocols/oscar/userinfo.c:480
 msgid "Position"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:480
+#: ../libpurple/protocols/oscar/userinfo.c:481
 msgid "Web Page"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:508
+#: ../libpurple/protocols/oscar/userinfo.c:509
 msgid "Online Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:513
+#: ../libpurple/protocols/oscar/userinfo.c:514
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1184
 msgid "Member Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/userinfo.c:518
+#: ../libpurple/protocols/oscar/userinfo.c:519
 msgid "Capabilities"
 msgstr ""
 
@@ -10969,8 +10973,8 @@
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
 #: ../libpurple/protocols/oscar/visibility.c:26
-#: ../libpurple/protocols/yahoo/libymsg.c:4244
-#: ../libpurple/protocols/yahoo/libymsg.c:4320
+#: ../libpurple/protocols/yahoo/libymsg.c:4231
+#: ../libpurple/protocols/yahoo/libymsg.c:4307
 msgid "Appear Online"
 msgstr ""
 
@@ -10985,7 +10989,7 @@
 #. you to always appear offline to the chosen user (even when your status
 #. isn't Invisible).
 #: ../libpurple/protocols/oscar/visibility.c:36
-#: ../libpurple/protocols/yahoo/libymsg.c:4326
+#: ../libpurple/protocols/yahoo/libymsg.c:4313
 msgid "Appear Offline"
 msgstr ""
 
@@ -11043,136 +11047,136 @@
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1357
+#: ../libpurple/protocols/sametime/sametime.c:1355
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1367
+#: ../libpurple/protocols/sametime/sametime.c:1365
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1538
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1543
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1548
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1553
+#: ../libpurple/protocols/sametime/sametime.c:1551
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1558
+#: ../libpurple/protocols/sametime/sametime.c:1556
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1564
+#: ../libpurple/protocols/sametime/sametime.c:1562
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1568
+#: ../libpurple/protocols/sametime/sametime.c:1567
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1573
+#: ../libpurple/protocols/sametime/sametime.c:1572
 msgid "Starting Services"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1710
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1715
+#: ../libpurple/protocols/sametime/sametime.c:1714
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1847
+#: ../libpurple/protocols/sametime/sametime.c:1846
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:2021
+#: ../libpurple/protocols/sametime/sametime.c:2020
 msgid "Conference Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:2486
+#: ../libpurple/protocols/sametime/sametime.c:2468
 msgid "Unable to send message: "
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:2492
+#: ../libpurple/protocols/sametime/sametime.c:2474
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3042
+#: ../libpurple/protocols/sametime/sametime.c:3024
 msgid "Place Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3312
+#: ../libpurple/protocols/sametime/sametime.c:3276
 msgid "Microphone"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3313
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "Speakers"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3314
+#: ../libpurple/protocols/sametime/sametime.c:3278
 msgid "Video Camera"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3318
+#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "File Transfer"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3352
-#: ../libpurple/protocols/sametime/sametime.c:4192
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4156
 msgid "Supports"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3357
-#: ../libpurple/protocols/sametime/sametime.c:4166
+#: ../libpurple/protocols/sametime/sametime.c:3321
+#: ../libpurple/protocols/sametime/sametime.c:4130
 msgid "External User"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3463
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3464
+#: ../libpurple/protocols/sametime/sametime.c:3428
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3468
+#: ../libpurple/protocols/sametime/sametime.c:3432
 msgid "New Conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3470
+#: ../libpurple/protocols/sametime/sametime.c:3434
 msgid "Create"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3535
+#: ../libpurple/protocols/sametime/sametime.c:3499
 msgid "Available Conferences"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3541
+#: ../libpurple/protocols/sametime/sametime.c:3505
 msgid "Create New Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3548
+#: ../libpurple/protocols/sametime/sametime.c:3512
 msgid "Invite user to a conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3549
+#: ../libpurple/protocols/sametime/sametime.c:3513
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11180,135 +11184,135 @@
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3554
+#: ../libpurple/protocols/sametime/sametime.c:3518
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Invite to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3650
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3669 ../pidgin/gtkconv.c:4681
+#: ../libpurple/protocols/sametime/sametime.c:3633 ../pidgin/gtkconv.c:4681
 msgid "Topic:"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3729
+#: ../libpurple/protocols/sametime/sametime.c:3693
 msgid "A server is required to connect this account"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4182
+#: ../libpurple/protocols/sametime/sametime.c:4146
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4184
+#: ../libpurple/protocols/sametime/sametime.c:4148
 msgid "Last Known Client"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4348
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:4312
+#: ../libpurple/protocols/sametime/sametime.c:5529
 msgid "User Name"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4351
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:4315
+#: ../libpurple/protocols/sametime/sametime.c:5532
 msgid "Sametime ID"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4375
+#: ../libpurple/protocols/sametime/sametime.c:4339
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4376
+#: ../libpurple/protocols/sametime/sametime.c:4340
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4381
+#: ../libpurple/protocols/sametime/sametime.c:4345
 msgid "Select User"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4465
+#: ../libpurple/protocols/sametime/sametime.c:4429
 msgid "Unable to add user: user not found"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4467
+#: ../libpurple/protocols/sametime/sametime.c:4431
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5056
+#: ../libpurple/protocols/sametime/sametime.c:5020
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5205
+#: ../libpurple/protocols/sametime/sametime.c:5169
 msgid "Remotely Stored Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5210
+#: ../libpurple/protocols/sametime/sametime.c:5174
 msgid "Buddy List Storage Mode"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5213
+#: ../libpurple/protocols/sametime/sametime.c:5177
 msgid "Local Buddy List Only"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5179
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5217
+#: ../libpurple/protocols/sametime/sametime.c:5181
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5219
+#: ../libpurple/protocols/sametime/sametime.c:5183
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5274
+#: ../libpurple/protocols/sametime/sametime.c:5238
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
+#: ../libpurple/protocols/sametime/sametime.c:5278
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5368
+#: ../libpurple/protocols/sametime/sametime.c:5332
 msgid "Unable to add group: group exists"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5369
+#: ../libpurple/protocols/sametime/sametime.c:5333
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
-#: ../libpurple/protocols/sametime/sametime.c:5502
+#: ../libpurple/protocols/sametime/sametime.c:5336
+#: ../libpurple/protocols/sametime/sametime.c:5466
 msgid "Unable to add group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5395
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5447
+#: ../libpurple/protocols/sametime/sametime.c:5411
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5412
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -11316,37 +11320,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5453
+#: ../libpurple/protocols/sametime/sametime.c:5417
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5496
+#: ../libpurple/protocols/sametime/sametime.c:5460
 msgid "Unable to add group: group not found"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:5462
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5539
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5504
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5589
+#: ../libpurple/protocols/sametime/sametime.c:5553
 #, c-format
 msgid "Search results for '%s'"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5590
+#: ../libpurple/protocols/sametime/sametime.c:5554
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -11354,60 +11358,60 @@
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5597 ../pidgin/gtknotify.c:972
+#: ../libpurple/protocols/sametime/sametime.c:5561 ../pidgin/gtknotify.c:972
 msgid "Search Results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5586
 msgid "No matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5587
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5591
 msgid "No Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5664
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "Search for a user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5665
+#: ../libpurple/protocols/sametime/sametime.c:5629
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5668
+#: ../libpurple/protocols/sametime/sametime.c:5632
 msgid "User Search"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5681
+#: ../libpurple/protocols/sametime/sametime.c:5645
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5685
+#: ../libpurple/protocols/sametime/sametime.c:5649
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5689
+#: ../libpurple/protocols/sametime/sametime.c:5653
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5693
+#: ../libpurple/protocols/sametime/sametime.c:5657
 msgid "User Search..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:5764
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5810
+#: ../libpurple/protocols/sametime/sametime.c:5774
 msgid "Hide client identity"
 msgstr ""
 
@@ -11533,8 +11537,8 @@
 #: ../libpurple/protocols/silc/buddy.c:500
 #: ../libpurple/protocols/silc/buddy.c:511
 #: ../libpurple/protocols/silc/buddy.c:544
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../libpurple/protocols/silc/ops.c:1526
+#: ../libpurple/protocols/silc/ops.c:1514
+#: ../libpurple/protocols/silc/ops.c:1525
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -11543,8 +11547,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc/ops.c:1527
+#: ../libpurple/protocols/silc/ops.c:1515
+#: ../libpurple/protocols/silc/ops.c:1526
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -11552,14 +11556,14 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:626
-#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/buddy.c:1662
 #: ../libpurple/protocols/silc10/buddy.c:635
 #: ../libpurple/protocols/silc10/buddy.c:1674
 msgid "Show Public Key"
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:627
-#: ../libpurple/protocols/silc/buddy.c:1035
+#: ../libpurple/protocols/silc/buddy.c:1029
 #: ../libpurple/protocols/silc/chat.c:241
 #: ../libpurple/protocols/silc10/buddy.c:636
 #: ../libpurple/protocols/silc10/buddy.c:1036
@@ -11568,11 +11572,11 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:706
-#: ../libpurple/protocols/silc/ops.c:1065
-#: ../libpurple/protocols/silc/ops.c:1180
+#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1301
 #: ../libpurple/protocols/silc/ops.c:1302
-#: ../libpurple/protocols/silc/ops.c:1303
-#: ../libpurple/protocols/silc/ops.c:1321
+#: ../libpurple/protocols/silc/ops.c:1320
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -11583,8 +11587,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/buddy.c:707
-#: ../libpurple/protocols/silc/ops.c:1181
-#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc/ops.c:1180
+#: ../libpurple/protocols/silc/ops.c:1321
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -11605,109 +11609,109 @@
 msgstr ""
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1061
 #: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1072
 #: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1075
 #: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1079
 #: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/buddy.c:1187
 #: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1195
+#: ../libpurple/protocols/silc/buddy.c:1189
 #: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1487
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc10/buddy.c:1494
 msgid "Detached"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1491
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
 #: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:50
 msgid "Indisposed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1489
 #: ../libpurple/protocols/silc/silc.c:62
 #: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:52
 msgid "Wake Me Up"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1491
 #: ../libpurple/protocols/silc/silc.c:54
 #: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:44
 msgid "Hyper Active"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc10/buddy.c:1506
 msgid "Robot"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc/ops.c:1218
 #: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1574
-#: ../libpurple/protocols/silc/ops.c:1236
+#: ../libpurple/protocols/silc/buddy.c:1568
+#: ../libpurple/protocols/silc/ops.c:1235
 #: ../libpurple/protocols/silc10/buddy.c:1582
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1579
-#: ../libpurple/protocols/silc/ops.c:1241
+#: ../libpurple/protocols/silc/buddy.c:1573
+#: ../libpurple/protocols/silc/ops.c:1240
 #: ../libpurple/protocols/silc10/buddy.c:1587
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1584
-#: ../libpurple/protocols/silc/ops.c:1246
+#: ../libpurple/protocols/silc/buddy.c:1578
+#: ../libpurple/protocols/silc/ops.c:1245
 #: ../libpurple/protocols/silc10/buddy.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1589
-#: ../libpurple/protocols/silc/ops.c:1251
+#: ../libpurple/protocols/silc/buddy.c:1583
+#: ../libpurple/protocols/silc/ops.c:1250
 #: ../libpurple/protocols/silc10/buddy.c:1597
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:747
@@ -11715,41 +11719,41 @@
 msgid "Timezone"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1594
-#: ../libpurple/protocols/silc/ops.c:1256
+#: ../libpurple/protocols/silc/buddy.c:1588
+#: ../libpurple/protocols/silc/ops.c:1255
 #: ../libpurple/protocols/silc10/buddy.c:1602
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc/buddy.c:1645
 #: ../libpurple/protocols/silc10/buddy.c:1656
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1656
+#: ../libpurple/protocols/silc/buddy.c:1650
 #: ../libpurple/protocols/silc10/buddy.c:1662
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc/buddy.c:1655
 #: ../libpurple/protocols/silc10/buddy.c:1667
 msgid "IM with Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1674
+#: ../libpurple/protocols/silc/buddy.c:1668
 #: ../libpurple/protocols/silc10/buddy.c:1680
 msgid "Get Public Key..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1675
+#: ../libpurple/protocols/silc/ops.c:1623
 #: ../libpurple/protocols/silc10/buddy.c:1687
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1691
+#: ../libpurple/protocols/silc/buddy.c:1685
 #: ../libpurple/protocols/silc/chat.c:1004
 #: ../libpurple/protocols/silc10/buddy.c:1697
 #: ../libpurple/protocols/silc10/chat.c:977
@@ -11892,7 +11896,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:607
-#: ../libpurple/protocols/silc/ops.c:1829
+#: ../libpurple/protocols/silc/ops.c:1828
 #: ../libpurple/protocols/silc/silc.c:1260
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
@@ -12096,8 +12100,8 @@
 msgid "Error occurred"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:560 ../libpurple/protocols/silc/ops.c:569
-#: ../libpurple/protocols/silc/ops.c:578
+#: ../libpurple/protocols/silc/ops.c:558 ../libpurple/protocols/silc/ops.c:567
+#: ../libpurple/protocols/silc/ops.c:576
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -12105,38 +12109,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:644
+#: ../libpurple/protocols/silc/ops.c:642
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:648
+#: ../libpurple/protocols/silc/ops.c:646
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:681
+#: ../libpurple/protocols/silc/ops.c:679
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:689
+#: ../libpurple/protocols/silc/ops.c:687
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:718
+#: ../libpurple/protocols/silc/ops.c:716
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:745 ../libpurple/protocols/silc/ops.c:750
-#: ../libpurple/protocols/silc/ops.c:755
+#: ../libpurple/protocols/silc/ops.c:743 ../libpurple/protocols/silc/ops.c:748
+#: ../libpurple/protocols/silc/ops.c:753
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -12144,8 +12148,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:776 ../libpurple/protocols/silc/ops.c:781
-#: ../libpurple/protocols/silc/ops.c:786
+#: ../libpurple/protocols/silc/ops.c:774 ../libpurple/protocols/silc/ops.c:779
+#: ../libpurple/protocols/silc/ops.c:784
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -12153,157 +12157,157 @@
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:823
+#: ../libpurple/protocols/silc/ops.c:821
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:996
+#: ../libpurple/protocols/silc/ops.c:995
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1019
+#: ../libpurple/protocols/silc/ops.c:1018
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1027
+#: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1031
+#: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc/silc.c:1253
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:949
 msgid "Organization"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/ops.c:1034
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1059
+#: ../libpurple/protocols/silc/ops.c:1058
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1105
+#: ../libpurple/protocols/silc/ops.c:1104
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1139
+#: ../libpurple/protocols/silc/ops.c:1138
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1143
+#: ../libpurple/protocols/silc/ops.c:1142
 #: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1202
-#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1201
+#: ../libpurple/protocols/silc/ops.c:1339
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1070
 msgid "Real Name"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1230
+#: ../libpurple/protocols/silc/ops.c:1229
 #: ../libpurple/protocols/silc10/ops.c:1213 ../pidgin/gtkblist-theme.c:467
 msgid "Status Text"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc/ops.c:1366
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1365
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1367
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1366
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1306
+#: ../libpurple/protocols/silc/ops.c:1305
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1385
+#: ../libpurple/protocols/silc/ops.c:1384
 #: ../libpurple/protocols/silc/silc.c:1317
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:1013
 msgid "Detach From Server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1385
+#: ../libpurple/protocols/silc/ops.c:1384
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1405
+#: ../libpurple/protocols/silc/ops.c:1404
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1434
+#: ../libpurple/protocols/silc/ops.c:1433
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1483
+#: ../libpurple/protocols/silc/ops.c:1482
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1483
+#: ../libpurple/protocols/silc/ops.c:1482
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1484
+#: ../libpurple/protocols/silc/ops.c:1483
 msgid "Network is empty"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1527
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1540
-#: ../libpurple/protocols/silc/ops.c:1553
+#: ../libpurple/protocols/silc/ops.c:1539
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1541
+#: ../libpurple/protocols/silc/ops.c:1540
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1564
+#: ../libpurple/protocols/silc/ops.c:1563
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1565
+#: ../libpurple/protocols/silc/ops.c:1564
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1572
+#: ../libpurple/protocols/silc/ops.c:1571
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -12324,43 +12328,43 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1603
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1611
+#: ../libpurple/protocols/silc/ops.c:1616
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1611
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1616
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1624
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1664
+#: ../libpurple/protocols/silc/ops.c:1663
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1664
+#: ../libpurple/protocols/silc/ops.c:1663
 msgid "Cannot watch user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1740
-#: ../libpurple/protocols/silc/ops.c:1791
+#: ../libpurple/protocols/silc/ops.c:1739
+#: ../libpurple/protocols/silc/ops.c:1790
 #: ../libpurple/protocols/silc/silc.c:396
 #: ../libpurple/protocols/silc10/ops.c:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
@@ -12368,17 +12372,17 @@
 msgid "Resuming session"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1742
+#: ../libpurple/protocols/silc/ops.c:1741
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1793
+#: ../libpurple/protocols/silc/ops.c:1792
 #: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1830
+#: ../libpurple/protocols/silc/ops.c:1829
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr ""
@@ -12484,7 +12488,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:981
-#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2411
+#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2417
 #, c-format
 msgid "Normal"
 msgstr ""
@@ -12497,14 +12501,14 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1014
-#: ../libpurple/protocols/silc/util.c:568
+#: ../libpurple/protocols/silc/util.c:517
 #: ../libpurple/protocols/silc10/silc.c:710
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1016
-#: ../libpurple/protocols/silc/util.c:570
+#: ../libpurple/protocols/silc/util.c:519
 #: ../libpurple/protocols/silc10/silc.c:712
 #: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
@@ -12719,7 +12723,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1941
 #: ../libpurple/protocols/silc10/silc.c:1650
-#: ../libpurple/protocols/zephyr/zephyr.c:2693
+#: ../libpurple/protocols/zephyr/zephyr.c:2708
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
@@ -12859,7 +12863,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:2188
-#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2803
+#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2808
 msgid "Network"
 msgstr ""
 
@@ -12912,75 +12916,75 @@
 msgid "Digitally sign and verify all messages"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:208
-#: ../libpurple/protocols/silc/util.c:251
+#: ../libpurple/protocols/silc/util.c:159
+#: ../libpurple/protocols/silc/util.c:202
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:217
-#: ../libpurple/protocols/silc/util.c:260
+#: ../libpurple/protocols/silc/util.c:168
+#: ../libpurple/protocols/silc/util.c:211
 msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:313
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:315
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:317
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:319
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:321
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:323
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:324
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:376
+#: ../libpurple/protocols/silc/util.c:325
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:378
+#: ../libpurple/protocols/silc/util.c:327
 #, c-format
 msgid "Version: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:329
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12989,7 +12993,7 @@
 "\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:381
+#: ../libpurple/protocols/silc/util.c:330
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12997,51 +13001,51 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:383
-#: ../libpurple/protocols/silc/util.c:384
+#: ../libpurple/protocols/silc/util.c:332
+#: ../libpurple/protocols/silc/util.c:333
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:566
+#: ../libpurple/protocols/silc/util.c:515
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:572
+#: ../libpurple/protocols/silc/util.c:521
 #: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:590
+#: ../libpurple/protocols/silc/util.c:539
 #: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc/util.c:543
 #: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/silc/util.c:545
 #: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:289 ../libpurple/protocols/silc10/wb.c:287
+#: ../libpurple/protocols/silc/wb.c:287 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:293 ../libpurple/protocols/silc10/wb.c:291
+#: ../libpurple/protocols/silc/wb.c:291 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:307 ../libpurple/protocols/silc10/wb.c:305
+#: ../libpurple/protocols/silc/wb.c:305 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr ""
 
@@ -13120,27 +13124,27 @@
 msgid "Unable to create connection"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1142
+#: ../libpurple/protocols/simple/simple.c:1147
 msgid "Unknown server response"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1780
-#: ../libpurple/protocols/simple/simple.c:1830
-#: ../libpurple/protocols/simple/simple.c:1845
-#: ../libpurple/protocols/simple/simple.c:1900
+#: ../libpurple/protocols/simple/simple.c:1782
+#: ../libpurple/protocols/simple/simple.c:1832
+#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Unable to create listen socket"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1809
-#: ../libpurple/protocols/simple/simple.c:1911 ../libpurple/proxy.c:2240
+#: ../libpurple/protocols/simple/simple.c:1811
+#: ../libpurple/protocols/simple/simple.c:1913 ../libpurple/proxy.c:2211
 msgid "Unable to resolve hostname"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1929
+#: ../libpurple/protocols/simple/simple.c:1931
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1948
+#: ../libpurple/protocols/simple/simple.c:1950
 msgid "SIP connect server not specified"
 msgstr ""
 
@@ -13152,36 +13156,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2138
+#: ../libpurple/protocols/simple/simple.c:2140
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2139
+#: ../libpurple/protocols/simple/simple.c:2141
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2167
+#: ../libpurple/protocols/simple/simple.c:2169
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2173
+#: ../libpurple/protocols/simple/simple.c:2175
 msgid "Use UDP"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2175
+#: ../libpurple/protocols/simple/simple.c:2177
 msgid "Use proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2177 ../pidgin/gtkprefs.c:2804
+#: ../libpurple/protocols/simple/simple.c:2179 ../pidgin/gtkprefs.c:2809
 msgid "Proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2179
+#: ../libpurple/protocols/simple/simple.c:2181
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2181
+#: ../libpurple/protocols/simple/simple.c:2183
 msgid "Auth Domain"
 msgstr ""
 
@@ -13273,7 +13277,7 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:928
+#: ../libpurple/protocols/yahoo/libymsg.c:926
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
@@ -13312,38 +13316,38 @@
 msgstr ""
 
 #. Some error in the received stream
-#: ../libpurple/protocols/yahoo/libymsg.c:2017
-#: ../libpurple/protocols/yahoo/libymsg.c:2100
+#: ../libpurple/protocols/yahoo/libymsg.c:2016
+#: ../libpurple/protocols/yahoo/libymsg.c:2101
 msgid "Received invalid data"
 msgstr ""
 
 #. security lock from too many failed login attempts
-#: ../libpurple/protocols/yahoo/libymsg.c:2113
+#: ../libpurple/protocols/yahoo/libymsg.c:2114
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
 
 #. indicates a lock of some description
-#: ../libpurple/protocols/yahoo/libymsg.c:2124
+#: ../libpurple/protocols/yahoo/libymsg.c:2125
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
 
 #. indicates a lock due to logging in too frequently
-#: ../libpurple/protocols/yahoo/libymsg.c:2130
+#: ../libpurple/protocols/yahoo/libymsg.c:2131
 msgid ""
 "Account locked: You have been logging in too frequently.  Wait a few minutes "
 "before trying to connect again.  Logging into the Yahoo! website may help."
 msgstr ""
 
 #. username or password missing
-#: ../libpurple/protocols/yahoo/libymsg.c:2137
+#: ../libpurple/protocols/yahoo/libymsg.c:2138
 msgid "Username or password missing"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2256
+#: ../libpurple/protocols/yahoo/libymsg.c:2249
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13351,175 +13355,175 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2260
+#: ../libpurple/protocols/yahoo/libymsg.c:2253
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2351
+#: ../libpurple/protocols/yahoo/libymsg.c:2336
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2354
+#: ../libpurple/protocols/yahoo/libymsg.c:2339
 msgid "Ignore buddy?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2432
+#: ../libpurple/protocols/yahoo/libymsg.c:2417
 msgid "Invalid username or password"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2436
+#: ../libpurple/protocols/yahoo/libymsg.c:2421
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2443
+#: ../libpurple/protocols/yahoo/libymsg.c:2428
 msgid "Unknown error 52.  Reconnecting should fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2447
+#: ../libpurple/protocols/yahoo/libymsg.c:2432
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2453
+#: ../libpurple/protocols/yahoo/libymsg.c:2438
 #, c-format
 msgid ""
 "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2547
+#: ../libpurple/protocols/yahoo/libymsg.c:2532
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2550
+#: ../libpurple/protocols/yahoo/libymsg.c:2535
 msgid "Unable to add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3207
+#: ../libpurple/protocols/yahoo/libymsg.c:3194
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3553
+#: ../libpurple/protocols/yahoo/libymsg.c:3540
 msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3609
+#: ../libpurple/protocols/yahoo/libymsg.c:3596
 #, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3634
+#: ../libpurple/protocols/yahoo/libymsg.c:3621
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3851
+#: ../libpurple/protocols/yahoo/libymsg.c:3838
 msgid "Unable to connect: The server returned an empty response."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3885
+#: ../libpurple/protocols/yahoo/libymsg.c:3872
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4086
-#: ../libpurple/protocols/yahoo/libymsg.c:5117
+#: ../libpurple/protocols/yahoo/libymsg.c:4073
+#: ../libpurple/protocols/yahoo/libymsg.c:5104
 msgid "Not at Home"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4088
-#: ../libpurple/protocols/yahoo/libymsg.c:5120
+#: ../libpurple/protocols/yahoo/libymsg.c:4075
+#: ../libpurple/protocols/yahoo/libymsg.c:5107
 msgid "Not at Desk"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4090
-#: ../libpurple/protocols/yahoo/libymsg.c:5123
+#: ../libpurple/protocols/yahoo/libymsg.c:4077
+#: ../libpurple/protocols/yahoo/libymsg.c:5110
 msgid "Not in Office"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4094
-#: ../libpurple/protocols/yahoo/libymsg.c:5129
+#: ../libpurple/protocols/yahoo/libymsg.c:4081
+#: ../libpurple/protocols/yahoo/libymsg.c:5116
 msgid "On Vacation"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4098
-#: ../libpurple/protocols/yahoo/libymsg.c:5135
+#: ../libpurple/protocols/yahoo/libymsg.c:4085
+#: ../libpurple/protocols/yahoo/libymsg.c:5122
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4196
-#: ../libpurple/protocols/yahoo/libymsg.c:4227
+#: ../libpurple/protocols/yahoo/libymsg.c:4183
+#: ../libpurple/protocols/yahoo/libymsg.c:4214
 msgid "Not on server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4247
-#: ../libpurple/protocols/yahoo/libymsg.c:4341
+#: ../libpurple/protocols/yahoo/libymsg.c:4234
+#: ../libpurple/protocols/yahoo/libymsg.c:4328
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4263
+#: ../libpurple/protocols/yahoo/libymsg.c:4250
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4335
+#: ../libpurple/protocols/yahoo/libymsg.c:4322
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4394
+#: ../libpurple/protocols/yahoo/libymsg.c:4381
 msgid "Join in Chat"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4400
+#: ../libpurple/protocols/yahoo/libymsg.c:4387
 msgid "Initiate Conference"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4428
+#: ../libpurple/protocols/yahoo/libymsg.c:4415
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4433
+#: ../libpurple/protocols/yahoo/libymsg.c:4420
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4572
+#: ../libpurple/protocols/yahoo/libymsg.c:4559
 msgid "Select the ID you want to activate"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4583
+#: ../libpurple/protocols/yahoo/libymsg.c:4570
 msgid "Join whom in chat?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4599
+#: ../libpurple/protocols/yahoo/libymsg.c:4586
 msgid "Activate ID..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4603
+#: ../libpurple/protocols/yahoo/libymsg.c:4590
 msgid "Join User in Chat..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4608
+#: ../libpurple/protocols/yahoo/libymsg.c:4595
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4635
-#: ../libpurple/protocols/yahoo/libymsg.c:4732
+#: ../libpurple/protocols/yahoo/libymsg.c:4622
+#: ../libpurple/protocols/yahoo/libymsg.c:4719
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4665
-#: ../libpurple/protocols/yahoo/libymsg.c:4796
+#: ../libpurple/protocols/yahoo/libymsg.c:4652
+#: ../libpurple/protocols/yahoo/libymsg.c:4783
 msgid "Can't send SMS. Unknown mobile carrier."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4787
+#: ../libpurple/protocols/yahoo/libymsg.c:4774
 msgid "Getting mobile carrier to send the SMS."
 msgstr ""
 
@@ -13532,19 +13536,19 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:167
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:247
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1313
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1297
 msgid "Unable to connect."
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:346
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1217
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1978
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1201
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1949
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1863
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1840
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
@@ -13635,68 +13639,68 @@
 msgid "%s has declined to join."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:507
+#: ../libpurple/protocols/yahoo/yahoochat.c:506
 msgid "Failed to join chat"
 msgstr ""
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:510
+#: ../libpurple/protocols/yahoo/yahoochat.c:509
 msgid "Unknown room"
 msgstr ""
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:513
+#: ../libpurple/protocols/yahoo/yahoochat.c:512
 msgid "Maybe the room is full"
 msgstr ""
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:516
+#: ../libpurple/protocols/yahoo/yahoochat.c:515
 msgid "Not available"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:520
+#: ../libpurple/protocols/yahoo/yahoochat.c:519
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:603
 #, c-format
 msgid "You are now chatting in %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:834
+#: ../libpurple/protocols/yahoo/yahoochat.c:809
 msgid "Failed to join buddy in chat"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:835
+#: ../libpurple/protocols/yahoo/yahoochat.c:810
 msgid "Maybe they're not in a chat?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1530
-#: ../libpurple/protocols/yahoo/yahoochat.c:1556
+#: ../libpurple/protocols/yahoo/yahoochat.c:1505
+#: ../libpurple/protocols/yahoo/yahoochat.c:1531
 msgid "Fetching the room list failed."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1616
+#: ../libpurple/protocols/yahoo/yahoochat.c:1591
 msgid "Voices"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1619
+#: ../libpurple/protocols/yahoo/yahoochat.c:1594
 msgid "Webcams"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1630
-#: ../libpurple/protocols/yahoo/yahoochat.c:1701
+#: ../libpurple/protocols/yahoo/yahoochat.c:1605
+#: ../libpurple/protocols/yahoo/yahoochat.c:1676
 msgid "Connection problem"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1630
-#: ../libpurple/protocols/yahoo/yahoochat.c:1701
+#: ../libpurple/protocols/yahoo/yahoochat.c:1605
+#: ../libpurple/protocols/yahoo/yahoochat.c:1676
 msgid "Unable to fetch room list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1693
+#: ../libpurple/protocols/yahoo/yahoochat.c:1668
 msgid "User Rooms"
 msgstr ""
 
@@ -13710,100 +13714,100 @@
 "in the Account Editor)"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:755
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:800
-#: ../libpurple/protocols/zephyr/zephyr.c:1181
+#: ../libpurple/protocols/zephyr/zephyr.c:807
+#: ../libpurple/protocols/zephyr/zephyr.c:1191
 msgid "Hidden or not logged-in"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:806
-#: ../libpurple/protocols/zephyr/zephyr.c:1183
+#: ../libpurple/protocols/zephyr/zephyr.c:813
+#: ../libpurple/protocols/zephyr/zephyr.c:1193
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1506
-#: ../libpurple/protocols/zephyr/zephyr.c:1507
+#: ../libpurple/protocols/zephyr/zephyr.c:1518
+#: ../libpurple/protocols/zephyr/zephyr.c:1519
 msgid "Anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2357
+#: ../libpurple/protocols/zephyr/zephyr.c:2372
 msgid "_Class:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2363
+#: ../libpurple/protocols/zephyr/zephyr.c:2378
 msgid "_Instance:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2369
+#: ../libpurple/protocols/zephyr/zephyr.c:2384
 msgid "_Recipient:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2380
+#: ../libpurple/protocols/zephyr/zephyr.c:2395
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2698
+#: ../libpurple/protocols/zephyr/zephyr.c:2713
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2703
+#: ../libpurple/protocols/zephyr/zephyr.c:2718
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2708
+#: ../libpurple/protocols/zephyr/zephyr.c:2723
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2713
+#: ../libpurple/protocols/zephyr/zephyr.c:2728
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2718
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2724
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2729
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2735
+#: ../libpurple/protocols/zephyr/zephyr.c:2750
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to "
 "&lt;<i>class</i>,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2741
+#: ../libpurple/protocols/zephyr/zephyr.c:2756
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to "
 "&lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2747
+#: ../libpurple/protocols/zephyr/zephyr.c:2762
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to "
 "&lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2752
+#: ../libpurple/protocols/zephyr/zephyr.c:2767
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2828
+#: ../libpurple/protocols/zephyr/zephyr.c:2843
 msgid "Resubscribe"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2831
+#: ../libpurple/protocols/zephyr/zephyr.c:2846
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -13817,66 +13821,66 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2931
-#: ../libpurple/protocols/zephyr/zephyr.c:2933
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr ""
 
-#: ../libpurple/proxy.c:754 ../libpurple/proxy.c:816 ../libpurple/proxy.c:1269
-#: ../libpurple/proxy.c:1463 ../libpurple/proxy.c:2123
+#: ../libpurple/proxy.c:752 ../libpurple/proxy.c:807 ../libpurple/proxy.c:1254
+#: ../libpurple/proxy.c:1441 ../libpurple/proxy.c:2099
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:1002 ../libpurple/proxy.c:1023
+#: ../libpurple/proxy.c:989 ../libpurple/proxy.c:1010
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:1056 ../libpurple/proxy.c:1118
-#: ../libpurple/proxy.c:1147
+#: ../libpurple/proxy.c:1043 ../libpurple/proxy.c:1105
+#: ../libpurple/proxy.c:1134
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr ""
 
-#: ../libpurple/proxy.c:1143
+#: ../libpurple/proxy.c:1130
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
-#: ../libpurple/proxy.c:1343
+#: ../libpurple/proxy.c:1323
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
@@ -14042,99 +14046,99 @@
 msgid "%x %X"
 msgstr ""
 
-#: ../libpurple/util.c:3294
+#: ../libpurple/util.c:3309
 msgid "Calculating..."
 msgstr ""
 
-#: ../libpurple/util.c:3297
+#: ../libpurple/util.c:3312
 msgid "Unknown."
 msgstr ""
 
-#: ../libpurple/util.c:3323
+#: ../libpurple/util.c:3338
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3335
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3343
+#: ../libpurple/util.c:3358
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3349
+#: ../libpurple/util.c:3364
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3357
+#: ../libpurple/util.c:3372
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3363
+#: ../libpurple/util.c:3378
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3644
+#: ../libpurple/util.c:3659
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3694 ../libpurple/util.c:4228
+#: ../libpurple/util.c:3709 ../libpurple/util.c:4252
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3834
+#: ../libpurple/util.c:3858
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr ""
 
-#: ../libpurple/util.c:3901 ../libpurple/util.c:3921
+#: ../libpurple/util.c:3925 ../libpurple/util.c:3945
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3955
+#: ../libpurple/util.c:3979
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:4079
+#: ../libpurple/util.c:4103
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:4110 ../libpurple/util.c:4140 ../libpurple/util.c:4210
+#: ../libpurple/util.c:4134 ../libpurple/util.c:4164 ../libpurple/util.c:4234
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:5085
+#: ../libpurple/util.c:5129
 #, c-format
 msgid " - %s"
 msgstr ""
 
-#: ../libpurple/util.c:5091
+#: ../libpurple/util.c:5135
 #, c-format
 msgid " (%s)"
 msgstr ""
@@ -14176,87 +14180,87 @@
 "the old file has been renamed to %s~."
 msgstr ""
 
-#: ../pidgin.desktop.in.h:1
+#: ../pidgin/data/pidgin.desktop.in.h:1
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#: ../pidgin.desktop.in.h:2
+#: ../pidgin/data/pidgin.desktop.in.h:2
 msgid "Internet Messenger"
 msgstr ""
 
-#: ../pidgin.desktop.in.h:3
+#: ../pidgin/data/pidgin.desktop.in.h:3
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:448
+#: ../pidgin/gtkaccount.c:455
 msgid "Login Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:473
+#: ../pidgin/gtkaccount.c:480
 msgid "Pro_tocol:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:486 ../pidgin/gtkaccount.c:1129
+#: ../pidgin/gtkaccount.c:493 ../pidgin/gtkaccount.c:1136
 msgid "_Username:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:599
+#: ../pidgin/gtkaccount.c:606
 msgid "Remember pass_word"
 msgstr ""
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:654
+#: ../pidgin/gtkaccount.c:661
 msgid "User Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:667
+#: ../pidgin/gtkaccount.c:674
 msgid "_Local alias:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:671
+#: ../pidgin/gtkaccount.c:678
 msgid "New _mail notifications"
 msgstr ""
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:676
+#: ../pidgin/gtkaccount.c:683
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:808
+#: ../pidgin/gtkaccount.c:815
 msgid "Ad_vanced"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:993
+#: ../pidgin/gtkaccount.c:1000
 msgid "Use GNOME Proxy Settings"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:994
+#: ../pidgin/gtkaccount.c:1001
 msgid "Use Global Proxy Settings"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1000
+#: ../pidgin/gtkaccount.c:1007
 msgid "No Proxy"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2113
+#: ../pidgin/gtkaccount.c:1013 ../pidgin/gtkprefs.c:2119
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1012 ../pidgin/gtkprefs.c:2114
+#: ../pidgin/gtkaccount.c:1019 ../pidgin/gtkprefs.c:2120
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:2115
+#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:2121
 msgid "Tor/Privacy (SOCKS5)"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1024 ../pidgin/gtkprefs.c:2116
+#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:2122
 msgid "HTTP"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2117
+#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:2123
 msgid "Use Environmental Settings"
 msgstr ""
 
@@ -14265,73 +14269,73 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1075
+#: ../pidgin/gtkaccount.c:1082
 msgid "If you look real closely"
 msgstr ""
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1078
+#: ../pidgin/gtkaccount.c:1085
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1108
+#: ../pidgin/gtkaccount.c:1115
 msgid "Proxy _type:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1117 ../pidgin/gtkprefs.c:2133
+#: ../pidgin/gtkaccount.c:1124 ../pidgin/gtkprefs.c:2139
 msgid "_Host:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1121
+#: ../pidgin/gtkaccount.c:1128
 msgid "_Port:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1138 ../pidgin/gtkprefs.c:2185
+#: ../pidgin/gtkaccount.c:1145 ../pidgin/gtkprefs.c:2191
 msgid "Pa_ssword:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1207
+#: ../pidgin/gtkaccount.c:1214
 msgid "Use _silence suppression"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1212
+#: ../pidgin/gtkaccount.c:1219
 msgid "_Voice and Video"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1301
+#: ../pidgin/gtkaccount.c:1308
 msgid "Unable to save new account"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1302
+#: ../pidgin/gtkaccount.c:1309
 msgid "An account already exists with the specified criteria."
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1576
+#: ../pidgin/gtkaccount.c:1583
 msgid "Add Account"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1593
+#: ../pidgin/gtkaccount.c:1600
 msgid "_Basic"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1601
+#: ../pidgin/gtkaccount.c:1608
 msgid "Create _this new account on the server"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1618
+#: ../pidgin/gtkaccount.c:1625
 msgid "P_roxy"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2010 ../pidgin/gtkplugin.c:752
+#: ../pidgin/gtkaccount.c:2017 ../pidgin/gtkplugin.c:754
 #: ../pidgin/plugins/convcolors.c:343
 msgid "Enabled"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2038
+#: ../pidgin/gtkaccount.c:2045
 msgid "Protocol"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2225
+#: ../pidgin/gtkaccount.c:2232
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14345,19 +14349,19 @@
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2582
 #, c-format
 msgid ""
 "<a href=\"viewinfo\">%s</a>%s%s%s wants to add you (%s) to his or her buddy "
 "list%s%s"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2588
+#: ../pidgin/gtkaccount.c:2595
 #, c-format
 msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2622
+#: ../pidgin/gtkaccount.c:2629
 msgid "Send Instant Message"
 msgstr ""
 
@@ -14539,8 +14543,8 @@
 msgid "Room _List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1404 ../pidgin/gtkprivacy.c:537
-#: ../pidgin/gtkprivacy.c:551
+#: ../pidgin/gtkblist.c:1404 ../pidgin/gtkprivacy.c:538
+#: ../pidgin/gtkprivacy.c:552
 msgid "_Block"
 msgstr ""
 
@@ -14755,7 +14759,7 @@
 msgid "/_Accounts"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3626 ../pidgin/gtkblist.c:8018
+#: ../pidgin/gtkblist.c:3626 ../pidgin/gtkblist.c:8021
 msgid "/Accounts/Manage Accounts"
 msgstr ""
 
@@ -15044,96 +15048,96 @@
 msgid "/Buddies/Show/Protocol Icons"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7094
+#: ../pidgin/gtkblist.c:7097
 msgid "Add a buddy.\n"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7109
+#: ../pidgin/gtkblist.c:7112
 msgid "Buddy's _username:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7126
+#: ../pidgin/gtkblist.c:7129
 msgid "(Optional) A_lias:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7137
+#: ../pidgin/gtkblist.c:7140
 msgid "(Optional) _Invite message:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7142
+#: ../pidgin/gtkblist.c:7145
 msgid "Add buddy to _group:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7247
+#: ../pidgin/gtkblist.c:7250
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7263
+#: ../pidgin/gtkblist.c:7266
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7272
+#: ../pidgin/gtkblist.c:7275
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7293
+#: ../pidgin/gtkblist.c:7296
 msgid "A_lias:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7300
+#: ../pidgin/gtkblist.c:7303
 msgid "_Group:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7304
+#: ../pidgin/gtkblist.c:7307
 msgid "Auto_join when account connects."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7305
+#: ../pidgin/gtkblist.c:7308
 msgid "_Remain in chat after window is closed."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7328
+#: ../pidgin/gtkblist.c:7331
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8032
+#: ../pidgin/gtkblist.c:8035
 msgid "Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8037
+#: ../pidgin/gtkblist.c:8040
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8091
+#: ../pidgin/gtkblist.c:8094
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8112
+#: ../pidgin/gtkblist.c:8115
 msgid "_Edit Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8130
+#: ../pidgin/gtkblist.c:8133
 msgid "Set _Mood..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8140 ../pidgin/gtkconv.c:3345
+#: ../pidgin/gtkblist.c:8143 ../pidgin/gtkconv.c:3345
 #: ../pidgin/gtkimhtml.c:1862
 msgid "No actions available"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8147
+#: ../pidgin/gtkblist.c:8150
 msgid "_Disable"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8165
+#: ../pidgin/gtkblist.c:8168
 msgid "/Tools"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8236
+#: ../pidgin/gtkblist.c:8239
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
@@ -15460,7 +15464,7 @@
 msgstr ""
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3885 ../pidgin/gtkconv.c:8615
+#: ../pidgin/gtkconv.c:3885 ../pidgin/gtkconv.c:8618
 msgid "S_end To"
 msgstr ""
 
@@ -15481,84 +15485,84 @@
 msgid "Find:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6173 ../pidgin/gtkconv.c:6291
+#: ../pidgin/gtkconv.c:6176 ../pidgin/gtkconv.c:6294
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkconv.c:6824
+#: ../pidgin/gtkconv.c:6827
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6827
+#: ../pidgin/gtkconv.c:6830
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6830
+#: ../pidgin/gtkconv.c:6833
 msgid "Unread Messages"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6836
+#: ../pidgin/gtkconv.c:6839
 msgid "New Event"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7602
+#: ../pidgin/gtkconv.c:7605
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will "
 "automatically rejoin the chat when the account reconnects."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8093
+#: ../pidgin/gtkconv.c:8096
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8298
+#: ../pidgin/gtkconv.c:8301
 msgid "Confirm close"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8330
+#: ../pidgin/gtkconv.c:8333
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8953
+#: ../pidgin/gtkconv.c:8956
 msgid "Close other tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8959
+#: ../pidgin/gtkconv.c:8962
 msgid "Close all tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8967
+#: ../pidgin/gtkconv.c:8970
 msgid "Detach this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8973
+#: ../pidgin/gtkconv.c:8976
 msgid "Close this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9478
+#: ../pidgin/gtkconv.c:9481
 msgid "Close conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:10068
+#: ../pidgin/gtkconv.c:10071
 msgid "Last created window"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:10070
+#: ../pidgin/gtkconv.c:10073
 msgid "Separate IM and Chat windows"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:10072 ../pidgin/gtkprefs.c:2009
+#: ../pidgin/gtkconv.c:10075 ../pidgin/gtkprefs.c:2015
 msgid "New window"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:10074
+#: ../pidgin/gtkconv.c:10077
 msgid "By group"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:10076
+#: ../pidgin/gtkconv.c:10079
 msgid "By account"
 msgstr ""
 
@@ -15693,7 +15697,7 @@
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:273
 msgid "Arabic"
 msgstr ""
 
@@ -15710,13 +15714,13 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
-#: ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:274
 msgid "Bulgarian"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:267
-#: ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:275
+#: ../pidgin/gtkdialogs.c:276
 msgid "Bengali"
 msgstr ""
 
@@ -15724,30 +15728,31 @@
 msgid "Bengali-India"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Bosnian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:269
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:277
+#: ../pidgin/gtkdialogs.c:278
 msgid "Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
 msgid "Valencian-Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:271
-#: ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:279
+#: ../pidgin/gtkdialogs.c:280
 msgid "Czech"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:281
+#: ../pidgin/gtkdialogs.c:282
 msgid "Danish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:273
-#: ../pidgin/gtkdialogs.c:274
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:283
+#: ../pidgin/gtkdialogs.c:284
 msgid "German"
 msgstr ""
 
@@ -15760,11 +15765,11 @@
 msgid "Greek"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:285
 msgid "Australian English"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:275
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:286
 msgid "British English"
 msgstr ""
 
@@ -15776,72 +15781,72 @@
 msgid "Esperanto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:276
-#: ../pidgin/gtkdialogs.c:277 ../pidgin/gtkdialogs.c:278
-#: ../pidgin/gtkdialogs.c:279
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:287
+#: ../pidgin/gtkdialogs.c:288 ../pidgin/gtkdialogs.c:289
+#: ../pidgin/gtkdialogs.c:290
 msgid "Spanish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Estonian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:280
-#: ../pidgin/gtkdialogs.c:281
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:291
+#: ../pidgin/gtkdialogs.c:292
 msgid "Basque"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Persian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:282
-#: ../pidgin/gtkdialogs.c:283
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:293
+#: ../pidgin/gtkdialogs.c:294
 msgid "Finnish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:284
-#: ../pidgin/gtkdialogs.c:285 ../pidgin/gtkdialogs.c:286
-#: ../pidgin/gtkdialogs.c:287
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:295
+#: ../pidgin/gtkdialogs.c:296 ../pidgin/gtkdialogs.c:297
+#: ../pidgin/gtkdialogs.c:298
 msgid "French"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
 msgid "Irish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:288
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:299
 msgid "Galician"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193
 msgid "Gujarati"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193
 msgid "Gujarati Language Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:289
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:300
 msgid "Hebrew"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:290
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:301
 msgid "Hindi"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197
 msgid "Croatian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:291
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:302
 msgid "Hungarian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:303
 msgid "Armenian"
 msgstr ""
 
@@ -15849,17 +15854,17 @@
 msgid "Indonesian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:292
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:304
 msgid "Italian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:293
-#: ../pidgin/gtkdialogs.c:294 ../pidgin/gtkdialogs.c:295
-#: ../pidgin/gtkdialogs.c:296
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:305
+#: ../pidgin/gtkdialogs.c:306 ../pidgin/gtkdialogs.c:307
+#: ../pidgin/gtkdialogs.c:308
 msgid "Japanese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:297
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:309
 msgid "Georgian"
 msgstr ""
 
@@ -15867,215 +15872,216 @@
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Khmer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:205
 msgid "Kannada"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:205
 msgid "Kannada Translation team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:298
-#: ../pidgin/gtkdialogs.c:299
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:310
+#: ../pidgin/gtkdialogs.c:311
 msgid "Korean"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:210
 msgid "Kurdish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:312
 msgid "Lao"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:300
-#: ../pidgin/gtkdialogs.c:301 ../pidgin/gtkdialogs.c:302
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:313
+#: ../pidgin/gtkdialogs.c:314 ../pidgin/gtkdialogs.c:315
 msgid "Lithuanian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
 msgid "Maithili"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:216
 msgid "Meadow Mari"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:303
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:316
 msgid "Macedonian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:220
 msgid "Malayalam"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:221
 msgid "Mongolian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:222
 msgid "Marathi"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:317
 msgid "Malay"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:223
 msgid "Burmese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:304
-#: ../pidgin/gtkdialogs.c:305 ../pidgin/gtkdialogs.c:306
+#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:318
+#: ../pidgin/gtkdialogs.c:319 ../pidgin/gtkdialogs.c:320
+#: ../pidgin/gtkdialogs.c:321
 msgid "Bokmål Norwegian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:225
 msgid "Nepali"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:307
+#: ../pidgin/gtkdialogs.c:226 ../pidgin/gtkdialogs.c:322
 msgid "Dutch, Flemish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:227
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:323
 msgid "Occitan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:229
 msgid "Oriya"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:230
 msgid "Punjabi"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:308
-#: ../pidgin/gtkdialogs.c:309 ../pidgin/gtkdialogs.c:310
-#: ../pidgin/gtkdialogs.c:311 ../pidgin/gtkdialogs.c:312
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:324
+#: ../pidgin/gtkdialogs.c:325 ../pidgin/gtkdialogs.c:326
+#: ../pidgin/gtkdialogs.c:327 ../pidgin/gtkdialogs.c:328
 msgid "Polish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:313
+#: ../pidgin/gtkdialogs.c:232 ../pidgin/gtkdialogs.c:329
 msgid "Portuguese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:314
-#: ../pidgin/gtkdialogs.c:315
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:330
+#: ../pidgin/gtkdialogs.c:331
 msgid "Portuguese-Brazil"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:234
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
 msgid "Romanian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:316
-#: ../pidgin/gtkdialogs.c:317 ../pidgin/gtkdialogs.c:318
+#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:332
+#: ../pidgin/gtkdialogs.c:333 ../pidgin/gtkdialogs.c:334
 msgid "Russian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:319 ../pidgin/gtkdialogs.c:320
-#: ../pidgin/gtkdialogs.c:321
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:335 ../pidgin/gtkdialogs.c:336
+#: ../pidgin/gtkdialogs.c:337
 msgid "Slovak"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:238 ../pidgin/gtkdialogs.c:322
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:338
 msgid "Slovenian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:242
 msgid "Albanian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:323
-#: ../pidgin/gtkdialogs.c:324
+#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:340
 msgid "Serbian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:244
 msgid "Serbian Latin"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
 msgid "Sinhala"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:325
-#: ../pidgin/gtkdialogs.c:326
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:341
+#: ../pidgin/gtkdialogs.c:342 ../pidgin/gtkdialogs.c:343
 msgid "Swedish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:248
 msgid "Swahili"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:246 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
 msgid "Tamil"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:248 ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:344
 msgid "Telugu"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:252
 msgid "Thai"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:254
 msgid "Ukranian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:255
 msgid "Urdu"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:252 ../pidgin/gtkdialogs.c:330
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:347
 msgid "Vietnamese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:331
-#: ../pidgin/gtkdialogs.c:332
+#: ../pidgin/gtkdialogs.c:261 ../pidgin/gtkdialogs.c:348
+#: ../pidgin/gtkdialogs.c:349
 msgid "Simplified Chinese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:264
 msgid "Hong Kong Chinese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:257 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:333
+#: ../pidgin/gtkdialogs.c:265 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:350
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:272
 msgid "Amharic"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:328 ../pidgin/gtkdialogs.c:329
+#: ../pidgin/gtkdialogs.c:345 ../pidgin/gtkdialogs.c:346
 msgid "Turkish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:330
+#: ../pidgin/gtkdialogs.c:347
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:508
+#: ../pidgin/gtkdialogs.c:525
 #, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
@@ -16086,7 +16092,7 @@
 " There is no warranty for %s.<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:535
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A "
@@ -16095,7 +16101,7 @@
 "devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:532
+#: ../pidgin/gtkdialogs.c:549
 msgid ""
 "<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
 "e-mailing <a "
@@ -16107,114 +16113,114 @@
 "responses may be less helpful.<br/>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:542
+#: ../pidgin/gtkdialogs.c:559
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:564
+#: ../pidgin/gtkdialogs.c:581
 msgid "Build Information"
 msgstr ""
 
 #. End of not to be translated section
-#: ../pidgin/gtkdialogs.c:733
+#: ../pidgin/gtkdialogs.c:746
 #, c-format
 msgid "%s Build Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:754
+#: ../pidgin/gtkdialogs.c:767
 msgid "Current Developers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:760
+#: ../pidgin/gtkdialogs.c:773
 msgid "Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:766
+#: ../pidgin/gtkdialogs.c:779
 msgid "Retired Developers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:785
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:775
+#: ../pidgin/gtkdialogs.c:788
 #, c-format
 msgid "%s Developer Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:796
+#: ../pidgin/gtkdialogs.c:809
 msgid "Current Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:802
+#: ../pidgin/gtkdialogs.c:815
 msgid "Past Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:805
+#: ../pidgin/gtkdialogs.c:818
 #, c-format
 msgid "%s Translator Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:816
+#: ../pidgin/gtkdialogs.c:829
 #, c-format
 msgid "%s Plugin Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:825
+#: ../pidgin/gtkdialogs.c:838
 msgid "Plugin Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:881 ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1101
+#: ../pidgin/gtkdialogs.c:894 ../pidgin/gtkdialogs.c:1033
+#: ../pidgin/gtkdialogs.c:1114
 msgid "_Name"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:886 ../pidgin/gtkdialogs.c:1025
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:899 ../pidgin/gtkdialogs.c:1038
+#: ../pidgin/gtkdialogs.c:1119
 msgid "_Account"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1033
+#: ../pidgin/gtkdialogs.c:1046
 msgid "Get User Info"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1035
+#: ../pidgin/gtkdialogs.c:1048
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1125
+#: ../pidgin/gtkdialogs.c:1138
 msgid "View User Log"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1160
 msgid "Alias Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1161
 msgid "Enter an alias for this contact."
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1170
+#: ../pidgin/gtkdialogs.c:1183
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1172
+#: ../pidgin/gtkdialogs.c:1185
 msgid "Alias Buddy"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1193
+#: ../pidgin/gtkdialogs.c:1206
 msgid "Alias Chat"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1194
+#: ../pidgin/gtkdialogs.c:1207
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1246
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -16225,70 +16231,70 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkdialogs.c:1241
+#: ../pidgin/gtkdialogs.c:1254
 msgid "Remove Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1244
+#: ../pidgin/gtkdialogs.c:1257
 msgid "_Remove Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1275
+#: ../pidgin/gtkdialogs.c:1288
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1282
+#: ../pidgin/gtkdialogs.c:1295
 msgid "Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1285
+#: ../pidgin/gtkdialogs.c:1298
 msgid "_Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1335
+#: ../pidgin/gtkdialogs.c:1348
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1338
+#: ../pidgin/gtkdialogs.c:1351
 msgid "Remove Group"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1341
+#: ../pidgin/gtkdialogs.c:1354
 msgid "_Remove Group"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1374
+#: ../pidgin/gtkdialogs.c:1387
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1377
+#: ../pidgin/gtkdialogs.c:1390
 msgid "Remove Buddy"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1380
+#: ../pidgin/gtkdialogs.c:1393
 msgid "_Remove Buddy"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1401
+#: ../pidgin/gtkdialogs.c:1414
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1404
+#: ../pidgin/gtkdialogs.c:1417
 msgid "Remove Chat"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1407
+#: ../pidgin/gtkdialogs.c:1420
 msgid "_Remove Chat"
 msgstr ""
 
@@ -16356,25 +16362,25 @@
 msgid "<b>Sending As:</b>"
 msgstr ""
 
-#: ../pidgin/gtkft.c:474 ../pidgin/gtkutils.c:3296
+#: ../pidgin/gtkft.c:474 ../pidgin/gtkutils.c:3304
 msgid "There is no application configured to open this type of file."
 msgstr ""
 
-#: ../pidgin/gtkft.c:479 ../pidgin/gtkutils.c:3301
+#: ../pidgin/gtkft.c:479 ../pidgin/gtkutils.c:3309
 msgid "An error occurred while opening the file."
 msgstr ""
 
-#: ../pidgin/gtkft.c:516 ../pidgin/gtkutils.c:3337
+#: ../pidgin/gtkft.c:516 ../pidgin/gtkutils.c:3345
 #, c-format
 msgid "Error launching %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkft.c:525 ../pidgin/gtkutils.c:3345
+#: ../pidgin/gtkft.c:525 ../pidgin/gtkutils.c:3353
 #, c-format
 msgid "Error running %s"
 msgstr ""
 
-#: ../pidgin/gtkft.c:526 ../pidgin/gtkutils.c:3346
+#: ../pidgin/gtkft.c:526 ../pidgin/gtkutils.c:3354
 #, c-format
 msgid "Process returned error code %d"
 msgstr ""
@@ -16844,7 +16850,7 @@
 msgid "display the current version and exit"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:497
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16861,42 +16867,42 @@
 "%swiki/GetABacktrace\n"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:781
+#: ../pidgin/gtkmain.c:785
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:271
+#: ../pidgin/gtkmedia.c:273
 msgid "_Media"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:272
+#: ../pidgin/gtkmedia.c:274
 msgid "_Hangup"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:632
+#: ../pidgin/gtkmedia.c:637
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:638
+#: ../pidgin/gtkmedia.c:643
 #, c-format
 msgid "%s wishes to start a video session with you."
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:644
+#: ../pidgin/gtkmedia.c:649
 msgid "Incoming Call"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:792
+#: ../pidgin/gtkmedia.c:962
 msgid "_Hold"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:863 ../pidgin/pidginstock.c:92
+#: ../pidgin/gtkmedia.c:1033 ../pidgin/pidginstock.c:92
 msgid "_Pause"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:881
+#: ../pidgin/gtkmedia.c:1051
 msgid "_Mute"
 msgstr ""
 
@@ -16998,27 +17004,27 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:591
+#: ../pidgin/gtkplugin.c:593
 msgid "Author"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:669
+#: ../pidgin/gtkplugin.c:671
 msgid "<b>Written by:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:689
+#: ../pidgin/gtkplugin.c:691
 msgid "<b>Web site:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:698
+#: ../pidgin/gtkplugin.c:700
 msgid "<b>Filename:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:725
+#: ../pidgin/gtkplugin.c:727
 msgid "Configure Pl_ugin"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:787
+#: ../pidgin/gtkplugin.c:789
 msgid "<b>Plugin Details</b>"
 msgstr ""
 
@@ -17112,7 +17118,7 @@
 msgid "Br_owse..."
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:699 ../pidgin/gtkprefs.c:2654
+#: ../pidgin/gtkpounce.c:699 ../pidgin/gtkprefs.c:2660
 msgid "Pre_view"
 msgstr ""
 
@@ -17197,556 +17203,556 @@
 msgid "Theme failed to unpack."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:740 ../pidgin/gtkprefs.c:781
+#: ../pidgin/gtkprefs.c:743 ../pidgin/gtkprefs.c:787
 msgid "Theme failed to load."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:784
+#: ../pidgin/gtkprefs.c:790
 msgid "Theme failed to copy."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1085
+#: ../pidgin/gtkprefs.c:1091
 msgid "Theme Selections"
 msgstr ""
 
 #. Instructions
-#: ../pidgin/gtkprefs.c:1088
+#: ../pidgin/gtkprefs.c:1094
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1102
+#: ../pidgin/gtkprefs.c:1108
 msgid "Buddy List Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1114
 msgid "Status Icon Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1120
 msgid "Sound Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1120
+#: ../pidgin/gtkprefs.c:1126
 msgid "Smiley Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1293
+#: ../pidgin/gtkprefs.c:1299
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1313
+#: ../pidgin/gtkprefs.c:1319
 msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
 #. System Tray
-#: ../pidgin/gtkprefs.c:1344
+#: ../pidgin/gtkprefs.c:1350
 msgid "System Tray Icon"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1345
+#: ../pidgin/gtkprefs.c:1351
 msgid "_Show system tray icon:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1348
+#: ../pidgin/gtkprefs.c:1354
 msgid "On unread messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1354
+#: ../pidgin/gtkprefs.c:1360
 msgid "Conversation Window"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1361
 msgid "_Hide new IM conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1358 ../pidgin/gtkprefs.c:2750
+#: ../pidgin/gtkprefs.c:1364 ../pidgin/gtkprefs.c:2755
 msgid "When away"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1371
 msgid "Minimi_ze new conversation windows"
 msgstr ""
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:1369
+#: ../pidgin/gtkprefs.c:1375
 msgid "Tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1371
+#: ../pidgin/gtkprefs.c:1377
 msgid "Show IMs and chats in _tabbed windows"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1385
+#: ../pidgin/gtkprefs.c:1391
 msgid "Show close b_utton on tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1388
+#: ../pidgin/gtkprefs.c:1394
 msgid "_Placement:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1390
+#: ../pidgin/gtkprefs.c:1396
 msgid "Top"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1391
+#: ../pidgin/gtkprefs.c:1397
 msgid "Bottom"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1392
+#: ../pidgin/gtkprefs.c:1398
 msgid "Left"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1393
+#: ../pidgin/gtkprefs.c:1399
 msgid "Right"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1400
 msgid "Left Vertical"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1401
 msgid "Right Vertical"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1407
 msgid "N_ew conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1471
+#: ../pidgin/gtkprefs.c:1477
 msgid "Show _formatting on incoming messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1473
+#: ../pidgin/gtkprefs.c:1479
 msgid "Close IMs immediately when the tab is closed"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1482
 msgid "Show _detailed information"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1478
+#: ../pidgin/gtkprefs.c:1484
 msgid "Enable buddy ic_on animation"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1485
+#: ../pidgin/gtkprefs.c:1491
 msgid "_Notify buddies that you are typing to them"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1488
+#: ../pidgin/gtkprefs.c:1494
 msgid "Highlight _misspelled words"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1492
+#: ../pidgin/gtkprefs.c:1498
 msgid "Use smooth-scrolling"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1495
+#: ../pidgin/gtkprefs.c:1501
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1499
+#: ../pidgin/gtkprefs.c:1505
 msgid "Resize incoming custom smileys"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1503
+#: ../pidgin/gtkprefs.c:1509
 msgid "Maximum size:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1517
+#: ../pidgin/gtkprefs.c:1523
 msgid "Minimum input area height in lines:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1531
 msgid "Font"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1533
 msgid "Use font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1538
+#: ../pidgin/gtkprefs.c:1544
 msgid "Conversation _font:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1548
+#: ../pidgin/gtkprefs.c:1554
 msgid "Default Formatting"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1566
+#: ../pidgin/gtkprefs.c:1572
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1676
+#: ../pidgin/gtkprefs.c:1682
 msgid "Cannot start proxy configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1689
+#: ../pidgin/gtkprefs.c:1695
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1730
 msgid "Disabled"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1726
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1758
 msgid "ST_UN server:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1770
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1779
+#: ../pidgin/gtkprefs.c:1785
 msgid "Public _IP:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1791
+#: ../pidgin/gtkprefs.c:1797
 msgid "Ports"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1794
+#: ../pidgin/gtkprefs.c:1800
 msgid "_Enable automatic router port forwarding"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1805
 msgid "_Manually specify range of ports to listen on:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1802
+#: ../pidgin/gtkprefs.c:1808
 msgid "_Start:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1815
 msgid "_End:"
 msgstr ""
 
 #. TURN server
-#: ../pidgin/gtkprefs.c:1821
+#: ../pidgin/gtkprefs.c:1827
 msgid "Relay Server (TURN)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1831
+#: ../pidgin/gtkprefs.c:1837
 msgid "_TURN server:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1834
+#: ../pidgin/gtkprefs.c:1840
 msgid "_UDP Port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1843
 msgid "T_CP Port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1840
+#: ../pidgin/gtkprefs.c:1846
 msgid "Use_rname:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1842
+#: ../pidgin/gtkprefs.c:1848
 msgid "Pass_word:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1873
+#: ../pidgin/gtkprefs.c:1879
 msgid "Seamonkey"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1880
 msgid "Opera"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1875
+#: ../pidgin/gtkprefs.c:1881
 msgid "Netscape"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1882
 msgid "Mozilla"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1877
+#: ../pidgin/gtkprefs.c:1883
 msgid "Konqueror"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1884
 msgid "Google Chrome"
 msgstr ""
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
-#: ../pidgin/gtkprefs.c:1881
+#: ../pidgin/gtkprefs.c:1887
 msgid "Desktop Default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1882
+#: ../pidgin/gtkprefs.c:1888
 msgid "GNOME Default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1883
+#: ../pidgin/gtkprefs.c:1889
 msgid "Galeon"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1884
+#: ../pidgin/gtkprefs.c:1890
 msgid "Firefox"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1885
+#: ../pidgin/gtkprefs.c:1891
 msgid "Firebird"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1886
+#: ../pidgin/gtkprefs.c:1892
 msgid "Epiphany"
 msgstr ""
 
 #. Translators: please do not translate "chromium-browser" here!
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1894
 msgid "Chromium (chromium-browser)"
 msgstr ""
 
 #. Translators: please do not translate "chrome" here!
-#: ../pidgin/gtkprefs.c:1890
+#: ../pidgin/gtkprefs.c:1896
 msgid "Chromium (chrome)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1899
+#: ../pidgin/gtkprefs.c:1905
 msgid "Manual"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1956
+#: ../pidgin/gtkprefs.c:1962
 msgid "Browser Selection"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1962
+#: ../pidgin/gtkprefs.c:1968
 msgid "Browser preferences are configured in GNOME preferences"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1987
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1984
+#: ../pidgin/gtkprefs.c:1990
 msgid "Configure _Browser"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1997
+#: ../pidgin/gtkprefs.c:2003
 msgid "_Browser:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2005
+#: ../pidgin/gtkprefs.c:2011
 msgid "_Open link in:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2007
+#: ../pidgin/gtkprefs.c:2013
 msgid "Browser default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2008
+#: ../pidgin/gtkprefs.c:2014
 msgid "Existing window"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2010
+#: ../pidgin/gtkprefs.c:2016
 msgid "New tab"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2033
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2059
+#: ../pidgin/gtkprefs.c:2065
 msgid "Proxy Server"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2066
+#: ../pidgin/gtkprefs.c:2072
 msgid "Proxy preferences are configured in GNOME preferences"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2088
+#: ../pidgin/gtkprefs.c:2094
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2091
+#: ../pidgin/gtkprefs.c:2097
 msgid "Configure _Proxy"
 msgstr ""
 
 #. This is a global option that affects SOCKS4 usage even with
 #. * account-specific proxy settings
-#: ../pidgin/gtkprefs.c:2106
+#: ../pidgin/gtkprefs.c:2112
 msgid "Use remote _DNS with SOCKS4 proxies"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2110
+#: ../pidgin/gtkprefs.c:2116
 msgid "Proxy t_ype:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2112
+#: ../pidgin/gtkprefs.c:2118
 msgid "No proxy"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2151
+#: ../pidgin/gtkprefs.c:2157
 msgid "P_ort:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2167
+#: ../pidgin/gtkprefs.c:2173
 msgid "User_name:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2228
+#: ../pidgin/gtkprefs.c:2234
 msgid "Log _format:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2233
+#: ../pidgin/gtkprefs.c:2239
 msgid "Log all _instant messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2235
+#: ../pidgin/gtkprefs.c:2241
 msgid "Log all c_hats"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2237
+#: ../pidgin/gtkprefs.c:2243
 msgid "Log all _status changes to system log"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2394
+#: ../pidgin/gtkprefs.c:2400
 msgid "Sound Selection"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2405
+#: ../pidgin/gtkprefs.c:2411
 #, c-format
 msgid "Quietest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2407
+#: ../pidgin/gtkprefs.c:2413
 #, c-format
 msgid "Quieter"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2409
+#: ../pidgin/gtkprefs.c:2415
 #, c-format
 msgid "Quiet"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2413
+#: ../pidgin/gtkprefs.c:2419
 #, c-format
 msgid "Loud"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2415
+#: ../pidgin/gtkprefs.c:2421
 #, c-format
 msgid "Louder"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2417
+#: ../pidgin/gtkprefs.c:2423
 #, c-format
 msgid "Loudest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2509
+#: ../pidgin/gtkprefs.c:2515
 msgid "_Method:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2511
+#: ../pidgin/gtkprefs.c:2517
 msgid "Console beep"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2518
+#: ../pidgin/gtkprefs.c:2524
 msgid "No sounds"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2531
+#: ../pidgin/gtkprefs.c:2537
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2539
+#: ../pidgin/gtkprefs.c:2545
 msgid "M_ute sounds"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2542
+#: ../pidgin/gtkprefs.c:2548
 msgid "Sounds when conversation has _focus"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2544
+#: ../pidgin/gtkprefs.c:2550
 msgid "_Enable sounds:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2561
+#: ../pidgin/gtkprefs.c:2567
 msgid "V_olume:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2622
+#: ../pidgin/gtkprefs.c:2628
 msgid "Play"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2650
+#: ../pidgin/gtkprefs.c:2656
 msgid "_Browse..."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2658
+#: ../pidgin/gtkprefs.c:2664
 msgid "_Reset"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2711
+#: ../pidgin/gtkprefs.c:2716
 msgid "_Report idle time:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2716
+#: ../pidgin/gtkprefs.c:2721
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2723
+#: ../pidgin/gtkprefs.c:2728
 msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2729
+#: ../pidgin/gtkprefs.c:2734
 msgid "Change to this status when _idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2747
+#: ../pidgin/gtkprefs.c:2752
 msgid "_Auto-reply:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2751
+#: ../pidgin/gtkprefs.c:2756
 msgid "When both away and idle"
 msgstr ""
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2757
+#: ../pidgin/gtkprefs.c:2762
 msgid "Status at Startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2759
+#: ../pidgin/gtkprefs.c:2764
 msgid "Use status from last _exit at startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2768
+#: ../pidgin/gtkprefs.c:2773
 msgid "Status to a_pply at startup:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2792
+#: ../pidgin/gtkprefs.c:2797
 msgid "Interface"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2798
+#: ../pidgin/gtkprefs.c:2803
 msgid "Browser"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2807
+#: ../pidgin/gtkprefs.c:2812
 msgid "Status / Idle"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2808
+#: ../pidgin/gtkprefs.c:2813
 msgid "Themes"
 msgstr ""
 
@@ -17770,67 +17776,67 @@
 msgid "Block only the users below"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:343
+#: ../pidgin/gtkprivacy.c:344
 msgid "Privacy"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:353
+#: ../pidgin/gtkprivacy.c:354
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:362
+#: ../pidgin/gtkprivacy.c:363
 msgid "Set privacy for:"
 msgstr ""
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:405
+#: ../pidgin/gtkprivacy.c:406
 msgid "Remove Al_l"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:491 ../pidgin/gtkprivacy.c:508
+#: ../pidgin/gtkprivacy.c:492 ../pidgin/gtkprivacy.c:509
 msgid "Permit User"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:492
+#: ../pidgin/gtkprivacy.c:493
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:493
+#: ../pidgin/gtkprivacy.c:494
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:496 ../pidgin/gtkprivacy.c:512
+#: ../pidgin/gtkprivacy.c:497 ../pidgin/gtkprivacy.c:513
 msgid "_Permit"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:502
+#: ../pidgin/gtkprivacy.c:503
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:504
+#: ../pidgin/gtkprivacy.c:505
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:533 ../pidgin/gtkprivacy.c:547
+#: ../pidgin/gtkprivacy.c:534 ../pidgin/gtkprivacy.c:548
 msgid "Block User"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:534
+#: ../pidgin/gtkprivacy.c:535
 msgid "Type a user to block."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:535
+#: ../pidgin/gtkprivacy.c:536
 msgid "Please enter the name of the user you wish to block."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:543
+#: ../pidgin/gtkprivacy.c:544
 #, c-format
 msgid "Block %s?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:545
+#: ../pidgin/gtkprivacy.c:546
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
@@ -17839,23 +17845,23 @@
 msgid "Apply"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1578
 msgid "That file already exists"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1579
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1582
 msgid "Overwrite"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1557
+#: ../pidgin/gtkrequest.c:1583
 msgid "Choose New Name"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1656
+#: ../pidgin/gtkrequest.c:1684
 msgid "Select Folder..."
 msgstr ""
 
@@ -17952,7 +17958,7 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:322
+#: ../pidgin/gtkstatusbox.c:323
 msgid "Select Buddy Icon"
 msgstr ""
 
@@ -17988,61 +17994,61 @@
 msgid "Facebook (XMPP)"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1475 ../pidgin/gtkutils.c:1504
+#: ../pidgin/gtkutils.c:1483 ../pidgin/gtkutils.c:1512
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1478 ../pidgin/gtkutils.c:1506
+#: ../pidgin/gtkutils.c:1486 ../pidgin/gtkutils.c:1514
 msgid "Failed to load image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1582
+#: ../pidgin/gtkutils.c:1590
 #, c-format
 msgid "Cannot send folder %s."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1583
+#: ../pidgin/gtkutils.c:1591
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1616 ../pidgin/gtkutils.c:1628
-#: ../pidgin/gtkutils.c:1635
+#: ../pidgin/gtkutils.c:1624 ../pidgin/gtkutils.c:1636
+#: ../pidgin/gtkutils.c:1643
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1617
+#: ../pidgin/gtkutils.c:1625
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1623 ../pidgin/gtkutils.c:1643
+#: ../pidgin/gtkutils.c:1631 ../pidgin/gtkutils.c:1651
 msgid "Set as buddy icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1624 ../pidgin/gtkutils.c:1644
+#: ../pidgin/gtkutils.c:1632 ../pidgin/gtkutils.c:1652
 msgid "Send image file"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1625 ../pidgin/gtkutils.c:1644
+#: ../pidgin/gtkutils.c:1633 ../pidgin/gtkutils.c:1652
 msgid "Insert in message"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1629
+#: ../pidgin/gtkutils.c:1637
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1636
+#: ../pidgin/gtkutils.c:1644
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1637
+#: ../pidgin/gtkutils.c:1645
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -18056,17 +18062,17 @@
 #. * nothing else? Probably not.  I'll just give an error and
 #. * return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1694
+#: ../pidgin/gtkutils.c:1702
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1695
+#: ../pidgin/gtkutils.c:1703
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2275
+#: ../pidgin/gtkutils.c:2283
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -18074,48 +18080,48 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2520
+#: ../pidgin/gtkutils.c:2528
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2522
+#: ../pidgin/gtkutils.c:2530
 msgid "Icon Error"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2522
+#: ../pidgin/gtkutils.c:2530
 msgid "Could not set icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3233
+#: ../pidgin/gtkutils.c:3241
 msgid "_Open Link"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3240
+#: ../pidgin/gtkutils.c:3248
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3262
+#: ../pidgin/gtkutils.c:3270
 msgid "_Copy Email Address"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3384
+#: ../pidgin/gtkutils.c:3392
 msgid "_Open File"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3391
+#: ../pidgin/gtkutils.c:3399
 msgid "Open _Containing Directory"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3440 ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkutils.c:3448 ../pidgin/gtkwhiteboard.c:754
 msgid "Save File"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3460
+#: ../pidgin/gtkutils.c:3468
 msgid "_Play Sound"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3468
+#: ../pidgin/gtkutils.c:3476
 msgid "_Save File"
 msgstr ""
 
@@ -19441,55 +19447,55 @@
 msgid "Provides integration with Unity's messaging menu and launcher."
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:303
+#: ../pidgin/plugins/vvconfig.c:322
 msgid "Audio"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:305
+#: ../pidgin/plugins/vvconfig.c:324
 msgid "Video"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:316 ../pidgin/plugins/vvconfig.c:323
+#: ../pidgin/plugins/vvconfig.c:335 ../pidgin/plugins/vvconfig.c:342
 msgid "Output"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:316 ../pidgin/plugins/vvconfig.c:323
+#: ../pidgin/plugins/vvconfig.c:335 ../pidgin/plugins/vvconfig.c:342
 msgid "_Plugin"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:317 ../pidgin/plugins/vvconfig.c:324
+#: ../pidgin/plugins/vvconfig.c:336 ../pidgin/plugins/vvconfig.c:343
 msgid "_Device"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:319 ../pidgin/plugins/vvconfig.c:326
+#: ../pidgin/plugins/vvconfig.c:338 ../pidgin/plugins/vvconfig.c:345
 msgid "Input"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:319 ../pidgin/plugins/vvconfig.c:326
+#: ../pidgin/plugins/vvconfig.c:338 ../pidgin/plugins/vvconfig.c:345
 msgid "P_lugin"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:320 ../pidgin/plugins/vvconfig.c:327
+#: ../pidgin/plugins/vvconfig.c:339 ../pidgin/plugins/vvconfig.c:346
 msgid "D_evice"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:622
+#: ../pidgin/plugins/vvconfig.c:647
 msgid "DROP"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:679
+#: ../pidgin/plugins/vvconfig.c:704
 msgid "Volume:"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:683
+#: ../pidgin/plugins/vvconfig.c:708
 msgid "Silence threshold:"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:730
+#: ../pidgin/plugins/vvconfig.c:755
 msgid "Input and Output Settings"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:735
+#: ../pidgin/plugins/vvconfig.c:760
 msgid "Microphone Test"
 msgstr ""
 
@@ -19502,18 +19508,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/vvconfig.c:776
+#: ../pidgin/plugins/vvconfig.c:801
 msgid "Voice/Video Settings"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/vvconfig.c:778
+#: ../pidgin/plugins/vvconfig.c:803
 msgid "Configure your microphone and webcam."
 msgstr ""
 
 #. *< summary
-#: ../pidgin/plugins/vvconfig.c:779
+#: ../pidgin/plugins/vvconfig.c:804
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
 
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/unity_firefox_extension.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/unity_firefox_extension.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/unity_firefox_extension.po	2014-07-09 09:30:14.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/unity_firefox_extension.po	2015-08-14 07:58:54.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-07-07 15:05+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:39+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: unity_webapps.properties:0
 msgid ""
diff -Nru language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/update-manager.po language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/update-manager.po
--- language-pack-sc-base-14.04+20140707/data/sc/LC_MESSAGES/update-manager.po	2014-07-09 09:30:12.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/data/sc/LC_MESSAGES/update-manager.po	2015-08-14 07:58:52.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2014-04-28 21:02+0000\n"
+"POT-Creation-Date: 2015-04-15 20:23+0000\n"
 "PO-Revision-Date: 2010-09-06 03:55+0000\n"
 "Last-Translator: Borealis <Unknown>\n"
 "Language-Team: Sardinian <sc@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Launchpad-Export-Date: 2014-07-07 12:28+0000\n"
-"X-Generator: Launchpad (build 17086)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:45+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: sc\n"
 
 #: ../UpdateManager/backend/InstallBackendAptdaemon.py:67
@@ -121,7 +121,7 @@
 msgid "Restart _Later"
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:282
+#: ../UpdateManager/Dialogs.py:283
 msgid "_Restart Now…"
 msgstr ""
 
diff -Nru language-pack-sc-base-14.04+20140707/debian/changelog language-pack-sc-base-14.04+20150804/debian/changelog
--- language-pack-sc-base-14.04+20140707/debian/changelog	2014-07-09 09:30:12.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/debian/changelog	2015-08-14 07:58:51.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-sc-base (1:14.04+20140707) trusty-proposed; urgency=low
+language-pack-sc-base (1:14.04+20150804) trusty-proposed; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Wed, 09 Jul 2014 09:30:12 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Fri, 14 Aug 2015 07:58:51 +0000
 
diff -Nru language-pack-sc-base-14.04+20140707/debian/control language-pack-sc-base-14.04+20150804/debian/control
--- language-pack-sc-base-14.04+20140707/debian/control	2014-07-09 09:30:12.000000000 +0000
+++ language-pack-sc-base-14.04+20150804/debian/control	2015-08-14 07:58:51.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Language pack maintainers <language-packs@ubuntu.com>
 Build-Depends-Indep: gettext
 Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 
 Package: language-pack-sc-base
 Architecture: all