Binary files /tmp/N_lJFSaUCr/language-pack-kk-base-14.04+20150219/data/extra.tar and /tmp/SaSke6KpGU/language-pack-kk-base-14.04+20150804/data/extra.tar differ
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/app-install-data.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/app-install-data.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/app-install-data.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/app-install-data.po	2015-08-14 07:55:48.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: 2015-02-19 12:29+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:39+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../menu-data-additional/7zip.desktop.in.h:1
 msgid "7zip"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/apport.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/apport.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/apport.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/apport.po	2015-08-14 07:55:47.000000000 +0000
@@ -7,231 +7,445 @@
 msgstr ""
 "Project-Id-Version: apport\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-02-07 15:59+0000\n"
+"POT-Creation-Date: 2015-05-15 17:56+0000\n"
 "PO-Revision-Date: 2011-04-13 06:20+0000\n"
 "Last-Translator: jmb_kz <Unknown>\n"
 "Language-Team: Kazakh <kk@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: 2015-02-19 12:16+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:24+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
-#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
-msgid "See man page for details."
+#: ../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 "Apport"
+
+#: ../gtk/apport-gtk.ui.h:4 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4
+msgid "Crash report"
 msgstr ""
 
-#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
-msgid "specify the log file name produced by valgrind"
+#: ../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 ""
 
-#: ../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"
+#: ../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 ""
 
-#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50
+#: ../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 "<big><b>Олқылық (неполадка) жайлы мәліметтер жиналуды</b></big>"
+
+#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14
 msgid ""
-"do  not  create  or reuse a sandbox directory for additional debug symbols "
-"but rely only on installed debug symbols."
+"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 "<big><b>Олқылық (неполадка) жайлы мәліметтері жіберілуде</b></big>"
+
+#: ../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 ""
+"Жиналған мәліметтер қателерді байқау жүйесіне бағытталады. Бұл бірнеше "
+"минутыңызды алатын болады."
 
-#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
+#: ../data/apportcheckresume.py:73
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73
 msgid ""
-"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
-"it"
+"This occured during a previous suspend and prevented it from resuming "
+"properly."
 msgstr ""
+"Бұрыңғы кездегі қалқыту режиміне өту кезінде болды және ол жүйенің қайта "
+"қалпына келтіруіне кедергі болды."
 
-#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
+#: ../data/apportcheckresume.py:75
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75
 msgid ""
-"report download/install progress when installing packages into sandbox"
+"This occured during a previous hibernate and prevented it from resuming "
+"properly."
 msgstr ""
+"Бұрыңғы кездегі ұйықтату режиміне өту кезінде болды және ол жүйенің қайта "
+"қалпына келтіруіне кедергі болды."
 
-#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62
+#: ../data/apportcheckresume.py:80
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:80
 msgid ""
-"the executable that is run under valgrind's memcheck tool  for memory leak "
-"detection"
+"The resume processing hung very near the end and will have appeared to have "
+"completed normally."
 msgstr ""
+"Есепті құру үрдісі аяқталуына өте жақын кезде ілініп (зависание) қалды; есеп "
+"көрінген кезде, барлығы дұрыс аяқталғаны."
 
-#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-valgrind.py:66
-#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59
+#: ../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 "Таңдаңыз (%s):"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:148 ../bin/apport-cli.py:148
+#, python-format
+msgid "(%i bytes)"
+msgstr "(%i байт)"
+
+#: ../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/bin/apport-cli.py:179 ../bin/apport-cli.py:179
 msgid ""
-"Install an extra package into the sandbox (can be specified multiple times)"
+"After the problem report has been sent, please fill out the form in the\n"
+"automatically opened web browser."
 msgstr ""
+"Есеп жіберілгеннен кейін, шолғыштың ашылған терезесінде\n"
+"шығатын форманы толтырыңыз."
 
-#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
+#: ../debian/tmp/usr/bin/apport-cli.py:182 ../bin/apport-cli.py:182
 #, python-format
-msgid "Error: %s is not an executable. Stopping."
+msgid "&Send report (%s)"
+msgstr "Есепті &жіберу (%s)"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:186 ../bin/apport-cli.py:186
+msgid "&Examine locally"
 msgstr ""
 
-#: ../apport/com.ubuntu.apport.policy.in.h:1
-msgid "Collect system information"
+#: ../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 ""
+"Кері қайтару және бағдарламаның осы нұсқасында болатын ендігі қауыздарды "
+"&елемеу (игнорировать)"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:2
+#: ../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 "Қате: %s"
+
+#: ../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 ""
-"Authentication is required to collect system information for this problem "
-"report"
+"The collected information can be sent to the developers to improve the\n"
+"application. This might take a few minutes."
 msgstr ""
+"Бағдарламаны жақсарту үшін жиналған мәліметтер бағдарламаның өндірушілеріне\n"
+"жіберілуі мүмкін. Бұл бірнеше минутыңызды алатын болады."
 
-#: ../apport/com.ubuntu.apport.policy.in.h:3
-msgid "System problem reports"
+#: ../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 ""
+"Жиналған мәліметтер қателерді байқау жүйесіне бағытталады.\n"
+"Бұл бірнеше минутыңызды алатын болады."
 
-#: ../apport/com.ubuntu.apport.policy.in.h:4
+#: ../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 "Таңдалған: %s. Бірнеше нұсқалар:"
+
+#: ../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 "Файл орналасу жері (болдырмау үшін Enter басыңыз):"
+
+#: ../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 ""
-"Please enter your password to access problem reports of system programs"
+"You can launch a browser now, or copy this URL into a browser on another "
+"computer."
 msgstr ""
+"Енді сіз шолғышыңызды ашуға немесе сілтемені басқа компьютерге көшіруіңізге "
+"болады."
 
-#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:457 ../kde/apport-kde.py:493
-#: ../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
-msgid "Apport"
-msgstr "Apport"
+#: ../debian/tmp/usr/bin/apport-cli.py:357 ../bin/apport-cli.py:357
+msgid "Launch a browser now"
+msgstr "Шолғышты дәл қазір ашу"
 
-#: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2
-msgid "Crash report"
+#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371
+msgid "No pending crash reports. Try --help for more information."
+msgstr ""
+"Қауыздар жайлы мәлімдемелер басқалынбады. --help кілтін байқап көріңіз."
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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
+#, python-format
+msgid "The application %s has experienced an internal error."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
 
-#: ../gtk/apport-gtk.ui.h:3 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3
-msgid "<big><b>Sorry, an internal error happened.</b></big>"
+#: ../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 ""
 
-#: ../gtk/apport-gtk.ui.h:4 ../kde/apport-kde.py:227
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:256
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:300
-#: ../debian/tmp/usr/share/apport/apport-kde.py:227 ../gtk/apport-gtk.py:300
-#: ../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-gtk.ui.h:4
-msgid "If you notice further problems, try restarting the computer."
+#: ../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 ""
 
-#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5
-msgid "Send an error report to help fix this problem"
-msgstr ""
+#: ../kde/apport-kde.py:314 ../debian/tmp/usr/share/apport/apport-kde.py:314
+msgid "Username:"
+msgstr "Пайдаланушы аты:"
 
-#: ../gtk/apport-gtk.ui.h:6 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6
-msgid "Ignore future problems of this program version"
-msgstr ""
+#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315
+msgid "Password:"
+msgstr "Құпия сөз:"
 
-#: ../gtk/apport-gtk.ui.h:7 ../kde/apport-kde.py:278
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:573
-#: ../debian/tmp/usr/share/apport/apport-kde.py:278 ../gtk/apport-gtk.py:204
-#: ../gtk/apport-gtk.py:573 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7
-msgid "Show Details"
+#: ../kde/apport-kde.py:405 ../debian/tmp/usr/share/apport/apport-kde.py:405
+msgid "Collecting Problem Information"
+msgstr "Қате туралы мәлімет жинау"
+
+#: ../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 ""
+"Жиналған мәліметтерді бағдарламаны жақсарту үшін, өндірушілерге жіберуге "
+"болады. Бұл бірнеше минутыңызды алатын болады."
 
-#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8
-msgid "_Examine locally"
+#: ../kde/apport-kde.py:433 ../debian/tmp/usr/share/apport/apport-kde.py:433
+msgid "Uploading Problem Information"
+msgstr "Қате туралы мәліметті жіберу"
+
+#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
+msgid "See man page for details."
 msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:220
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:287
-#: ../debian/tmp/usr/share/apport/apport-kde.py:220 ../gtk/apport-gtk.py:287
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9
-msgid "Leave Closed"
+#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
+msgid "specify the log file name produced by valgrind"
 msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:10 ../kde/apport-kde.py:217 ../kde/apport-kde.py:230
-#: ../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/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-kde.py:217
-#: ../debian/tmp/usr/share/apport/apport-kde.py:230 ../gtk/apport-gtk.py:216
-#: ../gtk/apport-gtk.py:284 ../gtk/apport-gtk.py:303
-#: ../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-gtk.ui.h:10
-msgid "Continue"
+#: ../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 ""
 
-#: ../gtk/apport-gtk.ui.h:11 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11
-msgid "<big><b>Collecting problem information</b></big>"
-msgstr "<big><b>Олқылық (неполадка) жайлы мәліметтер жиналуды</b></big>"
+#: ../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 ""
 
-#: ../gtk/apport-gtk.ui.h:12 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12
+#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
 msgid ""
-"Information is being collected that may help the developers fix the problem "
-"you report."
-msgstr "Өндірушілерге мәселені шешуге көмектесе алатын, мәліметтер жиналуда."
+"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
+"it"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:422
-#: ../debian/tmp/usr/share/apport/apport-kde.py:422
-#: ../debian/tmp/usr/bin/apport-cli.py:251
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../bin/apport-cli.py:251
-msgid "Uploading problem information"
-msgstr "Қате туралы ақпаратты жіберілу"
+#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
+msgid ""
+"report download/install progress when installing packages into sandbox"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14
-msgid "<big><b>Uploading problem information</b></big>"
-msgstr "<big><b>Олқылық (неполадка) жайлы мәліметтері жіберілуде</b></big>"
+#: ../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 ""
 
-#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:423
-#: ../debian/tmp/usr/share/apport/apport-kde.py:423
-#: ../debian/tmp/usr/share/apport/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 ""
-"Жиналған мәліметтер қателерді байқау жүйесіне бағытталады. Бұл бірнеше "
-"минутыңызды алатын болады."
 
-#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22
+#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
 #, python-format
-msgid "Usage: %s <report> <target directory>"
-msgstr "Қолданылуы: %s <есеп> <нысандалған (target) бума>"
+msgid "Error: %s is not an executable. Stopping."
+msgstr ""
 
-#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46
-msgid "Destination directory exists and is not empty."
-msgstr "Нысандалған бума бар және бос емес."
+#: ../kde/apport-kde-mimelnk.desktop.in.h:1
+msgid "Apport crash file"
+msgstr "Apport мәлесе есебі"
 
-#: ../debian/tmp/usr/share/apport/kernel_oops.py:30 ../data/kernel_oops.py:30
+#: ../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.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1
-#: ../kde/apport-kde-mime.desktop.in.h:1
+#: ../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.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2
-#: ../kde/apport-kde-mime.desktop.in.h:2
+#: ../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 "Қауыз/қате жайлы өндірушілерге хабарлау"
 
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130
-#: ../data/general-hooks/ubuntu.py:130
-msgid ""
-"An Ubuntu package has a file conflict with a package that is not a genuine "
-"Ubuntu package"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:147
-#: ../data/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 ""
-
 #: ../apport/ui.py:124
 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:124
 msgid "This package does not seem to be installed correctly"
@@ -270,9 +484,9 @@
 msgid "Sorry, the program \"%s\" closed unexpectedly"
 msgstr "Кешіріңіз, бірақ \"%s\" бағдарламасы апатты түрде жабылды"
 
-#: ../apport/ui.py:272 ../apport/ui.py:1303
+#: ../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:1303
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1308
 #, python-format
 msgid "Problem in %s"
 msgstr "Олқылық (неполадка) %s ішінде"
@@ -288,18 +502,16 @@
 "емес."
 
 #: ../apport/ui.py:321 ../apport/ui.py:329 ../apport/ui.py:456
-#: ../apport/ui.py:459 ../apport/ui.py:660 ../apport/ui.py:1109
-#: ../apport/ui.py:1275 ../apport/ui.py:1279
+#: ../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:1109
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1275
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1279
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:276
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1049
+#: ../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 "Қате туралы есеп бұрыс"
 
@@ -528,379 +740,180 @@
 msgid "Print the Apport version number."
 msgstr "Apport нұсқасын баспаға шығару."
 
-#: ../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:1041 ../apport/ui.py:1281
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1041
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1281
+#: ../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 "Олқылық жайлы есеп бұзылған және де өңделу мүмкін емес."
 
 #. package does not exist
-#: ../apport/ui.py:1044
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1044
+#: ../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 "Есеп орнатылмаған пакетке жатады."
 
-#: ../apport/ui.py:1047
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1047
+#: ../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:1110
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1110
+#: ../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:1128
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1128
+#: ../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:1129
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1129
+#: ../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 "%s ашу үшін веб-шолғышты ашу мүмкін емес."
 
-#: ../apport/ui.py:1229
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1229
-#, python-format
-msgid "Please enter your account information for the %s bug tracking system"
-msgstr ""
-
-#: ../apport/ui.py:1241
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1241
-msgid "Network problem"
-msgstr "Желілік мәселе"
-
-#: ../apport/ui.py:1243
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1243
-msgid ""
-"Cannot connect to crash database, please check your Internet connection."
-msgstr ""
-
-#: ../apport/ui.py:1270
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1270
-msgid "Memory exhaustion"
-msgstr "Жады жетіспейді"
-
-#: ../apport/ui.py:1271
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1271
-msgid "Your system does not have enough memory to process this crash report."
-msgstr "Осы есепті өңдеу үшін жүйелік жады жетіспейді."
-
-#: ../apport/ui.py:1306
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1306
-#, python-format
-msgid ""
-"The problem cannot be reported:\n"
-"\n"
-"%s"
-msgstr ""
-"Қате туралы хабарлау мүмкін емес:\n"
-"\n"
-"%s"
-
-#: ../apport/ui.py:1362 ../apport/ui.py:1369
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1362
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1369
-msgid "Problem already known"
-msgstr "Қате сондай-ақ белгілі"
-
-#: ../apport/ui.py:1363
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1363
-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:1370
-#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1370
-msgid "This problem was already reported to developers. Thank you!"
-msgstr ""
-
-#: ../kde/apport-kde.py:169
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:177
-#: ../debian/tmp/usr/share/apport/apport-kde.py:169 ../gtk/apport-gtk.py:177
-#: ../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/bin/apport-cli.py:178 ../bin/apport-cli.py:178
-msgid "Send problem report to the developers?"
-msgstr "Осы қате есебін өндірушілерге жіберу қажет пе?"
-
-#: ../kde/apport-kde.py:177
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:186
-#: ../debian/tmp/usr/share/apport/apport-kde.py:177 ../gtk/apport-gtk.py:186
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437
-msgid "Send"
-msgstr ""
-
-#: ../kde/apport-kde.py:183 ../kde/apport-kde.py:224
-#: ../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/apport-gtk.py:165
-#: ../debian/tmp/usr/share/apport/apport-kde.py:183
-#: ../debian/tmp/usr/share/apport/apport-kde.py:224 ../gtk/apport-gtk.py:165
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300
-#, python-format
-msgid "Sorry, %s has experienced an internal error."
-msgstr ""
-
-#: ../kde/apport-kde.py:191 ../debian/tmp/usr/share/apport/apport-gtk.py:257
-#: ../debian/tmp/usr/share/apport/apport-kde.py:191 ../gtk/apport-gtk.py:257
-#, python-format
-msgid "Package: %s"
-msgstr ""
-
-#: ../kde/apport-kde.py:197
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:264
-#: ../debian/tmp/usr/share/apport/apport-kde.py:197 ../gtk/apport-gtk.py:264
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137
-msgid "Sorry, a problem occurred while installing software."
-msgstr ""
-
-#: ../kde/apport-kde.py:204 ../debian/tmp/usr/share/apport/apport-gtk.py:273
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:292
-#: ../debian/tmp/usr/share/apport/apport-kde.py:204 ../gtk/apport-gtk.py:273
-#: ../gtk/apport-gtk.py:292
-#, python-format
-msgid "The application %s has experienced an internal error."
-msgstr ""
-
-#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-gtk.py:276
-#: ../debian/tmp/usr/share/apport/apport-kde.py:208 ../gtk/apport-gtk.py:276
-#, python-format
-msgid "The application %s has closed unexpectedly."
-msgstr ""
-
-#: ../kde/apport-kde.py:221 ../kde/apport-kde.py:368
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:229
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:288
-#: ../debian/tmp/usr/share/apport/apport-kde.py:221
-#: ../debian/tmp/usr/share/apport/apport-kde.py:368 ../gtk/apport-gtk.py:229
-#: ../gtk/apport-gtk.py:288
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273
-msgid "Relaunch"
-msgstr ""
-
-#: ../kde/apport-kde.py:231 ../debian/tmp/usr/share/apport/apport-gtk.py:304
-#: ../debian/tmp/usr/share/apport/apport-kde.py:231 ../gtk/apport-gtk.py:304
-msgid "Ignore future problems of this type"
-msgstr ""
-
-#: ../kde/apport-kde.py:275 ../debian/tmp/usr/share/apport/apport-gtk.py:577
-#: ../debian/tmp/usr/share/apport/apport-kde.py:275 ../gtk/apport-gtk.py:577
-msgid "Hide Details"
-msgstr ""
-
-#: ../kde/apport-kde.py:301 ../debian/tmp/usr/share/apport/apport-kde.py:301
-msgid "Username:"
-msgstr "Пайдаланушы аты:"
-
-#: ../kde/apport-kde.py:302 ../debian/tmp/usr/share/apport/apport-kde.py:302
-msgid "Password:"
-msgstr "Құпия сөз:"
-
-#: ../kde/apport-kde.py:349 ../debian/tmp/usr/share/apport/apport-gtk.py:142
-#: ../debian/tmp/usr/share/apport/apport-kde.py:349 ../gtk/apport-gtk.py:142
-#: ../debian/tmp/usr/bin/apport-cli.py:150 ../bin/apport-cli.py:150
-msgid "(binary data)"
-msgstr "(екілік мәліметтер)"
-
-#: ../kde/apport-kde.py:393 ../debian/tmp/usr/share/apport/apport-kde.py:393
-msgid "Collecting Problem Information"
-msgstr "Қате туралы мәлімет жинау"
-
-#: ../kde/apport-kde.py:394 ../debian/tmp/usr/share/apport/apport-kde.py:394
-#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238
-msgid "Collecting problem information"
-msgstr "Қате туралы ақпаратты жинау"
-
-#: ../kde/apport-kde.py:395 ../debian/tmp/usr/share/apport/apport-kde.py:395
-msgid ""
-"The collected information can be sent to the developers to improve the "
-"application. This might take a few minutes."
-msgstr ""
-"Жиналған мәліметтерді бағдарламаны жақсарту үшін, өндірушілерге жіберуге "
-"болады. Бұл бірнеше минутыңызды алатын болады."
-
-#: ../kde/apport-kde.py:421 ../debian/tmp/usr/share/apport/apport-kde.py:421
-msgid "Uploading Problem 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/apport-gtk.py:157 ../gtk/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
-#, python-format
-msgid "Sorry, %s has closed unexpectedly."
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:228 ../gtk/apport-gtk.py:228
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:276
-msgid "Force Closed"
-msgstr ""
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:238 ../gtk/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
-#, python-format
-msgid "The program \"%s\" has stopped responding."
-msgstr ""
-
-#: ../kde/apport-kde-mimelnk.desktop.in.h:1
-msgid "Apport crash file"
-msgstr "Apport мәлесе есебі"
-
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263
-msgid "The application Apport has stopped responding."
+#: ../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 ""
 
-#: ../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/ui.py:1246
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1246
+msgid "Network problem"
+msgstr "Желілік мәселе"
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340
-msgid "Sorry, the application apport has stopped unexpectedly."
+#: ../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 ""
 
-#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357
-msgid "Sorry, apport has closed unexpectedly."
-msgstr ""
+#: ../apport/ui.py:1275
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1275
+msgid "Memory exhaustion"
+msgstr "Жады жетіспейді"
 
-#: ../data/apportcheckresume.py:73
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:73
+#: ../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:1311
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1311
+#, python-format
 msgid ""
-"This occured during a previous suspend and prevented it from resuming "
-"properly."
+"The problem cannot be reported:\n"
+"\n"
+"%s"
 msgstr ""
-"Бұрыңғы кездегі қалқыту режиміне өту кезінде болды және ол жүйенің қайта "
-"қалпына келтіруіне кедергі болды."
+"Қате туралы хабарлау мүмкін емес:\n"
+"\n"
+"%s"
 
-#: ../data/apportcheckresume.py:75
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75
+#: ../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:1368
+#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1368
 msgid ""
-"This occured during a previous hibernate and prevented it from resuming "
-"properly."
+"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 ""
-"Бұрыңғы кездегі ұйықтату режиміне өту кезінде болды және ол жүйенің қайта "
-"қалпына келтіруіне кедергі болды."
+"Веб-шолғышта көрсетілгендей, осы қате қателер есептерлерінде хабарланған. "
+"Сіз осы қате жайлы, өндірушілерге көмектесетін, қосымша қосатын "
+"мәліметтеріңіз бар болуын тексеріңіз."
 
-#: ../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."
+#: ../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 ""
-"Есепті құру үрдісі аяқталуына өте жақын кезде ілініп (зависание) қалды; есеп "
-"көрінген кезде, барлығы дұрыс аяқталғаны."
 
 #: ../bin/apport-retrace.py:31 ../debian/tmp/usr/bin/apport-retrace.py:31
 msgid "%prog [options] <apport problem report | crash ID>"
 msgstr "%prog [баптаулар] <apport мәселе бойынша есеп | қауыз ID >"
 
-#: ../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 "
@@ -910,39 +923,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 ""
@@ -962,150 +975,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 "Осы тиеуді жіберу қажет пе? [y/n]"
 
-#: ../debian/tmp/usr/bin/apport-cli.py:74 ../bin/apport-cli.py:74
-msgid "Press any key to continue..."
-msgstr "Жалғастыру үшін кез-келген пернені басыңыз..."
+#: ../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 ""
 
-#: ../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/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 ""
 
-#: ../debian/tmp/usr/bin/apport-cli.py:85 ../bin/apport-cli.py:85
+#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22
 #, python-format
-msgid "Please choose (%s):"
-msgstr "Таңдаңыз (%s):"
+msgid "Usage: %s <report> <target directory>"
+msgstr "Қолданылуы: %s <есеп> <нысандалған (target) бума>"
 
-#: ../debian/tmp/usr/bin/apport-cli.py:148 ../bin/apport-cli.py:148
-#, python-format
-msgid "(%i bytes)"
-msgstr "(%i байт)"
+#: ../debian/tmp/usr/bin/apport-unpack.py:46 ../bin/apport-unpack.py:46
+msgid "Destination directory exists and is not empty."
+msgstr "Нысандалған бума бар және бос емес."
 
-#: ../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."
+#: ../apport/com.ubuntu.apport.policy.in.h:1
+msgid "Collect system information"
 msgstr ""
-"Есеп жіберілгеннен кейін, шолғыштың ашылған терезесінде\n"
-"шығатын форманы толтырыңыз."
-
-#: ../debian/tmp/usr/bin/apport-cli.py:182 ../bin/apport-cli.py:182
-#, python-format
-msgid "&Send report (%s)"
-msgstr "Есепті &жіберу (%s)"
 
-#: ../debian/tmp/usr/bin/apport-cli.py:186 ../bin/apport-cli.py:186
-msgid "&Examine locally"
+#: ../apport/com.ubuntu.apport.policy.in.h:2
+msgid ""
+"Authentication is required to collect system information for this problem "
+"report"
 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"
+#: ../apport/com.ubuntu.apport.policy.in.h:3
+msgid "System problem reports"
 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 "Қате: %s"
 
-#: ../debian/tmp/usr/bin/apport-cli.py:239 ../bin/apport-cli.py:239
+#: ../apport/com.ubuntu.apport.policy.in.h:4
 msgid ""
-"The collected information can be sent to the developers to improve the\n"
-"application. This might take a few minutes."
+"Please enter your password to access problem reports of system programs"
 msgstr ""
-"Бағдарламаны жақсарту үшін жиналған мәліметтер бағдарламаның өндірушілеріне\n"
-"жіберілуі мүмкін. Бұл бірнеше минутыңызды алатын болады."
 
-#: ../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."
+#: ../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 ""
-"Жиналған мәліметтер қателерді байқау жүйесіне бағытталады.\n"
-"Бұл бірнеше минутыңызды алатын болады."
 
-#: ../debian/tmp/usr/bin/apport-cli.py:302 ../bin/apport-cli.py:302
-msgid "&Done"
-msgstr "&Дайын"
+#: ../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/bin/apport-cli.py:308 ../bin/apport-cli.py:308
-msgid "none"
-msgstr "жоқ"
+#: ../gtk/apport-gtk.py:228 ../debian/tmp/usr/share/apport/apport-gtk.py:228
+msgid "Force Closed"
+msgstr ""
 
-#: ../debian/tmp/usr/bin/apport-cli.py:309 ../bin/apport-cli.py:309
+#: ../gtk/apport-gtk.py:238 ../debian/tmp/usr/share/apport/apport-gtk.py:238
 #, python-format
-msgid "Selected: %s. Multiple choices:"
-msgstr "Таңдалған: %s. Бірнеше нұсқалар:"
-
-#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325
-msgid "Choices:"
-msgstr "Таңдаулар:"
+msgid "The application %s has stopped responding."
+msgstr ""
 
-#: ../debian/tmp/usr/bin/apport-cli.py:339 ../bin/apport-cli.py:339
-msgid "Path to file (Enter to cancel):"
-msgstr "Файл орналасу жері (болдырмау үшін Enter басыңыз):"
+#: ../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/bin/apport-cli.py:345 ../bin/apport-cli.py:345
-msgid "File does not exist."
-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 ""
 
-#: ../debian/tmp/usr/bin/apport-cli.py:347 ../bin/apport-cli.py:347
-msgid "This is a directory."
-msgstr "Бұл бума."
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:263
+msgid "The application Apport has stopped responding."
+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/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/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."
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:340
+msgid "Sorry, the application apport has stopped unexpectedly."
 msgstr ""
-"Енді сіз шолғышыңызды ашуға немесе сілтемені басқа компьютерге көшіруіңізге "
-"болады."
 
-#: ../debian/tmp/usr/bin/apport-cli.py:357 ../bin/apport-cli.py:357
-msgid "Launch a browser now"
-msgstr "Шолғышты дәл қазір ашу"
+#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:357
+msgid "Sorry, apport has closed unexpectedly."
+msgstr ""
 
-#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371
-msgid "No pending crash reports. Try --help for more information."
+#: ../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 ""
-"Қауыздар жайлы мәлімдемелер басқалынбады. --help кілтін байқап көріңіз."
 
-#: ../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"
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:150
+#: ../data/general-hooks/ubuntu.py:150
+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 ""
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/apturl.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/apturl.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/apturl.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/apturl.po	2015-08-14 07:55:49.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: 2015-02-19 12:38+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:50+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../apturl-gtk:49 ../apturl-kde:52
 msgid "User requested interrupt."
@@ -129,20 +129,20 @@
 msgid "Enable additional components"
 msgstr "Қосымша құрамдастарды қосу"
 
-#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:85 ../AptUrl/kde/KdeUI.py:80
+#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:103 ../AptUrl/kde/KdeUI.py:80
 msgid "Enable additional software channel"
 msgstr "Қосымша бағдарламалар қайнар көзін қосу"
 
-#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:86 ../AptUrl/kde/KdeUI.py:81
+#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:104 ../AptUrl/kde/KdeUI.py:81
 #, python-format
 msgid "Do you want to enable the following software channel: '%s'?"
 msgstr "Сіз \"%s\" қосымша бағдарламалар қайнар көзін қосқыңыз келеді ме?"
 
-#: ../AptUrl/gtk/GtkUI.py:154 ../AptUrl/kde/KdeUI.py:133
+#: ../AptUrl/gtk/GtkUI.py:168 ../AptUrl/kde/KdeUI.py:133
 msgid "Install additional software?"
 msgstr "Қосымша бағдарламаларды орнатайын ба?"
 
-#: ../AptUrl/gtk/GtkUI.py:155 ../AptUrl/kde/KdeUI.py:134
+#: ../AptUrl/gtk/GtkUI.py:169 ../AptUrl/kde/KdeUI.py:134
 #, python-format
 msgid "Do you want to install package '%s'?"
 msgstr "\"%s\" пакетін орнатайын ба?"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/avahi.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/avahi.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/avahi.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/avahi.po	2015-08-14 07:55:47.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: 2015-02-19 11:58+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:05+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../avahi-common/error.c:30
 msgid "OK"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/bootloader.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/bootloader.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/bootloader.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/bootloader.po	2015-08-14 07:55:47.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: 2015-02-19 12:07+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:16+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: kk\n"
 
 #. ok button label
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/colord.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/colord.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/colord.po	2015-02-19 15:29:18.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/colord.po	2015-08-14 07:55:51.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: 2015-02-19 13:20+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:35+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: kk\n"
 
 #. TRANSLATORS: command line option
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/command-not-found.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/command-not-found.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/command-not-found.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/command-not-found.po	2015-08-14 07:55:47.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: 2015-02-19 12:16+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:25+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../CommandNotFound/CommandNotFound.py:148
 #, python-format
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/coreutils.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/coreutils.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/coreutils.po	2015-02-19 15:29:11.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/coreutils.po	2015-08-14 07:55:44.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-02-19 10:39+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 05:36+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "X-Poedit-Country: KAZAKHSTAN\n"
 "Language: kk\n"
 "X-Poedit-Language: Kazakh\n"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/cracklib.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/cracklib.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/cracklib.po	2015-02-19 15:29:11.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/cracklib.po	2015-08-14 07:55:44.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: 2015-02-19 10:40+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 05:37+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: lib/fascist.c:516
 msgid "it is based on your username"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/debconf.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/debconf.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/debconf.po	2015-02-19 15:29:11.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/debconf.po	2015-08-14 07:55:44.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: 2015-02-19 10:40+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 05:37+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../Debconf/AutoSelect.pm:76
 #, perl-format
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/debian-tasks.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/debian-tasks.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/debian-tasks.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/debian-tasks.po	2015-08-14 07:55:47.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-19 11:57+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:04+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: kk\n"
 
 #. Description
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/dpkg.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/dpkg.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/dpkg.po	2015-02-19 15:29:11.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/dpkg.po	2015-08-14 07:55:44.000000000 +0000
@@ -15,50 +15,49 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-02-19 10:43+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 05:41+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
-#: lib/dpkg/ar.c:78
+#: lib/dpkg/ar.c
 #, c-format
 msgid "invalid character '%c' in archive '%.250s' member '%.16s' size"
 msgstr ""
 
-#: lib/dpkg/ar.c:99 lib/dpkg/ar.c:122 lib/dpkg/ar.c:136 lib/dpkg/ar.c:140
-#: lib/dpkg/ar.c:168 utils/update-alternatives.c:1169
+#: lib/dpkg/ar.c utils/update-alternatives.c
 #, c-format
 msgid "unable to write file '%s'"
 msgstr ""
 
-#: lib/dpkg/ar.c:110
+#: lib/dpkg/ar.c
 #, c-format
 msgid "ar member name '%s' length too long"
 msgstr ""
 
-#: lib/dpkg/ar.c:112
+#: lib/dpkg/ar.c
 #, c-format
 msgid "ar member size %jd too large"
 msgstr ""
 
-#: lib/dpkg/ar.c:119
+#: lib/dpkg/ar.c
 #, c-format
 msgid "generated corrupt ar header for '%s'"
 msgstr ""
 
-#: lib/dpkg/ar.c:154
+#: lib/dpkg/ar.c
 #, c-format
 msgid "failed to fstat ar member file (%s)"
 msgstr ""
 
-#: lib/dpkg/ar.c:163
+#: lib/dpkg/ar.c
 #, c-format
 msgid "cannot append ar member file (%s) to '%s': %s"
 msgstr ""
 
-#: lib/dpkg/arch.c:64 lib/dpkg/parsehelp.c:112 lib/dpkg/pkg-format.c:212
+#: lib/dpkg/arch.c lib/dpkg/parsehelp.c lib/dpkg/pkg-format.c
 msgid "may not be empty string"
 msgstr ""
 
-#: lib/dpkg/arch.c:66
+#: lib/dpkg/arch.c
 msgid "must start with an alphanumeric"
 msgstr ""
 
@@ -67,36 +66,36 @@
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 
-#: lib/dpkg/arch.c:236
+#: lib/dpkg/arch.c
 msgctxt "architecture"
 msgid "<none>"
 msgstr ""
 
-#: lib/dpkg/arch.c:238
+#: lib/dpkg/arch.c
 msgctxt "architecture"
 msgid "<empty>"
 msgstr ""
 
-#: lib/dpkg/arch.c:328
+#: lib/dpkg/arch.c
 msgid "error writing to architecture list"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c:57
+#: lib/dpkg/atomic-file.c
 #, c-format
 msgid "unable to create new file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c:68
+#: lib/dpkg/atomic-file.c
 #, c-format
 msgid "unable to write new file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c:70
+#: lib/dpkg/atomic-file.c
 #, c-format
 msgid "unable to flush new file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c:72
+#: lib/dpkg/atomic-file.c
 #, c-format
 msgid "unable to sync new file '%.250s'"
 msgstr ""
@@ -106,12 +105,12 @@
 msgid "unable to close new file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c:92
+#: lib/dpkg/atomic-file.c
 #, c-format
 msgid "error removing old backup file '%s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c:94
+#: lib/dpkg/atomic-file.c
 #, c-format
 msgid "error creating new backup file '%s'"
 msgstr ""
@@ -123,162 +122,160 @@
 msgid "cannot remove `%.250s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c:115
+#: lib/dpkg/atomic-file.c
 #, c-format
 msgid "error installing new file '%s'"
 msgstr ""
 
-#: lib/dpkg/buffer.c:133
+#: lib/dpkg/buffer.c
 msgid "failed to write"
 msgstr ""
 
-#: lib/dpkg/buffer.c:154
+#: lib/dpkg/buffer.c
 msgid "failed to read"
 msgstr ""
 
-#: lib/dpkg/buffer.c:229
+#: lib/dpkg/buffer.c
 msgid "unexpected end of file or stream"
 msgstr ""
 
-#: lib/dpkg/buffer.c:271
+#: lib/dpkg/buffer.c
 msgid "failed to seek"
 msgstr ""
 
-#: lib/dpkg/command.c:182 lib/dpkg/command.c:229 src/help.c:393
-#: src/unpack.c:103 src/unpack.c:143 src/unpack.c:565 src/unpack.c:956
-#: dpkg-deb/build.c:190 dpkg-deb/build.c:465 dpkg-deb/build.c:564
-#: dpkg-deb/info.c:66 dpkg-split/split.c:71 utils/update-alternatives.c:414
+#: lib/dpkg/command.c lib/dpkg/path-remove.c src/unpack.c dpkg-deb/build.c
+#: dpkg-split/split.c utils/update-alternatives.c
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr ""
 
-#: lib/dpkg/compress.c:113 lib/dpkg/compress.c:122
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: pass-through copy error: %s"
 msgstr ""
 
-#: lib/dpkg/compress.c:156
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding input to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:168
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal gzip read error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:176 lib/dpkg/compress.c:180
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal gzip write error"
 msgstr ""
 
-#: lib/dpkg/compress.c:206
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding output to gzip stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:213
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal gzip read error"
 msgstr ""
 
-#: lib/dpkg/compress.c:223
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal gzip write error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:236
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal gzip write error: %s"
 msgstr ""
 
-#: lib/dpkg/compress.c:289
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding input to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:301
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal bzip2 read error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:309 lib/dpkg/compress.c:313 lib/dpkg/compress.c:363
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal bzip2 write error"
 msgstr ""
 
-#: lib/dpkg/compress.c:327
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
 msgstr ""
 
-#: lib/dpkg/compress.c:334
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal bzip2 read error"
 msgstr ""
 
-#: lib/dpkg/compress.c:344 lib/dpkg/compress.c:355
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: internal bzip2 write error: '%s'"
 msgstr ""
 
-#: lib/dpkg/compress.c:351
+#: lib/dpkg/compress.c
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/compress.c:412
+#: lib/dpkg/compress.c
 msgid "internal error (bug)"
 msgstr ""
 
-#: lib/dpkg/compress.c:419
+#: lib/dpkg/compress.c
 msgid "memory usage limit reached"
 msgstr ""
 
-#: lib/dpkg/compress.c:423
+#: lib/dpkg/compress.c
 msgid "unsupported compression preset"
 msgstr ""
 
-#: lib/dpkg/compress.c:425
+#: lib/dpkg/compress.c
 msgid "unsupported options in file header"
 msgstr ""
 
-#: lib/dpkg/compress.c:429
+#: lib/dpkg/compress.c
 msgid "compressed data is corrupt"
 msgstr ""
 
-#: lib/dpkg/compress.c:433
+#: lib/dpkg/compress.c
 msgid "unexpected end of input"
 msgstr ""
 
-#: lib/dpkg/compress.c:437
+#: lib/dpkg/compress.c
 msgid "file format not recognized"
 msgstr ""
 
-#: lib/dpkg/compress.c:441
+#: lib/dpkg/compress.c
 msgid "unsupported type of integrity check"
 msgstr ""
 
-#: lib/dpkg/compress.c:482
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: lzma read error"
 msgstr ""
 
-#: lib/dpkg/compress.c:494
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: lzma write error"
 msgstr ""
 
-#: lib/dpkg/compress.c:503
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: lzma close error"
 msgstr ""
 
-#: lib/dpkg/compress.c:509
+#: lib/dpkg/compress.c
 #, c-format
 msgid "%s: lzma error: %s"
 msgstr ""
 
-#: lib/dpkg/compress.c:816
+#: lib/dpkg/compress.c
 msgid "unknown compression strategy"
 msgstr ""
 
@@ -291,7 +288,7 @@
 "жаңарту бумасында %.250s файлы бар, оның аты тым ұзын (%d символ, мүмкін "
 "болатын %d)"
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
@@ -303,7 +300,7 @@
 msgid "cannot scan updates directory `%.255s'"
 msgstr "жаңартулар бумасын қарау сәтсіз аяқталды %.255s"
 
-#: lib/dpkg/dbmodify.c:101
+#: lib/dpkg/dbmodify.c
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr "%.255s алынған жаңартулар файлын өшірген кезде қате кетті"
@@ -313,51 +310,51 @@
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' құру кезінде қате кетті"
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr "%.250s туралау белгілерімен толтырған кезде қате кетті"
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr "%.250s туралаған соң тазартқанда қате кетті"
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr "%.250s туралаған соң басына ауысқанда қате кетті"
 
-#: lib/dpkg/dbmodify.c:196
+#: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:222
+#: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:232
+#: lib/dpkg/dbmodify.c
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:234
+#: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:258
+#: lib/dpkg/dbmodify.c
 msgid "requested operation requires superuser privilege"
 msgstr "таңдалған операцияны орында үшін суперпайдаланушы болуыңыз керек"
 
-#: lib/dpkg/dbmodify.c:263
+#: lib/dpkg/dbmodify.c
 msgid "unable to access dpkg status area"
 msgstr "dpkg қалып-күй аймағына рұқсат жоқ"
 
-#: lib/dpkg/dbmodify.c:265
+#: lib/dpkg/dbmodify.c
 msgid "operation requires read/write access to dpkg status area"
 msgstr "бұл әрекет dpkg қалып-күй аймағын оқу құқығын сұрайды"
 
-#: lib/dpkg/dbmodify.c:316
+#: lib/dpkg/dbmodify.c
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr "өзімнің жаңарту файлын өшірген кезде қате кетті %.255s"
@@ -395,53 +392,51 @@
 msgid "unable to install updated status of `%.250s'"
 msgstr "келесі дестенің жаңартылған күйін орнатқан кезде қате кетті `%.250s'"
 
-#: lib/dpkg/deb-version.c:55
+#: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
 msgstr ""
 
-#: lib/dpkg/deb-version.c:57
+#: lib/dpkg/deb-version.c
 msgid "format version has no dot"
 msgstr ""
 
-#: lib/dpkg/deb-version.c:63
+#: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
 msgstr ""
 
-#: lib/dpkg/deb-version.c:65
+#: lib/dpkg/deb-version.c
 msgid "format version followed by junk"
 msgstr ""
 
-#: lib/dpkg/dir.c:50
+#: lib/dpkg/dir.c
 #, c-format
 msgid "unable to get file descriptor for directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:54
+#: lib/dpkg/dir.c
 #, c-format
 msgid "unable to sync directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:69 lib/dpkg/dir.c:131
+#: lib/dpkg/dir.c
 #, c-format
 msgid "unable to open directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:217 dpkg-split/split.c:207
-#: utils/update-alternatives.c:1305
+#: lib/dpkg/dir.c src/divertcmd.c dpkg-split/split.c
+#: utils/update-alternatives.c
 #, c-format
 msgid "unable to open file '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:111 src/divertcmd.c:232 dpkg-deb/build.c:600
-#: dpkg-split/join.c:70 dpkg-split/queue.c:203
-#: utils/update-alternatives.c:1425
+#: lib/dpkg/dir.c src/divertcmd.c dpkg-deb/build.c dpkg-split/join.c
+#: dpkg-split/queue.c utils/update-alternatives.c
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:113 src/divertcmd.c:234 dpkg-deb/build.c:602
-#: dpkg-split/join.c:72 dpkg-split/queue.c:205
-#: utils/update-alternatives.c:1333 utils/update-alternatives.c:1427
+#: lib/dpkg/dir.c src/divertcmd.c dpkg-deb/build.c dpkg-split/join.c
+#: dpkg-split/queue.c utils/update-alternatives.c
 #, c-format
 msgid "unable to close file '%s'"
 msgstr ""
@@ -451,80 +446,80 @@
 msgid "failed to write details of `%.50s' to `%.250s'"
 msgstr "`%.50s' туралы ақпаратты `%.250s' ішіне жазғанда қате кетті"
 
-#: lib/dpkg/dump.c:496
+#: lib/dpkg/dump.c
 #, c-format
 msgid "unable to set buffering on %s database file"
 msgstr ""
 
-#: lib/dpkg/dump.c:508
+#: lib/dpkg/dump.c
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:98
+#: lib/dpkg/ehandle.c
 #, c-format
 msgid ""
 "%s: unrecoverable fatal error, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:104
+#: lib/dpkg/ehandle.c
 #, c-format
 msgid ""
 "%s: outside error context, aborting:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:124
+#: lib/dpkg/ehandle.c
 msgid "out of memory for new error context"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:189
+#: lib/dpkg/ehandle.c
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
 " %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:208
+#: lib/dpkg/ehandle.c
 #, c-format
 msgid "%s: too many nested errors during error recovery!!\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:275 lib/dpkg/ehandle.c:314
+#: lib/dpkg/ehandle.c
 msgid "out of memory for new cleanup entry"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:298
+#: lib/dpkg/ehandle.c
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:359
+#: lib/dpkg/ehandle.c
 #, c-format
 msgid "%s: error: %s\n"
 msgstr ""
 
-#: lib/dpkg/ehandle.c:395
+#: lib/dpkg/ehandle.c
 #, c-format
 msgid "%s:%s:%d:%s: internal error: %s\n"
 msgstr ""
 
-#: lib/dpkg/fields.c:52
+#: lib/dpkg/fields.c
 #, c-format
 msgid "%s is missing"
 msgstr ""
 
-#: lib/dpkg/fields.c:56
+#: lib/dpkg/fields.c
 #, c-format
 msgid "'%.50s' is not allowed for %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:80
+#: lib/dpkg/fields.c
 #, c-format
 msgid "junk after %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:94
+#: lib/dpkg/fields.c
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr ""
@@ -549,62 +544,61 @@
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/dpkg/fields.c:162
+#: lib/dpkg/fields.c
 msgid "yes/no in boolean field"
 msgstr ""
 
-#: lib/dpkg/fields.c:177
+#: lib/dpkg/fields.c
 msgid "foreign/allowed/same/no in quadstate field"
 msgstr ""
 
-#: lib/dpkg/fields.c:189
+#: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' is not a valid architecture name: %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:208
+#: lib/dpkg/fields.c
 msgid "word in 'Priority' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:221 lib/dpkg/fields.c:272 lib/dpkg/fields.c:622
-#: lib/dpkg/fields.c:647
+#: lib/dpkg/fields.c
 #, c-format
 msgid "value for '%s' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:226
+#: lib/dpkg/fields.c
 msgid "first (want) word in 'Status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:228
+#: lib/dpkg/fields.c
 msgid "second (error) word in 'Status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:230
+#: lib/dpkg/fields.c
 msgid "third (status) word in 'Status' field"
 msgstr ""
 
-#: lib/dpkg/fields.c:240 lib/dpkg/fields.c:278
+#: lib/dpkg/fields.c
 #, c-format
 msgid "error in '%s' field string '%.250s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:252
+#: lib/dpkg/fields.c
 #, c-format
 msgid "obsolete '%s' or '%s' field used"
 msgstr ""
 
-#: lib/dpkg/fields.c:305
+#: lib/dpkg/fields.c
 #, c-format
 msgid "value for '%s' field has malformatted line '%.*s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:327
+#: lib/dpkg/fields.c
 #, c-format
 msgid "value for '%s' has line starting with non-space '%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:344
+#: lib/dpkg/fields.c
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 
@@ -619,14 +613,14 @@
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:444
+#: lib/dpkg/fields.c
 #, c-format
 msgid ""
 "'%s' field, missing architecture name, or garbage where architecture name "
 "expected"
 msgstr ""
 
-#: lib/dpkg/fields.c:457
+#: lib/dpkg/fields.c
 #, c-format
 msgid ""
 "'%s' field, reference to '%.255s': invalid architecture name '%.255s': %s"
@@ -653,7 +647,7 @@
 " implicit exact match on version number, suggest using `=' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:515
+#: lib/dpkg/fields.c
 #, c-format
 msgid "only exact versions may be used for '%s' field"
 msgstr ""
@@ -675,7 +669,7 @@
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr ""
 
-#: lib/dpkg/fields.c:551
+#: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
@@ -710,119 +704,118 @@
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr ""
 
-#: lib/dpkg/file.c:53
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to stat source file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/file.c:57
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to change ownership of target file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/file.c:61
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to set mode of target file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/file.c:87
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr ""
 
-#: lib/dpkg/file.c:113
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to check file '%s' lock status"
 msgstr ""
 
-#: lib/dpkg/file.c:148
+#: lib/dpkg/file.c
 #, c-format
 msgid "%s is locked by another process"
 msgstr ""
 
-#: lib/dpkg/file.c:150
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to lock %s"
 msgstr ""
 
-#: lib/dpkg/file.c:171 lib/dpkg/file.c:176
+#: lib/dpkg/file.c
 msgid "showing file on pager"
 msgstr ""
 
-#: lib/dpkg/log.c:53
+#: lib/dpkg/log.c
 #, c-format
 msgid "could not open log '%s': %s"
 msgstr ""
 
-#: lib/dpkg/log.c:85
+#: lib/dpkg/log.c
 msgid "<package status and progress file descriptor>"
 msgstr ""
 
-#: lib/dpkg/log.c:114
+#: lib/dpkg/log.c
 #, c-format
 msgid "unable to write to status fd %d"
 msgstr ""
 
-#: lib/dpkg/mlib.c:42 lib/dpkg/mlib.c:98 utils/update-alternatives.c:274
-#: utils/update-alternatives.c:331 utils/update-alternatives.c:1122
+#: lib/dpkg/mlib.c utils/update-alternatives.c
 msgid "failed to allocate memory"
 msgstr ""
 
-#: lib/dpkg/mlib.c:110
+#: lib/dpkg/mlib.c
 #, c-format
 msgid "failed to dup for std%s"
 msgstr ""
 
-#: lib/dpkg/mlib.c:111
+#: lib/dpkg/mlib.c
 #, c-format
 msgid "failed to dup for fd %d"
 msgstr ""
 
-#: lib/dpkg/mlib.c:117
+#: lib/dpkg/mlib.c
 msgid "failed to create pipe"
 msgstr ""
 
-#: lib/dpkg/mlib.c:125
+#: lib/dpkg/mlib.c
 #, c-format
 msgid "error writing to '%s'"
 msgstr ""
 
-#: lib/dpkg/mlib.c:135
+#: lib/dpkg/mlib.c
 #, c-format
 msgid "unable to read filedescriptor flags for %.250s"
 msgstr ""
 
-#: lib/dpkg/mlib.c:137
+#: lib/dpkg/mlib.c
 #, c-format
 msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 
-#: lib/dpkg/options.c:64
+#: lib/dpkg/options.c
 #, c-format
 msgid "configuration error: %s:%d: %s"
 msgstr ""
 
-#: lib/dpkg/options.c:78
+#: lib/dpkg/options.c
 #, c-format
 msgid "failed to open configuration file '%.255s' for reading: %s"
 msgstr ""
 
-#: lib/dpkg/options.c:105
+#: lib/dpkg/options.c
 #, c-format
 msgid "unbalanced quotes in '%s'"
 msgstr ""
 
-#: lib/dpkg/options.c:121
+#: lib/dpkg/options.c utils/update-alternatives.c
 #, c-format
 msgid "unknown option '%s'"
 msgstr ""
 
-#: lib/dpkg/options.c:125
+#: lib/dpkg/options.c
 #, c-format
 msgid "'%s' needs a value"
 msgstr ""
 
-#: lib/dpkg/options.c:131
+#: lib/dpkg/options.c
 #, c-format
 msgid "'%s' does not take a value"
 msgstr ""
@@ -837,37 +830,37 @@
 msgid "error closing configuration file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/options.c:174
+#: lib/dpkg/options.c
 #, c-format
 msgid "error opening configuration directory '%s'"
 msgstr ""
 
-#: lib/dpkg/options.c:237
+#: lib/dpkg/options.c
 #, c-format
 msgid "unknown option --%s"
 msgstr ""
 
-#: lib/dpkg/options.c:241
+#: lib/dpkg/options.c
 #, c-format
 msgid "--%s option takes a value"
 msgstr ""
 
-#: lib/dpkg/options.c:246
+#: lib/dpkg/options.c
 #, c-format
 msgid "--%s option does not take a value"
 msgstr ""
 
-#: lib/dpkg/options.c:254
+#: lib/dpkg/options.c
 #, c-format
 msgid "unknown option -%c"
 msgstr ""
 
-#: lib/dpkg/options.c:259
+#: lib/dpkg/options.c
 #, c-format
 msgid "-%c option takes a value"
 msgstr ""
 
-#: lib/dpkg/options.c:267
+#: lib/dpkg/options.c
 #, c-format
 msgid "-%c option does not take a value"
 msgstr ""
@@ -882,7 +875,7 @@
 msgid "obsolete option '--%s'\n"
 msgstr ""
 
-#: lib/dpkg/options.c:310
+#: lib/dpkg/options.c
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
@@ -902,65 +895,65 @@
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:204 lib/dpkg/parsehelp.c:290 lib/dpkg/parsehelp.c:302
+#: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
 msgid "missing %s"
 msgstr ""
 
-#: lib/dpkg/parse.c:206 lib/dpkg/parsehelp.c:292 lib/dpkg/parsehelp.c:305
+#: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
 msgid "empty value for %s"
 msgstr ""
 
-#: lib/dpkg/parse.c:215
+#: lib/dpkg/parse.c
 #, c-format
 msgid "package has field '%s' but is missing architecture"
 msgstr ""
 
-#: lib/dpkg/parse.c:219
+#: lib/dpkg/parse.c
 #, c-format
 msgid "package has field '%s' but is architecture all"
 msgstr ""
 
-#: lib/dpkg/parse.c:238
+#: lib/dpkg/parse.c
 msgid "Config-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:249
+#: lib/dpkg/parse.c
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:253
+#: lib/dpkg/parse.c
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:259
+#: lib/dpkg/parse.c
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:263
+#: lib/dpkg/parse.c
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:273
+#: lib/dpkg/parse.c
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:351
+#: lib/dpkg/parse.c
 msgid ""
 "multiple non-coinstallable package instances present; most probably due to "
 "an upgrade from an unofficial dpkg"
 msgstr ""
 
-#: lib/dpkg/parse.c:355
+#: lib/dpkg/parse.c
 msgid ""
 "mixed non-coinstallable and coinstallable package instances present; most "
 "probably due to an upgrade from an unofficial dpkg"
 msgstr ""
 
-#: lib/dpkg/parse.c:415
+#: lib/dpkg/parse.c
 #, c-format
 msgid ""
 "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
@@ -982,7 +975,7 @@
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:588
+#: lib/dpkg/parse.c
 #, c-format
 msgid "reading package info file '%.255s'"
 msgstr ""
@@ -992,11 +985,11 @@
 msgid "failed to close after read: `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:628
+#: lib/dpkg/parse.c
 msgid "empty field name"
 msgstr ""
 
-#: lib/dpkg/parse.c:630
+#: lib/dpkg/parse.c
 #, c-format
 msgid "field name '%.*s' cannot start with hyphen"
 msgstr ""
@@ -1031,7 +1024,7 @@
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 
-#: lib/dpkg/parse.c:676
+#: lib/dpkg/parse.c
 #, c-format
 msgid "blank line in value of field '%.*s'"
 msgstr ""
@@ -1041,7 +1034,7 @@
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:786
+#: lib/dpkg/parse.c
 msgid "several package info entries found, only one allowed"
 msgstr ""
 
@@ -1050,156 +1043,156 @@
 msgid "no package information in `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:52
+#: lib/dpkg/parsehelp.c
 #, c-format
 msgid ""
 "parsing file '%.255s' near line %d package '%.255s':\n"
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:55
+#: lib/dpkg/parsehelp.c
 #, c-format
 msgid ""
 "parsing file '%.255s' near line %d:\n"
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:114
+#: lib/dpkg/parsehelp.c
 msgid "must start with an alphanumeric character"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:162
+#: lib/dpkg/parsehelp.c
 msgctxt "version"
 msgid "<none>"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:196
+#: lib/dpkg/parsehelp.c
 msgid "version string is empty"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:208
+#: lib/dpkg/parsehelp.c
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:217
+#: lib/dpkg/parsehelp.c
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:219
+#: lib/dpkg/parsehelp.c
 msgid "epoch in version is negative"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:221
+#: lib/dpkg/parsehelp.c
 msgid "epoch in version is too big"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:223
+#: lib/dpkg/parsehelp.c
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:238
+#: lib/dpkg/parsehelp.c
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:241
+#: lib/dpkg/parsehelp.c
 msgid "invalid character in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:245
+#: lib/dpkg/parsehelp.c
 msgid "invalid character in revision number"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c:147 lib/dpkg/pkg-spec.c:98
+#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
 #, c-format
 msgid "ambiguous package name '%s' with more than one installed instance"
 msgstr ""
 
-#: lib/dpkg/pkg-format.c:87
+#: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
 msgstr ""
 
-#: lib/dpkg/pkg-format.c:92
+#: lib/dpkg/pkg-format.c
 msgid "field width is out of range"
 msgstr ""
 
-#: lib/dpkg/pkg-format.c:183
+#: lib/dpkg/pkg-format.c
 msgid "missing closing brace"
 msgstr ""
 
-#: lib/dpkg/pkg-show.c:141
+#: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr ""
 
-#: lib/dpkg/pkg-spec.c:71
+#: lib/dpkg/pkg-spec.c
 #, c-format
 msgid "illegal package name in specifier '%s%s%s': %s"
 msgstr ""
 
-#: lib/dpkg/pkg-spec.c:82
+#: lib/dpkg/pkg-spec.c
 #, c-format
 msgid "illegal architecture name in specifier '%s:%s': %s"
 msgstr ""
 
-#: lib/dpkg/report.c:66
+#: lib/dpkg/report.c
 #, c-format
 msgid "%s: warning: %s\n"
 msgstr ""
 
-#: lib/dpkg/strwide.c:60
+#: lib/dpkg/strwide.c
 #, c-format
 msgid "cannot convert multibyte string '%s' to a wide-character string"
 msgstr ""
 
-#: lib/dpkg/strwide.c:113
+#: lib/dpkg/strwide.c
 #, c-format
 msgid "cannot convert multibyte sequence '%s' to a wide character"
 msgstr ""
 
-#: lib/dpkg/subproc.c:57
+#: lib/dpkg/subproc.c
 #, c-format
 msgid "unable to ignore signal %s before running %.250s"
 msgstr ""
 
-#: lib/dpkg/subproc.c:46
+#: lib/dpkg/subproc.c
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:98
+#: lib/dpkg/subproc.c
 #, c-format
 msgid "%s (subprocess): %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:109 utils/update-alternatives.c:411
+#: lib/dpkg/subproc.c utils/update-alternatives.c
 msgid "fork failed"
 msgstr ""
 
-#: lib/dpkg/subproc.c:139
+#: lib/dpkg/subproc.c
 #, c-format
 msgid "subprocess %s returned error exit status %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:150
+#: lib/dpkg/subproc.c
 #, c-format
 msgid "subprocess %s was interrupted"
 msgstr ""
 
-#: lib/dpkg/subproc.c:152
+#: lib/dpkg/subproc.c
 #, c-format
 msgid "subprocess %s was killed by signal (%s)%s"
 msgstr ""
 
-#: lib/dpkg/subproc.c:154
+#: lib/dpkg/subproc.c
 msgid ", core dumped"
 msgstr ""
 
-#: lib/dpkg/subproc.c:159
+#: lib/dpkg/subproc.c
 #, c-format
 msgid "subprocess %s failed with wait status code %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:176 utils/update-alternatives.c:418
+#: lib/dpkg/subproc.c utils/update-alternatives.c
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr ""
@@ -1224,7 +1217,7 @@
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:141
+#: lib/dpkg/trigdeferred.l
 msgid "triggers area"
 msgstr ""
 
@@ -1322,7 +1315,7 @@
 msgid "unable to open triggers ci file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:706
+#: lib/dpkg/triglib.c
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
@@ -1341,11 +1334,11 @@
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigname.c:34
+#: lib/dpkg/trigname.c
 msgid "empty trigger names are not permitted"
 msgstr ""
 
-#: lib/dpkg/trigname.c:38
+#: lib/dpkg/trigname.c
 msgid "trigger name contains invalid character"
 msgstr ""
 
@@ -1369,20 +1362,20 @@
 msgid "unexpected eof reading `%.250s'"
 msgstr ""
 
-#: lib/dpkg/varbuf.c:82 lib/dpkg/varbuf.c:88
+#: lib/dpkg/varbuf.c
 msgid "error formatting string into varbuf variable"
 msgstr ""
 
-#: src/archives.c:244
+#: src/archives.c
 msgid "error reading from dpkg-deb pipe"
 msgstr ""
 
-#: src/archives.c:259
+#: src/archives.c
 #, c-format
 msgid "cannot skip padding for file '%.255s': %s"
 msgstr ""
 
-#: src/archives.c:272
+#: src/archives.c
 #, c-format
 msgid "cannot skip file '%.255s' (replaced or excluded?) from pipe: %s"
 msgstr ""
@@ -1392,17 +1385,17 @@
 msgid "unable to create `%.255s' (while processing `%.255s')"
 msgstr ""
 
-#: src/archives.c:347
+#: src/archives.c
 #, c-format
 msgid "cannot copy extracted data for '%.255s' to '%.255s': %s"
 msgstr ""
 
-#: src/archives.c:363 src/archives.c:479 src/statcmd.c:167
+#: src/archives.c:363 src/archives.c:479 src/statcmd.c:165
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:365 src/archives.c:481 src/statcmd.c:169
+#: src/archives.c:365 src/archives.c:481 src/statcmd.c:167
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
@@ -1437,7 +1430,7 @@
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:432
+#: src/archives.c
 #, c-format
 msgid "cannot compute MD5 hash for tar file '%.255s': %s"
 msgstr ""
@@ -1452,15 +1445,15 @@
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:513
+#: src/selinux.c
 msgid "cannot open security status notification channel"
 msgstr ""
 
-#: src/archives.c:528
+#: src/selinux.c
 msgid "cannot get security labeling handle"
 msgstr ""
 
-#: src/archives.c:576
+#: src/selinux.c
 #, c-format
 msgid "cannot set security context for file object '%s'"
 msgstr ""
@@ -1470,12 +1463,12 @@
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:607 src/archives.c:1145 src/configure.c:760
+#: src/archives.c src/configure.c
 #, c-format
 msgid "symbolic link '%.250s' size has changed from %jd to %zd"
 msgstr ""
 
-#: src/archives.c:644
+#: src/archives.c
 #, c-format
 msgid ""
 "trying to overwrite shared '%.250s', which is different from other instances "
@@ -1529,33 +1522,29 @@
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:986 src/divertcmd.c:148 utils/update-alternatives.c:623
-#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1310
-#: utils/update-alternatives.c:1461 utils/update-alternatives.c:1725
-#: utils/update-alternatives.c:2223 utils/update-alternatives.c:2271
-#: utils/update-alternatives.c:2449
+#: src/archives.c src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
 msgstr ""
 
-#: src/archives.c:1001
+#: src/archives.c
 #, c-format
 msgid "Replacing files in old package %s (%s) ...\n"
 msgstr ""
 
-#: src/archives.c:1007
+#: src/archives.c
 #, c-format
 msgid "Replaced by files in installed package %s (%s) ...\n"
 msgstr ""
 
-#: src/archives.c:1017
+#: src/archives.c
 #, c-format
 msgid ""
 "trying to overwrite directory '%.250s' in package %.250s %.250s with "
 "nondirectory"
 msgstr ""
 
-#: src/archives.c:1024
+#: src/archives.c
 #, c-format
 msgid "trying to overwrite '%.250s', which is also in package %.250s %.250s"
 msgstr ""
@@ -1585,203 +1574,195 @@
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:1211 src/archives.c:1252
+#: src/archives.c
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr ""
 
-#: src/archives.c:1254
+#: src/archives.c
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr ""
 
-#: src/archives.c:1331
+#: src/archives.c
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1336
+#: src/archives.c
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s"
 msgstr ""
 
-#: src/archives.c:1340
+#: src/archives.c
 #, c-format
 msgid ""
 "no, %s is essential, will not deconfigure\n"
 " it in order to enable %s"
 msgstr ""
 
-#: src/archives.c:1349
+#: src/archives.c
 #, c-format
 msgid ""
 "no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1359
+#: src/archives.c
 #, c-format
 msgid "removal of %.250s"
 msgstr ""
 
-#: src/archives.c:1384
+#: src/archives.c
 #, c-format
 msgid "installation of %.250s"
 msgstr ""
 
-#: src/archives.c:1386
+#: src/archives.c
 #, c-format
 msgid "considering deconfiguration of %s, which would be broken by %s ..."
 msgstr ""
 
-#: src/archives.c:1392
+#: src/archives.c
 #, c-format
 msgid "yes, will deconfigure %s (broken by %s)"
 msgstr ""
 
-#: src/archives.c:1397 src/archives.c:1520
+#: src/archives.c
 #, c-format
 msgid ""
 "regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1405
+#: src/archives.c
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1410
+#: src/archives.c
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1415
+#: src/archives.c
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1447
+#: src/archives.c
 #, c-format
 msgid "considering removing %s in favour of %s ..."
 msgstr ""
 
-#: src/archives.c:1453
+#: src/archives.c
 #, c-format
 msgid "%s is not properly installed; ignoring any dependencies on it"
 msgstr ""
 
-#: src/archives.c:1482
+#: src/archives.c
 #, c-format
 msgid "may have trouble removing %s, as it provides %s ..."
 msgstr ""
 
-#: src/archives.c:1497
+#: src/archives.c
 #, c-format
 msgid ""
 "package %s requires reinstallation, but will remove anyway as you requested"
 msgstr ""
 
-#: src/archives.c:1501
+#: src/archives.c
 #, c-format
 msgid "package %s requires reinstallation, will not remove"
 msgstr ""
 
-#: src/archives.c:1510
+#: src/archives.c
 #, c-format
 msgid "yes, will remove %s in favour of %s"
 msgstr ""
 
-#: src/archives.c:1523
+#: src/archives.c
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:1525
+#: src/archives.c
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1577
+#: src/archives.c
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:1587
+#: src/archives.c
 msgid "find for dpkg --recursive"
 msgstr ""
 
-#: src/archives.c:1608
+#: src/archives.c
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:1614
+#: src/archives.c
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1615
+#: src/archives.c
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1618
+#: src/archives.c
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1621
+#: src/archives.c
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1632
+#: src/archives.c
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1666 src/divertcmd.c:76 src/divertcmd.c:116
-#: src/enquiry.c:234 src/enquiry.c:355 src/enquiry.c:557 src/enquiry.c:559
-#: src/enquiry.c:572 src/enquiry.c:602 src/main.c:67 src/main.c:171
-#: src/main.c:322 src/main.c:624 src/packages.c:294 src/querycmd.c:329
-#: src/querycmd.c:431 src/querycmd.c:473 src/querycmd.c:482 src/querycmd.c:528
-#: src/querycmd.c:612 src/querycmd.c:785 src/querycmd.c:833 src/select.c:101
-#: src/statcmd.c:64 src/statcmd.c:94 src/trigcmd.c:57 src/trigcmd.c:90
-#: dpkg-deb/build.c:447 dpkg-deb/extract.c:234 dpkg-deb/extract.c:270
-#: dpkg-deb/info.c:206 dpkg-deb/info.c:244 dpkg-deb/main.c:61
-#: dpkg-deb/main.c:135 dpkg-split/info.c:266 dpkg-split/main.c:55
-#: dpkg-split/main.c:99 dpkg-split/queue.c:156 dpkg-split/queue.c:298
+#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
+#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c dpkg-deb/build.c
+#: dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c dpkg-split/info.c
+#: dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1667 src/packages.c:295 src/querycmd.c:330
-#: src/querycmd.c:429 src/querycmd.c:534 src/querycmd.c:613 src/select.c:102
-#: dpkg-split/main.c:170 dpkg-split/queue.c:234
+#: src/archives.c src/packages.c src/querycmd.c src/select.c dpkg-split/main.c
+#: dpkg-split/queue.c
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1710
+#: src/archives.c
 #, c-format
 msgid "Selecting previously unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1714
+#: src/archives.c
 #, c-format
 msgid "Skipping unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1731
+#: src/archives.c
 #, c-format
 msgid "version %.250s of %.250s already installed, skipping"
 msgstr ""
 
-#: src/archives.c:1740
+#: src/archives.c
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s"
 msgstr ""
 
-#: src/archives.c:1746
+#: src/archives.c
 #, c-format
 msgid "will not downgrade %.250s from %.250s to %.250s, skipping"
 msgstr ""
@@ -1798,7 +1779,7 @@
 msgid "unable to restore backup version of `%.250s'"
 msgstr ""
 
-#: src/cleanup.c:98
+#: src/cleanup.c
 #, c-format
 msgid "unable to remove backup copy of '%.250s'"
 msgstr ""
@@ -1813,69 +1794,69 @@
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr ""
 
-#: src/configure.c:98
+#: src/configure.c
 #, c-format
 msgid "Configuration file '%s'\n"
 msgstr ""
 
-#: src/configure.c:100
+#: src/configure.c
 #, c-format
 msgid "Configuration file '%s' (actually '%s')\n"
 msgstr ""
 
-#: src/configure.c:105
+#: src/configure.c
 #, c-format
 msgid ""
 " ==> File on system created by you or by a script.\n"
 " ==> File also in package provided by package maintainer.\n"
 msgstr ""
 
-#: src/configure.c:109
+#: src/configure.c
 #, c-format
 msgid "     Not modified since installation.\n"
 msgstr ""
 
-#: src/configure.c:111
+#: src/configure.c
 #, c-format
 msgid " ==> Modified (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:112
+#: src/configure.c
 #, c-format
 msgid " ==> Deleted (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:115
+#: src/configure.c
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
 
-#: src/configure.c:116
+#: src/configure.c
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 
-#: src/configure.c:125
+#: src/configure.c
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:129
+#: src/configure.c
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:138
+#: src/configure.c
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr ""
 
-#: src/configure.c:142
+#: src/configure.c
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr ""
 
-#: src/configure.c:148
+#: src/configure.c
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1885,33 +1866,33 @@
 "      Z     : start a shell to examine the situation\n"
 msgstr ""
 
-#: src/configure.c:156
+#: src/configure.c
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr ""
 
-#: src/configure.c:159
+#: src/configure.c
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr ""
 
-#: src/configure.c:163
+#: src/configure.c
 msgid "[default=N]"
 msgstr ""
 
-#: src/configure.c:164
+#: src/configure.c
 msgid "[default=Y]"
 msgstr ""
 
-#: src/configure.c:165
+#: src/configure.c
 msgid "[no default]"
 msgstr ""
 
-#: src/configure.c:168
+#: src/configure.c
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 
-#: src/configure.c:177
+#: src/configure.c
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 
@@ -1919,7 +1900,7 @@
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
-#: src/configure.c:211 src/configure.c:215
+#: src/configure.c
 msgid "conffile difference visualizer"
 msgstr ""
 
@@ -1927,11 +1908,11 @@
 msgid "Type `exit' when you're done.\n"
 msgstr ""
 
-#: src/configure.c:241 src/configure.c:245
+#: src/configure.c
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:403
+#: src/configure.c
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
@@ -1949,37 +1930,37 @@
 "Installing new config file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:467
+#: src/configure.c
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:476
+#: src/configure.c
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:483
+#: src/configure.c
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:490
+#: src/configure.c
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:495
+#: src/configure.c
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 
-#: src/configure.c:500
+#: src/configure.c
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:505
+#: src/configure.c
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr ""
@@ -1994,7 +1975,7 @@
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 
-#: src/configure.c:567
+#: src/configure.c
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr ""
@@ -2006,232 +1987,231 @@
 " cannot configure (current status `%.250s')"
 msgstr ""
 
-#: src/configure.c:583
+#: src/configure.c
 #, c-format
 msgid ""
 "package %s cannot be configured because %s is not ready (current status '%s')"
 msgstr ""
 
-#: src/configure.c:591
+#: src/configure.c
 #, c-format
 msgid ""
 "package %s %s cannot be configured because %s is at a different version (%s)"
 msgstr ""
 
-#: src/configure.c:627
+#: src/configure.c
 #, c-format
 msgid ""
 "dependency problems prevent configuration of %s:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:630
+#: src/configure.c
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: src/configure.c:633
+#: src/configure.c
 #, c-format
 msgid ""
 "%s: dependency problems, but configuring anyway as you requested:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:641
+#: src/configure.c
 msgid ""
 "package is in a very bad inconsistent state; you should\n"
 " reinstall it before attempting configuration"
 msgstr ""
 
-#: src/configure.c:644
+#: src/configure.c
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr ""
 
-#: src/configure.c:729
+#: src/configure.c
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:743
+#: src/configure.c
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
 " (= '%s')"
 msgstr ""
 
-#: src/configure.c:754
+#: src/configure.c
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:781
+#: src/configure.c
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c:797
+#: src/configure.c
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 
-#: src/configure.c:825 dpkg-split/split.c:143
+#: src/configure.c dpkg-split/split.c
 #, c-format
 msgid "cannot compute MD5 hash for file '%s': %s"
 msgstr ""
 
-#: src/configure.c:832
+#: src/configure.c
 #, c-format
 msgid "%s: unable to open %s for hash: %s"
 msgstr ""
 
-#: src/depcon.c:247
+#: src/depcon.c
 #, c-format
 msgid "%s depends on %s"
 msgstr ""
 
-#: src/depcon.c:250
+#: src/depcon.c
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr ""
 
-#: src/depcon.c:253
+#: src/depcon.c
 #, c-format
 msgid "%s recommends %s"
 msgstr ""
 
-#: src/depcon.c:256
+#: src/depcon.c
 #, c-format
 msgid "%s suggests %s"
 msgstr ""
 
-#: src/depcon.c:259
+#: src/depcon.c
 #, c-format
 msgid "%s breaks %s"
 msgstr ""
 
-#: src/depcon.c:262
+#: src/depcon.c
 #, c-format
 msgid "%s conflicts with %s"
 msgstr ""
 
-#: src/depcon.c:265
+#: src/depcon.c
 #, c-format
 msgid "%s enhances %s"
 msgstr ""
 
-#: src/depcon.c:378
+#: src/depcon.c
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:382
+#: src/depcon.c
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:390
+#: src/depcon.c
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:404
+#: src/depcon.c
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:424
+#: src/depcon.c
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: src/depcon.c:429
+#: src/depcon.c
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:438
+#: src/depcon.c
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:450
+#: src/depcon.c
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: src/depcon.c:490
+#: src/depcon.c
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:495
+#: src/depcon.c
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:506
+#: src/depcon.c
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: src/depcon.c:521
+#: src/depcon.c
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: src/depcon.c:553
+#: src/depcon.c
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:584
+#: src/depcon.c
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr ""
 
-#: src/depcon.c:615
+#: src/depcon.c
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:664
+#: src/depcon.c
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr ""
 
-#: src/divertcmd.c:53
+#: src/divertcmd.c
 msgid "Use --help for help about diverting files."
 msgstr ""
 
-#: src/divertcmd.c:69 src/statcmd.c:57 utils/update-alternatives.c:80
+#: src/divertcmd.c src/statcmd.c utils/update-alternatives.c
 #, c-format
 msgid "Debian %s version %s.\n"
 msgstr ""
 
-#: src/divertcmd.c:73 src/main.c:64 src/querycmd.c:782 src/statcmd.c:61
-#: src/trigcmd.c:54 dpkg-deb/main.c:58 dpkg-split/main.c:52
-#: utils/update-alternatives.c:84
+#: src/divertcmd.c src/main.c src/querycmd.c src/statcmd.c src/trigcmd.c
+#: dpkg-deb/main.c dpkg-split/main.c utils/update-alternatives.c
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: src/divertcmd.c:85 src/main.c:82 src/querycmd.c:794 src/statcmd.c:73
-#: dpkg-deb/main.c:70 dpkg-split/main.c:64 utils/update-alternatives.c:92
+#: src/divertcmd.c src/main.c src/querycmd.c src/statcmd.c dpkg-deb/main.c
+#: dpkg-split/main.c utils/update-alternatives.c
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:89
+#: src/divertcmd.c
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2243,7 +2223,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:98
+#: src/divertcmd.c
 #, c-format
 msgid ""
 "Options:\n"
@@ -2261,7 +2241,7 @@
 "\n"
 msgstr ""
 
-#: src/divertcmd.c:112
+#: src/divertcmd.c
 #, c-format
 msgid ""
 "When adding, default is --local and --divert <original>.distrib.\n"
@@ -2270,7 +2250,7 @@
 "divert.\n"
 msgstr ""
 
-#: src/divertcmd.c:166
+#: src/divertcmd.c
 #, c-format
 msgid "error checking '%s'"
 msgstr ""
@@ -2282,86 +2262,85 @@
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:222 utils/update-alternatives.c:1392
+#: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "unable to create file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:227
+#: src/divertcmd.c
 #, c-format
 msgid "cannot copy '%s' to '%s': %s"
 msgstr ""
 
-#: src/divertcmd.c:239
+#: src/divertcmd.c
 #, c-format
 msgid "cannot rename '%s' to '%s'"
 msgstr ""
 
-#: src/divertcmd.c:254
+#: src/divertcmd.c
 #, c-format
 msgid "rename: remove duplicate old link '%s'"
 msgstr ""
 
-#: src/divertcmd.c:264
+#: src/divertcmd.c
 #, c-format
 msgid "unable to remove copied source file '%s'"
 msgstr ""
 
-#: src/divertcmd.c:273 src/divertcmd.c:737
+#: src/divertcmd.c
 #, c-format
 msgid "filename \"%s\" is not absolute"
 msgstr ""
 
-#: src/divertcmd.c:275
+#: src/divertcmd.c
 msgid "file may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:295
+#: src/divertcmd.c
 #, c-format
 msgid "local diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c:297
+#: src/divertcmd.c
 #, c-format
 msgid "local diversion of %s to %s"
 msgstr ""
 
-#: src/divertcmd.c:301
+#: src/divertcmd.c
 #, c-format
 msgid "diversion of %s by %s"
 msgstr ""
 
-#: src/divertcmd.c:304
+#: src/divertcmd.c
 #, c-format
 msgid "diversion of %s to %s by %s"
 msgstr ""
 
-#: src/divertcmd.c:320
+#: src/divertcmd.c
 #, c-format
 msgid "any diversion of %s"
 msgstr ""
 
-#: src/divertcmd.c:322
+#: src/divertcmd.c
 #, c-format
 msgid "any diversion of %s to %s"
 msgstr ""
 
-#: src/divertcmd.c:427 src/divertcmd.c:559 src/divertcmd.c:677
-#: src/divertcmd.c:699 src/statcmd.c:283
+#: src/divertcmd.c src/statcmd.c
 #, c-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: src/divertcmd.c:436
+#: src/divertcmd.c
 msgid "cannot divert directories"
 msgstr ""
 
-#: src/divertcmd.c:449
+#: src/divertcmd.c
 #, c-format
 msgid "cannot divert file '%s' to itself"
 msgstr ""
 
-#: src/divertcmd.c:469
+#: src/divertcmd.c
 #, c-format
 msgid "Leaving '%s'\n"
 msgstr ""
@@ -2371,18 +2350,18 @@
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: src/divertcmd.c:497
+#: src/divertcmd.c
 #, c-format
 msgid "Adding '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:503
+#: src/divertcmd.c
 #, c-format
 msgid ""
 "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:568
+#: src/divertcmd.c
 #, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
@@ -2403,29 +2382,29 @@
 "  found `%s'"
 msgstr ""
 
-#: src/divertcmd.c:600
+#: src/divertcmd.c
 #, c-format
 msgid "Ignoring request to remove shared diversion '%s'.\n"
 msgstr ""
 
-#: src/divertcmd.c:606
+#: src/divertcmd.c
 #, c-format
 msgid "Removing '%s'\n"
 msgstr ""
 
-#: src/divertcmd.c:728
+#: src/divertcmd.c
 msgid "package may not contain newlines"
 msgstr ""
 
-#: src/divertcmd.c:739
+#: src/divertcmd.c
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c:64
+#: src/divertdb.c
 msgid "failed to open diversions file"
 msgstr ""
 
-#: src/divertdb.c:69
+#: src/divertdb.c
 msgid "failed to fstat diversions file"
 msgstr ""
 
@@ -2434,160 +2413,158 @@
 msgid "conflicting diversions involving `%.250s' or `%.250s'"
 msgstr ""
 
-#: src/enquiry.c:94
+#: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
 "installation.  They must be reinstalled for them (and any packages\n"
 "that depend on them) to function properly:\n"
 msgstr ""
 
-#: src/enquiry.c:101
+#: src/enquiry.c
 msgid ""
 "The following packages have been unpacked but not yet configured.\n"
 "They must be configured using dpkg --configure or the configure\n"
 "menu option in dselect for them to work:\n"
 msgstr ""
 
-#: src/enquiry.c:108
+#: src/enquiry.c
 msgid ""
 "The following packages are only half configured, probably due to problems\n"
 "configuring them the first time.  The configuration should be retried using\n"
 "dpkg --configure <package> or the configure menu option in dselect:\n"
 msgstr ""
 
-#: src/enquiry.c:115
+#: src/enquiry.c
 msgid ""
 "The following packages are only half installed, due to problems during\n"
 "installation.  The installation can probably be completed by retrying it;\n"
 "the packages can be removed using dselect or dpkg --remove:\n"
 msgstr ""
 
-#: src/enquiry.c:122
+#: src/enquiry.c
 msgid ""
 "The following packages are awaiting processing of triggers that they\n"
 "have activated in other packages.  This processing can be requested using\n"
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c:129
+#: src/enquiry.c
 msgid ""
 "The following packages have been triggered, but the trigger processing\n"
 "has not yet been done.  Trigger processing can be requested using\n"
 "dselect or dpkg --configure --pending (or dpkg --triggers-only):\n"
 msgstr ""
 
-#: src/enquiry.c:136
+#: src/enquiry.c
 msgid ""
 "The following packages are missing the list control file in the\n"
 "database, they need to be reinstalled:\n"
 msgstr ""
 
-#: src/enquiry.c:142
+#: src/enquiry.c
 msgid ""
 "The following packages are missing the md5sums control file in the\n"
 "database, they need to be reinstalled:\n"
 msgstr ""
 
-#: src/enquiry.c:147
+#: src/enquiry.c
 msgid "The following packages do not have an architecture:\n"
 msgstr ""
 
-#: src/enquiry.c:151
+#: src/enquiry.c
 msgid "The following packages have an illegal architecture:\n"
 msgstr ""
 
-#: src/enquiry.c:156
+#: src/enquiry.c
 msgid ""
 "The following packages have an unknown foreign architecture, which will\n"
 "cause dependency issues on front-ends. This can be fixed by registering\n"
 "the foreign architecture with dpkg --add-architecture:\n"
 msgstr ""
 
-#: src/enquiry.c:283 src/enquiry.c:368 src/enquiry.c:467 src/enquiry.c:568
-#: src/enquiry.c:591 src/select.c:121 src/select.c:209 src/trigcmd.c:219
-#: src/update.c:48 src/update.c:114 dpkg-split/queue.c:249
+#: src/enquiry.c src/select.c src/trigcmd.c src/update.c dpkg-split/queue.c
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
 
-#: src/enquiry.c:218
+#: src/enquiry.c
 msgid ""
 "Another process has locked the database for writing, and might currently be\n"
 "modifying it, some of the following problems might just be due to that.\n"
 msgstr ""
 
-#: src/enquiry.c:263
+#: src/enquiry.c
 msgctxt "section"
 msgid "<unknown>"
 msgstr ""
 
-#: src/enquiry.c:323
+#: src/enquiry.c
 #, c-format
 msgid " %d in %s: "
 msgstr ""
 
-#: src/enquiry.c:342
+#: src/enquiry.c
 #, c-format
 msgid " %d package, from the following section:"
 msgid_plural " %d packages, from the following sections:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/enquiry.c:383
+#: src/enquiry.c
 #, c-format
 msgid ""
 "Version of dpkg with working %s support not yet configured.\n"
 " Please use 'dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: src/enquiry.c:388
+#: src/enquiry.c
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for %s support!\n"
 msgstr ""
 
-#: src/enquiry.c:399
+#: src/enquiry.c
 msgid "Pre-Depends field"
 msgstr ""
 
-#: src/enquiry.c:407
+#: src/enquiry.c
 msgid "epoch"
 msgstr ""
 
-#: src/enquiry.c:415
+#: src/enquiry.c
 msgid "long filenames"
 msgstr ""
 
-#: src/enquiry.c:424
+#: src/enquiry.c
 msgid "multiple Conflicts and Replaces"
 msgstr ""
 
-#: src/enquiry.c:432
+#: src/enquiry.c
 msgid "multi-arch"
 msgstr ""
 
-#: src/enquiry.c:541
+#: src/enquiry.c
 #, c-format
 msgid ""
 "cannot see how to satisfy pre-dependency:\n"
 " %s"
 msgstr ""
 
-#: src/enquiry.c:542
+#: src/enquiry.c
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: src/enquiry.c:580 dpkg-deb/main.c:172 dpkg-deb/main.c:181
+#: src/enquiry.c dpkg-deb/main.c
 #, c-format
 msgid "obsolete option '--%s'; please use '--%s' instead"
 msgstr ""
 
-#: src/enquiry.c:649
+#: src/enquiry.c
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: src/enquiry.c:654
+#: src/enquiry.c
 msgid "--compare-versions bad relation"
 msgstr ""
 
@@ -2596,50 +2573,50 @@
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
 
-#: src/errors.c:65
+#: src/errors.c
 #, c-format
 msgid ""
 "failed to allocate memory for new entry in list of failed packages: %s"
 msgstr ""
 
-#: src/errors.c:76
+#: src/errors.c
 msgid "too many errors, stopping"
 msgstr ""
 
-#: src/errors.c:85
+#: src/errors.c
 #, c-format
 msgid ""
 "error processing package %s (--%s):\n"
 " %s"
 msgstr ""
 
-#: src/errors.c:98
+#: src/errors.c
 #, c-format
 msgid ""
 "error processing archive %s (--%s):\n"
 " %s"
 msgstr ""
 
-#: src/errors.c:110
+#: src/errors.c
 msgid "Errors were encountered while processing:\n"
 msgstr ""
 
-#: src/errors.c:117
+#: src/errors.c
 msgid "Processing was halted because there were too many errors.\n"
 msgstr ""
 
-#: src/errors.c:128
+#: src/errors.c
 #, c-format
 msgid "package %s was on hold, processing it anyway as you requested"
 msgstr ""
 
-#: src/errors.c:132
+#: src/errors.c
 #, c-format
 msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c:142
+#: src/errors.c
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
@@ -2648,29 +2625,29 @@
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:243
+#: src/filesdb.c
 #, c-format
 msgid ""
 "files list file for package '%.250s' missing; assuming package has no files "
 "currently installed"
 msgstr ""
 
-#: src/filesdb.c:255
+#: src/filesdb.c
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c:259
+#: src/filesdb.c
 #, c-format
 msgid "files list for package '%.250s' is not a regular file"
 msgstr ""
 
-#: src/filesdb.c:267
+#: src/filesdb.c
 #, c-format
 msgid "reading files list for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c:277
+#: src/filesdb.c
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
@@ -2685,104 +2662,104 @@
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:408
+#: src/filesdb.c
 msgid "(Reading database ... "
 msgstr ""
 
-#: src/filesdb.c:429
+#: src/filesdb.c
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/filesdb-hash.c:95
+#: src/filesdb-hash.c
 #, c-format
 msgid "control file '%s' for package '%s' is missing final newline"
 msgstr ""
 
-#: src/filesdb-hash.c:104
+#: src/filesdb-hash.c
 #, c-format
 msgid "control file '%s' missing value"
 msgstr ""
 
-#: src/filesdb-hash.c:107
+#: src/filesdb-hash.c
 #, c-format
 msgid "control file '%s' missing value separator"
 msgstr ""
 
-#: src/filesdb-hash.c:120
+#: src/filesdb-hash.c
 #, c-format
 msgid "control file '%s' for package '%s' contains empty filename"
 msgstr ""
 
-#: src/filesdb-hash.c:146
+#: src/filesdb-hash.c
 #, c-format
 msgid "cannot open '%s' control file for package '%s'"
 msgstr ""
 
-#: src/filesdb-hash.c:151
+#: src/filesdb-hash.c
 #, c-format
 msgid "cannot stat '%s' control file for package '%s'"
 msgstr ""
 
-#: src/filesdb-hash.c:155
+#: src/filesdb-hash.c
 #, c-format
 msgid "'%s' file for package '%s' is not a regular file"
 msgstr ""
 
-#: src/filesdb-hash.c:165
+#: src/filesdb-hash.c
 #, c-format
 msgid "cannot read '%s' control file for package '%s'"
 msgstr ""
 
-#: src/filesdb-hash.c:172
+#: src/filesdb-hash.c
 #, c-format
 msgid "cannot close '%s' control file for package '%s'"
 msgstr ""
 
-#: src/help.c:44
+#: src/help.c
 msgid "not installed"
 msgstr ""
 
-#: src/help.c:45
+#: src/help.c
 msgid "not installed but configs remain"
 msgstr ""
 
-#: src/help.c:46
+#: src/help.c
 msgid "broken due to failed removal or installation"
 msgstr ""
 
-#: src/help.c:47
+#: src/help.c
 msgid "unpacked but not configured"
 msgstr ""
 
-#: src/help.c:48
+#: src/help.c
 msgid "broken due to postinst failure"
 msgstr ""
 
-#: src/help.c:49
+#: src/help.c
 msgid "awaiting trigger processing by another package"
 msgstr ""
 
-#: src/help.c:50
+#: src/help.c
 msgid "triggered"
 msgstr ""
 
-#: src/help.c:51
+#: src/help.c
 msgid "installed"
 msgstr ""
 
-#: src/help.c:112
+#: src/help.c
 msgid "PATH is not set"
 msgstr ""
 
-#: src/help.c:134
+#: src/help.c
 #, c-format
 msgid "'%s' not found in PATH or not executable"
 msgstr ""
 
-#: src/help.c:143
+#: src/help.c
 #, c-format
 msgid ""
 "%d expected program not found in PATH or not executable\n"
@@ -2793,17 +2770,17 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/help.c:146
+#: src/help.c
 msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr ""
 
-#: src/help.c:388
+#: lib/dpkg/path-remove.c
 #, c-format
 msgid "unable to securely remove '%.255s'"
 msgstr ""
 
-#: src/help.c:393 src/help.c:397 dpkg-deb/info.c:66 dpkg-deb/info.c:68
+#: lib/dpkg/path-remove.c
 msgid "rm command for cleanup"
 msgstr ""
 
@@ -2812,32 +2789,32 @@
 msgid "unable to check existence of `%.250s'"
 msgstr ""
 
-#: src/infodb-access.c:83 src/infodb-upgrade.c:93
+#: src/infodb-access.c src/infodb-upgrade.c
 msgid "cannot read info directory"
 msgstr ""
 
-#: src/infodb-format.c:52 src/unpack.c:214
+#: src/infodb-format.c src/unpack.c
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: src/infodb-format.c:56
+#: src/infodb-format.c
 #, c-format
 msgid "corrupt info database format file '%s'"
 msgstr ""
 
-#: src/infodb-format.c:88
+#: src/infodb-format.c
 #, c-format
 msgid ""
 "info database format (%d) is bogus or too new; try getting a newer dpkg"
 msgstr ""
 
-#: src/infodb-upgrade.c:123
+#: src/infodb-upgrade.c
 #, c-format
 msgid "info file %s/%s not associated to any package"
 msgstr ""
 
-#: src/infodb-upgrade.c:183
+#: src/infodb-upgrade.c
 #, c-format
 msgid "error while writing '%s'"
 msgstr ""
@@ -2883,8 +2860,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:118 src/querycmd.c:813 src/trigcmd.c:76 dpkg-deb/main.c:90
-#: dpkg-split/main.c:78
+#: src/main.c src/querycmd.c src/trigcmd.c dpkg-deb/main.c dpkg-split/main.c
 #, c-format
 msgid ""
 "  -?, --help                       Show this help message.\n"
@@ -2910,7 +2886,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c
 #, c-format
 msgid ""
 "Options:\n"
@@ -2950,7 +2926,7 @@
 "\n"
 msgstr ""
 
-#: src/main.c:162
+#: src/main.c
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
@@ -2962,12 +2938,12 @@
 "\n"
 msgstr ""
 
-#: src/main.c:169
+#: src/main.c
 #, c-format
 msgid "Use 'apt' or 'aptitude' for user-friendly package management.\n"
 msgstr ""
 
-#: src/main.c:177
+#: src/main.c
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use 'apt' or 'aptitude' for user-friendly package management;\n"
@@ -2979,63 +2955,63 @@
 "'more' !"
 msgstr ""
 
-#: src/main.c:226
+#: src/main.c
 msgid "Set all force options"
 msgstr ""
 
-#: src/main.c:228
+#: src/main.c
 msgid "Replace a package with a lower version"
 msgstr ""
 
-#: src/main.c:230
+#: src/main.c
 msgid "Configure any package which may help this one"
 msgstr ""
 
-#: src/main.c:232
+#: src/main.c
 msgid "Process incidental packages even when on hold"
 msgstr ""
 
-#: src/main.c:234
+#: src/main.c
 msgid "Try to (de)install things even when not root"
 msgstr ""
 
-#: src/main.c:236
+#: src/main.c
 msgid "PATH is missing important programs, problems likely"
 msgstr ""
 
-#: src/main.c:238
+#: src/main.c
 msgid "Install a package even if it fails authenticity check"
 msgstr ""
 
-#: src/main.c:240
+#: src/main.c
 msgid "Process even packages with wrong versions"
 msgstr ""
 
-#: src/main.c:242
+#: src/main.c
 msgid "Overwrite a file from one package with another"
 msgstr ""
 
-#: src/main.c:244
+#: src/main.c
 msgid "Overwrite a diverted file with an undiverted version"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c
 msgid "Overwrite one package's directory with another's file"
 msgstr ""
 
-#: src/main.c:248
+#: src/main.c
 msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
 
-#: src/main.c:250
+#: src/main.c
 msgid "Always use the new config files, don't prompt"
 msgstr ""
 
-#: src/main.c:252
+#: src/main.c
 msgid "Always use the old config files, don't prompt"
 msgstr ""
 
-#: src/main.c:254
+#: src/main.c
 msgid ""
 "Use the default option for new config files if one\n"
 "is available, don't prompt. If no default can be found,\n"
@@ -3043,95 +3019,95 @@
 "confnew options is also given"
 msgstr ""
 
-#: src/main.c:259
+#: src/main.c
 msgid "Always install missing config files"
 msgstr ""
 
-#: src/main.c:261
+#: src/main.c
 msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/main.c:263
+#: src/main.c
 msgid "Process even packages with wrong or no architecture"
 msgstr ""
 
-#: src/main.c:265
+#: src/main.c
 msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c
 msgid "Allow installation of conflicting packages"
 msgstr ""
 
-#: src/main.c:269
+#: src/main.c
 msgid "Turn all dependency problems into warnings"
 msgstr ""
 
-#: src/main.c:271
+#: src/main.c
 msgid "Turn dependency version problems into warnings"
 msgstr ""
 
-#: src/main.c:273
+#: src/main.c
 msgid "Remove packages which require installation"
 msgstr ""
 
-#: src/main.c:275
+#: src/main.c
 msgid "Remove an essential package"
 msgstr ""
 
-#: src/main.c:287
+#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c
 msgid "Invocation and status of maintainer scripts"
 msgstr ""
 
-#: src/main.c:289
+#: src/main.c
 msgid "Output for each file processed"
 msgstr ""
 
-#: src/main.c:290
+#: src/main.c
 msgid "Lots of output for each file processed"
 msgstr ""
 
-#: src/main.c:291
+#: src/main.c
 msgid "Output for each configuration file"
 msgstr ""
 
-#: src/main.c:292
+#: src/main.c
 msgid "Lots of output for each configuration file"
 msgstr ""
 
-#: src/main.c:293
+#: src/main.c
 msgid "Dependencies and conflicts"
 msgstr ""
 
-#: src/main.c:294
+#: src/main.c
 msgid "Lots of dependencies/conflicts output"
 msgstr ""
 
-#: src/main.c:295
+#: src/main.c
 msgid "Trigger activation and processing"
 msgstr ""
 
-#: src/main.c:296
+#: src/main.c
 msgid "Lots of output regarding triggers"
 msgstr ""
 
-#: src/main.c:297
+#: src/main.c
 msgid "Silly amounts of output regarding triggers"
 msgstr ""
 
-#: src/main.c:298
+#: src/main.c
 msgid "Lots of drivel about eg the dpkg/info directory"
 msgstr ""
 
-#: src/main.c:299
+#: src/main.c
 msgid "Insane amounts of drivel"
 msgstr ""
 
-#: src/main.c:312
+#: src/main.c
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -3139,7 +3115,7 @@
 " Number  Ref. in source   Description\n"
 msgstr ""
 
-#: src/main.c:319
+#: src/main.c
 #, c-format
 msgid ""
 "\n"
@@ -3147,32 +3123,32 @@
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:329
+#: src/main.c
 #, c-format
 msgid "--%s requires a positive octal argument"
 msgstr ""
 
-#: src/main.c:344
+#: src/main.c
 #, c-format
 msgid "unknown verify output format '%s'"
 msgstr ""
 
-#: src/main.c:380
+#: src/main.c
 #, c-format
 msgid "null package name in --%s comma-separated list '%.250s'"
 msgstr ""
 
-#: lib/dpkg/options-parsers.c:49
+#: lib/dpkg/options-parsers.c
 #, c-format
 msgid "--%s needs a valid package name but '%.250s' is not: %s"
 msgstr ""
 
-#: src/main.c:466
+#: src/main.c
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr ""
 
-#: src/main.c:505
+#: src/main.c
 msgid "status logger"
 msgstr ""
 
@@ -3181,32 +3157,32 @@
 msgid "--%s takes one argument"
 msgstr ""
 
-#: src/main.c:527
+#: src/main.c
 #, c-format
 msgid "architecture '%s' is illegal: %s"
 msgstr ""
 
-#: src/main.c:530
+#: src/main.c
 #, c-format
 msgid "architecture '%s' is reserved and cannot be added"
 msgstr ""
 
-#: src/main.c:553
+#: src/main.c
 #, c-format
 msgid "cannot remove non-foreign architecture '%s'"
 msgstr ""
 
-#: src/main.c:564
+#: src/main.c
 #, c-format
 msgid "removing architecture '%s' currently in use by database"
 msgstr ""
 
-#: src/main.c:567
+#: src/main.c
 #, c-format
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 
-#: src/main.c:612
+#: src/main.c
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3215,7 +3191,7 @@
 " Forcing things:\n"
 msgstr ""
 
-#: src/main.c:621
+#: src/main.c
 #, c-format
 msgid ""
 "\n"
@@ -3233,7 +3209,7 @@
 msgid "obsolete force/refuse option '%s'\n"
 msgstr ""
 
-#: src/main.c:517 src/main.c:547 src/main.c:782 dpkg-deb/info.c:311
+#: src/main.c dpkg-deb/info.c
 #, c-format
 msgid "--%s takes exactly one argument"
 msgstr ""
@@ -3248,37 +3224,36 @@
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:855 src/main.c:873 src/querycmd.c:875 src/statcmd.c:368
-#: dpkg-deb/main.c:260 dpkg-split/main.c:166
+#: src/main.c src/querycmd.c src/statcmd.c dpkg-deb/main.c dpkg-split/main.c
 msgid "need an action option"
 msgstr ""
 
-#: src/main.c:879 src/script.c:106
+#: src/main.c src/script.c
 msgid "unable to setenv for subprocesses"
 msgstr ""
 
-#: src/packages.c:126
+#: src/packages.c
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
 msgstr ""
 
-#: src/packages.c:151
+#: src/packages.c
 #, c-format
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: src/packages.c:156 src/querycmd.c:451 src/querycmd.c:689
+#: src/packages.c src/querycmd.c
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr ""
 
-#: src/packages.c:205
+#: src/packages.c
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
 msgstr ""
 
-#: src/packages.c:209
+#: src/packages.c
 #, c-format
 msgid ""
 "More than one copy of package %s has been unpacked\n"
@@ -3292,76 +3267,76 @@
 " (current status `%.250s' with no pending triggers)"
 msgstr ""
 
-#: src/packages.c:374
+#: src/packages.c
 #, c-format
 msgid "  Package %s which provides %s is to be removed.\n"
 msgstr ""
 
-#: src/packages.c:378
+#: src/packages.c
 #, c-format
 msgid "  Package %s is to be removed.\n"
 msgstr ""
 
-#: src/packages.c:411
+#: src/packages.c
 #, c-format
 msgid "  Version of %s on system is %s.\n"
 msgstr ""
 
-#: src/packages.c:434
+#: src/packages.c
 #, c-format
 msgid "  Package %s which provides %s awaits trigger processing.\n"
 msgstr ""
 
-#: src/packages.c:439
+#: src/packages.c
 #, c-format
 msgid "  Package %s awaits trigger processing.\n"
 msgstr ""
 
-#: src/packages.c:468
+#: src/packages.c
 #, c-format
 msgid "also configuring '%s' (required by '%s')"
 msgstr ""
 
-#: src/packages.c:477
+#: src/packages.c
 #, c-format
 msgid "  Package %s which provides %s is not configured yet.\n"
 msgstr ""
 
-#: src/packages.c:481
+#: src/packages.c
 #, c-format
 msgid "  Package %s is not configured yet.\n"
 msgstr ""
 
-#: src/packages.c:492
+#: src/packages.c
 #, c-format
 msgid "  Package %s which provides %s is not installed.\n"
 msgstr ""
 
-#: src/packages.c:496
+#: src/packages.c
 #, c-format
 msgid "  Package %s is not installed.\n"
 msgstr ""
 
-#: src/packages.c:539
+#: src/packages.c
 #, c-format
 msgid " %s (%s) breaks %s and is %s.\n"
 msgstr ""
 
-#: src/packages.c:546
+#: src/packages.c
 #, c-format
 msgid "  %s (%s) provides %s.\n"
 msgstr ""
 
-#: src/packages.c:551
+#: src/packages.c
 #, c-format
 msgid "  Version of %s to be configured is %s.\n"
 msgstr ""
 
-#: src/packages.c:698
+#: src/packages.c
 msgid " depends on "
 msgstr ""
 
-#: src/packages.c:704
+#: src/packages.c
 msgid "; however:\n"
 msgstr ""
 
@@ -3371,7 +3346,7 @@
 #. * the first three columns, which should ideally match the English one
 #. * (e.g. Remove → supRimeix), see dpkg-query(1) for further details. The
 #. * translated message can use additional lines if needed.
-#: src/querycmd.c:191
+#: src/querycmd.c
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-"
@@ -3379,68 +3354,67 @@
 "|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)\n"
 msgstr ""
 
-#: src/querycmd.c:195
+#: src/querycmd.c
 msgid "Name"
 msgstr ""
 
-#: src/querycmd.c:195
+#: src/querycmd.c
 msgid "Version"
 msgstr ""
 
-#: src/querycmd.c:196
+#: src/querycmd.c
 msgid "Architecture"
 msgstr ""
 
-#: src/querycmd.c:196
+#: src/querycmd.c
 msgid "Description"
 msgstr ""
 
-#: src/querycmd.c:319 src/querycmd.c:602 src/select.c:95
+#: src/querycmd.c src/select.c
 #, c-format
 msgid "no packages found matching %s"
 msgstr ""
 
-#: src/querycmd.c:350
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr ""
 
-#: src/querycmd.c:352
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s to: %s\n"
 msgstr ""
 
-#: src/querycmd.c:355
+#: src/querycmd.c
 #, c-format
 msgid "local diversion from: %s\n"
 msgstr ""
 
-#: src/querycmd.c:356
+#: src/querycmd.c
 #, c-format
 msgid "local diversion to: %s\n"
 msgstr ""
 
-#: src/querycmd.c:386
+#: src/querycmd.c
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 
-#: src/querycmd.c:427
+#: src/querycmd.c
 #, c-format
 msgid "no path found matching pattern %s"
 msgstr ""
 
-#: src/querycmd.c:469
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not installed and no information is available"
 msgstr ""
 
-#: src/querycmd.c:478
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr ""
 
-#: src/enquiry.c:185 src/querycmd.c:488 src/querycmd.c:703 src/querycmd.c:730
-#: src/querycmd.c:762
+#: src/enquiry.c src/querycmd.c
 #, c-format
 msgid "package '%s' is not installed"
 msgstr ""
@@ -3450,58 +3424,58 @@
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: src/querycmd.c:505
+#: src/querycmd.c
 #, c-format
 msgid "locally diverted to: %s\n"
 msgstr ""
 
-#: src/querycmd.c:508
+#: src/querycmd.c
 #, c-format
 msgid "package diverts others to: %s\n"
 msgstr ""
 
-#: src/querycmd.c:511
+#: src/querycmd.c
 #, c-format
 msgid "diverted by %s to: %s\n"
 msgstr ""
 
-#: src/querycmd.c:532
+#: src/querycmd.c
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: src/querycmd.c:553 dpkg-deb/info.c:260
+#: src/querycmd.c dpkg-deb/info.c
 #, c-format
 msgid "error in show format: %s"
 msgstr ""
 
-#: src/querycmd.c:644
+#: src/querycmd.c
 #, c-format
 msgid "control file contains %c"
 msgstr ""
 
-#: src/querycmd.c:694 dpkg-deb/build.c:414
+#: src/querycmd.c dpkg-deb/build.c
 #, c-format
 msgid "--%s takes at most two arguments"
 msgstr ""
 
-#: src/querycmd.c:724
+#: src/querycmd.c
 #, c-format
 msgid "--%s takes one package name argument"
 msgstr ""
 
-#: src/querycmd.c:749 src/querycmd.c:754
+#: src/querycmd.c
 #, c-format
 msgid "--%s takes exactly two arguments"
 msgstr ""
 
-#: src/querycmd.c:767
+#: src/querycmd.c
 #, c-format
 msgid "control file '%s' does not exist"
 msgstr ""
 
-#: src/querycmd.c:779
+#: src/querycmd.c
 #, c-format
 msgid "Debian %s package management program query tool version %s.\n"
 msgstr ""
@@ -3524,7 +3498,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c:818
+#: src/querycmd.c
 #, c-format
 msgid ""
 "Options:\n"
@@ -3534,7 +3508,7 @@
 "\n"
 msgstr ""
 
-#: src/querycmd.c:825 dpkg-deb/main.c:121
+#: src/querycmd.c dpkg-deb/main.c
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3548,56 +3522,56 @@
 "  case left alignment will be used.\n"
 msgstr ""
 
-#: src/querycmd.c:839
+#: src/querycmd.c
 msgid "Use --help for help about querying packages."
 msgstr ""
 
-#: src/remove.c:106
+#: src/remove.c
 #, c-format
 msgid "ignoring request to remove %.250s which isn't installed"
 msgstr ""
 
-#: src/remove.c:114
+#: src/remove.c
 #, c-format
 msgid ""
 "ignoring request to remove %.250s, only the config\n"
 " files of which are on the system; use --purge to remove them too"
 msgstr ""
 
-#: src/remove.c:123
+#: src/remove.c
 msgid "this is an essential package; it should not be removed"
 msgstr ""
 
-#: src/remove.c:143
+#: src/remove.c
 #, c-format
 msgid ""
 "dependency problems prevent removal of %s:\n"
 "%s"
 msgstr ""
 
-#: src/remove.c:145
+#: src/remove.c
 msgid "dependency problems - not removing"
 msgstr ""
 
-#: src/remove.c:148
+#: src/remove.c
 #, c-format
 msgid ""
 "%s: dependency problems, but removing anyway as you requested:\n"
 "%s"
 msgstr ""
 
-#: src/remove.c:156
+#: src/remove.c
 msgid ""
 "package is in a very bad inconsistent state; you should\n"
 " reinstall it before attempting a removal"
 msgstr ""
 
-#: src/remove.c:163
+#: src/remove.c
 #, c-format
 msgid "Would remove or purge %s (%s) ...\n"
 msgstr ""
 
-#: src/remove.c:173
+#: src/remove.c
 #, c-format
 msgid "Removing %s (%s) ...\n"
 msgstr ""
@@ -3607,29 +3581,29 @@
 msgid "unable to delete control info file `%.250s'"
 msgstr ""
 
-#: src/remove.c:341 src/remove.c:434
+#: src/remove.c
 #, c-format
 msgid ""
 "while removing %.250s, unable to remove directory '%.250s': %s - directory "
 "may be a mount point?"
 msgstr ""
 
-#: src/remove.c:350
+#: src/remove.c
 #, c-format
 msgid "unable to securely remove '%.250s'"
 msgstr ""
 
-#: src/remove.c:429
+#: src/remove.c
 #, c-format
 msgid "while removing %.250s, directory '%.250s' not empty so not removed"
 msgstr ""
 
-#: src/remove.c:446
+#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr ""
 
-#: src/remove.c:472
+#: src/remove.c
 #, c-format
 msgid "Purging configuration files for %s (%s) ...\n"
 msgstr ""
@@ -3649,11 +3623,11 @@
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
 
-#: src/remove.c:638
+#: src/remove.c
 msgid "cannot remove old files list"
 msgstr ""
 
-#: src/remove.c:644
+#: src/remove.c
 msgid "can't remove old postrm script"
 msgstr ""
 
@@ -3662,7 +3636,7 @@
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/script.c:104
+#: src/script.c
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
@@ -3677,15 +3651,15 @@
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: src/script.c:176
+#: src/script.c
 msgid "unable to setenv for maintainer script"
 msgstr ""
 
-#: src/script.c:181
+#: src/script.c
 msgid "cannot set security execution context for maintainer script"
 msgstr ""
 
-#: src/script.c:205
+#: src/script.c
 #, c-format
 msgid "installed %s script"
 msgstr ""
@@ -3695,30 +3669,30 @@
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/script.c:275 src/script.c:340
+#: src/script.c
 #, c-format
 msgid "new %s script"
 msgstr ""
 
-#: src/script.c:313
+#: src/script.c
 #, c-format
 msgid "old %s script"
 msgstr ""
 
-#: src/script.c:328
+#: src/script.c
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
 msgstr ""
 
-#: src/script.c:337
+#: src/script.c
 msgid "trying script from the new package instead ..."
 msgstr ""
 
-#: src/script.c:351
+#: src/script.c
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/script.c:357
+#: src/script.c
 msgid "... it looks like that went OK"
 msgstr ""
 
@@ -3727,7 +3701,7 @@
 msgid "unexpected eof in package name at line %d"
 msgstr ""
 
-#: src/select.c:148
+#: src/select.c
 #, c-format
 msgid "unexpected end of line in package name at line %d"
 msgstr ""
@@ -3737,46 +3711,46 @@
 msgid "unexpected eof after package name at line %d"
 msgstr ""
 
-#: src/select.c:155
+#: src/select.c
 #, c-format
 msgid "unexpected end of line after package name at line %d"
 msgstr ""
 
-#: src/select.c:168
+#: src/select.c
 #, c-format
 msgid "unexpected data after package and selection at line %d"
 msgstr ""
 
-#: src/select.c:172
+#: src/select.c
 #, c-format
 msgid "illegal package name at line %d: %.250s"
 msgstr ""
 
-#: src/select.c:177
+#: src/select.c
 #, c-format
 msgid "package not in database at line %d: %.250s"
 msgstr ""
 
-#: src/select.c:183
+#: src/select.c
 #, c-format
 msgid "unknown wanted status at line %d: %.250s"
 msgstr ""
 
-#: src/select.c:189
+#: src/select.c
 msgid "read error on standard input"
 msgstr ""
 
-#: src/select.c:195
+#: src/select.c
 msgid ""
 "found unknown packages; this might mean the available database\n"
 "is outdated, and needs to be updated through a frontend method"
 msgstr ""
 
-#: src/statcmd.c:52
+#: src/statcmd.c
 msgid "Use --help for help about overriding file stat information."
 msgstr ""
 
-#: src/statcmd.c:77
+#: src/statcmd.c
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3787,7 +3761,7 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:85
+#: src/statcmd.c
 #, c-format
 msgid ""
 "Options:\n"
@@ -3800,40 +3774,40 @@
 "\n"
 msgstr ""
 
-#: src/statcmd.c:112
+#: src/statcmd.c
 msgid "stripping trailing /"
 msgstr ""
 
-#: src/statcmd.c:239
+#: src/statcmd.c
 #, c-format
 msgid "--%s needs four arguments"
 msgstr ""
 
-#: src/statcmd.c:242
+#: src/statcmd.c
 msgid "path may not contain newlines"
 msgstr ""
 
-#: src/statcmd.c:249
+#: src/statcmd.c
 #, c-format
 msgid ""
 "an override for '%s' already exists, but --force specified so will be ignored"
 msgstr ""
 
-#: src/statcmd.c:253
+#: src/statcmd.c
 #, c-format
 msgid "an override for '%s' already exists; aborting"
 msgstr ""
 
-#: src/statcmd.c:265
+#: src/statcmd.c
 #, c-format
 msgid "--update given but %s does not exist"
 msgstr ""
 
-#: src/statcmd.c:289
+#: src/statcmd.c
 msgid "no override present"
 msgstr ""
 
-#: src/statcmd.c:297
+#: src/statcmd.c
 msgid "--update is useless for --remove"
 msgstr ""
 
@@ -3850,7 +3824,7 @@
 msgid "syntax error: invalid gid in statoverride file"
 msgstr ""
 
-#: src/statdb.c:89
+#: src/statdb.c:88
 #, c-format
 msgid "syntax error: unknown group '%s' in statoverride file"
 msgstr ""
@@ -3859,50 +3833,50 @@
 msgid "syntax error: invalid mode in statoverride file"
 msgstr ""
 
-#: src/statdb.c:132
+#: src/statdb.c
 msgid "failed to open statoverride file"
 msgstr ""
 
-#: src/statdb.c:137
+#: src/statdb.c
 msgid "failed to fstat statoverride file"
 msgstr ""
 
-#: src/statdb.c:184
+#: src/statdb.c
 #, c-format
 msgid "reading statoverride file '%.250s'"
 msgstr ""
 
-#: src/statdb.c:192
+#: src/statdb.c
 msgid "statoverride file is missing final newline"
 msgstr ""
 
-#: src/statdb.c:196
+#: src/statdb.c
 msgid "statoverride file contains empty line"
 msgstr ""
 
-#: src/statdb.c:202 src/statdb.c:223 src/statdb.c:244
+#: src/statdb.c
 msgid "syntax error in statoverride file"
 msgstr ""
 
-#: src/statdb.c:218 src/statdb.c:239 src/statdb.c:252
+#: src/statdb.c
 msgid "unexpected end of line in statoverride file"
 msgstr ""
 
-#: src/statdb.c:256
+#: src/statdb.c
 #, c-format
 msgid "multiple statoverrides present for file '%.250s'"
 msgstr ""
 
-#: src/trigcmd.c:45
+#: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
 
-#: src/trigcmd.c:50
+#: src/trigcmd.c
 #, c-format
 msgid "Debian %s package trigger utility version %s.\n"
 msgstr ""
 
-#: src/trigcmd.c:66
+#: src/trigcmd.c
 #, c-format
 msgid ""
 "Usage: %s [<options> ...] <trigger-name>\n"
@@ -3910,7 +3884,7 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:71
+#: src/trigcmd.c
 #, c-format
 msgid ""
 "Commands:\n"
@@ -3933,24 +3907,24 @@
 "\n"
 msgstr ""
 
-#: src/trigcmd.c:123
+#: src/trigcmd.c
 msgid ""
 "must be called from a maintainer script (or with a --by-package option)"
 msgstr ""
 
-#: src/trigcmd.c:179
+#: src/trigcmd.c
 msgid "triggers data directory not yet created"
 msgstr ""
 
-#: src/trigcmd.c:182
+#: src/trigcmd.c
 msgid "trigger records not yet in existence"
 msgstr ""
 
-#: src/trigcmd.c:225
+#: src/trigcmd.c
 msgid "takes one argument, the trigger name"
 msgstr ""
 
-#: src/trigcmd.c:229
+#: src/trigcmd.c
 #, c-format
 msgid "illegal awaited package name '%.250s': %.250s"
 msgstr ""
@@ -3960,29 +3934,29 @@
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr ""
 
-#: src/trigproc.c:309
+#: src/trigproc.c
 msgid ""
 "cycle found while processing triggers:\n"
 " chain of packages whose triggers are or may be responsible:"
 msgstr ""
 
-#: src/trigproc.c:317
+#: src/trigproc.c
 #, c-format
 msgid ""
 "\n"
 " packages' pending triggers which are or may be unresolvable:\n"
 msgstr ""
 
-#: src/trigproc.c:342
+#: src/trigproc.c
 msgid "triggers looping, abandoned"
 msgstr ""
 
-#: src/trigproc.c:425
+#: src/trigproc.c
 #, c-format
 msgid "Processing triggers for %s (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c:76
+#: src/unpack.c
 #, c-format
 msgid ".../%s"
 msgstr ""
@@ -3992,40 +3966,40 @@
 msgid "error ensuring `%.250s' doesn't exist"
 msgstr ""
 
-#: src/unpack.c:104
+#: src/unpack.c
 msgid "split package reassembly"
 msgstr ""
 
-#: src/unpack.c:113
+#: src/unpack.c
 msgid "reassembled package file"
 msgstr ""
 
-#: src/unpack.c:138
+#: src/unpack.c
 #, c-format
 msgid "Authenticating %s ...\n"
 msgstr ""
 
-#: src/unpack.c:144
+#: src/unpack.c
 msgid "package signature verification"
 msgstr ""
 
-#: src/unpack.c:151
+#: src/unpack.c
 #, c-format
 msgid "verification on package %s failed!"
 msgstr ""
 
-#: src/unpack.c:153
+#: src/unpack.c
 #, c-format
 msgid ""
 "verification on package %s failed; but installing anyway as you requested"
 msgstr ""
 
-#: src/unpack.c:156
+#: src/unpack.c
 #, c-format
 msgid "passed\n"
 msgstr ""
 
-#: src/unpack.c:169 dpkg-deb/info.c:82
+#: src/unpack.c dpkg-deb/info.c
 msgid "unable to create temporary directory"
 msgstr ""
 
@@ -4045,7 +4019,7 @@
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: src/unpack.c:376
+#: src/unpack.c
 msgid "unable to open temp control directory"
 msgstr ""
 
@@ -4065,7 +4039,7 @@
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/unpack.c:406
+#: src/unpack.c
 #, c-format
 msgid "package %s contained list as info file"
 msgstr ""
@@ -4075,113 +4049,113 @@
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/unpack.c:439
+#: src/unpack.c
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
 
-#: src/unpack.c:544
+#: src/unpack.c
 msgid "cannot access archive"
 msgstr ""
 
-#: src/unpack.c:566
+#: src/unpack.c
 msgid "package control information extraction"
 msgstr ""
 
-#: src/unpack.c:601
+#: src/unpack.c
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr ""
 
-#: src/unpack.c:611
+#: src/unpack.c
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 
-#: src/unpack.c:675
+#: src/unpack.c
 #, c-format
 msgid ""
 "regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/unpack.c:679
+#: src/unpack.c
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr ""
 
-#: src/unpack.c:681
+#: src/unpack.c
 msgid "ignoring pre-dependency problem!"
 msgstr ""
 
-#: src/unpack.c:696
+#: src/unpack.c
 #, c-format
 msgid "Preparing to unpack %s ...\n"
 msgstr ""
 
-#: src/unpack.c:632
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 
-#: src/unpack.c:294 utils/update-alternatives.c:2159
+#: src/unpack.c utils/update-alternatives.c
 #, c-format
 msgid "read error in %.250s"
 msgstr ""
 
-#: src/unpack.c:297
+#: src/unpack.c
 #, c-format
 msgid "error closing %.250s"
 msgstr ""
 
-#: src/unpack.c:767
+#: src/unpack.c
 #, c-format
 msgid "De-configuring %s (%s), to allow removal of %s (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c:773
+#: src/unpack.c
 #, c-format
 msgid "De-configuring %s (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c:865
+#: src/unpack.c
 #, c-format
 msgid "Unpacking %s (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c:869
+#: src/unpack.c
 #, c-format
 msgid "Unpacking %s (%s) over (%s) ...\n"
 msgstr ""
 
-#: src/unpack.c:957
+#: src/unpack.c
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/unpack.c:972
+#: src/unpack.c
 msgid "error reading dpkg-deb tar output"
 msgstr ""
 
-#: src/unpack.c:974
+#: src/unpack.c
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 
-#: src/unpack.c:978
+#: src/unpack.c
 #, c-format
 msgid "cannot zap possible trailing zeros from dpkg-deb: %s"
 msgstr ""
 
-#: src/unpack.c:1038
+#: src/unpack.c
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/unpack.c:1050
+#: src/unpack.c
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr ""
 
-#: src/unpack.c:1053
+#: src/unpack.c
 #, c-format
 msgid ""
 "old conffile '%.250s' was an empty directory (and has now been deleted)"
@@ -4192,14 +4166,14 @@
 msgid "unable to stat other new file `%.250s'"
 msgstr ""
 
-#: src/unpack.c:1110
+#: src/unpack.c
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/unpack.c:1151
+#: src/unpack.c
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr ""
@@ -4209,32 +4183,32 @@
 msgid "--%s needs exactly one Packages-file argument"
 msgstr ""
 
-#: src/update.c:64
+#: src/update.c
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 
-#: src/update.c:66
+#: src/update.c
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 
-#: src/update.c:73
+#: src/update.c
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:76
+#: src/update.c
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:102
+#: src/update.c
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/update.c:116
+#: src/update.c
 #, c-format
 msgid ""
 "obsolete '--%s' option; unavailable packages are automatically cleaned up"
@@ -4245,30 +4219,29 @@
 msgid "file name '%.50s...' is too long"
 msgstr ""
 
-#: dpkg-deb/build.c:128
+#: dpkg-deb/build.c
 #, c-format
 msgid "unable to stat file name '%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:201 dpkg-deb/build.c:212
+#: dpkg-deb/build.c
 #, c-format
 msgid "failed to write filename to tar pipe (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c:202 dpkg-deb/build.c:212 dpkg-deb/build.c:544
-#: dpkg-deb/build.c:547 dpkg-deb/build.c:593
+#: dpkg-deb/build.c
 msgid "data member"
 msgstr ""
 
-#: dpkg-deb/build.c:237
+#: dpkg-deb/build.c
 msgid "unable to stat control directory"
 msgstr ""
 
-#: dpkg-deb/build.c:239
+#: dpkg-deb/build.c
 msgid "control directory is not a directory"
 msgstr ""
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c
 #, c-format
 msgid ""
 "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
@@ -4291,20 +4264,20 @@
 msgid "maintainer script `%.50s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:285
+#: dpkg-deb/build.c
 msgid "error opening conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:294
+#: dpkg-deb/build.c
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 
-#: dpkg-deb/build.c:301
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "conffile name '%.50s...' is too long, or missing final newline"
 msgstr ""
 
-#: dpkg-deb/build.c:306
+#: dpkg-deb/build.c
 #, c-format
 msgid "conffile filename '%s' contains trailing white spaces"
 msgstr ""
@@ -4319,17 +4292,17 @@
 msgid "conffile `%.250s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:312
+#: dpkg-deb/build.c
 #, c-format
 msgid "conffile '%s' is not a plain file"
 msgstr ""
 
-#: dpkg-deb/build.c:316
+#: dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is duplicated"
 msgstr ""
 
-#: dpkg-deb/build.c:329
+#: dpkg-deb/build.c
 msgid "error reading conffiles file"
 msgstr ""
 
@@ -4337,7 +4310,7 @@
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 
-#: dpkg-deb/build.c:353
+#: dpkg-deb/build.c
 #, c-format
 msgid "'%s' contains user-defined Priority value '%s'"
 msgstr ""
@@ -4347,15 +4320,14 @@
 msgid "'%s' contains user-defined field '%s'"
 msgstr ""
 
-#: dpkg-deb/build.c:409
+#: dpkg-deb/build.c:358
 #, c-format
 msgid "ignoring %d warning about the control file(s)\n"
 msgid_plural "ignoring %d warnings about the control file(s)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c:407 utils/update-alternatives.c:2650
-#: utils/update-alternatives.c:2657
+#: dpkg-deb/build.c utils/update-alternatives.c
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4365,15 +4337,15 @@
 msgid "unable to check for existence of archive `%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:435
+#: dpkg-deb/build.c
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 
-#: dpkg-deb/build.c:436
+#: dpkg-deb/build.c
 msgid "not checking contents of control area"
 msgstr ""
 
-#: dpkg-deb/build.c:437
+#: dpkg-deb/build.c
 #, c-format
 msgid "dpkg-deb: building an unknown package in '%s'.\n"
 msgstr ""
@@ -4383,31 +4355,30 @@
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:473 dpkg-deb/build.c:544
+#: dpkg-deb/build.c
 #, c-format
 msgid "failed to make temporary file (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c:473 dpkg-deb/build.c:476 dpkg-deb/build.c:499
-#: dpkg-deb/build.c:508 dpkg-deb/build.c:514
+#: dpkg-deb/build.c
 msgid "control member"
 msgstr ""
 
-#: dpkg-deb/build.c:476 dpkg-deb/build.c:547
+#: dpkg-deb/build.c
 #, c-format
 msgid "failed to unlink temporary file (%s), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:491
+#: dpkg-deb/build.c
 msgid "compressing control member"
 msgstr ""
 
-#: dpkg-deb/build.c:499 dpkg-deb/build.c:593
+#: dpkg-deb/build.c
 #, c-format
 msgid "failed to rewind temporary file (%s)"
 msgstr ""
 
-#: dpkg-deb/build.c:508
+#: dpkg-deb/build.c
 #, c-format
 msgid "failed to stat temporary file (%s)"
 msgstr ""
@@ -4417,29 +4388,29 @@
 msgid "error writing `%s'"
 msgstr ""
 
-#: dpkg-deb/build.c:514
+#: dpkg-deb/build.c
 #, c-format
 msgid "cannot copy '%s' into archive '%s': %s"
 msgstr ""
 
-#: dpkg-deb/build.c:572
+#: dpkg-deb/build.c
 msgid "compressing data member"
 msgstr ""
 
-#: dpkg-deb/build.c:583
+#: dpkg-deb/build.c
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/extract.c:63 dpkg-deb/extract.c:65
+#: dpkg-deb/extract.c
 msgid "shell command to move files"
 msgstr ""
 
-#: dpkg-deb/extract.c:72
+#: dpkg-deb/extract.c
 #, c-format
 msgid "unexpected end of file in %s in %.255s"
 msgstr ""
 
-#: dpkg-deb/extract.c:74
+#: dpkg-deb/extract.c
 #, c-format
 msgid "error reading %s from file %.255s"
 msgstr ""
@@ -4449,19 +4420,19 @@
 msgid "failed to read archive `%.255s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:131
+#: dpkg-deb/extract.c
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:135
+#: dpkg-deb/extract.c
 msgid "archive magic version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:145
+#: dpkg-deb/extract.c
 msgid "archive member header"
 msgstr ""
 
-#: dpkg-deb/extract.c:150
+#: dpkg-deb/extract.c
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr ""
@@ -4471,73 +4442,73 @@
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 
-#: dpkg-deb/extract.c:160
+#: dpkg-deb/extract.c
 msgid "archive information header member"
 msgstr ""
 
-#: dpkg-deb/extract.c:164 dpkg-deb/extract.c:243
+#: dpkg-deb/extract.c
 msgid "archive has no newlines in header"
 msgstr ""
 
-#: dpkg-deb/extract.c:167 dpkg-deb/extract.c:246
+#: dpkg-deb/extract.c
 #, c-format
 msgid "archive has invalid format version: %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:169
+#: dpkg-deb/extract.c
 #, c-format
 msgid "archive is format version %d.%d; get a newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:179 dpkg-deb/extract.c:221
+#: dpkg-deb/extract.c
 #, c-format
 msgid "cannot skip archive member from '%s': %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:194 dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c
 #, c-format
 msgid "archive '%s' has premature member '%.*s' before '%s', giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:189 dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c
 #, c-format
 msgid "archive '%s' uses unknown compression for member '%.*s', giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:215
+#: dpkg-deb/extract.c
 #, c-format
 msgid "archive '%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:230
+#: dpkg-deb/extract.c
 #, c-format
 msgid ""
 " new debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:250
+#: dpkg-deb/extract.c
 msgid "archive control member size"
 msgstr ""
 
-#: dpkg-deb/extract.c:253
+#: dpkg-deb/extract.c
 #, c-format
 msgid "archive has malformatted control member size '%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c
 #, c-format
 msgid "cannot skip archive control member from '%s': %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c
 #, c-format
 msgid ""
 " old debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:274
+#: dpkg-deb/extract.c
 msgid ""
 "file looks like it might be an archive which has been\n"
 " corrupted by being downloaded in ASCII mode"
@@ -4548,61 +4519,60 @@
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:286
+#: dpkg-deb/extract.c
 #, c-format
 msgid "cannot copy archive member from '%s' to decompressor pipe: %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c
 msgid "cannot close decompressor pipe"
 msgstr ""
 
-#: dpkg-deb/extract.c:306
+#: dpkg-deb/extract.c
 msgid "decompressing archive member"
 msgstr ""
 
-#: dpkg-deb/extract.c:347
+#: dpkg-deb/extract.c
 msgid "failed to chdir to directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:350
+#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:352
+#: dpkg-deb/extract.c
 msgid "failed to chdir to directory after creating it"
 msgstr ""
 
-#: dpkg-deb/extract.c:362
+#: dpkg-deb/extract.c
 msgid "<decompress>"
 msgstr ""
 
-#: dpkg-deb/extract.c:364
+#: dpkg-deb/extract.c
 msgid "paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:386 dpkg-deb/extract.c:403 dpkg-deb/extract.c:418
-#: dpkg-deb/info.c:78
+#: dpkg-deb/extract.c dpkg-deb/info.c
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:388 dpkg-deb/extract.c:405
+#: dpkg-deb/extract.c
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
 
-#: dpkg-deb/extract.c:424 dpkg-deb/extract.c:452 dpkg-deb/extract.c:486
+#: dpkg-deb/extract.c
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:443 dpkg-deb/extract.c:477
+#: dpkg-deb/extract.c
 #, c-format
 msgid "--%s needs .deb filename and directory arguments"
 msgstr ""
 
-#: dpkg-deb/extract.c:448 dpkg-deb/extract.c:482
+#: dpkg-deb/extract.c
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -4613,12 +4583,12 @@
 msgid "failed to chdir to `/' for cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c
 #, c-format
 msgid "cannot extract control file '%s' from '%s': %s"
 msgstr ""
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c
 #, c-format
 msgid "'%.255s' contains no control component '%.255s'"
 msgstr ""
@@ -4628,7 +4598,7 @@
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c
 #, c-format
 msgid "%d requested control component is missing"
 msgid_plural "%d requested control components are missing"
@@ -4655,12 +4625,12 @@
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:173
+#: dpkg-deb/info.c
 #, c-format
 msgid " %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:177
+#: dpkg-deb/info.c
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
@@ -4669,15 +4639,15 @@
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:224
+#: dpkg-deb/info.c:222
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:263
+#: dpkg-deb/info.c:261
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:265
+#: dpkg-deb/info.c:263
 #, c-format
 msgid "error closing the '%s' component"
 msgstr ""
@@ -4740,7 +4710,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:130
+#: dpkg-deb/main.c
 #, c-format
 msgid ""
 "\n"
@@ -4749,28 +4719,28 @@
 "unpacked using 'dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:141
+#: dpkg-deb/main.c
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:158
+#: dpkg-deb/main.c
 #, c-format
 msgid "invalid deb format version: %s"
 msgstr ""
 
-#: dpkg-deb/main.c:164
+#: dpkg-deb/main.c
 #, c-format
 msgid "unknown deb format version: %s"
 msgstr ""
 
-#: dpkg-deb/main.c:197
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr ""
 
-#: dpkg-deb/main.c:208
+#: dpkg-deb/main.c
 #, c-format
 msgid "unknown compression strategy '%s'!"
 msgstr ""
@@ -4780,12 +4750,12 @@
 msgid "unknown compression type `%s'!"
 msgstr ""
 
-#: dpkg-deb/main.c:218
+#: dpkg-deb/main.c
 #, c-format
 msgid "deprecated compression type '%s'; use xz instead"
 msgstr ""
 
-#: dpkg-deb/main.c:263
+#: dpkg-deb/main.c
 #, c-format
 msgid "invalid compressor parameters: %s"
 msgstr ""
@@ -4795,7 +4765,7 @@
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr ""
 
-#: dpkg-split/info.c:57
+#: dpkg-split/info.c
 #, c-format
 msgid "file '%s' is corrupt; out of range integer in %s"
 msgstr ""
@@ -4810,7 +4780,7 @@
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
 msgstr ""
 
-#: dpkg-split/info.c:95 dpkg-split/main.c:114
+#: dpkg-split/info.c dpkg-split/main.c
 #, c-format
 msgid "error reading %.250s"
 msgstr ""
@@ -4830,29 +4800,29 @@
 msgid "file `%.250s' is corrupt - nulls in info section"
 msgstr ""
 
-#: dpkg-split/info.c:129
+#: dpkg-split/info.c
 msgid "format version number"
 msgstr ""
 
-#: dpkg-split/info.c:131
+#: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' has invalid format version: %s"
 msgstr ""
 
-#: dpkg-split/info.c:133
+#: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is format version %d.%d; get a newer dpkg-split"
 msgstr ""
 
-#: dpkg-split/info.c:136
+#: dpkg-split/info.c
 msgid "package name"
 msgstr ""
 
-#: dpkg-split/info.c:137
+#: dpkg-split/info.c
 msgid "package version number"
 msgstr ""
 
-#: dpkg-split/info.c:138
+#: dpkg-split/info.c
 msgid "package file MD5 checksum"
 msgstr ""
 
@@ -4861,42 +4831,42 @@
 msgid "file `%.250s' is corrupt - bad MD5 checksum `%.250s'"
 msgstr ""
 
-#: dpkg-split/info.c:143 dpkg-split/info.c:144
+#: dpkg-split/info.c
 msgid "archive total size"
 msgstr ""
 
-#: dpkg-split/info.c:145 dpkg-split/info.c:146
+#: dpkg-split/info.c
 msgid "archive part offset"
 msgstr ""
 
-#: dpkg-split/info.c:148
+#: dpkg-split/info.c
 msgid "archive part numbers"
 msgstr ""
 
-#: dpkg-split/info.c:151
+#: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - no slash between archive part numbers"
 msgstr ""
 
-#: dpkg-split/info.c:154
+#: dpkg-split/info.c
 msgid "number of archive parts"
 msgstr ""
 
-#: dpkg-split/info.c:156
+#: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - bad number of archive parts"
 msgstr ""
 
-#: dpkg-split/info.c:158
+#: dpkg-split/info.c
 msgid "archive parts number"
 msgstr ""
 
-#: dpkg-split/info.c:160
+#: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - bad archive part number"
 msgstr ""
 
-#: dpkg-split/info.c:166
+#: dpkg-split/info.c
 msgid "package architecture"
 msgstr ""
 
@@ -4940,7 +4910,7 @@
 msgid "file `%.250s' is not an archive part"
 msgstr ""
 
-#: dpkg-split/info.c:218
+#: dpkg-split/info.c
 #, c-format
 msgid ""
 "%s:\n"
@@ -4958,12 +4928,12 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/info.c:234
+#: dpkg-split/info.c
 msgctxt "architecture"
 msgid "<unknown>"
 msgstr ""
 
-#: dpkg-split/info.c:253 dpkg-split/join.c:110
+#: dpkg-split/info.c dpkg-split/join.c
 #, c-format
 msgid "--%s requires one or more part file arguments"
 msgstr ""
@@ -4973,7 +4943,7 @@
 msgid "file `%s' is not an archive part\n"
 msgstr ""
 
-#: dpkg-split/join.c:45
+#: dpkg-split/join.c
 #, c-format
 msgid "Putting package %s together from %d part: "
 msgid_plural "Putting package %s together from %d parts: "
@@ -4990,17 +4960,17 @@
 msgid "unable to (re)open input part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:60
+#: dpkg-split/join.c
 #, c-format
 msgid "cannot skip split package header for '%s': %s"
 msgstr ""
 
-#: dpkg-split/join.c:63
+#: dpkg-split/join.c
 #, c-format
 msgid "cannot append split package part '%s' to '%s': %s"
 msgstr ""
 
-#: dpkg-split/join.c:74 dpkg-split/split.c:246
+#: dpkg-split/join.c dpkg-split/split.c
 #, c-format
 msgid "done\n"
 msgstr ""
@@ -5016,7 +4986,7 @@
 "there are several versions of part %d - at least `%.250s' and `%.250s'"
 msgstr ""
 
-#: dpkg-split/join.c:133
+#: dpkg-split/join.c
 #, c-format
 msgid "part %d is missing"
 msgstr ""
@@ -5026,7 +4996,7 @@
 msgid "Debian `%s' package split/join tool; version %s.\n"
 msgstr ""
 
-#: dpkg-split/main.c:68
+#: dpkg-split/main.c
 #, c-format
 msgid ""
 "Commands:\n"
@@ -5039,7 +5009,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c
 #, c-format
 msgid ""
 "Options:\n"
@@ -5052,7 +5022,7 @@
 "\n"
 msgstr ""
 
-#: dpkg-split/main.c:93
+#: dpkg-split/main.c
 #, c-format
 msgid ""
 "Exit status:\n"
@@ -5061,20 +5031,20 @@
 "  2 = trouble\n"
 msgstr ""
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: dpkg-split/main.c:115
+#: dpkg-split/main.c
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:129
+#: dpkg-split/main.c
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: dpkg-split/main.c:133
+#: dpkg-split/main.c
 #, c-format
 msgid "part size must be at least %d KiB (to allow for header)"
 msgstr ""
@@ -5084,11 +5054,11 @@
 msgid "unable to read depot directory `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:145
+#: dpkg-split/queue.c
 msgid "--auto requires the use of the --output option"
 msgstr ""
 
-#: dpkg-split/queue.c:148
+#: dpkg-split/queue.c
 msgid "--auto requires exactly one part file argument"
 msgstr ""
 
@@ -5112,7 +5082,7 @@
 msgid "unable to open new depot file `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:199
+#: dpkg-split/queue.c
 #, c-format
 msgid "cannot extract split package part '%s': %s"
 msgstr ""
@@ -5122,12 +5092,12 @@
 msgid "unable to rename new depot file `%.250s' to `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:212
+#: dpkg-split/queue.c
 #, c-format
 msgid "Part %d of package %s filed (still want "
 msgstr ""
 
-#: dpkg-split/queue.c:216
+#: dpkg-split/queue.c
 msgid " and "
 msgstr ""
 
@@ -5136,7 +5106,7 @@
 msgid "unable to delete used-up depot file `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:253
+#: dpkg-split/queue.c
 msgid "Junk files left around in the depot directory:\n"
 msgstr ""
 
@@ -5145,21 +5115,21 @@
 msgid "unable to stat `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:261
+#: dpkg-split/queue.c
 #, c-format
 msgid " %s (%jd bytes)\n"
 msgstr ""
 
-#: dpkg-split/queue.c:263
+#: dpkg-split/queue.c
 #, c-format
 msgid " %s (not a plain file)\n"
 msgstr ""
 
-#: dpkg-split/queue.c:268
+#: dpkg-split/queue.c
 msgid "Packages not yet reassembled:\n"
 msgstr ""
 
-#: dpkg-split/queue.c:276
+#: dpkg-split/queue.c
 #, c-format
 msgid " Package %s: part(s) "
 msgstr ""
@@ -5169,7 +5139,7 @@
 msgid "part file `%.250s' is not a plain file"
 msgstr ""
 
-#: dpkg-split/queue.c:296
+#: dpkg-split/queue.c
 #, c-format
 msgid "(total %jd bytes)\n"
 msgstr ""
@@ -5179,12 +5149,12 @@
 msgid "unable to discard `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:330
+#: dpkg-split/queue.c
 #, c-format
 msgid "Deleted %s.\n"
 msgstr ""
 
-#: dpkg-split/split.c:72 dpkg-split/split.c:85
+#: dpkg-split/split.c
 msgid "package field value extraction"
 msgstr ""
 
@@ -5198,7 +5168,7 @@
 msgid "unable to open source file `%.250s'"
 msgstr ""
 
-#: dpkg-split/split.c:138
+#: dpkg-split/split.c
 msgid "unable to fstat source file"
 msgstr ""
 
@@ -5207,28 +5177,28 @@
 msgid "source file `%.250s' not a plain file"
 msgstr ""
 
-#: dpkg-split/split.c:158
+#: dpkg-split/split.c
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:198
+#: dpkg-split/split.c
 msgid ""
 "header is too long, making part too long; the package name or version\n"
 "numbers must be extraordinarily long, or something; giving up"
 msgstr ""
 
-#: dpkg-split/split.c:258
+#: dpkg-split/split.c
 msgid "--split needs a source filename argument"
 msgstr ""
 
-#: dpkg-split/split.c:261
+#: dpkg-split/split.c
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 
-#: utils/update-alternatives.c:96
+#: utils/update-alternatives.c
 #, c-format
 msgid ""
 "Commands:\n"
@@ -5252,7 +5222,7 @@
 "\n"
 msgstr ""
 
-#: utils/update-alternatives.c:115
+#: utils/update-alternatives.c
 #, c-format
 msgid ""
 "<link> is the symlink pointing to %s/<name>.\n"
@@ -5267,7 +5237,7 @@
 "\n"
 msgstr ""
 
-#: utils/update-alternatives.c:126
+#: utils/update-alternatives.c
 #, c-format
 msgid ""
 "Options:\n"
@@ -5284,199 +5254,199 @@
 "  --version                show the version.\n"
 msgstr ""
 
-#: utils/update-alternatives.c:145 utils/update-alternatives.c:158
+#: utils/update-alternatives.c
 msgid "error"
 msgstr ""
 
-#: utils/update-alternatives.c:176
+#: utils/update-alternatives.c
 #, c-format
 msgid "Use '%s --help' for program usage information."
 msgstr ""
 
-#: utils/update-alternatives.c:190
+#: utils/update-alternatives.c
 msgid "warning"
 msgstr ""
 
-#: utils/update-alternatives.c:259
+#: utils/update-alternatives.c
 #, c-format
 msgid "malloc failed (%zu bytes)"
 msgstr ""
 
-#: utils/update-alternatives.c:353
+#: utils/update-alternatives.c
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:385
+#: utils/update-alternatives.c
 #, c-format
 msgid "cannot append to '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:498
+#: utils/update-alternatives.c
 #, c-format
 msgid "unable to remove '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:1002
+#: utils/update-alternatives.c
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1002
+#: utils/update-alternatives.c
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1126
+#: utils/update-alternatives.c
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1128
+#: utils/update-alternatives.c
 #, c-format
 msgid "while reading %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134
+#: utils/update-alternatives.c
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1152
+#: utils/update-alternatives.c
 #, c-format
 msgid "%s corrupt: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1165
+#: utils/update-alternatives.c
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1178
+#: utils/update-alternatives.c
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1186 utils/update-alternatives.c:2626
+#: utils/update-alternatives.c
 #, c-format
 msgid "duplicate slave name %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1189
+#: utils/update-alternatives.c
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c:1193
+#: utils/update-alternatives.c
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1200 utils/update-alternatives.c:2633
+#: utils/update-alternatives.c
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1218
+#: utils/update-alternatives.c
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1226
+#: utils/update-alternatives.c
 #, c-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1236
+#: utils/update-alternatives.c
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist; removing from list of "
 "alternatives"
 msgstr ""
 
-#: utils/update-alternatives.c:1239 utils/update-alternatives.c:1250
+#: utils/update-alternatives.c
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1242 utils/update-alternatives.c:1266
+#: utils/update-alternatives.c
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1255
+#: utils/update-alternatives.c
 #, c-format
 msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1259
+#: utils/update-alternatives.c
 #, c-format
 msgid "priority of %s is out of range: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1316
+#: utils/update-alternatives.c
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1318
+#: utils/update-alternatives.c
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1323
+#: utils/update-alternatives.c
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c:1367
+#: utils/update-alternatives.c
 #, c-format
 msgid "discarding obsolete slave link %s (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1423
+#: utils/update-alternatives.c
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:1538
+#: utils/update-alternatives.c
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1540
+#: utils/update-alternatives.c
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c:1544
+#: utils/update-alternatives.c
 #, c-format
 msgid "%s - priority %d"
 msgstr ""
 
-#: utils/update-alternatives.c:1547
+#: utils/update-alternatives.c
 #, c-format
 msgid "  slave %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1554
+#: utils/update-alternatives.c
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr ""
 
-#: utils/update-alternatives.c:1556
+#: utils/update-alternatives.c
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1604
+#: utils/update-alternatives.c
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1609
+#: utils/update-alternatives.c
 msgid "Selection"
 msgstr ""
 
-#: utils/update-alternatives.c:1610
+#: utils/update-alternatives.c
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1610
+#: utils/update-alternatives.c
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1610
+#: utils/update-alternatives.c
 msgid "Status"
 msgstr ""
 
@@ -5485,77 +5455,76 @@
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1766
+#: utils/update-alternatives.c
 #, c-format
 msgid "not replacing %s with a link"
 msgstr ""
 
-#: utils/update-alternatives.c:1807
+#: utils/update-alternatives.c
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1825
+#: utils/update-alternatives.c
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist"
 msgstr ""
 
-#: utils/update-alternatives.c:1835
+#: utils/update-alternatives.c
 #, c-format
 msgid "not removing %s since it's not a symlink"
 msgstr ""
 
-#: utils/update-alternatives.c:2124 utils/update-alternatives.c:2130
+#: utils/update-alternatives.c
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2134
+#: utils/update-alternatives.c
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:2138
+#: utils/update-alternatives.c
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2165
+#: utils/update-alternatives.c
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2178 utils/update-alternatives.c:2191
-#: utils/update-alternatives.c:2201
+#: utils/update-alternatives.c
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2226
+#: utils/update-alternatives.c
 #, c-format
 msgid "%s/%s is dangling; it will be updated with best choice"
 msgstr ""
 
-#: utils/update-alternatives.c:2230
+#: utils/update-alternatives.c
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script); switching to manual "
 "updates only"
 msgstr ""
 
-#: utils/update-alternatives.c:2238
+#: utils/update-alternatives.c
 #, c-format
 msgid "setting up automatic selection of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2277
+#: utils/update-alternatives.c
 #, c-format
 msgid "renaming %s slave link from %s to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2298
+#: utils/update-alternatives.c
 #, c-format
 msgid "renaming %s link from %s to %s"
 msgstr ""
@@ -5565,63 +5534,63 @@
 msgid "using %s to provide %s (%s) in %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2346
+#: utils/update-alternatives.c
 #, c-format
 msgid "updating alternative %s because link group %s has changed slave links"
 msgstr ""
 
-#: utils/update-alternatives.c:2351
+#: utils/update-alternatives.c
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken"
 msgstr ""
 
-#: utils/update-alternatives.c:2359
+#: utils/update-alternatives.c
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2385
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative name (%s) must not contain '/' and spaces"
 msgstr ""
 
-#: utils/update-alternatives.c:2393
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2401
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2432
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative %s can't be master: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2440 utils/update-alternatives.c:2476
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative link %s is already managed by %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2446
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative path %s doesn't exist"
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative %s can't be slave of %s: it is a master alternative"
 msgstr ""
 
-#: utils/update-alternatives.c:2467
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative %s can't be slave of %s: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2487
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative link %s is already managed by %s (slave of %s)"
 msgstr ""
@@ -5631,51 +5600,51 @@
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2551
+#: utils/update-alternatives.c
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2618
+#: utils/update-alternatives.c
 msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2561
+#: utils/update-alternatives.c
 msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2563
+#: utils/update-alternatives.c
 msgid "priority is out of range"
 msgstr ""
 
-#: utils/update-alternatives.c:2576
+#: utils/update-alternatives.c
 #, c-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2593
+#: utils/update-alternatives.c
 #, c-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2609
+#: utils/update-alternatives.c
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2611
+#: utils/update-alternatives.c
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2620
+#: utils/update-alternatives.c
 #, c-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2623
+#: utils/update-alternatives.c
 #, c-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2643
+#: utils/update-alternatives.c
 #, c-format
 msgid "--%s needs a <file> argument"
 msgstr ""
@@ -5685,56 +5654,56 @@
 msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2674
+#: utils/update-alternatives.c
 msgid ""
 "need --display, --query, --list, --get-selections, --config, --set, --set-"
 "selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2690 utils/update-alternatives.c:2696
+#: utils/update-alternatives.c
 #, c-format
 msgid "no alternatives for %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2713
+#: utils/update-alternatives.c
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2735
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative %s for %s not registered; not setting"
 msgstr ""
 
-#: utils/update-alternatives.c:2741 utils/update-alternatives.c:2747
+#: utils/update-alternatives.c
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2749 utils/update-alternatives.c:2757
+#: utils/update-alternatives.c
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2755
+#: utils/update-alternatives.c
 #, c-format
 msgid "There is only one alternative in link group %s (providing %s): %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2765
+#: utils/update-alternatives.c
 #, c-format
 msgid "alternative %s for %s not registered; not removing"
 msgstr ""
 
-#: utils/update-alternatives.c:2773
+#: utils/update-alternatives.c
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2798
+#: utils/update-alternatives.c
 #, c-format
 msgid "automatic updates of %s/%s are disabled; leaving it alone"
 msgstr ""
 
-#: utils/update-alternatives.c:2800
+#: utils/update-alternatives.c
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'"
 msgstr ""
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/ecryptfs-utils.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/ecryptfs-utils.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/ecryptfs-utils.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/ecryptfs-utils.po	2015-08-14 07:55:49.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-02-19 03:45+0000\n"
 "Last-Translator: jmb_kz <Unknown>\n"
 "Language-Team: Kazakh <kk@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: 2015-02-19 12:36+0000\n"
-"X-Generator: Launchpad (build 17341)\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-kk-base-14.04+20150219/data/kk/LC_MESSAGES/example-content.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/example-content.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/example-content.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/example-content.po	2015-08-14 07:55:47.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: 2015-02-19 12:12+0000\n"
-"X-Generator: Launchpad (build 17341)\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-kk-base-14.04+20150219/data/kk/LC_MESSAGES/friendly-recovery.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/friendly-recovery.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/friendly-recovery.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/friendly-recovery.po	2015-08-14 07:55:49.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: 2015-02-19 12:39+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:51+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../lib/recovery-mode/options/apt-snapshots:20
 #, sh-format
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/grep.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/grep.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/grep.po	2015-02-19 15:29:12.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/grep.po	2015-08-14 07:55:45.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: 2015-02-19 11:09+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:11+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: lib/argmatch.c:133
 #, c-format
@@ -31,12 +31,12 @@
 msgid "Valid arguments are:"
 msgstr ""
 
-#: lib/closeout.c:112 src/grep.c:949
+#: lib/closeout.c:112 src/grep.c:1096
 #, c-format
 msgid "write error"
 msgstr ""
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr ""
 
@@ -95,8 +95,8 @@
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
 
-#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34
-#: src/pcresearch.c:177
+#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34
+#: src/pcresearch.c:267
 #, c-format
 msgid "memory exhausted"
 msgstr "жады жетпей жатыр"
@@ -334,7 +334,7 @@
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: lib/version-etc.c:245 src/grep.c:1620
+#: lib/version-etc.c:245
 #, c-format
 msgid ""
 "\n"
@@ -356,7 +356,7 @@
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: lib/version-etc.c:256 src/grep.c:1623
+#: lib/version-etc.c:256
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
@@ -375,33 +375,33 @@
 msgid "%s%s argument '%s' too large"
 msgstr ""
 
-#: src/dfa.c:1017 src/dfa.c:1020 src/dfa.c:1039 src/dfa.c:1049 src/dfa.c:1061
-#: src/dfa.c:1097 src/dfa.c:1106 src/dfa.c:1109 src/dfa.c:1114 src/dfa.c:1128
-#: src/dfa.c:1174
+#: src/dfa.c:1026 src/dfa.c:1029 src/dfa.c:1048 src/dfa.c:1058 src/dfa.c:1070
+#: src/dfa.c:1106 src/dfa.c:1115 src/dfa.c:1118 src/dfa.c:1123 src/dfa.c:1137
+#: src/dfa.c:1185
 msgid "unbalanced ["
 msgstr ""
 
-#: src/dfa.c:1073
+#: src/dfa.c:1082
 msgid "invalid character class"
 msgstr ""
 
-#: src/dfa.c:1217
+#: src/dfa.c:1228
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr ""
 
-#: src/dfa.c:1265
+#: src/dfa.c:1290
 msgid "unfinished \\ escape"
 msgstr ""
 
-#: src/dfa.c:1845
+#: src/dfa.c:1875
 msgid "unbalanced ("
 msgstr ""
 
-#: src/dfa.c:1971
+#: src/dfa.c:2001
 msgid "no syntax specified"
 msgstr ""
 
-#: src/dfa.c:1979
+#: src/dfa.c:2009
 msgid "unbalanced )"
 msgstr ""
 
@@ -421,12 +421,12 @@
 msgid "Invocation as 'fgrep' is deprecated; use 'grep -F' instead.\n"
 msgstr ""
 
-#: src/grep.c:1532
+#: src/grep.c:1710
 #, c-format
 msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
 msgstr ""
 
-#: src/grep.c:1612
+#: src/grep.c:1791
 #, c-format
 msgid ""
 "'egrep' means 'grep -E'.  'fgrep' means 'grep -F'.\n"
@@ -442,58 +442,58 @@
 msgid "others, see <http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>"
 msgstr ""
 
-#: src/grep.c:502
+#: src/grep.c:605
 msgid "invalid context length argument"
 msgstr "контекст ұзындығының қате мәні"
 
-#: src/grep.c:571
+#: src/grep.c:700
 msgid "lseek failed"
 msgstr ""
 
-#: src/grep.c:704
+#: src/grep.c:658
 #, c-format
 msgid "input is too large to count"
 msgstr "кіріс мәліметтері санау үшін өте үлкен"
 
-#: src/grep.c:1257
+#: src/grep.c:1420
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "Бинарлы файл %s сәйкес келеді\n"
 
-#: src/grep.c:1300
+#: src/grep.c:1464
 #, c-format
 msgid "warning: %s: %s"
 msgstr ""
 
-#: src/grep.c:1301
+#: src/grep.c:1465
 msgid "recursive directory loop"
 msgstr "бумалар рекурсивті түрде циклденген"
 
-#: src/grep.c:1449
+#: src/grep.c:1627
 #, c-format
 msgid "input file %s is also the output"
 msgstr ""
 
-#: src/grep.c:1507
+#: src/grep.c:1685
 msgid "(standard input)"
 msgstr "(стандартты енгізу)"
 
-#: src/grep.c:1523 src/grep.c:1530
+#: src/grep.c:1701 src/grep.c:1708
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "Қолданылуы: %s [КІЛТ]... ҮЛГІ [ФАЙЛ]...\n"
 
-#: src/grep.c:1525
+#: src/grep.c:1703
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: src/grep.c:1531
+#: src/grep.c:1709
 #, c-format
 msgid "Search for PATTERN in each FILE or standard input.\n"
 msgstr "ҮЛГІНІ әр ФАЙЛДЫҢ ішінен, немесе стандартты кірістен іздеу.\n"
 
-#: src/grep.c:1533
+#: src/grep.c:1711
 #, c-format
 msgid ""
 "Example: %s -i 'hello world' menu.h main.c\n"
@@ -511,7 +511,7 @@
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:1543
+#: src/grep.c:1721
 #, c-format
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN for matching\n"
@@ -534,7 +534,7 @@
 "      --mmap                deprecated no-op; evokes a warning\n"
 msgstr ""
 
-#: src/grep.c:1557
+#: src/grep.c:1735
 #, c-format
 msgid ""
 "\n"
@@ -549,7 +549,7 @@
 "prefix\n"
 msgstr ""
 
-#: src/grep.c:1568
+#: src/grep.c:1746
 #, c-format
 msgid ""
 "  -o, --only-matching       show only the part of a line matching PATTERN\n"
@@ -559,7 +559,7 @@
 "  -a, --text                equivalent to --binary-files=text\n"
 msgstr ""
 
-#: src/grep.c:1575
+#: src/grep.c:1753
 #, c-format
 msgid ""
 "  -I                        equivalent to --binary-files=without-match\n"
@@ -571,7 +571,7 @@
 "  -R, --dereference-recursive  likewise, but follow all symlinks\n"
 msgstr ""
 
-#: src/grep.c:1584
+#: src/grep.c:1762
 #, c-format
 msgid ""
 "      --include=FILE_PATTERN  search only files that match FILE_PATTERN\n"
@@ -582,7 +582,7 @@
 "skipped.\n"
 msgstr ""
 
-#: src/grep.c:1590
+#: src/grep.c:1769
 #, c-format
 msgid ""
 "  -L, --files-without-match  print only names of FILEs containing no match\n"
@@ -592,7 +592,7 @@
 "  -Z, --null                print 0 byte after FILE name\n"
 msgstr ""
 
-#: src/grep.c:1596
+#: src/grep.c:1775
 #, c-format
 msgid ""
 "\n"
@@ -602,7 +602,7 @@
 "  -C, --context=NUM         print NUM lines of output context\n"
 msgstr ""
 
-#: src/grep.c:1603
+#: src/grep.c:1782
 #, c-format
 msgid ""
 "  -NUM                      same as --context=NUM\n"
@@ -616,7 +616,7 @@
 "\n"
 msgstr ""
 
-#: src/grep.c:1615
+#: src/grep.c:1794
 #, c-format
 msgid ""
 "When FILE is -, read standard input.  With no FILE, read . if a command-"
@@ -636,27 +636,27 @@
 msgid "%s can only use the %s pattern syntax"
 msgstr ""
 
-#: src/grep.c:1687
+#: src/grep.c:1863
 #, c-format
 msgid "conflicting matchers specified"
 msgstr ""
 
-#: src/grep.c:1698
+#: src/grep.c:1874
 #, c-format
 msgid "invalid matcher %s"
 msgstr ""
 
-#: src/grep.c:2006
+#: src/grep.c:2187
 #, c-format
 msgid "unknown devices method"
 msgstr ""
 
-#: src/grep.c:2133
+#: src/grep.c:2314
 #, c-format
 msgid "invalid max count"
 msgstr ""
 
-#: src/grep.c:2190
+#: src/grep.c:2371
 #, c-format
 msgid "unknown binary-files type"
 msgstr ""
@@ -666,38 +666,38 @@
 msgid "the --mmap option has been a no-op since 2010"
 msgstr ""
 
-#: src/pcresearch.c:48
+#: src/pcresearch.c:54
 msgid ""
 "support for the -P option is not compiled into this --disable-perl-regexp "
 "binary"
 msgstr ""
 
-#: src/pcresearch.c:64
+#: src/pcresearch.c:74
 #, c-format
 msgid "the -P option only supports a single pattern"
 msgstr ""
 
-#: src/pcresearch.c:110
+#: src/pcresearch.c:120
 #, c-format
 msgid "internal error (should never happen)"
 msgstr ""
 
-#: src/pcresearch.c:120
+#: src/pcresearch.c:130
 #, c-format
 msgid "failed to allocate memory for the PCRE JIT stack"
 msgstr ""
 
-#: src/pcresearch.c:134
+#: src/pcresearch.c:150
 #, c-format
 msgid "internal error"
 msgstr ""
 
-#: src/pcresearch.c:162
+#: src/pcresearch.c:186
 #, c-format
 msgid "exceeded PCRE's line length limit"
 msgstr ""
 
-#: src/pcresearch.c:181
+#: src/pcresearch.c:271
 #, c-format
 msgid "exceeded PCRE's backtracking limit"
 msgstr ""
@@ -707,7 +707,7 @@
 msgid "invalid UTF-8 byte sequence in input"
 msgstr ""
 
-#: src/pcresearch.c:192
+#: src/pcresearch.c:278
 #, c-format
 msgid "internal PCRE error: %d"
 msgstr ""
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/grub.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/grub.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/grub.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/grub.po	2015-08-14 07:55:47.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: 2015-02-19 11:53+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:59+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: grub-core/bus/usb/serial/ftdi.c:145 grub-core/bus/usb/serial/pl2303.c:158
 #: grub-core/term/ieee1275/escc.c:169 grub-core/term/ns8250.c:200
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/hello-debhelper.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/hello-debhelper.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/hello-debhelper.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/hello-debhelper.po	2015-08-14 07:55:47.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: 2015-02-19 11:53+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:00+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: src/hello.c:98
 #, c-format
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/hello.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/hello.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/hello.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/hello.po	2015-08-14 07:55:47.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: 2015-02-19 11:53+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:00+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: src/hello.c:103
 #, c-format
@@ -49,26 +49,26 @@
 "| Сәлем, әлем! |\n"
 "+-----------------+\n"
 
-#: src/hello.c:50
+#: src/hello.c:60
 msgid "Hello, world!"
 msgstr "Сәлем, әлем!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:156
+#: src/hello.c:121
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Қолданылуы: %s [БАПТАУЛАР]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:126
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Достық, үйлестіруге болатын сәлем басып шығарады.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:167
+#: src/hello.c:132
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"
@@ -93,27 +93,27 @@
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:185
+#: src/hello.c:149
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
-#: src/hello.c:188
+#: src/hello.c:152
 #, c-format
 msgid "Report %s bugs to: %s\n"
 msgstr ""
 
-#: src/hello.c:192
+#: src/hello.c:156
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/hello.c:194
+#: src/hello.c:158
 #, c-format
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr ""
 
-#: src/hello.c:197
+#: src/hello.c:161
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 
@@ -133,7 +133,7 @@
 "болады.\n"
 "сіздің еліңіздің заңдарыңызға сай, ЕШҚАНДАЙ КЕПІЛДІК берілмейді.\n"
 
-#: lib/error.c:188
+#: lib/error.c:191
 msgid "Unknown system error"
 msgstr "Белгісіз жүйелік қате"
 
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/human-theme.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/human-theme.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/human-theme.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/human-theme.po	2015-08-14 07:55:47.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: 2015-02-19 12:16+0000\n"
-"X-Generator: Launchpad (build 17341)\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-kk-base-14.04+20150219/data/kk/LC_MESSAGES/indicator-datetime.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/indicator-datetime.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/indicator-datetime.po	2015-02-19 15:29:17.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/indicator-datetime.po	2015-08-14 07:55:50.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: 2015-02-19 13:04+0000\n"
-"X-Generator: Launchpad (build 17341)\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
@@ -132,7 +132,7 @@
 msgid "%s (has alarms)"
 msgstr ""
 
-#: ../src/snap.cpp:129
+#: ../src/snap.cpp:132
 #, c-format
 msgid "Alarm %s"
 msgstr ""
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/kdesudo.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/kdesudo.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/kdesudo.po	2015-02-19 15:29:19.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/kdesudo.po	2015-08-14 07:55: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: 2015-02-19 13:37+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:55+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: .pc/kubuntu_dont_use_kfatal.diff/kdesudo/kdesudo.cpp:83
 #: kdesudo/kdesudo.cpp:83
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/language-selector.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/language-selector.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/language-selector.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/language-selector.po	2015-08-14 07:55:47.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-02-19 11:57+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:05+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: kk\n"
 
 #. Hack for Chinese langpack split
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/libapt-pkg4.12.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/libapt-pkg4.12.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/libapt-pkg4.12.po	2015-02-19 15:29:11.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/libapt-pkg4.12.po	2015-08-14 07:55:43.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: 2015-02-19 10:31+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 05:28+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: methods/bzip2.cc:60 methods/gzip.cc:52
 msgid "Empty files can't be valid archives"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/lightdm.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/lightdm.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/lightdm.po	2015-02-19 15:29:18.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/lightdm.po	2015-08-14 07:55:51.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: lightdm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-12-11 19:13+0000\n"
-"PO-Revision-Date: 2015-02-17 09:48+0000\n"
-"Last-Translator: Adam Conrad <adconrad@0c3.net>\n"
+"POT-Creation-Date: 2015-06-18 22:46+0000\n"
+"PO-Revision-Date: 2015-07-01 05:16+0000\n"
+"Last-Translator: Chris Halse Rogers <chris@cooperteam.net>\n"
 "Language-Team: Kazakh <kk@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: 2015-02-19 13:12+0000\n"
-"X-Generator: Launchpad (build 17341)\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
@@ -47,59 +47,59 @@
 msgstr ""
 
 #. Help string for command line --config flag
-#: ../src/lightdm.c:1107
+#: ../src/lightdm.c:1162
 msgid "Use configuration file"
 msgstr "Баптау файлын қолдану"
 
 #. Help string for command line --debug flag
-#: ../src/lightdm.c:1110
+#: ../src/lightdm.c:1165
 msgid "Print debugging messages"
 msgstr "Мінету (debug) хабарламаларды көрсету"
 
 #. Help string for command line --test-mode flag
-#: ../src/lightdm.c:1113
+#: ../src/lightdm.c:1168
 msgid "Run as unprivileged user, skipping things that require root access"
 msgstr ""
 "Әкімшілік құқықтарын қажет ететін іс-әрекеттерді өткізіп жіберіп, тек жай "
 "құқықтармен орындау"
 
 #. Help string for command line --pid-file flag
-#: ../src/lightdm.c:1116
+#: ../src/lightdm.c:1171
 msgid "File to write PID into"
 msgstr "PID-ты жазу үшін файл"
 
 #. Help string for command line --log-dir flag
-#: ../src/lightdm.c:1119
+#: ../src/lightdm.c:1174
 msgid "Directory to write logs to"
 msgstr "Лог файлдарды жазу үшін бума"
 
 #. Help string for command line --run-dir flag
-#: ../src/lightdm.c:1122
+#: ../src/lightdm.c:1177
 msgid "Directory to store running state"
 msgstr "Орындалу қалып-күйін жазу үшін бума"
 
 #. Help string for command line --cache-dir flag
-#: ../src/lightdm.c:1125
+#: ../src/lightdm.c:1180
 msgid "Directory to cache information"
 msgstr "Кэш ақпараты үшін бума"
 
 #. Help string for command line --show-config flag
-#: ../src/lightdm.c:1128
+#: ../src/lightdm.c:1183
 msgid "Show combined configuration"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/lightdm.c:1131
+#: ../src/lightdm.c:1186
 msgid "Show release version"
 msgstr "Нұсқа нөмірін көрсету"
 
 #. Arguments and description for --help test
-#: ../src/lightdm.c:1150
+#: ../src/lightdm.c:1205
 msgid "- Display Manager"
 msgstr "- Экран басқарушысы"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/lightdm.c:1160
+#: ../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-kk-base-14.04+20150219/data/kk/LC_MESSAGES/Linux-PAM.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/Linux-PAM.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/Linux-PAM.po	2015-02-19 15:29:13.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/Linux-PAM.po	2015-08-14 07:55:46.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-02-19 11:27+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:29+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: kk\n"
 
 #: libpam_misc/misc_conv.c:33
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/mountall.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/mountall.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/mountall.po	2015-02-19 15:29:17.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/mountall.po	2015-08-14 07:55:50.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: 2015-02-19 13:01+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:16+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: src/mountall.c:767
 msgid "unable to mount"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/NetworkManager.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/NetworkManager.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/NetworkManager.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/NetworkManager.po	2015-08-14 07:55:47.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: network-manager\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-04-09 15:25+0000\n"
+"POT-Creation-Date: 2015-04-28 12:15+0000\n"
 "PO-Revision-Date: 2010-02-11 11:16+0000\n"
 "Last-Translator: jmb_kz <Unknown>\n"
 "Language-Team: Kazakh <kk@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: 2015-02-19 12:01+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:09+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../cli/src/common.c:38 ../cli/src/common.c:50 ../cli/src/common.c:58
 #: ../cli/src/common.c:69 ../cli/src/connections.c:193
@@ -2652,7 +2652,7 @@
 msgid "VLAN connection %d"
 msgstr ""
 
-#: ../src/nm-manager.c:3369 ../tui/nm-editor-utils.c:246
+#: ../src/nm-manager.c:3465 ../tui/nm-editor-utils.c:246
 #, c-format
 msgid "VPN connection %d"
 msgstr ""
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/newt.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/newt.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/newt.po	2015-02-19 15:29:13.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/newt.po	2015-08-14 07:55:46.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: 2015-02-19 11:26+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:29+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "X-Poedit-Country: KAZAKHSTAN\n"
 "X-Poedit-Language: Kazakh\n"
 
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/oneconf.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/oneconf.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/oneconf.po	2015-02-19 15:29:18.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/oneconf.po	2015-08-14 07:55:51.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: oneconf\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-24 15:44+0000\n"
+"POT-Creation-Date: 2015-07-08 14:00+0000\n"
 "PO-Revision-Date: 2011-09-21 06:03+0000\n"
 "Last-Translator: jmb_kz <Unknown>\n"
 "Language-Team: Kazakh <kk@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: 2015-02-19 13:13+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:28+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: .././oneconf-service:70
 #, c-format
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/pidgin-libnotify.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/pidgin-libnotify.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/pidgin-libnotify.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/pidgin-libnotify.po	2015-08-14 07:55:49.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: 2015-02-19 12:37+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:49+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../src/pidgin-libnotify.c:85
 msgid "New messages"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/pidgin.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/pidgin.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/pidgin.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/pidgin.po	2015-08-14 07:55:49.000000000 +0000
@@ -15,15 +15,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-02-19 12:34+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:44+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 "Зяблик"
+msgstr "Finch"
 
 #: ../finch/finch.c:247
 #, c-format
@@ -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/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
@@ -100,7 +100,7 @@
 
 #: ../finch/gntaccount.c:520
 msgid "Remember password"
-msgstr "Құпия сөзді сақтау"
+msgstr "Парольді сақтау"
 
 #: ../finch/gntaccount.c:559
 msgid "There are no protocol plugins installed."
@@ -111,9 +111,9 @@
 msgstr "'make install' істелмеген болуы мүмкін"
 
 #: ../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 "Тіркелгіні өзгерту"
+msgstr "Тіркелгіні түзету"
 
 #: ../finch/gntaccount.c:570
 msgid "New Account"
@@ -121,25 +121,25 @@
 
 #: ../finch/gntaccount.c:596 ../pidgin/gtkft.c:651
 msgid "Protocol:"
-msgstr "Протоколы:"
+msgstr "Хаттама:"
 
 #: ../finch/gntaccount.c:604
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:288
 msgid "Username:"
-msgstr ""
+msgstr "Пайдаланушы аты:"
 
 #: ../finch/gntaccount.c:617
 msgid "Password:"
-msgstr "Паролі:"
+msgstr "Пароль:"
 
 #: ../finch/gntaccount.c:627
 msgid "Alias:"
-msgstr "Бүркеншік атау:"
+msgstr "Алиас:"
 
 #. Register checkbox
 #: ../finch/gntaccount.c:638
 msgid "Create this account on the server"
-msgstr ""
+msgstr "Бұл тіркелгіні серверде жасау"
 
 #. Cancel button
 #. Cancel
@@ -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,64 +201,64 @@
 #: ../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 "Қайту"
+msgstr "Бас тарту"
 
 #. 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?"
-msgstr "%s жойғу рас па?"
+msgstr "%s өшіруді шынымен қалайсыз ба?"
 
 #: ../finch/gntaccount.c:714
 msgid "Delete Account"
-msgstr "Тіркелгі жою"
+msgstr "Тіркелгіні өшіру"
 
 #. Delete button
 #: ../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 "Жою"
+msgstr "Өшіру"
 
 #: ../finch/gntaccount.c:793 ../finch/gntblist.c:2628 ../finch/gntui.c:99
-#: ../pidgin/gtkaccount.c:2341
+#: ../pidgin/gtkaccount.c:2348
 msgid "Accounts"
-msgstr "Тіркелгілері"
+msgstr "Тіркелгілер"
 
 #: ../finch/gntaccount.c:799
 msgid "You can enable/disable accounts from the following list."
@@ -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 "Өзгерту"
 
-#: ../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,19 +298,19 @@
 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 "Бұғат"
+msgstr "Тыйым салу"
 
 #: ../finch/gntblist.c:278
 #, c-format
@@ -324,7 +324,7 @@
 #: ../finch/gntblist.c:287
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "Тіркелгілері: %s (%s)"
+msgstr "Тіркелгі: %s (%s)"
 
 #: ../finch/gntblist.c:299
 #, c-format
@@ -338,9 +338,9 @@
 #: ../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 "Әдетті"
+msgstr "Бастапқы"
 
 #: ../finch/gntblist.c:636
 msgid "You must provide a username for the buddy."
@@ -362,24 +362,24 @@
 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 "Пайдаланушысы"
+msgstr "Пайдаланушы аты"
 
 #: ../finch/gntblist.c:681
 msgid "Alias (optional)"
@@ -395,23 +395,23 @@
 
 #: ../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
 msgid "Account"
-msgstr "Пайдаланушы тіркемесі"
+msgstr "Тіркелгі"
 
 #: ../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 "Досты қосу"
@@ -420,33 +420,33 @@
 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
 msgid "Name"
-msgstr "Атауы"
+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 "Бүреншік ат"
@@ -454,13 +454,13 @@
 #: ../finch/gntblist.c:797 ../finch/gntblist.c:3085
 #: ../pidgin/plugins/themeedit.c:255
 msgid "Group"
-msgstr "Тобы"
+msgstr "Топ"
 
 #: ../finch/gntblist.c:801 ../finch/gntblist.c:1226
 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 ""
 
@@ -477,8 +477,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 "Топты қосу"
 
@@ -496,17 +496,17 @@
 
 #: ../finch/gntblist.c:1210 ../finch/gntstatus.c:207
 msgid "Edit"
-msgstr "Өңдеу"
+msgstr "Түзету"
 
 #: ../finch/gntblist.c:1235
 msgid "Edit Settings"
 msgstr ""
 
-#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1003
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1011
 msgid "Information"
-msgstr "Мәлімет"
+msgstr "Ақпарат"
 
-#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1003
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1011
 msgid "Retrieving..."
 msgstr "Түсіру..."
 
@@ -521,7 +521,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 "Файл жіберу"
@@ -529,7 +529,7 @@
 #: ../finch/gntblist.c:1354 ../libpurple/protocols/gg/gg.c:1628
 #: ../libpurple/protocols/msn/msn.c:1125
 msgid "Blocked"
-msgstr "Бұғатталған"
+msgstr "Блокталған"
 
 #: ../finch/gntblist.c:1359
 msgid "Show when offline"
@@ -542,7 +542,7 @@
 
 #: ../finch/gntblist.c:1446 ../finch/gntblist.c:1735
 msgid "Rename"
-msgstr "Қайта атау"
+msgstr "Атын ауыстыру"
 
 #: ../finch/gntblist.c:1446
 msgid "Set Alias"
@@ -577,7 +577,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"
@@ -598,22 +598,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,23 +621,23 @@
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:546
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1065 ../pidgin/gtkblist.c:3803
 msgid "Nickname"
-msgstr "Бүркеншік"
+msgstr "Ник аты"
 
 #. 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 "Тоқтап тұр"
+msgstr "Іссіз"
 
 #: ../finch/gntblist.c:1823
 msgid "On Mobile"
@@ -652,9 +652,9 @@
 msgstr "Сақталған..."
 
 #: ../finch/gntblist.c:2596 ../finch/gntplugin.c:354 ../finch/gntui.c:105
-#: ../pidgin/gtkplugin.c:720
+#: ../pidgin/gtkplugin.c:722
 msgid "Plugins"
-msgstr "Модульдер"
+msgstr "Плагиндер"
 
 #: ../finch/gntblist.c:2751 ../finch/gntblist.c:2756
 msgid "Block/Unblock"
@@ -662,7 +662,7 @@
 
 #: ../finch/gntblist.c:2752
 msgid "Block"
-msgstr "Шектеу"
+msgstr "Блоктау"
 
 #: ../finch/gntblist.c:2753
 msgid "Unblock"
@@ -678,26 +678,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
@@ -708,22 +708,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 "Иә"
+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 ""
@@ -740,11 +740,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 "Кіру"
 
-#: ../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."
@@ -753,7 +753,7 @@
 #. Create the "Options" frame.
 #: ../finch/gntblist.c:2999 ../finch/gntpounce.c:461 ../pidgin/gtkpounce.c:831
 msgid "Options"
-msgstr "Баптаулар"
+msgstr "Опциялар"
 
 #: ../finch/gntblist.c:3005
 msgid "Send IM..."
@@ -789,7 +789,7 @@
 
 #: ../finch/gntblist.c:3049
 msgid "Sort"
-msgstr "Реттеу"
+msgstr "Сұрыптау"
 
 #: ../finch/gntblist.c:3054
 msgid "By Status"
@@ -810,12 +810,12 @@
 
 #: ../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
 msgid "Chat"
-msgstr "Әңгіме-дүкен"
+msgstr "Чат"
 
 #: ../finch/gntblist.c:3090 ../finch/plugins/grouping.c:365
 msgid "Grouping"
@@ -900,27 +900,27 @@
 
 #: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Сертификаттар менеджері"
 
 #: ../finch/gntcertmgr.c:298 ../libpurple/protocols/silc/silc.c:1247
 #: ../libpurple/protocols/silc10/silc.c:943 ../pidgin/gtkcertmgr.c:433
 msgid "Hostname"
-msgstr "Хост атауы"
+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 "Мәлімет"
+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 "Жабу"
@@ -1017,7 +1017,7 @@
 
 #: ../finch/gntconv.c:553
 msgid "Send To"
-msgstr ""
+msgstr "Қайда жіберу"
 
 #: ../finch/gntconv.c:606
 msgid "Conversation"
@@ -1027,7 +1027,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 ""
 
@@ -1088,27 +1088,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 ""
 
@@ -1150,12 +1150,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 ""
 
@@ -1163,17 +1163,17 @@
 #. * 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 "Тазалау"
+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 "Аялдау"
+msgstr "Аялдату"
 
 #: ../finch/gntft.c:121 ../pidgin/gtkft.c:225
 #, c-format
@@ -1194,7 +1194,7 @@
 
 #: ../finch/gntft.c:220 ../pidgin/gtkft.c:608
 msgid "Filename"
-msgstr "Файл атауы"
+msgstr "Файл аты"
 
 #: ../finch/gntft.c:220 ../pidgin/gtkft.c:615
 msgid "Size"
@@ -1202,11 +1202,11 @@
 
 #: ../finch/gntft.c:220
 msgid "Speed"
-msgstr "Жылдамдығы"
+msgstr "Жылдамдық"
 
 #: ../finch/gntft.c:220 ../pidgin/gtkft.c:622
 msgid "Remaining"
-msgstr ""
+msgstr "Қалған"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #. presence
@@ -1217,22 +1217,22 @@
 #: ../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"
-msgstr "Күй-жайы"
+msgstr "Күйі"
 
 #: ../finch/gntft.c:230
 msgid "Close this window when all transfers finish"
@@ -1256,7 +1256,7 @@
 
 #: ../finch/gntft.c:391 ../pidgin/gtkft.c:985
 msgid "Failed"
-msgstr "Жеткізу қатесі"
+msgstr "Сәтсіз"
 
 #: ../finch/gntft.c:436 ../pidgin/gtkft.c:130
 #, c-format
@@ -1273,7 +1273,7 @@
 
 #: ../finch/gntft.c:448 ../pidgin/gtkft.c:156 ../pidgin/gtkft.c:1047
 msgid "Finished"
-msgstr "Бітті"
+msgstr "Аяқталған"
 
 #: ../finch/gntft.c:450
 #, c-format
@@ -1282,11 +1282,11 @@
 
 #: ../finch/gntft.c:457
 msgid "Sending"
-msgstr ""
+msgstr "Жіберуде"
 
 #: ../finch/gntft.c:457
 msgid "Receiving"
-msgstr ""
+msgstr "Алуда"
 
 #: ../finch/gntlog.c:193
 #, c-format
@@ -1351,7 +1351,7 @@
 msgid "System Log"
 msgstr ""
 
-#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:339
+#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:341
 msgid "Calling..."
 msgstr ""
 
@@ -1366,17 +1366,17 @@
 
 #: ../finch/gntmedia.c:162 ../libpurple/certificate.c:1376
 msgid "Reject"
-msgstr "Рұқсат етілмеген"
+msgstr "Болдырмау"
 
-#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:1139 ../pidgin/gtkmedia.c:1141
+#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:1144 ../pidgin/gtkmedia.c:1146
 msgid "Call in progress."
 msgstr ""
 
-#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:1118
+#: ../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 ""
@@ -1386,7 +1386,7 @@
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
 
-#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:1134
+#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:1139
 msgid "You have rejected the call."
 msgstr ""
 
@@ -1394,71 +1394,71 @@
 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 "Жіберуші"
+msgstr "Жiберушi"
 
-#: ../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 "(жоқ)"
+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 ""
+msgstr "URI"
 
 #: ../finch/gntplugin.c:86 ../finch/gntplugin.c:95
 msgid "ERROR"
-msgstr ""
+msgstr "ҚАТЕ"
 
 #: ../finch/gntplugin.c:86
 msgid "loading plugin failed"
@@ -1521,10 +1521,10 @@
 #. (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 "Баптаулары"
+msgstr "Баптаулар"
 
 #: ../finch/gntpounce.c:195 ../pidgin/gtkpounce.c:267
 msgid "Please enter a buddy to pounce."
@@ -1708,68 +1708,68 @@
 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 "Ешқашанда"
+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 "Журналды жүргізу"
+msgstr "Журналдау"
 
 #: ../finch/gntrequest.c:399
 msgid "You must fill all the required fields."
@@ -1783,13 +1783,13 @@
 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 "Файл сақтандыру..."
+msgstr "Файлды сақтау..."
 
-#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1585
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1611
 msgid "Open File..."
-msgstr "Файл ашу..."
+msgstr "Файлды ашу..."
 
 #: ../finch/gntrequest.c:783
 msgid "Choose Location..."
@@ -1804,7 +1804,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 ""
@@ -1827,7 +1827,7 @@
 
 #: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
-msgstr ""
+msgstr "Хабарлама жіберілді"
 
 #: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
@@ -1864,10 +1864,10 @@
 #: ../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 "(әдетті)"
+msgstr "(бастапқы)"
 
 #: ../finch/gntsound.c:752
 msgid "Select Sound File ..."
@@ -1875,21 +1875,21 @@
 
 #: ../finch/gntsound.c:927
 msgid "Sound Preferences"
-msgstr ""
+msgstr "Дыбыс баптаулары"
 
 #: ../finch/gntsound.c:938
 msgid "Profiles"
 msgstr "Профильдер"
 
-#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2513
+#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2519
 msgid "Automatic"
-msgstr "Авто"
+msgstr "Автоматты түрде"
 
 #: ../finch/gntsound.c:980
 msgid "Console Beep"
 msgstr ""
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2517
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2523
 msgid "Command"
 msgstr "Команда"
 
@@ -1903,7 +1903,7 @@
 
 #: ../finch/gntsound.c:989
 msgid "Method: "
-msgstr ""
+msgstr "Тәсіл: "
 
 #: ../finch/gntsound.c:996
 #, c-format
@@ -1913,7 +1913,7 @@
 msgstr ""
 
 #. Sound options
-#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2503
+#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2509
 msgid "Sound Options"
 msgstr ""
 
@@ -1921,19 +1921,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 "Әрқашанда"
+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 ""
 
@@ -1942,26 +1942,26 @@
 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 "Оқиға"
 
 #: ../finch/gntsound.c:1043
 msgid "File"
-msgstr "Файлдан"
+msgstr "Файл"
 
 #: ../finch/gntsound.c:1062
 msgid "Test"
-msgstr "Тексеру"
+msgstr "Сынау"
 
 #: ../finch/gntsound.c:1065 ../pidgin/gtkpounce.c:700
 msgid "Reset"
-msgstr "Ысырып тастау"
+msgstr "Тастау"
 
 #: ../finch/gntsound.c:1068
 msgid "Choose..."
@@ -1984,7 +1984,7 @@
 #: ../finch/gntstatus.c:185 ../finch/gntstatus.c:541
 #: ../libpurple/protocols/mxit/actions.c:290 ../pidgin/gtksavedstatuses.c:468
 msgid "Title"
-msgstr "Атағы"
+msgstr "Атауы"
 
 #: ../finch/gntstatus.c:185 ../pidgin/gtksavedstatuses.c:481
 msgid "Type"
@@ -2007,13 +2007,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
@@ -2023,29 +2023,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 "Хабарлама"
@@ -2053,7 +2053,7 @@
 #. Use
 #: ../finch/gntstatus.c:196 ../finch/gntstatus.c:595
 msgid "Use"
-msgstr "Болсын"
+msgstr "Қолдану"
 
 #: ../finch/gntstatus.c:303
 msgid "Invalid title"
@@ -2077,11 +2077,11 @@
 
 #: ../finch/gntstatus.c:466 ../pidgin/gtkft.c:654
 msgid "Status:"
-msgstr "Күй-жайы:"
+msgstr "Күйі:"
 
 #: ../finch/gntstatus.c:481
 msgid "Message:"
-msgstr "Хабар:"
+msgstr "Хабарлама:"
 
 #: ../finch/gntstatus.c:530
 msgid "Edit Status"
@@ -2098,9 +2098,9 @@
 
 #: ../finch/gntui.c:102
 msgid "Certificates"
-msgstr "Куәліктер"
+msgstr "Сертификаттар"
 
-#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2806
+#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2811
 msgid "Sounds"
 msgstr "Дыбыстар"
 
@@ -2279,14 +2279,14 @@
 #: ../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
 msgid "Offline"
-msgstr "Желіге қосылмаған"
+msgstr "Желіде емес"
 
 #: ../finch/plugins/grouping.c:115 ../pidgin/gtkblist.c:3912
 msgid "Online Buddies"
@@ -2337,112 +2337,113 @@
 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 ""
+msgstr "%s (%s) үшін парольді енгізіңіз"
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1267
 msgid "Enter Password"
-msgstr "Парольді келтіру"
+msgstr "Парольді енгізіңіз"
 
-#: ../libpurple/account.c:1213
+#: ../libpurple/account.c:1272
 msgid "Save password"
-msgstr "Құпия сөзді сақтау"
+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 ""
+msgstr "Жаңа пароль"
 
-#: ../libpurple/account.c:1566
+#: ../libpurple/account.c:1625
 msgid "New password (again)"
-msgstr ""
+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: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 "Беймәлім"
+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 "Достар"
+msgstr "Таныстар"
 
-#: ../libpurple/blist.c:612
+#: ../libpurple/blist.c:613
 msgid "buddy list"
-msgstr ""
+msgstr "таныстар тізімі"
 
 #: ../libpurple/certificate.c:50
 msgid "The certificate is self-signed and cannot be automatically checked."
@@ -2572,7 +2573,8 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:2178
+#: ../libpurple/certificate.c:2144 ../libpurple/certificate.c:2203
+#: ../libpurple/certificate.c:2208
 msgid "Certificate Information"
 msgstr "Куәлік мәліметі"
 
@@ -2601,13 +2603,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 "Беймәлім қате"
 
@@ -2624,8 +2627,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 ""
 
@@ -2701,55 +2704,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 ""
 
@@ -2823,215 +2826,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 ""
 
@@ -3087,38 +3090,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 ""
@@ -3206,11 +3209,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 ""
@@ -3258,8 +3261,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 "Жазбалар"
 
@@ -3488,114 +3491,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 "MSN Messenger"
 
 #. 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 ""
 
@@ -3605,19 +3608,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"
@@ -3703,7 +3706,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
@@ -3715,7 +3718,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
@@ -3765,14 +3768,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 ""
 
@@ -3848,8 +3851,8 @@
 msgstr ""
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1183
-#: ../libpurple/plugins/ssl/ssl-nss.c:1032
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1232
+#: ../libpurple/plugins/ssl/ssl-nss.c:1199
 msgid "X.509 Certificates"
 msgstr ""
 
@@ -3859,7 +3862,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1259
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1308
 msgid "GNUTLS"
 msgstr ""
 
@@ -3867,8 +3870,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1262
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1264
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1311
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1313
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -3878,7 +3881,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:1108
+#: ../libpurple/plugins/ssl/ssl-nss.c:1275
 msgid "NSS"
 msgstr ""
 
@@ -3886,8 +3889,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:1111
-#: ../libpurple/plugins/ssl/ssl-nss.c:1113
+#: ../libpurple/plugins/ssl/ssl-nss.c:1278
+#: ../libpurple/plugins/ssl/ssl-nss.c:1280
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -4003,14 +4006,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 "Тегі"
 
@@ -4021,12 +4024,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
@@ -4073,16 +4076,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 ""
 
@@ -4090,13 +4093,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."
@@ -4136,15 +4139,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 "Қала"
 
@@ -4153,13 +4156,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 "Жыныс"
@@ -4173,7 +4176,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 "Ер"
 
@@ -4181,7 +4184,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 "Әйел"
 
@@ -4210,7 +4213,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 ""
 
@@ -4235,15 +4238,15 @@
 #: ../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"
-msgstr "Жетімді"
+msgstr "Қолжетерлік"
 
 #. 2
 #: ../libpurple/protocols/gg/gg.c:763
-#: ../libpurple/protocols/jabber/jabber.c:2394
+#: ../libpurple/protocols/jabber/jabber.c:2402
 #: ../libpurple/protocols/jabber/jutil.c:706
 #: ../libpurple/protocols/mxit/roster.c:56
 msgid "Chatty"
@@ -4251,12 +4254,12 @@
 
 #. 3
 #: ../libpurple/protocols/gg/gg.c:766
-#: ../libpurple/protocols/jabber/jabber.c:2440
+#: ../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 "Әурелемеу"
 
@@ -4264,25 +4267,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: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 "UIN"
 
@@ -4294,8 +4297,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"
@@ -4306,7 +4309,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 ""
 
@@ -4335,11 +4338,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
@@ -4361,36 +4364,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 ""
 
@@ -4405,44 +4408,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 ""
 
@@ -4453,34 +4456,34 @@
 msgid "Unknown command: %s"
 msgstr "Белгесіз жарлық %s"
 
-#: ../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 "Кәзіргі болімі %s"
 
-#: ../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 ""
 
@@ -4507,124 +4510,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 "Бөлімі"
 
@@ -4636,50 +4639,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"
@@ -4689,15 +4692,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 ""
 
@@ -4742,8 +4745,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 "Бүркеншік ат"
@@ -4757,7 +4760,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 ""
@@ -4863,7 +4866,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)"
@@ -4876,7 +4879,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 ""
 
@@ -4933,7 +4936,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 ""
@@ -5072,7 +5075,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 ""
 
@@ -5190,9 +5193,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 "Беймәлім қате"
 
@@ -5284,8 +5287,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 ""
@@ -5328,7 +5331,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 ""
 
@@ -5371,21 +5374,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 "Тегі"
@@ -5396,7 +5399,7 @@
 msgstr "Аты"
 
 #: ../libpurple/protocols/jabber/buddy.c:354
-#: ../libpurple/protocols/jabber/jabber.c:1329
+#: ../libpurple/protocols/jabber/jabber.c:1337
 msgid "URL"
 msgstr "URL"
 
@@ -5458,9 +5461,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 ""
@@ -5474,18 +5477,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 "Сипаттамасы"
 
@@ -5513,18 +5516,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 "Ресурс"
 
@@ -5542,17 +5545,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 "Адресі"
@@ -5624,7 +5627,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 "Тегі"
@@ -5661,8 +5664,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 ""
 
@@ -5673,7 +5676,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"
@@ -5696,8 +5699,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 ""
 
@@ -5766,7 +5769,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 ""
@@ -5801,7 +5804,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 ""
 
@@ -5809,223 +5812,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
@@ -6034,35 +6037,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 ""
 
@@ -6072,335 +6075,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 "
@@ -6409,132 +6412,132 @@
 
 #. 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 ""
 
@@ -6559,8 +6562,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 "Домен"
 
@@ -6574,7 +6577,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 ""
 
@@ -6703,38 +6706,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"
@@ -6756,9 +6759,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
@@ -6770,9 +6773,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
@@ -6784,9 +6787,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
@@ -6796,9 +6799,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
@@ -6892,9 +6895,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
@@ -6930,9 +6933,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
@@ -6998,9 +7001,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
@@ -7008,9 +7011,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
@@ -7080,9 +7083,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
@@ -7121,9 +7124,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
@@ -7207,20 +7210,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 ""
 
@@ -7270,7 +7273,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 ""
 
@@ -7420,7 +7423,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 "Идентификациялау қатесі"
 
@@ -7653,26 +7656,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 "Тез ораламын"
 
@@ -7680,25 +7683,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 "Түскі үзілістемін"
 
@@ -7759,243 +7762,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 ""
@@ -8009,31 +8012,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 ""
 
@@ -8045,44 +8048,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 "
@@ -8303,7 +8306,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 ""
 
@@ -8429,7 +8432,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/mxit/actions.c:501
-#: ../libpurple/protocols/oscar/oscar.c:5333
+#: ../libpurple/protocols/oscar/oscar.c:5328
 msgid "_Search"
 msgstr ""
 
@@ -8469,16 +8472,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 ""
@@ -8699,7 +8702,7 @@
 
 #: ../libpurple/protocols/mxit/profile.c:310
 msgid "No results"
-msgstr ""
+msgstr "Нәтижелер жоқ"
 
 #: ../libpurple/protocols/mxit/profile.c:310
 msgid "No contacts found."
@@ -8867,8 +8870,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"
@@ -8876,7 +8879,7 @@
 
 #: ../libpurple/protocols/mxit/roster.c:254
 msgid "Pending"
-msgstr ""
+msgstr "Кезекте"
 
 #: ../libpurple/protocols/mxit/roster.c:256
 msgid "Invited"
@@ -8897,7 +8900,7 @@
 
 #: ../libpurple/protocols/mxit/splashscreen.c:207
 msgid "More Information"
-msgstr ""
+msgstr "Көбірек ақпарат"
 
 #: ../libpurple/protocols/myspace/myspace.c:136
 #, c-format
@@ -8961,7 +8964,7 @@
 
 #: ../libpurple/protocols/myspace/myspace.c:909
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
 #: ../libpurple/protocols/myspace/myspace.c:1011
 msgid "IM Friends"
@@ -9102,8 +9105,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 "Пайдаланушы"
 
@@ -9123,45 +9126,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 ""
 
@@ -9172,7 +9175,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 ""
 
@@ -9371,9 +9374,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 ""
 
@@ -9560,7 +9563,7 @@
 msgstr "Пошта бөлімшесі"
 
 #: ../libpurple/protocols/novell/novell.c:1510
-#: ../libpurple/protocols/sametime/sametime.c:4169
+#: ../libpurple/protocols/sametime/sametime.c:4133
 msgid "User ID"
 msgstr "Пайдалауш. ID-і"
 
@@ -9572,7 +9575,7 @@
 #. 
 #: ../libpurple/protocols/novell/novell.c:1523
 msgid "Full name"
-msgstr ""
+msgstr "Толық аты"
 
 #: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
@@ -9653,8 +9656,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 ""
@@ -9667,11 +9670,11 @@
 #. * 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 ""
+msgstr "_ОК"
 
 #: ../libpurple/protocols/oscar/clientlogin.c:116
 #, c-format
@@ -9690,7 +9693,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."
@@ -9837,10 +9840,10 @@
 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 ""
+msgstr "Теріп жатыр"
 
 #: ../libpurple/protocols/oscar/family_locate.c:420
 msgid "At the office"
@@ -9881,7 +9884,7 @@
 #. "I am mobile." / "John is mobile."
 #: ../libpurple/protocols/oscar/family_locate.c:433 ../libpurple/status.c:168
 msgid "Mobile"
-msgstr "Қалта телефоны"
+msgstr "Мобильді"
 
 #: ../libpurple/protocols/oscar/family_locate.c:434
 msgid "Searching the web"
@@ -9930,9 +9933,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 ""
 
@@ -9973,9 +9977,9 @@
 #: ../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 "Кодтамасы"
+msgstr "Кодталуы"
 
 #: ../libpurple/protocols/oscar/odc.c:43
 msgid "The remote user has closed the connection."
@@ -10015,17 +10019,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 "Қол жетпеуде"
+msgstr "Қолжетерсіз"
 
 #: ../libpurple/protocols/oscar/oscar.c:163
-#: ../libpurple/protocols/oscar/oscar.c:4839
+#: ../libpurple/protocols/oscar/oscar.c:4834
 msgid "Occupied"
 msgstr "Бос емес"
 
@@ -10034,28 +10038,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 ""
 
@@ -10102,7 +10106,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 ""
@@ -10112,35 +10116,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 "
@@ -10148,40 +10152,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 "
@@ -10189,17 +10193,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"
@@ -10208,7 +10212,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"
@@ -10217,7 +10221,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"
@@ -10226,39 +10230,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 ""
+msgstr "Қ_осу"
 
-#: ../libpurple/protocols/oscar/oscar.c:2044
+#: ../libpurple/protocols/oscar/oscar.c:2042
 msgid "_Decline"
-msgstr ""
+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."
@@ -10267,7 +10271,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."
@@ -10276,7 +10280,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."
@@ -10285,130 +10289,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 "
@@ -10419,11 +10423,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 "
@@ -10434,11 +10438,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 "
@@ -10446,64 +10450,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 ""
+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 "
@@ -10511,204 +10515,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 ""
+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 "
@@ -10716,7 +10720,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 "Достың таңбашасы"
@@ -10804,15 +10808,15 @@
 
 #: ../libpurple/protocols/oscar/userinfo.c:115
 msgid "Camera"
-msgstr "Фотокамера"
+msgstr "Камера"
 
 #: ../libpurple/protocols/oscar/userinfo.c:118
 msgid "Screen Sharing"
-msgstr ""
+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 "IP адресі"
 
@@ -10829,53 +10833,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 "Қалта телефоны"
+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 ""
+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 "Мүмкіндіктері"
 
@@ -10975,8 +10979,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 ""
 
@@ -10991,7 +10995,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 "Желіден тыс деп көріну"
 
@@ -11049,136 +11053,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 "Файл тасымалдау"
+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 "Құру"
+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 "
@@ -11186,135 +11190,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 "Пайдаланушы"
+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 "
@@ -11322,37 +11326,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 "
@@ -11360,60 +11364,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 "Іздеу нәтижесі"
+msgstr "Іздеу нәтижелері"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5586
 msgid "No matches"
-msgstr ""
+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 ""
+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 ""
 
@@ -11448,7 +11452,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:139
 #: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
-msgstr ""
+msgstr "Кілт туралы келісім"
 
 #: ../libpurple/protocols/silc/buddy.c:55
 #: ../libpurple/protocols/silc10/buddy.c:54
@@ -11539,8 +11543,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
@@ -11549,8 +11553,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
@@ -11558,14 +11562,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
@@ -11574,11 +11578,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
@@ -11589,8 +11593,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
@@ -11611,109 +11615,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 ""
+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
@@ -11721,41 +11725,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
@@ -11898,7 +11902,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
@@ -12102,8 +12106,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
@@ -12111,38 +12115,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
@@ -12150,8 +12154,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
@@ -12159,157 +12163,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 ""
@@ -12330,43 +12334,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
@@ -12374,17 +12378,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 ""
@@ -12490,7 +12494,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 "Қалыпты"
@@ -12503,14 +12507,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 "SMS"
 
 #: ../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"
@@ -12725,7 +12729,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 ""
 
@@ -12865,7 +12869,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 "Желі"
 
@@ -12918,75 +12922,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 ""
@@ -12995,7 +12999,7 @@
 "\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:381
+#: ../libpurple/protocols/silc/util.c:330
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -13003,51 +13007,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 ""
 
@@ -13126,27 +13130,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 ""
 
@@ -13158,36 +13162,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 ""
 
@@ -13279,7 +13283,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 ""
@@ -13318,38 +13322,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 "
@@ -13357,175 +13361,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 ""
+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 ""
 
@@ -13538,19 +13542,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 ""
@@ -13596,7 +13600,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1151
 msgid "Home Page"
-msgstr "Мекен парақшасы"
+msgstr "Үй парағы"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
 msgid "Cool Link 1"
@@ -13641,68 +13645,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 "Қол жеткізбейді"
+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 ""
 
@@ -13716,100 +13720,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 ""
+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 ""
 
@@ -13823,66 +13827,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 ""
@@ -13906,7 +13910,7 @@
 
 #: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:563
 msgid "_No"
-msgstr "_Жоқ"
+msgstr "Ж_оқ"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
@@ -13917,7 +13921,7 @@
 #. 
 #: ../libpurple/request.h:1508 ../libpurple/request.h:1521
 msgid "_Accept"
-msgstr ""
+msgstr "Қ_абылдау"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
@@ -13933,7 +13937,7 @@
 #: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr ""
+msgstr "%s енді %s ретінде белгілі.\n"
 
 #: ../libpurple/server.c:821
 #, c-format
@@ -14048,99 +14052,94 @@
 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 "Белгісіз"
+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] ""
+msgstr[0] "%d күн"
 
-#: ../libpurple/util.c:3343
+#: ../libpurple/util.c:3358
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d сағат"
 
-#: ../libpurple/util.c:3349
+#: ../libpurple/util.c:3364
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d сағат"
 
-#: ../libpurple/util.c:3357
+#: ../libpurple/util.c:3372
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d минут"
 
-#: ../libpurple/util.c:3363
+#: ../libpurple/util.c:3378
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d минут"
 
-#: ../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 ""
@@ -14158,12 +14157,12 @@
 #. 10060
 #: ../libpurple/win32/libc_interface.c:370
 msgid "Connection timed out."
-msgstr "Қосылымды күту мерзімі бітті."
+msgstr "Байланыс уақыты біткен."
 
 #. 10061
 #: ../libpurple/win32/libc_interface.c:373
 msgid "Connection refused."
-msgstr "Қосылыс қабылданбады."
+msgstr "Байланыс үзілді."
 
 #. 10048
 #: ../libpurple/win32/libc_interface.c:376
@@ -14182,87 +14181,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 ""
+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 "HTTP"
 
-#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2117
+#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:2123
 msgid "Use Environmental Settings"
 msgstr ""
 
@@ -14271,73 +14270,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 ""
+msgstr "_Хост:"
 
-#: ../pidgin/gtkaccount.c:1121
+#: ../pidgin/gtkaccount.c:1128
 msgid "_Port:"
-msgstr ""
+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 ""
+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 "Болсын"
+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"
@@ -14351,26 +14350,26 @@
 "<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 ""
 
 #. Buddy List
 #: ../pidgin/gtkblist-theme.c:370 ../pidgin/gtkimhtmltoolbar.c:1234
 msgid "Background Color"
-msgstr "Аясының түсі"
+msgstr "Фон түсі"
 
 #: ../pidgin/gtkblist-theme.c:371
 msgid "The background color for the buddy list"
@@ -14545,10 +14544,10 @@
 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 ""
+msgstr "_Блоктау"
 
 #: ../pidgin/gtkblist.c:1404
 msgid "Un_block"
@@ -14556,7 +14555,7 @@
 
 #: ../pidgin/gtkblist.c:1447
 msgid "Move to"
-msgstr ""
+msgstr "Қайда жылжыту"
 
 #: ../pidgin/gtkblist.c:1491
 msgid "Get _Info"
@@ -14607,7 +14606,7 @@
 #: ../pidgin/gtkblist.c:1563 ../pidgin/gtkblist.c:1571
 #: ../pidgin/gtkblist.c:1765 ../pidgin/gtkblist.c:1788
 msgid "_Remove"
-msgstr ""
+msgstr "Ө_шіру"
 
 #: ../pidgin/gtkblist.c:1696
 msgid "Set Custom Icon"
@@ -14631,7 +14630,7 @@
 
 #: ../pidgin/gtkblist.c:1722
 msgid "_Rename"
-msgstr ""
+msgstr "Атын ауысты_ру"
 
 #. join button
 #: ../pidgin/gtkblist.c:1747 ../pidgin/gtkroomlist.c:323
@@ -14653,11 +14652,11 @@
 
 #: ../pidgin/gtkblist.c:1795 ../pidgin/gtkblist.c:1820
 msgid "_Collapse"
-msgstr ""
+msgstr "Бү_ктеу"
 
 #: ../pidgin/gtkblist.c:1825
 msgid "_Expand"
-msgstr ""
+msgstr "Жа_зық қылу"
 
 #: ../pidgin/gtkblist.c:2072 ../pidgin/gtkblist.c:2084
 #: ../pidgin/gtkblist.c:6001 ../pidgin/gtkblist.c:6014
@@ -14761,7 +14760,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 ""
 
@@ -14850,7 +14849,7 @@
 #: ../pidgin/gtkblist.c:3685
 #, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
+msgstr "<b>Тіркелгі:</b> %s"
 
 #: ../pidgin/gtkblist.c:3704
 #, c-format
@@ -14989,7 +14988,7 @@
 
 #: ../pidgin/gtkblist.c:5224
 msgid "Welcome back!"
-msgstr "Хошкеліпсіз!"
+msgstr "Қайта келуіңізбен!"
 
 #: ../pidgin/gtkblist.c:5260
 #, c-format
@@ -15050,96 +15049,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 ""
 
@@ -15466,7 +15465,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 ""
 
@@ -15487,84 +15486,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 ""
 
@@ -15618,7 +15617,7 @@
 
 #: ../pidgin/gtkdebug.c:938
 msgid "All"
-msgstr "Бүкіл"
+msgstr "Барлығы"
 
 #: ../pidgin/gtkdebug.c:939
 msgid "Misc"
@@ -15697,82 +15696,83 @@
 
 #: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Afrikaans"
-msgstr ""
+msgstr "Африкаанс"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:273
 msgid "Arabic"
-msgstr "Араб"
+msgstr "Арабша"
 
 #: ../pidgin/gtkdialogs.c:153
 msgid "Assamese"
-msgstr ""
+msgstr "Ассам"
 
 #: ../pidgin/gtkdialogs.c:154
 msgid "Asturian"
-msgstr ""
+msgstr "Астурия"
 
 #: ../pidgin/gtkdialogs.c:155
 msgid "Belarusian Latin"
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
-#: ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:274
 msgid "Bulgarian"
-msgstr "Болгар"
+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 "Бенгали"
+msgstr "Бенгалдық"
 
 #: ../pidgin/gtkdialogs.c:161
 msgid "Bengali-India"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Bosnian"
-msgstr "Босниялық"
+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 ""
+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 "Дат"
+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 "Неміс"
 
 #: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
 #: ../pidgin/gtkdialogs.c:172
 msgid "Dzongkha"
-msgstr ""
+msgstr "Дзонг-кэ"
 
 #: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
 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 ""
+msgstr "Ұлыбританиялық ағылшын"
 
 #: ../pidgin/gtkdialogs.c:177
 msgid "Canadian English"
@@ -15782,90 +15782,90 @@
 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 "Испанша"
+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 "Фин"
+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 ""
+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 ""
+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 "Яхуди"
+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 ""
+msgstr "Хорват"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:291
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:302
 msgid "Hungarian"
-msgstr "Мадяр"
+msgstr "Венгр"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:303
 msgid "Armenian"
-msgstr ""
+msgstr "Армян"
 
 #: ../pidgin/gtkdialogs.c:199
 msgid "Indonesian"
-msgstr ""
+msgstr "Индонезия"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:292
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:304
 msgid "Italian"
-msgstr "Итальянша"
+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 "Жапонша"
+msgstr "Жапон"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:297
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:309
 msgid "Georgian"
 msgstr "Грузин"
 
@@ -15873,215 +15873,216 @@
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Khmer"
-msgstr ""
+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 "Корейше"
+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 "Курдтар"
+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 "Литов"
+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 "Македон"
+msgstr "Македония"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:220
 msgid "Malayalam"
-msgstr ""
+msgstr "Малайялам"
 
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:221
 msgid "Mongolian"
-msgstr ""
+msgstr "Моңғол"
 
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:222
 msgid "Marathi"
-msgstr ""
+msgstr "Маратхи"
 
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:317
 msgid "Malay"
-msgstr ""
+msgstr "Малай"
 
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:223
 msgid "Burmese"
-msgstr ""
+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 ""
+msgstr "Норвегиялық Букмол"
 
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:225
 msgid "Nepali"
-msgstr ""
+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 ""
+msgstr "Норвегиялық Нюнорск"
 
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:323
 msgid "Occitan"
-msgstr ""
+msgstr "Окситан"
 
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:229
 msgid "Oriya"
-msgstr ""
+msgstr "Ория"
 
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:230
 msgid "Punjabi"
-msgstr ""
+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 "Поляк"
+msgstr "Польша"
 
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:313
+#: ../pidgin/gtkdialogs.c:232 ../pidgin/gtkdialogs.c:329
 msgid "Portuguese"
-msgstr "Португалша"
+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 ""
+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 "Орысша"
+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 "Серб"
+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 "Синхала"
+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 "Швед"
+msgstr "Сальвадор"
 
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:248
 msgid "Swahili"
-msgstr ""
+msgstr "Суахили"
 
-#: ../pidgin/gtkdialogs.c:246 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
 msgid "Tamil"
-msgstr "Тамил"
+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 ""
+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 ""
+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 ""
+msgstr "Қытай әдеттегі"
 
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:272
 msgid "Amharic"
-msgstr ""
+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 "
@@ -16092,7 +16093,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 "
@@ -16101,7 +16102,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 "
@@ -16113,114 +16114,114 @@
 "responses may be less helpful.<br/>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:542
+#: ../pidgin/gtkdialogs.c:559
 #, c-format
 msgid "About %s"
-msgstr ""
+msgstr "%s туралы"
 
-#: ../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 "
@@ -16231,70 +16232,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 ""
 
@@ -16320,7 +16321,7 @@
 
 #: ../pidgin/gtkdocklet.c:722
 msgid "_Accounts"
-msgstr ""
+msgstr "Тір_келгілер"
 
 #: ../pidgin/gtkdocklet.c:723
 msgid "Plu_gins"
@@ -16340,11 +16341,11 @@
 
 #: ../pidgin/gtkdocklet.c:745
 msgid "_Quit"
-msgstr ""
+msgstr "_Шығу"
 
 #: ../pidgin/gtkft.c:150
 msgid "Not started"
-msgstr ""
+msgstr "Басталмаған"
 
 #: ../pidgin/gtkft.c:272
 msgid "<b>Receiving As:</b>"
@@ -16362,32 +16363,32 @@
 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 ""
 
 #: ../pidgin/gtkft.c:652
 msgid "Filename:"
-msgstr "Файл атауы:"
+msgstr "Файл аты:"
 
 #: ../pidgin/gtkft.c:653
 msgid "Local File:"
@@ -16395,7 +16396,7 @@
 
 #: ../pidgin/gtkft.c:655
 msgid "Speed:"
-msgstr "Жылдамдығы:"
+msgstr "Жылдамдық:"
 
 #: ../pidgin/gtkft.c:656
 msgid "Time Elapsed:"
@@ -16582,11 +16583,11 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:446 ../pidgin/gtkimhtmltoolbar.c:1239
 msgid "Insert Link"
-msgstr ""
+msgstr "Сiлтеменi кiрiстiру"
 
 #: ../pidgin/gtkimhtmltoolbar.c:450 ../pidgin/gtkimhtmltoolbar.c:1422
 msgid "_Insert"
-msgstr ""
+msgstr "_Кірістіру"
 
 #: ../pidgin/gtkimhtmltoolbar.c:515
 #, c-format
@@ -16595,7 +16596,7 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:540
 msgid "Insert Image"
-msgstr ""
+msgstr "Суретті кірістіру"
 
 #: ../pidgin/gtkimhtmltoolbar.c:673
 #, c-format
@@ -16618,7 +16619,7 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:971 ../pidgin/gtkimhtmltoolbar.c:1377
 msgid "_Font"
-msgstr ""
+msgstr "Қа_ріп"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "Group Items"
@@ -16630,7 +16631,7 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:1224 ../pidgin/plugins/convcolors.c:358
 msgid "Bold"
-msgstr "Қалың"
+msgstr "Жуан"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1225 ../pidgin/plugins/convcolors.c:367
 msgid "Italic"
@@ -16642,7 +16643,7 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "Strikethrough"
-msgstr ""
+msgstr "Сызып тасталған"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1229
 msgid "Increase Font Size"
@@ -16678,15 +16679,15 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:1337
 msgid "<b>_Bold</b>"
-msgstr ""
+msgstr "<b>_Жуан</b>"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1338
 msgid "<i>_Italic</i>"
-msgstr ""
+msgstr "<i>Кө_лбеу</i>"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1339
 msgid "<u>_Underline</u>"
-msgstr ""
+msgstr "<u>Асты сы_зылған</u>"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1340
 msgid "<span strikethrough='true'>Strikethrough</span>"
@@ -16721,11 +16722,11 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:1430
 msgid "_Image"
-msgstr ""
+msgstr "_Сурет"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1438
 msgid "_Link"
-msgstr ""
+msgstr "Сі_лтеме"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1446
 msgid "_Horizontal rule"
@@ -16850,7 +16851,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"
@@ -16867,42 +16868,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:957
+#: ../pidgin/gtkmedia.c:962
 msgid "_Hold"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:1028 ../pidgin/pidginstock.c:92
+#: ../pidgin/gtkmedia.c:1033 ../pidgin/pidginstock.c:92
 msgid "_Pause"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:1046
+#: ../pidgin/gtkmedia.c:1051
 msgid "_Mute"
 msgstr ""
 
@@ -17004,27 +17005,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 ""
 
@@ -17118,7 +17119,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 ""
 
@@ -17203,556 +17204,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 "Netscape"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1882
 msgid "Mozilla"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1877
+#: ../pidgin/gtkprefs.c:1883
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../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 ""
 
@@ -17776,67 +17777,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 ""
@@ -17845,23 +17846,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 "Қапшығын таңдау..."
 
@@ -17958,7 +17959,7 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:322
+#: ../pidgin/gtkstatusbox.c:323
 msgid "Select Buddy Icon"
 msgstr ""
 
@@ -17994,61 +17995,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"
@@ -18062,17 +18063,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"
@@ -18080,48 +18081,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 ""
 
@@ -18131,7 +18132,7 @@
 
 #: ../pidgin/gtkwhiteboard.c:857
 msgid "Select color"
-msgstr ""
+msgstr "Түсті тандаңыз"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -18145,7 +18146,7 @@
 
 #: ../pidgin/pidginstock.c:85
 msgid "Close _tabs"
-msgstr ""
+msgstr "Бе_ттерді жабу"
 
 #: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
@@ -18157,7 +18158,7 @@
 
 #: ../pidgin/pidginstock.c:89
 msgid "_Modify..."
-msgstr ""
+msgstr "Ө_згерту..."
 
 #: ../pidgin/pidginstock.c:90
 msgid "_Add..."
@@ -19447,55 +19448,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 ""
 
@@ -19508,18 +19509,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 ""
 
@@ -19701,7 +19702,7 @@
 #. Installer Subsection Text
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:12
 msgid "Shortcuts"
-msgstr ""
+msgstr "Жарлықтар"
 
 #. Installer Subsection Text
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:14
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/pulseaudio.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/pulseaudio.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/pulseaudio.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/pulseaudio.po	2015-08-14 07:55:48.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: 2015-02-19 12:23+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:34+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../src/modules/alsa/alsa-util.c:1134 ../src/modules/alsa/alsa-util.c:1209
 #, c-format
@@ -403,11 +403,11 @@
 msgid "pa_core_new() failed."
 msgstr ""
 
-#: ../src/daemon/main.c:1101
+#: ../src/daemon/main.c:1102
 msgid "Failed to initialize daemon."
 msgstr ""
 
-#: ../src/daemon/main.c:1106
+#: ../src/daemon/main.c:1107
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr ""
 
@@ -605,78 +605,78 @@
 msgid "Path: %s\n"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:258
+#: ../src/daemon/daemon-conf.c:259
 #, c-format
 msgid "[%s:%u] Invalid log target '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:273
+#: ../src/daemon/daemon-conf.c:274
 #, c-format
 msgid "[%s:%u] Invalid log level '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:288
+#: ../src/daemon/daemon-conf.c:289
 #, c-format
 msgid "[%s:%u] Invalid resample method '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:310
+#: ../src/daemon/daemon-conf.c:311
 #, c-format
 msgid "[%s:%u] Invalid rlimit '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:330
+#: ../src/daemon/daemon-conf.c:331
 #, c-format
 msgid "[%s:%u] Invalid sample format '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:347 ../src/daemon/daemon-conf.c:364
+#: ../src/daemon/daemon-conf.c:348 ../src/daemon/daemon-conf.c:365
 #, c-format
 msgid "[%s:%u] Invalid sample rate '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:387
+#: ../src/daemon/daemon-conf.c:388
 #, c-format
 msgid "[%s:%u] Invalid sample channels '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:404
+#: ../src/daemon/daemon-conf.c:405
 #, c-format
 msgid "[%s:%u] Invalid channel map '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:421
+#: ../src/daemon/daemon-conf.c:422
 #, c-format
 msgid "[%s:%u] Invalid number of fragments '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:438
+#: ../src/daemon/daemon-conf.c:439
 #, c-format
 msgid "[%s:%u] Invalid fragment size '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:455
+#: ../src/daemon/daemon-conf.c:456
 #, c-format
 msgid "[%s:%u] Invalid nice level '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:498
+#: ../src/daemon/daemon-conf.c:499
 #, c-format
 msgid "[%s:%u] Invalid server type '%s'."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:611
+#: ../src/daemon/daemon-conf.c:613
 #, c-format
 msgid "Failed to open configuration file: %s"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:627
+#: ../src/daemon/daemon-conf.c:629
 msgid ""
 "The specified default channel map has a different number of channels than "
 "the specified default number of channels."
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:714
+#: ../src/daemon/daemon-conf.c:716
 #, c-format
 msgid "### Read from configuration file: %s ###\n"
 msgstr ""
@@ -2771,7 +2771,7 @@
 "See --dump-resample-methods for possible values of resample methods.\n"
 msgstr ""
 
-#: ../src/tests/resampler-test.c:354
+#: ../src/tests/resampler-test.c:355
 #, c-format
 msgid "%s %s\n"
 msgstr ""
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/python-apt.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/python-apt.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/python-apt.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/python-apt.po	2015-08-14 07:55:46.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: 2015-02-19 11:35+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:39+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -30,367 +30,367 @@
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:140
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 14.04 'Trusty Tahr'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:147
+#: ../data/templates/Ubuntu.info.in:494
 msgid "Cdrom with Ubuntu 14.04 'Trusty Tahr'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:259
+#: ../data/templates/Ubuntu.info.in:606
 msgid "Ubuntu 13.10 'Saucy Salamander'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:266
+#: ../data/templates/Ubuntu.info.in:613
 msgid "Cdrom with Ubuntu 13.10 'Saucy Salamander'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:725
 msgid "Ubuntu 13.04 'Raring Ringtail'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:385
+#: ../data/templates/Ubuntu.info.in:732
 msgid "Cdrom with Ubuntu 13.04 'Raring Ringtail'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:844
 msgid "Ubuntu 12.10 'Quantal Quetzal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:851
 msgid "Cdrom with Ubuntu 12.10 'Quantal Quetzal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:33
+#: ../data/templates/Ubuntu.info.in:962
 msgid "Ubuntu 12.04 'Precise Pangolin'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:40
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:151
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:158
+#: ../data/templates/Ubuntu.info.in:1087
 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:1199
 msgid "Ubuntu 11.04 'Natty Narwhal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:277
+#: ../data/templates/Ubuntu.info.in:1206
 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1297
 msgid "Ubuntu 10.10 'Maverick Meerkat'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:388
+#: ../data/templates/Ubuntu.info.in:1317
 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:400
+#: ../data/templates/Ubuntu.info.in:1329
 msgid "Canonical Partners"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:402
+#: ../data/templates/Ubuntu.info.in:1331
 msgid "Software packaged by Canonical for their partners"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:403
+#: ../data/templates/Ubuntu.info.in:1332
 msgid "This software is not part of Ubuntu."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:410
+#: ../data/templates/Ubuntu.info.in:1339
 msgid "Independent"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1341
 msgid "Provided by third-party software developers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:413
+#: ../data/templates/Ubuntu.info.in:1342
 msgid "Software offered by third party developers."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:451
+#: ../data/templates/Ubuntu.info.in:1380
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:471
+#: ../data/templates/Ubuntu.info.in:1400
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:514
+#: ../data/templates/Ubuntu.info.in:1443
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:534
+#: ../data/templates/Ubuntu.info.in:1463
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1506
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:596
+#: ../data/templates/Ubuntu.info.in:1525
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:639
+#: ../data/templates/Ubuntu.info.in:1568
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:659
+#: ../data/templates/Ubuntu.info.in:1588
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 'Intrepid Ibex' компакт-дискісі"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:703
+#: ../data/templates/Ubuntu.info.in:1632
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:723
+#: ../data/templates/Ubuntu.info.in:1652
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 'Hardy Heron' компакт-дискісі"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:768
+#: ../data/templates/Ubuntu.info.in:1697
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:787
+#: ../data/templates/Ubuntu.info.in:1716
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 'Gutsy Gibbon' компакт-дискісі"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:832
+#: ../data/templates/Ubuntu.info.in:1761
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:851
+#: ../data/templates/Ubuntu.info.in:1780
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn' компакт-дискісі"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:893
+#: ../data/templates/Ubuntu.info.in:1822
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:898
+#: ../data/templates/Ubuntu.info.in:1827
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:904
+#: ../data/templates/Ubuntu.info.in:1833
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:912
+#: ../data/templates/Ubuntu.info.in:1841
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:954
+#: ../data/templates/Ubuntu.info.in:1883
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:957
+#: ../data/templates/Ubuntu.info.in:1886
 msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:959
+#: ../data/templates/Ubuntu.info.in:1888
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:960
+#: ../data/templates/Ubuntu.info.in:1889
 msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:962
+#: ../data/templates/Ubuntu.info.in:1891
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:963
+#: ../data/templates/Ubuntu.info.in:1892
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:965
+#: ../data/templates/Ubuntu.info.in:1894
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:966
+#: ../data/templates/Ubuntu.info.in:1895
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:973
+#: ../data/templates/Ubuntu.info.in:1902
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:989
+#: ../data/templates/Ubuntu.info.in:1918
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:994
+#: ../data/templates/Ubuntu.info.in:1923 ../data/templates/Debian.info.in:56
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:999
+#: ../data/templates/Ubuntu.info.in:1928
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1004
+#: ../data/templates/Ubuntu.info.in:1933
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1015
+#: ../data/templates/Ubuntu.info.in:1944
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1030
+#: ../data/templates/Ubuntu.info.in:1959
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1046
+#: ../data/templates/Ubuntu.info.in:1975
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1051
+#: ../data/templates/Ubuntu.info.in:1980
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1056
+#: ../data/templates/Ubuntu.info.in:1985
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1067
+#: ../data/templates/Ubuntu.info.in:1996
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1082
+#: ../data/templates/Ubuntu.info.in:2011
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1085 ../data/templates/Debian.info.in:149
+#: ../data/templates/Ubuntu.info.in:2014 ../data/templates/Debian.info.in:209
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1098
+#: ../data/templates/Ubuntu.info.in:2027
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1103
+#: ../data/templates/Ubuntu.info.in:2032
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1108
+#: ../data/templates/Ubuntu.info.in:2037
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1114
+#: ../data/templates/Ubuntu.info.in:2043
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1120
+#: ../data/templates/Ubuntu.info.in:2049
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1122
+#: ../data/templates/Ubuntu.info.in:2051
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1129
+#: ../data/templates/Ubuntu.info.in:2058
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1132
+#: ../data/templates/Ubuntu.info.in:2061
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1134
+#: ../data/templates/Ubuntu.info.in:2063
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1141
+#: ../data/templates/Ubuntu.info.in:2070
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1146
+#: ../data/templates/Ubuntu.info.in:2075
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1151
+#: ../data/templates/Ubuntu.info.in:2080
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -411,62 +411,62 @@
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:8
+#: ../data/templates/Debian.info.in:68
 msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:33
+#: ../data/templates/Debian.info.in:93
 msgid "Debian 5.0 'Lenny' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:58
+#: ../data/templates/Debian.info.in:118
 msgid "Debian 4.0 'Etch'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:83
+#: ../data/templates/Debian.info.in:143
 msgid "Debian 3.1 'Sarge'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:154
 msgid "Proposed updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:161
 msgid "Security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:168
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:181
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:147
+#: ../data/templates/Debian.info.in:207
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:151
+#: ../data/templates/Debian.info.in:211
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:153
+#: ../data/templates/Debian.info.in:213
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:206 ../aptsources/distro.py:434
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:442
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -474,48 +474,48 @@
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
-#: ../aptsources/distro.py:246
+#: ../aptsources/distro.py:229 ../aptsources/distro.py:235
+#: ../aptsources/distro.py:251
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:250
+#: ../aptsources/distro.py:255
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
+#: ../apt/progress/gtk2.py:245
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
+#: ../apt/progress/gtk2.py:251
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:340
+#: ../apt/progress/gtk2.py:274
 msgid "Details"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:428
+#: ../apt/progress/gtk2.py:347
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:434
+#: ../apt/progress/gtk2.py:353
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:359
+#: ../apt/package.py:457
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:1088 ../apt/package.py:1194
+#: ../apt/package.py:1041 ../apt/package.py:1147 ../apt/package.py:1161
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1200
+#: ../apt/package.py:1154
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -524,123 +524,120 @@
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1207
+#: ../apt/package.py:1164
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:82
+#: ../apt/debfile.py:89
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:93
+#: ../apt/debfile.py:101
 #, python-format
 msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:211
+#: ../apt/debfile.py:226
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:232
+#: ../apt/debfile.py:249
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
-#: ../apt/debfile.py:373
+#: ../apt/debfile.py:396
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
 "(%(deprelation)s %(depversion)s)"
 msgstr ""
 
-#. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
-#: ../apt/debfile.py:389
+#: ../apt/debfile.py:423
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
 "%(targetver)s)"
 msgstr ""
 
-#: ../apt/debfile.py:399
+#: ../apt/debfile.py:437
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
 "the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
 
-#: ../apt/debfile.py:447
+#: ../apt/debfile.py:493
 msgid "No Architecture field in the package"
 msgstr ""
 
-#: ../apt/debfile.py:457
+#: ../apt/debfile.py:503
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
-#. the deb is older than the installed
-#: ../apt/debfile.py:464
+#: ../apt/debfile.py:512
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:489
+#: ../apt/debfile.py:537
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:519
+#: ../apt/debfile.py:566
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:593
+#: ../apt/debfile.py:642
 msgid ""
 "Automatically decompressed:\n"
 "\n"
 msgstr ""
 
-#: ../apt/debfile.py:599
+#: ../apt/debfile.py:648
 msgid "Automatically converted to printable ascii:\n"
 msgstr ""
 
-#: ../apt/debfile.py:689
+#: ../apt/debfile.py:753
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:700
+#: ../apt/debfile.py:764
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:82
+#: ../apt/progress/text.py:89
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:122
+#: ../apt/progress/text.py:129
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:131
+#: ../apt/progress/text.py:138
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:133
+#: ../apt/progress/text.py:140
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:144
+#: ../apt/progress/text.py:151
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:203
+#: ../apt/progress/text.py:211
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:214
+#: ../apt/progress/text.py:222
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -649,19 +646,19 @@
 msgstr ""
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:223
+#: ../apt/progress/text.py:231
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: ../apt/progress/text.py:239
+#: ../apt/progress/text.py:247
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr ""
 
-#: ../apt/progress/text.py:255
+#: ../apt/progress/text.py:263
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:162
+#: ../apt/cache.py:163
 msgid "Building data structures"
 msgstr ""
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/screen-resolution-extra.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/screen-resolution-extra.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/screen-resolution-extra.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/screen-resolution-extra.po	2015-08-14 07:55:49.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: 2015-02-19 12:49+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:02+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../ScreenResolution/ui.py:60
 msgid ""
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/shared-mime-info.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/shared-mime-info.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/shared-mime-info.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/shared-mime-info.po	2015-08-14 07:55:46.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-19 11:37+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:42+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: kk\n"
 
 #: ../freedesktop.org.xml.in.h:1
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/software-properties.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/software-properties.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/software-properties.po	2015-02-19 15:29:15.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/software-properties.po	2015-08-14 07:55:48.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: software-properties\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-21 13:43+0000\n"
+"POT-Creation-Date: 2015-07-07 19:35+0000\n"
 "PO-Revision-Date: 2014-03-07 11:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-02-19 12:26+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:36+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
 msgid "Write Configuration"
@@ -77,61 +77,61 @@
 msgid "Assume yes to all queries"
 msgstr ""
 
-#: ../add-apt-repository:75
+#: ../add-apt-repository:78
 msgid "Error: must run as root"
 msgstr "Қате: әкімшілік пайдаланушы атынан ашылуы тиіс"
 
-#: ../add-apt-repository:79
+#: ../add-apt-repository:82
 msgid "Error: need a repository as argument"
 msgstr "Қате: аргумент ретінде репозиторий көрсетілуі қажет"
 
-#: ../add-apt-repository:82
+#: ../add-apt-repository:85
 msgid "Error: need a single repository as argument"
 msgstr ""
 
-#: ../add-apt-repository:102
+#: ../add-apt-repository:105
 #, c-format
 msgid "'%s' distribution component disabled for all sources."
 msgstr ""
 
-#: ../add-apt-repository:104
+#: ../add-apt-repository:107
 #, c-format
 msgid "'%s' distribution component is already disabled for all sources."
 msgstr ""
 
-#: ../add-apt-repository:109
+#: ../add-apt-repository:112
 #, c-format
 msgid "'%s' distribution component enabled for all sources."
 msgstr ""
 
-#: ../add-apt-repository:111
+#: ../add-apt-repository:114
 #, c-format
 msgid "'%s' distribution component is already enabled for all sources."
 msgstr ""
 
-#: ../add-apt-repository:133
+#: ../add-apt-repository:136
 #, c-format
 msgid " More info: %s"
 msgstr " Көбірек ақпарат: %s"
 
-#: ../add-apt-repository:137
+#: ../add-apt-repository:140
 msgid "Press [ENTER] to continue or ctrl-c to cancel removing it"
 msgstr ""
 "Жалғастыру үшін [ENTER] пернесін, не жоюды болдырмау үшін Ctrl-C перне "
 "үйлесімін басыңыз"
 
-#: ../add-apt-repository:139
+#: ../add-apt-repository:142
 msgid "Press [ENTER] to continue or ctrl-c to cancel adding it"
 msgstr ""
 "Жалғастыру үшін [ENTER] пернесін не болдырмау үшін Ctrl-C пернелер үйлесімін "
 "басыңыз"
 
-#: ../add-apt-repository:157 ../add-apt-repository:161
+#: ../add-apt-repository:160 ../add-apt-repository:164
 #, c-format
 msgid "Error: '%s' doesn't exist in a sourcelist file"
 msgstr "Қате: \"%s\" қайнар көздер тізімінде жоқ"
 
-#: ../add-apt-repository:166
+#: ../add-apt-repository:169
 #, c-format
 msgid "Error: '%s' invalid"
 msgstr "Қате: \"%s\" бұрыс"
@@ -298,7 +298,6 @@
 msgid "Reload"
 msgstr "Жаңарту"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:705
 #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:2
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
@@ -316,11 +315,11 @@
 "\n"
 "Әрі қарай жалғастыру үшін интернетпен қосылысыңыз болуы қажет."
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:734
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:730
 msgid "CD Error"
 msgstr "CD диск қатесі"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:735
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:738
 #, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
@@ -349,8 +348,6 @@
 msgid "Please insert a disk in the drive:"
 msgstr "Дискті дисководқа салыңыз:"
 
-#. L10N: the example is of the format: deb http://ftp.debian.org sarge main
-#: ../softwareproperties/kde/DialogAdd.py:55
 #: ../data/gtkbuilder/dialog-add.ui.h:1
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
@@ -360,7 +357,6 @@
 "толық APT жолын енгізіңіз</b></big>"
 
 #. L10N: the example is of the format: deb http://ftp.debian.org sarge main
-#: ../softwareproperties/kde/DialogAdd.py:57
 #: ../softwareproperties/gtk/DialogAdd.py:62
 #, python-format
 msgid ""
@@ -421,6 +417,7 @@
 msgstr ""
 "Таңдалған мәліметтер, GPG кілті емес болуы мүмкін немесе ол бұзылған."
 
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:731
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:811
 msgid "Error scanning the CD"
 msgstr "CD сканерлеу кезінде қате туындады"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/sudo.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/sudo.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/sudo.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/sudo.po	2015-08-14 07:55:46.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: 2015-02-19 11:37+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:43+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: common/aix.c:93 common/aix.c:150
 msgid "unable to open userdb"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/swift.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/swift.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/swift.po	2015-02-19 15:29:18.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/swift.po	2015-08-14 07:55:51.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: 2015-02-19 13:12+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:27+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: swift/account/auditor.py:52 swift/account/auditor.py:75
 #, python-format
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/system-service.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/system-service.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/system-service.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/system-service.po	2015-08-14 07:55:50.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: 2015-02-19 12:50+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:03+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:1
 msgid "Get current global proxy"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/tasksel.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/tasksel.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/tasksel.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/tasksel.po	2015-08-14 07:55:47.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-19 11:57+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:04+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "X-Poedit-Country: KAZAKHSTAN\n"
 "Language: kk\n"
 "X-Poedit-Language: Kazakh\n"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/ubuntu-sso-client.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/ubuntu-sso-client.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/ubuntu-sso-client.po	2015-02-19 15:29:17.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/ubuntu-sso-client.po	2015-08-14 07:55:51.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: 2015-02-19 13:12+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:26+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #. Undefined variable '_', pylint: disable=E0602
 #. all the text that is used in the gui
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/ubuntu-wallpapers.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/ubuntu-wallpapers.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/ubuntu-wallpapers.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/ubuntu-wallpapers.po	2015-08-14 07:55:49.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: 2015-02-19 12:42+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 07:53+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../ubuntu-wallpapers.xml.in.h:1
 msgid "Ubuntu"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/udisks2.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/udisks2.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/udisks2.po	2015-02-19 15:29:19.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/udisks2.po	2015-08-14 07:55:52.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: udisks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-10 16:38+0000\n"
+"POT-Creation-Date: 2015-06-10 17:06+0000\n"
 "PO-Revision-Date: 2014-01-14 23:24+0000\n"
 "Last-Translator: Baurzhan Muftakhidinov <Unknown>\n"
 "Language-Team: Kazakh "
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-19 13:28+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:44+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: kk\n"
 
 #: ../data/org.freedesktop.udisks2.policy.in.h:1
@@ -338,38 +338,38 @@
 #. * the user is editing settings that involve system-level
 #. * passwords and secrets
 #. 
-#: ../src/udiskslinuxblock.c:1011
+#: ../src/udiskslinuxblock.c:1037
 msgid "Authentication is required to read system-level secrets"
 msgstr ""
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: ../src/udiskslinuxblock.c:1545
+#: ../src/udiskslinuxblock.c:1571
 msgid "Authentication is required to add an entry to the /etc/fstab file"
 msgstr "/etc/fstab файлына жазбаны қосу үшін аутентификация керек"
 
 #. Translators: shown in authentication dialog - do not tranlsate /etc/crypttab
-#: ../src/udiskslinuxblock.c:1563
+#: ../src/udiskslinuxblock.c:1589
 msgid "Authentication is required to add an entry to the /etc/crypttab file"
 msgstr "/etc/crypttab файлына жазбаны қосу үшін аутентификация керек"
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: ../src/udiskslinuxblock.c:1622
+#: ../src/udiskslinuxblock.c:1648
 msgid "Authentication is required to remove an entry from /etc/fstab file"
 msgstr "/etc/fstab файлынан жазбаны өшіру үшін аутентификация керек"
 
 #. Translators: shown in authentication dialog - do not translate /etc/crypttab
-#: ../src/udiskslinuxblock.c:1640
+#: ../src/udiskslinuxblock.c:1666
 msgid ""
 "Authentication is required to remove an entry from the /etc/crypttab file"
 msgstr "/etc/crypttab файлынан жазбаны өшіру үшін аутентификация керек"
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: ../src/udiskslinuxblock.c:1712
+#: ../src/udiskslinuxblock.c:1738
 msgid "Authentication is required to modify the /etc/fstab file"
 msgstr "/etc/fstab файлын түзету үшін аутентификация керек"
 
 #. Translators: shown in authentication dialog - do not translate /etc/crypttab
-#: ../src/udiskslinuxblock.c:1730
+#: ../src/udiskslinuxblock.c:1756
 msgid "Authentication is required to modify the /etc/crypttab file"
 msgstr "/etc/crypttab файлын түзету үшін аутентификация керек"
 
@@ -386,7 +386,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2237 ../src/udiskslinuxdriveata.c:2283
+#: ../src/udiskslinuxblock.c:2263 ../src/udiskslinuxdriveata.c:2287
 msgid "Authentication is required to perform a secure erase of $(drive)"
 msgstr "$(drive) қатты дискін қауіпсіз өшіру үшін аутентификация керек"
 
@@ -397,11 +397,11 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2249
+#: ../src/udiskslinuxblock.c:2275
 msgid "Authentication is required to format $(drive)"
 msgstr "$(drive) пішімдеу үшін аутентификация керек"
 
-#: ../src/udiskslinuxblock.c:2286 ../src/udiskslinuxdriveata.c:2295
+#: ../src/udiskslinuxblock.c:2312 ../src/udiskslinuxdriveata.c:2299
 msgid "Formatting Device"
 msgstr "Құрылғыны пішімдеу"
 
@@ -411,7 +411,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2705
+#: ../src/udiskslinuxblock.c:2731
 msgid "Authentication is required to open $(drive) for reading"
 msgstr "$(drive) оқу үшін ашу  үшін аутентификация керек"
 
@@ -421,7 +421,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2769
+#: ../src/udiskslinuxblock.c:2795
 msgid "Authentication is required to open $(drive) for writing"
 msgstr "$(drive) жазу үшін ашу үшін аутентификация керек"
 
@@ -431,7 +431,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2835
+#: ../src/udiskslinuxblock.c:2861
 msgid "Authentication is required to open $(drive) for benchmarking"
 msgstr ""
 
@@ -441,7 +441,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxblock.c:2896
+#: ../src/udiskslinuxblock.c:2922
 msgid "Authentication is required to rescan $(drive)"
 msgstr ""
 
@@ -451,7 +451,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdrive.c:1022
+#: ../src/udiskslinuxdrive.c:1009
 msgid "Authentication is required to eject $(drive)"
 msgstr "$(drive) шығару үшін аутентификация керек"
 
@@ -461,7 +461,7 @@
 #. * Do not translate $(drive), it's a placeholder and will be
 #. * replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdrive.c:1110
+#: ../src/udiskslinuxdrive.c:1097
 msgid "Authentication is required to configure settings for $(drive)"
 msgstr ""
 
@@ -471,7 +471,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdrive.c:1439
+#: ../src/udiskslinuxdrive.c:1413
 msgid "Authentication is required to power off $(drive)"
 msgstr "$(drive) сөндіру үшін аутентификация керек"
 
@@ -531,7 +531,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdriveata.c:1389
+#: ../src/udiskslinuxdriveata.c:1391
 msgid "Authentication is required to put $(drive) in standby mode"
 msgstr ""
 
@@ -541,7 +541,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdriveata.c:1521
+#: ../src/udiskslinuxdriveata.c:1525
 msgid "Authentication is required to wake up $(drive) from standby mode"
 msgstr ""
 
@@ -551,7 +551,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdriveata.c:2376
+#: ../src/udiskslinuxdriveata.c:2380
 msgid "Authentication is required to enable SMART on $(drive)"
 msgstr ""
 
@@ -561,7 +561,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxdriveata.c:2386
+#: ../src/udiskslinuxdriveata.c:2390
 msgid "Authentication is required to disable SMART on $(drive)"
 msgstr ""
 
@@ -571,7 +571,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxencrypted.c:352 ../src/udiskslinuxencrypted.c:704
+#: ../src/udiskslinuxencrypted.c:339 ../src/udiskslinuxencrypted.c:691
 msgid "Authentication is required to unlock the encrypted device $(drive)"
 msgstr ""
 
@@ -582,7 +582,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxencrypted.c:582
+#: ../src/udiskslinuxencrypted.c:569
 msgid ""
 "Authentication is required to lock the encrypted device $(drive) unlocked by "
 "another user"
@@ -648,7 +648,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxfilesystem.c:1959
+#: ../src/udiskslinuxfilesystem.c:1946
 msgid "Authentication is required to change the filesystem label on $(drive)"
 msgstr ""
 
@@ -686,7 +686,7 @@
 #. * attempts to start a RAID Array.
 #. 
 #. TODO: variables
-#: ../src/udiskslinuxmdraid.c:639
+#: ../src/udiskslinuxmdraid.c:645
 msgid "Authentication is required to start a RAID array"
 msgstr ""
 
@@ -694,7 +694,7 @@
 #. * attempts to stop a RAID Array.
 #. 
 #. TODO: variables
-#: ../src/udiskslinuxmdraid.c:808
+#: ../src/udiskslinuxmdraid.c:814
 msgid "Authentication is required to stop a RAID array"
 msgstr ""
 
@@ -702,7 +702,7 @@
 #. * attempts to remove a device from a RAID Array.
 #. 
 #. TODO: variables
-#: ../src/udiskslinuxmdraid.c:1013
+#: ../src/udiskslinuxmdraid.c:1019
 msgid "Authentication is required to remove a device from a RAID array"
 msgstr ""
 
@@ -710,7 +710,7 @@
 #. * attempts to add a device to a RAID Array.
 #. 
 #. TODO: variables
-#: ../src/udiskslinuxmdraid.c:1209
+#: ../src/udiskslinuxmdraid.c:1215
 msgid "Authentication is required to add a device to a RAID array"
 msgstr ""
 
@@ -718,7 +718,7 @@
 #. * attempts to change whether it has a write-intent bitmap
 #. 
 #. TODO: variables
-#: ../src/udiskslinuxmdraid.c:1339
+#: ../src/udiskslinuxmdraid.c:1345
 msgid ""
 "Authentication is required to configure the write-intent bitmap on a RAID "
 "array"
@@ -728,7 +728,7 @@
 #. * attempts to start/stop data scrubbing operations
 #. 
 #. TODO: variables
-#: ../src/udiskslinuxmdraid.c:1463
+#: ../src/udiskslinuxmdraid.c:1469
 msgid ""
 "Authentication is required to start/stop data scrubbing of a RAID array"
 msgstr ""
@@ -739,8 +739,8 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxpartition.c:281 ../src/udiskslinuxpartition.c:446
-#: ../src/udiskslinuxpartition.c:788
+#: ../src/udiskslinuxpartition.c:268 ../src/udiskslinuxpartition.c:420
+#: ../src/udiskslinuxpartition.c:749
 msgid "Authentication is required to modify the partition on device $(drive)"
 msgstr ""
 
@@ -750,7 +750,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxpartition.c:899
+#: ../src/udiskslinuxpartition.c:847
 msgid "Authentication is required to delete the partition $(drive)"
 msgstr ""
 
@@ -760,7 +760,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: ../src/udiskslinuxpartitiontable.c:399
+#: ../src/udiskslinuxpartitiontable.c:386
 msgid "Authentication is required to create a partition on $(drive)"
 msgstr ""
 
@@ -785,7 +785,7 @@
 msgstr ""
 
 #. Translators: Corresponds to the DOS/Master-Boot-Record "bootable" flag for a partition
-#: ../udisks/udisksclient.c:1094
+#: ../udisks/udisksclient.c:1098
 msgctxt "dos-part-flag"
 msgid "Bootable"
 msgstr "Жүктелетін"
@@ -793,7 +793,7 @@
 #. Translators: Corresponds to the GPT "system" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: ../udisks/udisksclient.c:1104
+#: ../udisks/udisksclient.c:1108
 msgctxt "gpt-part-flag"
 msgid "System"
 msgstr "Жүйелік"
@@ -801,7 +801,7 @@
 #. Translators: Corresponds to the GPT "legacy bios bootable" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: ../udisks/udisksclient.c:1111
+#: ../udisks/udisksclient.c:1115
 msgctxt "gpt-part-flag"
 msgid "Legacy BIOS Bootable"
 msgstr "Legacy BIOS Bootable"
@@ -809,7 +809,7 @@
 #. Translators: Corresponds to the GPT "read-only" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: ../udisks/udisksclient.c:1118
+#: ../udisks/udisksclient.c:1122
 msgctxt "gpt-part-flag"
 msgid "Read-only"
 msgstr "Тек оқу үшін"
@@ -817,7 +817,7 @@
 #. Translators: Corresponds to the GPT "hidden" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: ../udisks/udisksclient.c:1125
+#: ../udisks/udisksclient.c:1129
 msgctxt "gpt-part-flag"
 msgid "Hidden"
 msgstr "Жасырын"
@@ -825,20 +825,20 @@
 #. Translators: Corresponds to the GPT "no automount" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: ../udisks/udisksclient.c:1132
+#: ../udisks/udisksclient.c:1136
 msgctxt "gpt-part-flag"
 msgid "No Automount"
 msgstr "Автотіркеу жоқ"
 
 #. Translators: Partition info. First %s is the type, second %s is a list of flags
-#: ../udisks/udisksclient.c:1145
+#: ../udisks/udisksclient.c:1149
 #, c-format
 msgctxt "partition-info"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. Translators: The Partition info when unknown
-#: ../udisks/udisksclient.c:1156
+#: ../udisks/udisksclient.c:1160
 msgctxt "partition-info"
 msgid "Unknown"
 msgstr "Белгісіз"
@@ -846,7 +846,7 @@
 #. Translators: The first %s is the size in power-of-2 units, e.g. '64 KiB'
 #. * the second %s is the size as a number e.g. '65,536' (always > 1)
 #. 
-#: ../udisks/udisksclient.c:1711
+#: ../udisks/udisksclient.c:1723
 #, c-format
 msgctxt "byte-size-pow2"
 msgid "%s (%s bytes)"
@@ -855,62 +855,62 @@
 #. Translators: The first %s is the size in power-of-10 units, e.g. '100 kB'
 #. * the second %s is the size as a number e.g. '100,000' (always > 1)
 #. 
-#: ../udisks/udisksclient.c:1721
+#: ../udisks/udisksclient.c:1733
 #, c-format
 msgctxt "byte-size-pow10"
 msgid "%s (%s bytes)"
 msgstr "%s (%s байт)"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1782
+#: ../udisks/udisksclient.c:1794
 msgctxt "media"
 msgid "CompactFlash"
 msgstr "CompactFlash"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1787
+#: ../udisks/udisksclient.c:1799
 msgctxt "media"
 msgid "MemoryStick"
 msgstr "MemoryStick"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1792
+#: ../udisks/udisksclient.c:1804
 msgctxt "media"
 msgid "SmartMedia"
 msgstr "SmartMedia"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1797
+#: ../udisks/udisksclient.c:1809
 msgctxt "media"
 msgid "SecureDigital"
 msgstr "SecureDigital"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1802
+#: ../udisks/udisksclient.c:1814
 msgctxt "media"
 msgid "SD High Capacity"
 msgstr "SD High Capacity"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1807
+#: ../udisks/udisksclient.c:1819
 msgctxt "media"
 msgid "Floppy"
 msgstr "Floppy"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1812
+#: ../udisks/udisksclient.c:1824
 msgctxt "media"
 msgid "Zip"
 msgstr "Zip"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1817
+#: ../udisks/udisksclient.c:1829
 msgctxt "media"
 msgid "Jaz"
 msgstr "Jaz"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: ../udisks/udisksclient.c:1822
+#: ../udisks/udisksclient.c:1834
 msgctxt "media"
 msgid "Flash"
 msgstr "Flash"
@@ -918,7 +918,7 @@
 #. Translators: This word is used to describe the optical disc type, it may appear
 #. * in a slash-separated list e.g. 'CD/DVD/Blu-Ray'
 #. 
-#: ../udisks/udisksclient.c:1856
+#: ../udisks/udisksclient.c:1868
 msgctxt "disc-type"
 msgid "CD"
 msgstr "CD"
@@ -926,7 +926,7 @@
 #. Translators: This word is used to describe the optical disc type, it may appear
 #. * in a slash-separated list e.g. 'CD/DVD/Blu-Ray'
 #. 
-#: ../udisks/udisksclient.c:1865
+#: ../udisks/udisksclient.c:1877
 msgctxt "disc-type"
 msgid "DVD"
 msgstr "DVD"
@@ -934,7 +934,7 @@
 #. Translators: This word is used to describe the optical disc type, it may appear
 #. * in a slash-separated list e.g. 'CD/DVD/Blu-Ray'
 #. 
-#: ../udisks/udisksclient.c:1874
+#: ../udisks/udisksclient.c:1886
 msgctxt "disc-type"
 msgid "Blu-Ray"
 msgstr "Blu-Ray"
@@ -942,220 +942,220 @@
 #. Translators: This word is used to describe the optical disc type, it may appear
 #. * in a slash-separated list e.g. 'CD/DVD/Blu-Ray'
 #. 
-#: ../udisks/udisksclient.c:1883
+#: ../udisks/udisksclient.c:1895
 msgctxt "disc-type"
 msgid "HDDVD"
 msgstr "HDDVD"
 
-#: ../udisks/udisksclient.c:1904
+#: ../udisks/udisksclient.c:1916
 msgctxt "fs-type"
 msgid "FAT (12-bit version)"
 msgstr "FAT (12 биттік нұсқасы)"
 
-#: ../udisks/udisksclient.c:1904 ../udisks/udisksclient.c:1905
-#: ../udisks/udisksclient.c:1906 ../udisks/udisksclient.c:1907
-#: ../udisks/udisksclient.c:1908
+#: ../udisks/udisksclient.c:1916 ../udisks/udisksclient.c:1917
+#: ../udisks/udisksclient.c:1918 ../udisks/udisksclient.c:1919
+#: ../udisks/udisksclient.c:1920
 msgctxt "fs-type"
 msgid "FAT"
 msgstr "FAT"
 
-#: ../udisks/udisksclient.c:1905
+#: ../udisks/udisksclient.c:1917
 msgctxt "fs-type"
 msgid "FAT (16-bit version)"
 msgstr "FAT (16 биттік нұсқасы)"
 
-#: ../udisks/udisksclient.c:1906
+#: ../udisks/udisksclient.c:1918
 msgctxt "fs-type"
 msgid "FAT (32-bit version)"
 msgstr "FAT (32 биттік нұсқасы)"
 
-#: ../udisks/udisksclient.c:1907
+#: ../udisks/udisksclient.c:1919
 #, c-format
 msgctxt "fs-type"
 msgid "FAT (version %s)"
 msgstr "FAT (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1909
+#: ../udisks/udisksclient.c:1921
 #, c-format
 msgctxt "fs-type"
 msgid "NTFS (version %s)"
 msgstr "NTFS (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1909 ../udisks/udisksclient.c:1910
+#: ../udisks/udisksclient.c:1921 ../udisks/udisksclient.c:1922
 msgctxt "fs-type"
 msgid "NTFS"
 msgstr "NTFS"
 
-#: ../udisks/udisksclient.c:1911
+#: ../udisks/udisksclient.c:1923
 msgctxt "fs-type"
 msgid "HFS"
 msgstr "HFS"
 
-#: ../udisks/udisksclient.c:1912
+#: ../udisks/udisksclient.c:1924
 msgctxt "fs-type"
 msgid "HFS+"
 msgstr "HFS+"
 
-#: ../udisks/udisksclient.c:1913
+#: ../udisks/udisksclient.c:1925
 #, c-format
 msgctxt "fs-type"
 msgid "Ext2 (version %s)"
 msgstr "Ext2 (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1913 ../udisks/udisksclient.c:1914
+#: ../udisks/udisksclient.c:1925 ../udisks/udisksclient.c:1926
 msgctxt "fs-type"
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../udisks/udisksclient.c:1915
+#: ../udisks/udisksclient.c:1927
 #, c-format
 msgctxt "fs-type"
 msgid "Ext3 (version %s)"
 msgstr "Ext3 (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1915 ../udisks/udisksclient.c:1916
+#: ../udisks/udisksclient.c:1927 ../udisks/udisksclient.c:1928
 msgctxt "fs-type"
 msgid "Ext3"
 msgstr "Ext3"
 
-#: ../udisks/udisksclient.c:1917
+#: ../udisks/udisksclient.c:1929
 #, c-format
 msgctxt "fs-type"
 msgid "Ext4 (version %s)"
 msgstr "Ext4 (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1917 ../udisks/udisksclient.c:1918
+#: ../udisks/udisksclient.c:1929 ../udisks/udisksclient.c:1930
 msgctxt "fs-type"
 msgid "Ext4"
 msgstr "Ext4"
 
-#: ../udisks/udisksclient.c:1919
+#: ../udisks/udisksclient.c:1931
 #, c-format
 msgctxt "fs-type"
 msgid "Journal for Ext (version %s)"
 msgstr "Ext үшін журналы (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1919 ../udisks/udisksclient.c:1920
+#: ../udisks/udisksclient.c:1931 ../udisks/udisksclient.c:1932
 msgctxt "fs-type"
 msgid "JDB"
 msgstr "JDB"
 
-#: ../udisks/udisksclient.c:1920
+#: ../udisks/udisksclient.c:1932
 msgctxt "fs-type"
 msgid "Journal for Ext"
 msgstr "Ext үшін журналы"
 
-#: ../udisks/udisksclient.c:1921
+#: ../udisks/udisksclient.c:1933
 #, c-format
 msgctxt "fs-type"
 msgid "XFS (version %s)"
 msgstr "XFS (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1921 ../udisks/udisksclient.c:1922
+#: ../udisks/udisksclient.c:1933 ../udisks/udisksclient.c:1934
 msgctxt "fs-type"
 msgid "XFS"
 msgstr "XFS"
 
 #. TODO: No ID_FS_VERSION yet for btrfs...
-#: ../udisks/udisksclient.c:1924
+#: ../udisks/udisksclient.c:1936
 msgctxt "fs-type"
 msgid "Btrfs"
 msgstr "Btrfs"
 
-#: ../udisks/udisksclient.c:1925
+#: ../udisks/udisksclient.c:1937
 #, c-format
 msgctxt "fs-type"
 msgid "ISO 9660 (version %s)"
 msgstr "ISO 9660 (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1925 ../udisks/udisksclient.c:1926
+#: ../udisks/udisksclient.c:1937 ../udisks/udisksclient.c:1938
 msgctxt "fs-type"
 msgid "ISO9660"
 msgstr "ISO9660"
 
-#: ../udisks/udisksclient.c:1926
+#: ../udisks/udisksclient.c:1938
 msgctxt "fs-type"
 msgid "ISO 9660"
 msgstr "ISO 9660"
 
-#: ../udisks/udisksclient.c:1927
+#: ../udisks/udisksclient.c:1939
 #, c-format
 msgctxt "fs-type"
 msgid "UDF (version %s)"
 msgstr "UDF (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1927 ../udisks/udisksclient.c:1928
+#: ../udisks/udisksclient.c:1939 ../udisks/udisksclient.c:1940
 msgctxt "fs-type"
 msgid "UDF"
 msgstr "UDF"
 
-#: ../udisks/udisksclient.c:1929 ../udisks/udisksclient.c:1930
+#: ../udisks/udisksclient.c:1941 ../udisks/udisksclient.c:1942
 msgctxt "fs-type"
 msgid "exFAT"
 msgstr "exFAT"
 
-#: ../udisks/udisksclient.c:1930
+#: ../udisks/udisksclient.c:1942
 #, c-format
 msgctxt "fs-type"
 msgid "exFAT (version %s)"
 msgstr "exFAT (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1931
+#: ../udisks/udisksclient.c:1943
 #, c-format
 msgctxt "fs-type"
 msgid "Swap (version %s)"
 msgstr "Swap (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1931 ../udisks/udisksclient.c:1932
+#: ../udisks/udisksclient.c:1943 ../udisks/udisksclient.c:1944
 msgctxt "fs-type"
 msgid "Swap"
 msgstr "Swap"
 
-#: ../udisks/udisksclient.c:1933
+#: ../udisks/udisksclient.c:1945
 #, c-format
 msgctxt "fs-type"
 msgid "LVM2 Physical Volume (%s)"
 msgstr "LVM2 физикалық томы (%s)"
 
-#: ../udisks/udisksclient.c:1933 ../udisks/udisksclient.c:1934
+#: ../udisks/udisksclient.c:1945 ../udisks/udisksclient.c:1946
 msgctxt "fs-type"
 msgid "LVM2 PV"
 msgstr "LVM2 PV"
 
-#: ../udisks/udisksclient.c:1934
+#: ../udisks/udisksclient.c:1946
 msgctxt "fs-type"
 msgid "LVM2 Physical Volume"
 msgstr "LVM2 физикалық томы"
 
-#: ../udisks/udisksclient.c:1935
+#: ../udisks/udisksclient.c:1947
 #, c-format
 msgctxt "fs-type"
 msgid "Linux RAID Member (version %s)"
 msgstr "Linux RAID мүшесі (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1935 ../udisks/udisksclient.c:1936
+#: ../udisks/udisksclient.c:1947 ../udisks/udisksclient.c:1948
 msgctxt "fs-type"
 msgid "Linux RAID Member"
 msgstr "Linux RAID мүшесі"
 
-#: ../udisks/udisksclient.c:1937
+#: ../udisks/udisksclient.c:1949
 #, c-format
 msgctxt "fs-type"
 msgid "ZFS Device (ZPool version %s)"
 msgstr "ZFS Device (ZPool нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1937
+#: ../udisks/udisksclient.c:1949
 #, c-format
 msgctxt "fs-type"
 msgid "ZFS (v%s)"
 msgstr "ZFS (v%s)"
 
-#: ../udisks/udisksclient.c:1938
+#: ../udisks/udisksclient.c:1950
 msgctxt "fs-type"
 msgid "ZFS Device"
 msgstr "ZFS құрылғысы"
 
-#: ../udisks/udisksclient.c:1938
+#: ../udisks/udisksclient.c:1950
 msgctxt "fs-type"
 msgid "ZFS"
 msgstr "ZFS"
@@ -1182,57 +1182,57 @@
 msgid "IMSM RAID"
 msgstr "IMSM RAID"
 
-#: ../udisks/udisksclient.c:1941
+#: ../udisks/udisksclient.c:1953
 #, c-format
 msgctxt "fs-type"
 msgid "LUKS Encryption (version %s)"
 msgstr "LUKS шифрлеуі (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1941 ../udisks/udisksclient.c:1942
+#: ../udisks/udisksclient.c:1953 ../udisks/udisksclient.c:1954
 msgctxt "fs-type"
 msgid "LUKS"
 msgstr "LUKS"
 
-#: ../udisks/udisksclient.c:1942
+#: ../udisks/udisksclient.c:1954
 msgctxt "fs-type"
 msgid "LUKS Encryption"
 msgstr "LUKS шифрлеуі"
 
-#: ../udisks/udisksclient.c:1943
+#: ../udisks/udisksclient.c:1955
 #, c-format
 msgctxt "fs-type"
 msgid "VMFS (version %s)"
 msgstr "VMFS (нұсқасы %s)"
 
-#: ../udisks/udisksclient.c:1943
+#: ../udisks/udisksclient.c:1955
 #, c-format
 msgctxt "fs-type"
 msgid "VMFS (v%s)"
 msgstr "VMFS (v%s)"
 
-#: ../udisks/udisksclient.c:1944
+#: ../udisks/udisksclient.c:1956
 msgctxt "fs-type"
 msgid "VMFS"
 msgstr "VMFS"
 
-#: ../udisks/udisksclient.c:1945
+#: ../udisks/udisksclient.c:1957
 #, c-format
 msgctxt "fs-type"
 msgid "VMFS Volume Member (version %s)"
 msgstr "VMFS том мүшесі (нұақсы %s)"
 
-#: ../udisks/udisksclient.c:1945
+#: ../udisks/udisksclient.c:1957
 #, c-format
 msgctxt "fs-type"
 msgid "VMFS Member (v%s)"
 msgstr "VMFS мүшесі (v%s)"
 
-#: ../udisks/udisksclient.c:1946
+#: ../udisks/udisksclient.c:1958
 msgctxt "fs-type"
 msgid "VMFS Volume Member"
 msgstr "VMFS том мүшесі"
 
-#: ../udisks/udisksclient.c:1946
+#: ../udisks/udisksclient.c:1958
 msgctxt "fs-type"
 msgid "VMFS Member"
 msgstr "VMFS мүшесі"
@@ -1240,7 +1240,7 @@
 #. Translators: Shown for unknown filesystem types.
 #. * First %s is the raw filesystem type obtained from udev, second %s is version.
 #. 
-#: ../udisks/udisksclient.c:2018
+#: ../udisks/udisksclient.c:2030
 #, c-format
 msgctxt "fs-type"
 msgid "Unknown (%s %s)"
@@ -1249,7 +1249,7 @@
 #. Translators: Shown for unknown filesystem types.
 #. * First %s is the raw filesystem type obtained from udev.
 #. 
-#: ../udisks/udisksclient.c:2027
+#: ../udisks/udisksclient.c:2039
 #, c-format
 msgctxt "fs-type"
 msgid "Unknown (%s)"
@@ -1257,712 +1257,712 @@
 
 #. Translators: Shown for unknown filesystem types.
 #. 
-#: ../udisks/udisksclient.c:2033 ../udisks/udisksclient.c:2047
+#: ../udisks/udisksclient.c:2045 ../udisks/udisksclient.c:2059
 msgctxt "fs-type"
 msgid "Unknown"
 msgstr "Белгісіз"
 
 #. Translators: name of partition table format
-#: ../udisks/udisksclient.c:2064
+#: ../udisks/udisksclient.c:2076
 msgid "Master Boot Record"
 msgstr "Басты жүктелу жазбасы"
 
 #. Translators: name of partition table format
-#: ../udisks/udisksclient.c:2066
+#: ../udisks/udisksclient.c:2078
 msgid "GUID Partition Table"
 msgstr "GUID бөлімдер кестесі"
 
 #. Translators: name of partition table format
-#: ../udisks/udisksclient.c:2068
+#: ../udisks/udisksclient.c:2080
 msgid "Apple Partition Map"
 msgstr "Apple бөлімдер кестесі"
 
 #. Translators: name of partition table format
-#: ../udisks/udisksclient.c:2111 ../udisks/udisksclient.c:2116
+#: ../udisks/udisksclient.c:2123 ../udisks/udisksclient.c:2128
 msgctxt "partition-subtype"
 msgid "Generic"
 msgstr "Жалпы"
 
-#: ../udisks/udisksclient.c:2112 ../udisks/udisksclient.c:2117
+#: ../udisks/udisksclient.c:2124 ../udisks/udisksclient.c:2129
 msgctxt "partition-subtype"
 msgid "Linux"
 msgstr "Linux"
 
-#: ../udisks/udisksclient.c:2113 ../udisks/udisksclient.c:2118
-#: ../udisks/udisksclient.c:2123
+#: ../udisks/udisksclient.c:2125 ../udisks/udisksclient.c:2130
+#: ../udisks/udisksclient.c:2135
 msgctxt "partition-subtype"
 msgid "Windows"
 msgstr "Windows"
 
-#: ../udisks/udisksclient.c:2114 ../udisks/udisksclient.c:2120
+#: ../udisks/udisksclient.c:2126 ../udisks/udisksclient.c:2132
 msgctxt "partition-subtype"
 msgid "Other"
 msgstr "Басқа"
 
-#: ../udisks/udisksclient.c:2119 ../udisks/udisksclient.c:2122
+#: ../udisks/udisksclient.c:2131 ../udisks/udisksclient.c:2134
 msgctxt "partition-subtype"
 msgid "Mac OS X"
 msgstr "Mac OS X"
 
 #. see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. Not associated with any OS
-#: ../udisks/udisksclient.c:2210
+#: ../udisks/udisksclient.c:2222
 msgctxt "part-type"
 msgid "MBR Partition Scheme"
 msgstr "MBR бөлімдер схемасы"
 
-#: ../udisks/udisksclient.c:2211
+#: ../udisks/udisksclient.c:2223
 msgctxt "part-type"
 msgid "EFI System"
 msgstr "EFI жүйесі"
 
-#: ../udisks/udisksclient.c:2212
+#: ../udisks/udisksclient.c:2224
 msgctxt "part-type"
 msgid "BIOS Boot"
 msgstr "BIOS Boot"
 
 #. This is also defined in the Apple and Solaris section
-#: ../udisks/udisksclient.c:2214
+#: ../udisks/udisksclient.c:2226
 msgctxt "part-type"
 msgid "ZFS"
 msgstr "ZFS"
 
-#: ../udisks/udisksclient.c:2224
+#: ../udisks/udisksclient.c:2236
 msgctxt "part-type"
 msgid "Linux Filesystem"
 msgstr "Linux файлдық жүйесі"
 
-#: ../udisks/udisksclient.c:2225
+#: ../udisks/udisksclient.c:2237
 msgctxt "part-type"
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
 #. Linux
-#: ../udisks/udisksclient.c:2223
+#: ../udisks/udisksclient.c:2235
 msgctxt "part-type"
 msgid "Linux Swap"
 msgstr "Linux Swap"
 
-#: ../udisks/udisksclient.c:2226 ../udisks/udisksclient.c:2311
+#: ../udisks/udisksclient.c:2238 ../udisks/udisksclient.c:2323
 msgctxt "part-type"
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: ../udisks/udisksclient.c:2227
+#: ../udisks/udisksclient.c:2239
 msgctxt "part-type"
 msgid "Linux Reserved"
 msgstr "Linux Reserved"
 
 #. Microsoft
-#: ../udisks/udisksclient.c:2229
+#: ../udisks/udisksclient.c:2241
 msgctxt "part-type"
 msgid "Basic Data"
 msgstr "Basic Data"
 
-#: ../udisks/udisksclient.c:2230
+#: ../udisks/udisksclient.c:2242
 msgctxt "part-type"
 msgid "Microsoft Reserved"
 msgstr "Microsoft Reserved"
 
-#: ../udisks/udisksclient.c:2231
+#: ../udisks/udisksclient.c:2243
 msgctxt "part-type"
 msgid "Microsoft LDM metadata"
 msgstr "Microsoft LDM метаақпараты"
 
-#: ../udisks/udisksclient.c:2232
+#: ../udisks/udisksclient.c:2244
 msgctxt "part-type"
 msgid "Microsoft LDM data"
 msgstr "Microsoft LDM деректері"
 
-#: ../udisks/udisksclient.c:2233
+#: ../udisks/udisksclient.c:2245
 msgctxt "part-type"
 msgid "Microsoft Windows Recovery Environment"
 msgstr "Microsoft Windows Recovery Environment"
 
 #. Apple OS X
-#: ../udisks/udisksclient.c:2235
+#: ../udisks/udisksclient.c:2247
 msgctxt "part-type"
 msgid "Apple HFS/HFS+"
 msgstr "Apple HFS/HFS+"
 
 #. see http://developer.apple.com/documentation/mac/devices/devices-126.html
 #. *     http://lists.apple.com/archives/Darwin-drivers/2003/May/msg00021.html
-#: ../udisks/udisksclient.c:2236 ../udisks/udisksclient.c:2290
+#: ../udisks/udisksclient.c:2248 ../udisks/udisksclient.c:2302
 msgctxt "part-type"
 msgid "Apple UFS"
 msgstr "Apple UFS"
 
-#: ../udisks/udisksclient.c:2237
+#: ../udisks/udisksclient.c:2249
 msgctxt "part-type"
 msgid "Apple ZFS"
 msgstr "Apple ZFS"
 
 #. same as ZFS
-#: ../udisks/udisksclient.c:2238
+#: ../udisks/udisksclient.c:2250
 msgctxt "part-type"
 msgid "Apple RAID"
 msgstr "Apple RAID"
 
-#: ../udisks/udisksclient.c:2239
+#: ../udisks/udisksclient.c:2251
 msgctxt "part-type"
 msgid "Apple RAID (offline)"
 msgstr "Apple RAID (желіден тыс)"
 
-#: ../udisks/udisksclient.c:2240
+#: ../udisks/udisksclient.c:2252
 msgctxt "part-type"
 msgid "Apple Boot"
 msgstr "Apple Boot"
 
-#: ../udisks/udisksclient.c:2241
+#: ../udisks/udisksclient.c:2253
 msgctxt "part-type"
 msgid "Apple Label"
 msgstr "Apple Label"
 
-#: ../udisks/udisksclient.c:2242
+#: ../udisks/udisksclient.c:2254
 msgctxt "part-type"
 msgid "Apple TV Recovery"
 msgstr "Apple TV Recovery"
 
-#: ../udisks/udisksclient.c:2243
+#: ../udisks/udisksclient.c:2255
 msgctxt "part-type"
 msgid "Apple Core Storage"
 msgstr "Apple Core Storage"
 
 #. HP-UX
-#: ../udisks/udisksclient.c:2245
+#: ../udisks/udisksclient.c:2257
 msgctxt "part-type"
 msgid "HP-UX Data"
 msgstr "HP-UX Data"
 
-#: ../udisks/udisksclient.c:2246
+#: ../udisks/udisksclient.c:2258
 msgctxt "part-type"
 msgid "HP-UX Service"
 msgstr "HP-UX Service"
 
 #. FreeBSD
-#: ../udisks/udisksclient.c:2248
+#: ../udisks/udisksclient.c:2260
 msgctxt "part-type"
 msgid "FreeBSD Boot"
 msgstr "FreeBSD Boot"
 
-#: ../udisks/udisksclient.c:2249
+#: ../udisks/udisksclient.c:2261
 msgctxt "part-type"
 msgid "FreeBSD Data"
 msgstr "FreeBSD Data"
 
-#: ../udisks/udisksclient.c:2250
+#: ../udisks/udisksclient.c:2262
 msgctxt "part-type"
 msgid "FreeBSD Swap"
 msgstr "FreeBSD Swap"
 
-#: ../udisks/udisksclient.c:2251
+#: ../udisks/udisksclient.c:2263
 msgctxt "part-type"
 msgid "FreeBSD UFS"
 msgstr "FreeBSD UFS"
 
-#: ../udisks/udisksclient.c:2252
+#: ../udisks/udisksclient.c:2264
 msgctxt "part-type"
 msgid "FreeBSD Vinum"
 msgstr "FreeBSD Vinum"
 
-#: ../udisks/udisksclient.c:2253
+#: ../udisks/udisksclient.c:2265
 msgctxt "part-type"
 msgid "FreeBSD ZFS"
 msgstr "FreeBSD ZFS"
 
 #. Solaris
-#: ../udisks/udisksclient.c:2255
+#: ../udisks/udisksclient.c:2267
 msgctxt "part-type"
 msgid "Solaris Boot"
 msgstr "Solaris Boot"
 
-#: ../udisks/udisksclient.c:2256
+#: ../udisks/udisksclient.c:2268
 msgctxt "part-type"
 msgid "Solaris Root"
 msgstr "Solaris Root"
 
-#: ../udisks/udisksclient.c:2257
+#: ../udisks/udisksclient.c:2269
 msgctxt "part-type"
 msgid "Solaris Swap"
 msgstr "Solaris Swap"
 
-#: ../udisks/udisksclient.c:2258
+#: ../udisks/udisksclient.c:2270
 msgctxt "part-type"
 msgid "Solaris Backup"
 msgstr "Solaris Backup"
 
-#: ../udisks/udisksclient.c:2259
+#: ../udisks/udisksclient.c:2271
 msgctxt "part-type"
 msgid "Solaris /usr"
 msgstr "Solaris /usr"
 
 #. same as ZFS
-#: ../udisks/udisksclient.c:2260
+#: ../udisks/udisksclient.c:2272
 msgctxt "part-type"
 msgid "Solaris /var"
 msgstr "Solaris /var"
 
-#: ../udisks/udisksclient.c:2261
+#: ../udisks/udisksclient.c:2273
 msgctxt "part-type"
 msgid "Solaris /home"
 msgstr "Solaris /home"
 
-#: ../udisks/udisksclient.c:2262
+#: ../udisks/udisksclient.c:2274
 msgctxt "part-type"
 msgid "Solaris Alternate Sector"
 msgstr "Solaris Alternate Sector"
 
-#: ../udisks/udisksclient.c:2263
+#: ../udisks/udisksclient.c:2275
 msgctxt "part-type"
 msgid "Solaris Reserved"
 msgstr "Solaris Reserved"
 
-#: ../udisks/udisksclient.c:2264
+#: ../udisks/udisksclient.c:2276
 msgctxt "part-type"
 msgid "Solaris Reserved (2)"
 msgstr "Solaris Reserved (2)"
 
-#: ../udisks/udisksclient.c:2265
+#: ../udisks/udisksclient.c:2277
 msgctxt "part-type"
 msgid "Solaris Reserved (3)"
 msgstr "Solaris Reserved (3)"
 
-#: ../udisks/udisksclient.c:2266
+#: ../udisks/udisksclient.c:2278
 msgctxt "part-type"
 msgid "Solaris Reserved (4)"
 msgstr "Solaris Reserved (4)"
 
-#: ../udisks/udisksclient.c:2267
+#: ../udisks/udisksclient.c:2279
 msgctxt "part-type"
 msgid "Solaris Reserved (5)"
 msgstr "Solaris Reserved (5)"
 
 #. NetBSD
-#: ../udisks/udisksclient.c:2269
+#: ../udisks/udisksclient.c:2281
 msgctxt "part-type"
 msgid "NetBSD Swap"
 msgstr "NetBSD Swap"
 
-#: ../udisks/udisksclient.c:2270
+#: ../udisks/udisksclient.c:2282
 msgctxt "part-type"
 msgid "NetBSD FFS"
 msgstr "NetBSD FFS"
 
-#: ../udisks/udisksclient.c:2271
+#: ../udisks/udisksclient.c:2283
 msgctxt "part-type"
 msgid "NetBSD LFS"
 msgstr "NetBSD LFS"
 
-#: ../udisks/udisksclient.c:2272
+#: ../udisks/udisksclient.c:2284
 msgctxt "part-type"
 msgid "NetBSD RAID"
 msgstr "NetBSD RAID"
 
-#: ../udisks/udisksclient.c:2273
+#: ../udisks/udisksclient.c:2285
 msgctxt "part-type"
 msgid "NetBSD Concatenated"
 msgstr "NetBSD Concatenated"
 
-#: ../udisks/udisksclient.c:2274
+#: ../udisks/udisksclient.c:2286
 msgctxt "part-type"
 msgid "NetBSD Encrypted"
 msgstr "NetBSD Encrypted"
 
 #. VMWare, see http://blogs.vmware.com/vsphere/2011/08/vsphere-50-storage-features-part-7-gpt.html
-#: ../udisks/udisksclient.c:2276
+#: ../udisks/udisksclient.c:2288
 msgctxt "part-type"
 msgid "VMWare VMFS"
 msgstr "VMWare VMFS"
 
-#: ../udisks/udisksclient.c:2277
+#: ../udisks/udisksclient.c:2289
 msgctxt "part-type"
 msgid "VMWare vmkcore"
 msgstr "VMWare vmkcore"
 
 #. ChromeOS, see http://www.chromium.org/chromium-os/chromiumos-design-docs/disk-format
-#: ../udisks/udisksclient.c:2279
+#: ../udisks/udisksclient.c:2291
 msgctxt "part-type"
 msgid "ChromeOS Firmware"
 msgstr "ChromeOS Firmware"
 
-#: ../udisks/udisksclient.c:2280
+#: ../udisks/udisksclient.c:2292
 msgctxt "part-type"
 msgid "ChromeOS Kernel"
 msgstr "ChromeOS ядросы"
 
-#: ../udisks/udisksclient.c:2281
+#: ../udisks/udisksclient.c:2293
 msgctxt "part-type"
 msgid "ChromeOS Root Filesystem"
 msgstr "ChromeOS түбірлік файлдық жүйесі"
 
-#: ../udisks/udisksclient.c:2282
+#: ../udisks/udisksclient.c:2294
 msgctxt "part-type"
 msgid "ChromeOS Reserved"
 msgstr "ChromeOS Reserved"
 
-#: ../udisks/udisksclient.c:2291
+#: ../udisks/udisksclient.c:2303
 msgctxt "part-type"
 msgid "Apple HFS/HFS"
 msgstr "Apple HFS/HFS"
 
-#: ../udisks/udisksclient.c:2292
+#: ../udisks/udisksclient.c:2304
 msgctxt "part-type"
 msgid "Apple Partition Map"
 msgstr "Apple бөлімдер картасы"
 
-#: ../udisks/udisksclient.c:2293
+#: ../udisks/udisksclient.c:2305
 msgctxt "part-type"
 msgid "Unused"
 msgstr "Қолданылмаған"
 
-#: ../udisks/udisksclient.c:2294
+#: ../udisks/udisksclient.c:2306
 msgctxt "part-type"
 msgid "Empty"
 msgstr "Бос"
 
-#: ../udisks/udisksclient.c:2295
+#: ../udisks/udisksclient.c:2307
 msgctxt "part-type"
 msgid "Driver"
 msgstr "Драйвер"
 
-#: ../udisks/udisksclient.c:2296
+#: ../udisks/udisksclient.c:2308
 msgctxt "part-type"
 msgid "Driver 4.3"
 msgstr "Драйвер 4.3"
 
-#: ../udisks/udisksclient.c:2297
+#: ../udisks/udisksclient.c:2309
 msgctxt "part-type"
 msgid "ProDOS file system"
 msgstr "ProDOS файлдық жүйесі"
 
-#: ../udisks/udisksclient.c:2298
+#: ../udisks/udisksclient.c:2310
 msgctxt "part-type"
 msgid "FAT 12"
 msgstr "FAT 12"
 
-#: ../udisks/udisksclient.c:2299
+#: ../udisks/udisksclient.c:2311
 msgctxt "part-type"
 msgid "FAT 16"
 msgstr "FAT 16"
 
-#: ../udisks/udisksclient.c:2300
+#: ../udisks/udisksclient.c:2312
 msgctxt "part-type"
 msgid "FAT 32"
 msgstr "FAT 32"
 
-#: ../udisks/udisksclient.c:2301
+#: ../udisks/udisksclient.c:2313
 msgctxt "part-type"
 msgid "FAT 16 (Windows)"
 msgstr "FAT 16 (Windows)"
 
-#: ../udisks/udisksclient.c:2302
+#: ../udisks/udisksclient.c:2314
 msgctxt "part-type"
 msgid "FAT 32 (Windows)"
 msgstr "FAT 32 (Windows)"
 
 #. see http://www.win.tue.nl/~aeb/partitions/partition_types-1.html
-#: ../udisks/udisksclient.c:2305
+#: ../udisks/udisksclient.c:2317
 msgctxt "part-type"
 msgid "Extended"
 msgstr "Кеңейтілген"
 
-#: ../udisks/udisksclient.c:2306
+#: ../udisks/udisksclient.c:2318
 msgctxt "part-type"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#: ../udisks/udisksclient.c:2307
+#: ../udisks/udisksclient.c:2319
 msgctxt "part-type"
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#: ../udisks/udisksclient.c:2308
+#: ../udisks/udisksclient.c:2320
 msgctxt "part-type"
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: ../udisks/udisksclient.c:2309
+#: ../udisks/udisksclient.c:2321
 msgctxt "part-type"
 msgid "Linux"
 msgstr "Linux"
 
-#: ../udisks/udisksclient.c:2310
+#: ../udisks/udisksclient.c:2322
 msgctxt "part-type"
 msgid "Linux Extended"
 msgstr "Linux кеңейтілген"
 
-#: ../udisks/udisksclient.c:2312
+#: ../udisks/udisksclient.c:2324
 msgctxt "part-type"
 msgid "Linux RAID auto"
 msgstr "Linux RAID auto"
 
-#: ../udisks/udisksclient.c:2313
+#: ../udisks/udisksclient.c:2325
 msgctxt "part-type"
 msgid "FAT12"
 msgstr "FAT12"
 
-#: ../udisks/udisksclient.c:2314
+#: ../udisks/udisksclient.c:2326
 msgctxt "part-type"
 msgid "FAT16 <32M"
 msgstr "FAT16 <32M"
 
-#: ../udisks/udisksclient.c:2315
+#: ../udisks/udisksclient.c:2327
 msgctxt "part-type"
 msgid "FAT16"
 msgstr "FAT16"
 
-#: ../udisks/udisksclient.c:2316
+#: ../udisks/udisksclient.c:2328
 msgctxt "part-type"
 msgid "HPFS/NTFS"
 msgstr "HPFS/NTFS"
 
-#: ../udisks/udisksclient.c:2317
+#: ../udisks/udisksclient.c:2329
 msgctxt "part-type"
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
 
-#: ../udisks/udisksclient.c:2318
+#: ../udisks/udisksclient.c:2330
 msgctxt "part-type"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#: ../udisks/udisksclient.c:2319
+#: ../udisks/udisksclient.c:2331
 msgctxt "part-type"
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
 
-#: ../udisks/udisksclient.c:2320
+#: ../udisks/udisksclient.c:2332
 msgctxt "part-type"
 msgid "W95 Ext d (LBA)"
 msgstr "W95 Ext d (LBA)"
 
-#: ../udisks/udisksclient.c:2321
+#: ../udisks/udisksclient.c:2333
 msgctxt "part-type"
 msgid "Hidden FAT12"
 msgstr "Жасырын FAT12"
 
-#: ../udisks/udisksclient.c:2322
+#: ../udisks/udisksclient.c:2334
 msgctxt "part-type"
 msgid "Hidden FAT16 <32M"
 msgstr "Жасырын FAT16 <32M"
 
-#: ../udisks/udisksclient.c:2323
+#: ../udisks/udisksclient.c:2335
 msgctxt "part-type"
 msgid "Hidden FAT16"
 msgstr "Жасырын FAT16"
 
-#: ../udisks/udisksclient.c:2324
+#: ../udisks/udisksclient.c:2336
 msgctxt "part-type"
 msgid "Hidden HPFS/NTFS"
 msgstr "Жасырын HPFS/NTFS"
 
-#: ../udisks/udisksclient.c:2325
+#: ../udisks/udisksclient.c:2337
 msgctxt "part-type"
 msgid "Hidden W95 FAT32"
 msgstr "Жасырын W95 FAT32"
 
-#: ../udisks/udisksclient.c:2326
+#: ../udisks/udisksclient.c:2338
 msgctxt "part-type"
 msgid "Hidden W95 FAT32 (LBA)"
 msgstr "Жасырын W95 FAT32 (LBA)"
 
-#: ../udisks/udisksclient.c:2327
+#: ../udisks/udisksclient.c:2339
 msgctxt "part-type"
 msgid "Hidden W95 FAT16 (LBA)"
 msgstr "Жасырын W95 FAT16 (LBA)"
 
-#: ../udisks/udisksclient.c:2328
+#: ../udisks/udisksclient.c:2340
 msgctxt "part-type"
 msgid "OPUS"
 msgstr "OPUS"
 
-#: ../udisks/udisksclient.c:2329
+#: ../udisks/udisksclient.c:2341
 msgctxt "part-type"
 msgid "Compaq diagnostics"
 msgstr "Compaq diagnostics"
 
-#: ../udisks/udisksclient.c:2330
+#: ../udisks/udisksclient.c:2342
 msgctxt "part-type"
 msgid "PartitionMagic"
 msgstr "PartitionMagic"
 
-#: ../udisks/udisksclient.c:2331
+#: ../udisks/udisksclient.c:2343
 msgctxt "part-type"
 msgid "Minix"
 msgstr "Minix"
 
 #. cf. http://en.wikipedia.org/wiki/MINIX_file_system
-#: ../udisks/udisksclient.c:2332 ../udisks/udisksclient.c:2333
+#: ../udisks/udisksclient.c:2344 ../udisks/udisksclient.c:2345
 msgctxt "part-type"
 msgid "Hibernation"
 msgstr "Гибернация"
 
-#: ../udisks/udisksclient.c:2334
+#: ../udisks/udisksclient.c:2346
 msgctxt "part-type"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#: ../udisks/udisksclient.c:2335
+#: ../udisks/udisksclient.c:2347
 msgctxt "part-type"
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: ../udisks/udisksclient.c:2336 ../udisks/udisksclient.c:2337
+#: ../udisks/udisksclient.c:2348 ../udisks/udisksclient.c:2349
 msgctxt "part-type"
 msgid "Mac OS X"
 msgstr "Mac OS X"
 
-#: ../udisks/udisksclient.c:2338
+#: ../udisks/udisksclient.c:2350
 msgctxt "part-type"
 msgid "Solaris boot"
 msgstr "Solaris boot"
 
-#: ../udisks/udisksclient.c:2339
+#: ../udisks/udisksclient.c:2351
 msgctxt "part-type"
 msgid "Solaris"
 msgstr "Solaris"
 
-#: ../udisks/udisksclient.c:2340
+#: ../udisks/udisksclient.c:2352
 msgctxt "part-type"
 msgid "BeOS BFS"
 msgstr "BeOS BFS"
 
-#: ../udisks/udisksclient.c:2341
+#: ../udisks/udisksclient.c:2353
 msgctxt "part-type"
 msgid "SkyOS SkyFS"
 msgstr "SkyOS SkyFS"
 
-#: ../udisks/udisksclient.c:2487
+#: ../udisks/udisksclient.c:2499
 msgctxt "job"
 msgid "SMART self-test"
 msgstr "SMART өздік тест"
 
-#: ../udisks/udisksclient.c:2488
+#: ../udisks/udisksclient.c:2500
 msgctxt "job"
 msgid "Ejecting Medium"
 msgstr "Тасушы шығарылуда"
 
-#: ../udisks/udisksclient.c:2489
+#: ../udisks/udisksclient.c:2501
 msgctxt "job"
 msgid "Unlocking Device"
 msgstr "Құрылғы блоктаудан босатылуда"
 
-#: ../udisks/udisksclient.c:2490
+#: ../udisks/udisksclient.c:2502
 msgctxt "job"
 msgid "Locking Device"
 msgstr "Құрылғы блокталуда"
 
-#: ../udisks/udisksclient.c:2491
+#: ../udisks/udisksclient.c:2503
 msgctxt "job"
 msgid "Modifying Encrypted Device"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2492
+#: ../udisks/udisksclient.c:2504
 msgctxt "job"
 msgid "Starting Swap Device"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2493
+#: ../udisks/udisksclient.c:2505
 msgctxt "job"
 msgid "Stopping Swap Device"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2494
+#: ../udisks/udisksclient.c:2506
 msgctxt "job"
 msgid "Mounting Filesystem"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2495
+#: ../udisks/udisksclient.c:2507
 msgctxt "job"
 msgid "Unmounting Filesystem"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2496
+#: ../udisks/udisksclient.c:2508
 msgctxt "job"
 msgid "Modifying Filesystem"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2497
+#: ../udisks/udisksclient.c:2509
 msgctxt "job"
 msgid "Erasing Device"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2498
+#: ../udisks/udisksclient.c:2510
 msgctxt "job"
 msgid "Creating Filesystem"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2499
+#: ../udisks/udisksclient.c:2511
 msgctxt "job"
 msgid "Setting Up Loop Device"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2500
+#: ../udisks/udisksclient.c:2512
 msgctxt "job"
 msgid "Modifying Partition"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2501
+#: ../udisks/udisksclient.c:2513
 msgctxt "job"
 msgid "Deleting Partition"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2502
+#: ../udisks/udisksclient.c:2514
 msgctxt "job"
 msgid "Creating Partition"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2503
+#: ../udisks/udisksclient.c:2515
 msgctxt "job"
 msgid "Cleaning Up"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2504
+#: ../udisks/udisksclient.c:2516
 msgctxt "job"
 msgid "ATA Secure Erase"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2505
+#: ../udisks/udisksclient.c:2517
 msgctxt "job"
 msgid "ATA Enhanced Secure Erase"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2506
+#: ../udisks/udisksclient.c:2518
 msgctxt "job"
 msgid "Stopping RAID Array"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2507
+#: ../udisks/udisksclient.c:2519
 msgctxt "job"
 msgid "Starting RAID Array"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2508
+#: ../udisks/udisksclient.c:2520
 msgctxt "job"
 msgid "Marking Device as Faulty"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2509
+#: ../udisks/udisksclient.c:2521
 msgctxt "job"
 msgid "Removing Device from Array"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2510
+#: ../udisks/udisksclient.c:2522
 msgctxt "job"
 msgid "Adding Device to Array"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2511
+#: ../udisks/udisksclient.c:2523
 msgctxt "job"
 msgid "Setting Write-Intent Bitmap"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2512
+#: ../udisks/udisksclient.c:2524
 msgctxt "job"
 msgid "Creating RAID Array"
 msgstr ""
 
-#: ../udisks/udisksclient.c:2520
+#: ../udisks/udisksclient.c:2532
 #, c-format
 msgctxt "unknown-job"
 msgid "Unknown (%s)"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/unity_firefox_extension.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/unity_firefox_extension.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/unity_firefox_extension.po	2015-02-19 15:29:19.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/unity_firefox_extension.po	2015-08-14 07:55: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: 2015-02-19 13:23+0000\n"
-"X-Generator: Launchpad (build 17341)\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-kk-base-14.04+20150219/data/kk/LC_MESSAGES/update-manager.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/update-manager.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/update-manager.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/update-manager.po	2015-08-14 07:55:46.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: 2013-12-13 19:31+0000\n"
 "Last-Translator: jmb_kz <Unknown>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-02-19 11:39+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:45+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 "Language: kk\n"
 
 #: ../UpdateManager/backend/InstallBackendAptdaemon.py:67
@@ -27,19 +27,19 @@
 msgid "Installing updates…"
 msgstr ""
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:37
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
 msgid "Please wait, this can take some time."
 msgstr "Күтіңіз, бұл біраз уақыт алуы мүмкін."
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:39
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
 msgid "Update is complete"
 msgstr "Жаңарту аяқталды"
 
-#: ../UpdateManager/ChangelogViewer.py:79
+#: ../UpdateManager/ChangelogViewer.py:73
 msgid "Open Link in Browser"
 msgstr "Сілтемені веб шолғышта ашу"
 
-#: ../UpdateManager/ChangelogViewer.py:83
+#: ../UpdateManager/ChangelogViewer.py:76
 msgid "Copy Link to Clipboard"
 msgstr "Сілтемені алмастыру буферіне көшіру"
 
@@ -59,7 +59,8 @@
 msgid "No software updates are available."
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:160 ../UpdateManager/Dialogs.py:170
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
 msgid "The software on this computer is up to date."
 msgstr ""
 
@@ -100,11 +101,11 @@
 "     * Normal changes of a pre-release version of Ubuntu"
 msgstr ""
 
-#: ../UpdateManager/Dialogs.py:227
+#: ../data/gtkbuilder/UpdateManager.ui.h:3
 msgid "_Partial Upgrade"
 msgstr "_Жарым-жартылай жаңарту"
 
-#: ../UpdateManager/Dialogs.py:228
+#: ../DistUpgrade/DistUpgrade.ui.h:12
 msgid "_Continue"
 msgstr "_Жалғастыру"
 
@@ -138,11 +139,11 @@
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:326
+#: ../UpdateManager/UpdateManager.py:1159
 msgid "Software index is broken"
 msgstr "Бағдарламалардың индексі бұзылған"
 
-#: ../UpdateManager/UpdateManager.py:327
+#: ../UpdateManager/UpdateManager.py:1160
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -152,11 +153,11 @@
 "\"Synaptic\" пакеттер менеджерін қолданыңыз немесе терминалда \"sudo apt-get "
 "install -f\" орындаңыз."
 
-#: ../UpdateManager/UpdateManager.py:333
+#: ../UpdateManager/UpdateManager.py:1008
 msgid "Could not initialize the package information"
 msgstr "Пакеттер жайлы ақпаратты алу мүмкін емес"
 
-#: ../UpdateManager/UpdateManager.py:334
+#: ../UpdateManager/UpdateManager.py:1009
 msgid ""
 "An unresolvable problem occurred while initializing the package "
 "information.\n"
@@ -169,7 +170,8 @@
 "\"update-manager\" пакетінің осы қате туралы хабарлап, оған қосы келесі "
 "хабарламаны қосыңыз:\n"
 
-#: ../UpdateManager/UpdateManager.py:351
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
 msgid "Could not calculate the upgrade"
 msgstr "Жүйенің жаңартуын есептеу мүмкін емес"
 
@@ -185,8 +187,8 @@
 msgid "Install Now"
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:284
-#: ../UpdateManagerText/UpdateManagerText.py:36
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
 msgid "Install"
 msgstr "Орнату"
 
@@ -199,29 +201,29 @@
 msgstr ""
 
 #. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdatesAvailable.py:514
+#: ../UpdateManager/UpdateManager.py:393
 #, python-format
 msgid "Version %s: \n"
 msgstr "%s нұсқасы: \n"
 
-#: ../UpdateManager/UpdatesAvailable.py:577
+#: ../UpdateManager/UpdateManager.py:450
 msgid ""
 "No network connection detected, you can not download changelog information."
 msgstr "Желілік қосылыс жоқ, өзгертулер тізімін жүктеп алу мүмкін емес."
 
-#: ../UpdateManager/UpdatesAvailable.py:587
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Downloading list of changes..."
 msgstr "Өзгертулер тізімін жүктеу..."
 
-#: ../UpdateManager/UpdatesAvailable.py:631
+#: ../UpdateManager/UpdateManager.py:502
 msgid "_Deselect All"
 msgstr "_Белгілердің барлығын алып тастау"
 
-#: ../UpdateManager/UpdatesAvailable.py:637
+#: ../UpdateManager/UpdateManager.py:508
 msgid "Select _All"
 msgstr "Б_арлығын таңдау"
 
-#: ../UpdateManager/UpdatesAvailable.py:732
+#: ../UpdateManager/UpdateManager.py:572
 #, python-format
 msgid "%s will be downloaded."
 msgstr "%s жүктелінетін болады."
@@ -232,11 +234,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdatesAvailable.py:752
+#: ../UpdateManager/UpdateManager.py:589
 msgid "There are no updates to install."
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:761
+#: ../UpdateManager/UpdateManager.py:602
 msgid "Unknown download size."
 msgstr "Жүктелінетін көлем белгісіз."
 
@@ -258,12 +260,13 @@
 "The computer also needs to restart to finish installing previous updates."
 msgstr ""
 
-#. print("on_button_install_clicked")
-#: ../UpdateManager/UpdatesAvailable.py:826
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
 msgid "Not enough free disk space"
 msgstr "Дискіде қажетті бос орын жоқ"
 
-#: ../UpdateManager/UpdatesAvailable.py:827
+#: ../UpdateManager/UpdateManager.py:756
 #, python-format
 msgid ""
 "The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -275,11 +278,11 @@
 "clean\" команданы орындау арқылы өзіңіздің корзинаңызды тазартып, "
 "бағдарламалар орнатылымның уақытша пакеттерді жойыңыз."
 
-#: ../UpdateManager/UpdatesAvailable.py:853
+#: ../UpdateManager/UpdateManager.py:863
 msgid "Connecting..."
 msgstr "Қосылуда..."
 
-#: ../UpdateManager/UpdatesAvailable.py:869
+#: ../UpdateManager/UpdateManager.py:880
 msgid "You may not be able to check for updates or download new updates."
 msgstr "Жаңартуларға тексеру немесе жүктеуге құқықтар жетіспейді."
 
@@ -287,27 +290,28 @@
 msgid "Security updates"
 msgstr ""
 
-#: ../UpdateManager/UpdatesAvailable.py:1021
+#: ../UpdateManager/Core/UpdateList.py:70
 msgid "Other updates"
 msgstr "Басқа жаңартулар"
 
-#: ../UpdateManager/UnitySupport.py:67
+#: ../UpdateManager/UnitySupport.py:66
 msgid "Install All Available Updates"
 msgstr "Барлық жетімді жаңартуларды орнату"
 
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
 msgid "Cancel"
 msgstr "Болдырмау"
 
-#: ../UpdateManagerText/UpdateManagerText.py:38
+#: ../UpdateManagerText/UpdateManagerText.py:34
 msgid "Changelog"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:41
+#: ../UpdateManagerText/UpdateManagerText.py:37
 msgid "Updates"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:54
+#: ../UpdateManagerText/UpdateManagerText.py:50
 msgid "Building Updates List"
 msgstr "Жаңартулар тізімі құрастырылуда"
 
@@ -325,16 +329,16 @@
 " * Normal changes of a pre-release version of Ubuntu"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:127
+#: ../UpdateManagerText/UpdateManagerText.py:122
 msgid "Downloading changelog"
 msgstr "Өзгертулер тізімін жүктеу"
 
-#: ../UpdateManager/Core/MyCache.py:333
+#: ../UpdateManager/Core/MyCache.py:316
 msgid "This update does not come from a source that supports changelogs."
 msgstr ""
 "Бұл өзгерту өзгертулердің тарихын сақтамайтын қайнар көзінен ұсынылған."
 
-#: ../UpdateManager/Core/MyCache.py:339 ../UpdateManager/Core/MyCache.py:374
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -351,7 +355,7 @@
 "\n"
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:360
+#: ../UpdateManager/Core/MyCache.py:339
 #, python-format
 msgid ""
 "The changelog does not contain any relevant changes.\n"
@@ -365,7 +369,7 @@
 "http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "қараңыз немесе өзгертулер тізімін кейінірек қайтадан байқап көріңіз."
 
-#: ../UpdateManager/Core/MyCache.py:367
+#: ../UpdateManager/Core/MyCache.py:344
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -387,7 +391,7 @@
 msgstr ""
 
 #. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../UpdateManager/Core/utils.py:485
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
 #, python-format
 msgid "%(size).0f kB"
 msgid_plural "%(size).0f kB"
@@ -395,20 +399,20 @@
 msgstr[1] ""
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/Core/utils.py:489
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f Мб"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:1
+#: ../data/gtkbuilder/UpdateManager.ui.h:28
 msgid "updates"
 msgstr "жаңартулар"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
 msgid "Changes"
 msgstr "Өзгерістер"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:3
+#: ../data/gtkbuilder/UpdateManager.ui.h:34
 msgid "Description"
 msgstr "Сипаттама"
 
@@ -424,7 +428,7 @@
 msgid "The computer will need to restart."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:7
+#: ../data/gtkbuilder/UpdateManager.ui.h:29
 msgid ""
 "You are connected via roaming and may be charged for the data consumed by "
 "this update."
@@ -437,7 +441,7 @@
 "You may want to wait until you’re not using a mobile broadband connection."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:9
+#: ../data/gtkbuilder/UpdateManager.ui.h:31
 msgid "It’s safer to connect the computer to AC power before updating."
 msgstr ""
 "Жаңарту алдында компьютерді электр қуат көзіне қосқаны қауіпсіздеу болады."
@@ -450,132 +454,129 @@
 msgid "Show and install available updates"
 msgstr "Жетімді жаңартуларды көрсету және орнату"
 
-#: ../update-manager:71 ../update-manager-text:55
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
 msgid "Show version and exit"
 msgstr "Үлгісін көрсету және шығу"
 
-#: ../update-manager:74
+#: ../update-manager:64
 msgid "Directory that contains the data files"
 msgstr "Мәліммет файлдары бар бума"
 
-#: ../update-manager:77
+#: ../update-manager:67
 msgid "Check if a new Ubuntu release is available"
 msgstr "Ubuntu-ның жаңа релизінің жетімдігін тексеру"
 
-#: ../update-manager:80
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
 msgid "Check if upgrading to the latest devel release is possible"
 msgstr ""
 "Дистрибутивтің соңғы тұрақсыз үлгісіне дейін жаңарту мүмкіндігін тексеру"
 
-#: ../update-manager:84
+#: ../update-manager:74
 msgid "Upgrade using the latest proposed version of the release upgrader"
 msgstr "Жаңарту менеджерінің соңғы үлгісін қолданып жаңартуларды жасау"
 
-#: ../update-manager:91
+#: ../update-manager:81
 msgid "Do not focus on map when starting"
 msgstr "Ашылатын кезде картаны фокустамау (таңдамау)"
 
-#: ../update-manager:94
+#: ../update-manager:87
 msgid "Do not check for updates when starting"
 msgstr "Компьютер қосылған кезде жаңартуларға жетімдігін тексермеу"
 
-#: ../update-manager:98
+#: ../update-manager:91 ../do-release-upgrade:65
 msgid "Test upgrade with a sandbox aufs overlay"
 msgstr "Жаңартуларды қауіпсіз режимінде тестілеу"
 
-#: ../update-manager-text:59
+#: ../update-manager-text:54
 msgid "Show description of the package instead of the changelog"
 msgstr ""
 
-#: ../ubuntu-support-status:93
+#: ../ubuntu-support-status:79
 msgid "Show unsupported packages on this machine"
 msgstr ""
 
-#: ../ubuntu-support-status:96
+#: ../ubuntu-support-status:82
 msgid "Show supported packages on this machine"
 msgstr ""
 
-#: ../ubuntu-support-status:99
+#: ../ubuntu-support-status:85
 msgid "Show all packages with their status"
 msgstr ""
 
-#: ../ubuntu-support-status:102
+#: ../ubuntu-support-status:88
 msgid "Show all packages in a list"
 msgstr ""
 
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:130
 #, c-format
 msgid "Support status summary of '%s':"
 msgstr ""
 
-#: ../ubuntu-support-status:148
+#: ../ubuntu-support-status:133
 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
 msgstr ""
 
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:139
 msgid ""
 "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
 "downloaded"
 msgstr ""
 
-#: ../ubuntu-support-status:157
+#: ../ubuntu-support-status:142
 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
 msgstr ""
 
-#: ../ubuntu-support-status:165
+#: ../ubuntu-support-status:155
 msgid ""
 "Run with --show-unsupported, --show-supported or --show-all to see more "
 "details"
 msgstr ""
 
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:159
 msgid "No longer downloadable:"
 msgstr ""
 
-#: ../ubuntu-support-status:172
+#: ../ubuntu-support-status:162
 msgid "Unsupported: "
 msgstr ""
 
-#: ../ubuntu-support-status:177
+#: ../ubuntu-support-status:167
 #, c-format
 msgid "Supported until %s:"
 msgstr ""
 
-#: ../ubuntu-support-status:186
+#: ../ubuntu-support-status:176
 msgid "Unsupported"
 msgstr ""
 
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:43
+#: ../Janitor/computerjanitor/exc.py:30
 #, python-format
 msgid "Unimplemented method: %s"
 msgstr "Орындалмаған әдіс: %s"
 
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
 msgid "A file on disk"
 msgstr "Дисктегі файл"
 
-#: ../janitor/plugincore/core/missing_package_cruft.py:40
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
 msgid "Install missing package."
 msgstr "Жетіспеген пакетті орнату."
 
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:50
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
 #, python-format
 msgid "Package %s should be installed."
 msgstr "%s пакетті орнату қажет."
 
-#: ../janitor/plugincore/core/package_cruft.py:50
+#: ../Janitor/computerjanitor/package_cruft.py:45
 msgid ".deb package"
 msgstr ".deb пакеті"
 
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:47
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
 #, python-format
 msgid "%s needs to be marked as manually installed."
 msgstr "%s жекешелей орнатылған етіп белгілену қажет."
 
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:50
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
 msgid ""
 "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
 "installed. See bugs.launchpad.net, bug #279621 for details."
@@ -583,21 +584,22 @@
 "Жаңарту кезінде, орнатылған kdelibs5-dev орнына kdelibs4-dev орнату қажет. "
 "Бұл қате жайлы осы жерде оқуыңызға болады, bugs.launchpad.net, bug #279621."
 
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:45
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
 #, python-format
 msgid "%i obsolete entries in the status file"
 msgstr "Күй файлдың %i құрамдасы ескірген"
 
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:48
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
 msgid "Obsolete entries in dpkg status"
 msgstr "dpkg күйдің құрамы ескірген"
 
 #. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:51
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
 msgid "Obsolete dpkg status entries"
 msgstr "dpkg күйлер құрамы ескірген"
 
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:43
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
 msgid ""
 "Remove lilo since grub is also installed.(See bug #314004 for details.)"
 msgstr "Егер grub орнатылған болса, lilo жойыңыз. (толығырақ, bug #314004)"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/usbcreator.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/usbcreator.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/usbcreator.po	2015-02-19 15:29:16.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/usbcreator.po	2015-08-14 07:55:50.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: usb-creator\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-07 15:59+0000\n"
+"POT-Creation-Date: 2015-04-29 13:11+0000\n"
 "PO-Revision-Date: 2011-04-12 18:20+0000\n"
 "Last-Translator: jmb_kz <Unknown>\n"
 "Language-Team: Kazakh <kk@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: 2015-02-19 12:51+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 08:03+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:1
 msgid "Install the bootloader"
@@ -49,221 +49,228 @@
 msgid "System policy prevents mounting"
 msgstr ""
 
-#: .././desktop/usb-creator-gtk.desktop.in.h:1
+#: .././dbus/com.ubuntu.usbcreator.policy.in.h:9
+msgid "Run KVM"
+msgstr ""
+
+#: .././dbus/com.ubuntu.usbcreator.policy.in.h:10
+msgid "System policy prevents running KVM"
+msgstr ""
+
 #: .././desktop/usb-creator-kde.desktop.in.h:1
+#: .././desktop/usb-creator-gtk.desktop.in.h:1
 msgid "Startup Disk Creator"
 msgstr ""
 
-#: .././desktop/usb-creator-gtk.desktop.in.h:2
 #: .././desktop/usb-creator-kde.desktop.in.h:2
+#: .././desktop/usb-creator-gtk.desktop.in.h:2
 msgid "Create a startup disk using a CD or disc image"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. set title of progress window (same as gtk frontend)
-#: .././usbcreator/frontends/kde/frontend.py:206
 #: .././usbcreator/frontends/winui/install_window.py:23
-#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:206
+#: .././usbcreator/frontends/kde/frontend.py:180
+#: .././gui/usbcreator-gtk.ui.h:7 usbcreator/frontends/kde/frontend.py:180
 msgid "Installing"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO evand 2009-07-28: Better error message.
-#: .././usbcreator/frontends/kde/frontend.py:234
-#: .././usbcreator/frontends/gtk/frontend.py:733
-#: .././usbcreator/frontends/winui/frontend.py:87
-#: usbcreator/frontends/kde/frontend.py:234
+#: .././usbcreator/frontends/gtk/frontend.py:685
+#: .././usbcreator/frontends/winui/frontend.py:85
+#: .././usbcreator/frontends/kde/frontend.py:208
+#: usbcreator/frontends/kde/frontend.py:208
 msgid "Installation failed."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:412
-#: .././usbcreator/frontends/gtk/frontend.py:471
-#: usbcreator/frontends/kde/frontend.py:412
+#: .././usbcreator/frontends/gtk/frontend.py:444
+#: .././usbcreator/frontends/kde/frontend.py:368
+#: usbcreator/frontends/kde/frontend.py:368
 msgid "The device is not large enough to hold this image."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:414
-#: .././usbcreator/frontends/gtk/frontend.py:473
-#: usbcreator/frontends/kde/frontend.py:414
+#: .././usbcreator/frontends/gtk/frontend.py:446
+#: .././usbcreator/frontends/kde/frontend.py:370
+#: usbcreator/frontends/kde/frontend.py:370
 msgid "There is not enough free space for this image."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:417
-#: usbcreator/frontends/kde/frontend.py:417
+#: .././usbcreator/frontends/kde/frontend.py:373
+#: usbcreator/frontends/kde/frontend.py:373
 msgid "The device needs to be formatted for use."
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
-#. This here filter is for kfiledialog, no clue if it will ever make a return
-#. filter = '*.iso|' + _('CD Images') + '\n*.img|' + _('Disk Images')
 #. TODO evand 2009-07-28: The list itself needs to be moved into the
 #. base frontend.
 #. To be displayed as a list of file type filters.
-#: .././usbcreator/frontends/kde/frontend.py:453
-#: .././usbcreator/frontends/gtk/frontend.py:627
-#: .././usbcreator/frontends/winui/frontend.py:181
-#: usbcreator/frontends/kde/frontend.py:453
+#: .././usbcreator/frontends/gtk/frontend.py:585
+#: .././usbcreator/frontends/winui/frontend.py:177
+#: .././usbcreator/frontends/kde/frontend.py:406
+#: usbcreator/frontends/kde/frontend.py:406
 msgid "CD Images"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:453
-#: .././usbcreator/frontends/gtk/frontend.py:628
-#: .././usbcreator/frontends/winui/frontend.py:182
-#: usbcreator/frontends/kde/frontend.py:453
+#: .././usbcreator/frontends/gtk/frontend.py:585
+#: .././usbcreator/frontends/winui/frontend.py:178
+#: .././usbcreator/frontends/kde/frontend.py:406
+#: usbcreator/frontends/kde/frontend.py:406
 msgid "Disk Images"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:484
-#: usbcreator/frontends/kde/frontend.py:484
+#: .././usbcreator/frontends/kde/frontend.py:422
+#: usbcreator/frontends/kde/frontend.py:422
 msgid "Starting up"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:493
-#: usbcreator/frontends/kde/frontend.py:493
+#: .././usbcreator/frontends/kde/frontend.py:431
+#: usbcreator/frontends/kde/frontend.py:431
 msgid "You must select both source image and target device first."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:520
-#: .././usbcreator/frontends/winui/frontend.py:73
-#: usbcreator/frontends/kde/frontend.py:520
+#: .././usbcreator/frontends/winui/frontend.py:71
+#: .././usbcreator/frontends/kde/frontend.py:458
+#: usbcreator/frontends/kde/frontend.py:458
 msgid ""
 "The installation is complete.  You may now reboot your computer with this "
 "device inserted to try or install Ubuntu."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:531
-#: usbcreator/frontends/kde/frontend.py:531
+#: .././usbcreator/frontends/kde/frontend.py:469
+#: usbcreator/frontends/kde/frontend.py:469
 msgid "Retry?"
 msgstr "Қайталау?"
 
-#: .././usbcreator/frontends/kde/frontend.py:547
-#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:547
+#: .././usbcreator/frontends/kde/frontend.py:481
+#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:481
 msgid "Quit the installation?"
 msgstr "Орнатылымнан шығу қажет пе?"
 
-#: .././usbcreator/frontends/kde/frontend.py:548
-#: .././gui/usbcreator-gtk.ui.h:10 usbcreator/frontends/kde/frontend.py:548
+#: .././usbcreator/frontends/kde/frontend.py:482
+#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:482
 msgid "Do you really want to quit the installation now?"
 msgstr "Орнатылымнан қазір шығу қажет пе?"
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO information about the device we're about to format.
-#: .././usbcreator/frontends/kde/frontend.py:583
-#: .././usbcreator/frontends/gtk/frontend.py:793
-#: usbcreator/frontends/kde/frontend.py:583
+#: .././usbcreator/frontends/gtk/frontend.py:742
+#: .././usbcreator/frontends/kde/frontend.py:515
+#: usbcreator/frontends/kde/frontend.py:515
 msgid "Are you sure you want to erase the entire disk?"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:133
+#: .././usbcreator/frontends/gtk/frontend.py:134
 msgid "To run Ubuntu on a portable device, it needs to be set up first."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:134
+#: .././usbcreator/frontends/gtk/frontend.py:135
 msgid "Source disc image (.img):"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:135
+#: .././usbcreator/frontends/gtk/frontend.py:136
 msgid "Target device:"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:136
+#: .././usbcreator/frontends/gtk/frontend.py:137
 msgid "Ubuntu Core Installer"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:137
+#: .././usbcreator/frontends/gtk/frontend.py:138
 msgid "Install Ubuntu Core"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:138
+#: .././usbcreator/frontends/gtk/frontend.py:139
 msgid "Legal"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:369
+#: .././usbcreator/frontends/gtk/frontend.py:347 usbcreator-kde.ui.py:12
 msgid "CD-Drive/Image"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:371
 #: .././usbcreator/frontends/winui/main_dialog.py:27
 msgid "Image"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:385
-#: .././usbcreator/frontends/winui/main_dialog.py:28
+#: .././usbcreator/frontends/gtk/frontend.py:360
+#: .././usbcreator/frontends/winui/main_dialog.py:28 usbcreator-kde.ui.py:15
 msgid "OS Version"
 msgstr "ОЖ нұсқасы"
 
-#: .././usbcreator/frontends/gtk/frontend.py:395
-#: .././usbcreator/frontends/winui/main_dialog.py:29
+#. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
+#. encode to UTF-8 to work around GNOME #620579
+#: .././usbcreator/frontends/gtk/frontend.py:371
+#: .././usbcreator/frontends/winui/main_dialog.py:29 usbcreator-kde.ui.py:18
 msgid "Size"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:512
-#: .././usbcreator/frontends/gtk/frontend.py:798
+#: .././usbcreator/frontends/gtk/frontend.py:478
+#: .././usbcreator/frontends/gtk/frontend.py:747
 msgid "Erasing..."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:517
-#: .././gui/usbcreator-gtk.ui.h:16
+#: .././usbcreator/frontends/gtk/frontend.py:483
+#: .././gui/usbcreator-gtk.ui.h:15 usbcreator-kde.ui.py:42
 msgid "Erase Disk"
 msgstr "Дискті тазарту"
 
-#: .././usbcreator/frontends/gtk/frontend.py:571
-#: .././usbcreator/frontends/winui/main_dialog.py:36
+#: .././usbcreator/frontends/gtk/frontend.py:537
+#: .././usbcreator/frontends/winui/main_dialog.py:36 usbcreator-kde.ui.py:30
 msgid "Device"
 msgstr "Құрылғы"
 
-#: .././usbcreator/frontends/gtk/frontend.py:588
-#: .././usbcreator/frontends/winui/main_dialog.py:37
+#: .././usbcreator/frontends/gtk/frontend.py:553
+#: .././usbcreator/frontends/winui/main_dialog.py:37 usbcreator-kde.ui.py:33
 msgid "Label"
 msgstr "Белгі"
 
-#: .././usbcreator/frontends/gtk/frontend.py:598
-#: .././usbcreator/frontends/winui/main_dialog.py:38
+#: .././usbcreator/frontends/gtk/frontend.py:563
+#: .././usbcreator/frontends/winui/main_dialog.py:38 usbcreator-kde.ui.py:36
 msgid "Capacity"
 msgstr "Сыйымдылығы"
 
-#: .././usbcreator/frontends/gtk/frontend.py:608
-#: .././usbcreator/frontends/winui/main_dialog.py:39
+#: .././usbcreator/frontends/gtk/frontend.py:573
+#: .././usbcreator/frontends/winui/main_dialog.py:39 usbcreator-kde.ui.py:39
 msgid "Free Space"
 msgstr "Бос орын"
 
 #. TODO evand 2009-07-31: Make these the default values in the
 #. GtkBuilder file.
-#: .././usbcreator/frontends/gtk/frontend.py:649
+#: .././usbcreator/frontends/gtk/frontend.py:606
 #: .././usbcreator/frontends/winui/install_window.py:28
 msgid "Starting up..."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:678
-#: .././usbcreator/frontends/winui/frontend.py:155
+#: .././usbcreator/frontends/gtk/frontend.py:635
+#: .././usbcreator/frontends/winui/frontend.py:151
 #, python-format
 msgid "%d%% complete (%dm%ss remaining)"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:682
-#: .././usbcreator/frontends/winui/frontend.py:159
+#: .././usbcreator/frontends/gtk/frontend.py:639
+#: .././usbcreator/frontends/winui/frontend.py:155
 #, python-format
 msgid "%d%% complete"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:761
+#: .././usbcreator/frontends/gtk/frontend.py:763
 msgid "Installation is complete. Your device is rebooting into Ubuntu Core."
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:21
-#: .././gui/usbcreator-gtk.ui.h:12
+#: .././gui/usbcreator-gtk.ui.h:11 usbcreator-kde.ui.py:6
 msgid ""
 "To try or install Ubuntu from a removable disk, it needs to be set up as a "
 "startup disk."
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:24
-#: .././gui/usbcreator-gtk.ui.h:13
+#: .././gui/usbcreator-gtk.ui.h:12 usbcreator-kde.ui.py:9
 msgid "Source disc image (.iso) or CD:"
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:32
-#: .././gui/usbcreator-gtk.ui.h:14
+#: .././gui/usbcreator-gtk.ui.h:13 usbcreator-kde.ui.py:24
 msgid "Other..."
 msgstr ""
 
@@ -272,7 +279,7 @@
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:42
-#: .././gui/usbcreator-gtk.ui.h:17
+#: .././gui/usbcreator-gtk.ui.h:16 usbcreator-kde.ui.py:45
 msgid "When starting up from this disk, documents and settings will be:"
 msgstr ""
 
@@ -281,16 +288,16 @@
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:46
-#: .././gui/usbcreator-gtk.ui.h:19
+#: .././gui/usbcreator-gtk.ui.h:18 usbcreator-kde.ui.py:51
 msgid "How much:"
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:52
-#: .././gui/usbcreator-gtk.ui.h:20
+#: .././gui/usbcreator-gtk.ui.h:19 usbcreator-kde.ui.py:57
 msgid "Discarded on shutdown, unless you save them elsewhere"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/main_dialog.py:56
+#: .././usbcreator/frontends/winui/main_dialog.py:56 usbcreator-kde.ui.py:63
 msgid "Quit"
 msgstr "Шығу"
 
@@ -302,24 +309,25 @@
 msgid "&Cancel"
 msgstr "Бас &тарту"
 
-#: .././usbcreator/frontends/winui/frontend.py:76
+#: .././usbcreator/frontends/winui/frontend.py:74
 msgid "Installation complete"
 msgstr "Орнатылым аяқталды"
 
-#: .././usbcreator/frontends/winui/frontend.py:82
+#: .././usbcreator/frontends/winui/frontend.py:80
 msgid "Installation failed"
 msgstr "Орнатылым сәтсіз аяқталды"
 
-#: .././usbcreator/frontends/winui/frontend.py:183
+#: .././usbcreator/frontends/winui/frontend.py:179
 msgid "All"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/frontend.py:193
-#: .././gui/usbcreator-gtk.ui.h:11
+#: .././usbcreator/frontends/winui/frontend.py:189
+#: .././gui/usbcreator-gtk.ui.h:10 usbcreator-kde.ui.py:3
+#: usbcreator-kde.ui.py:60
 msgid "Make Startup Disk"
 msgstr ""
 
-#: .././usbcreator/install.py:140
+#: .././usbcreator/install.py:133
 #, python-format
 msgid "The extension \"%s\" is not supported."
 msgstr "\"%s\" кеңейтуге қолдау көрсетілмейді."
@@ -329,14 +337,14 @@
 msgid "Missing matching \"%s\" for source image %s."
 msgstr ""
 
-#: .././usbcreator/install.py:161
+#: .././usbcreator/install.py:148
 #, python-format
 msgid ""
 "An uncaught exception was raised:\n"
 "%s"
 msgstr ""
 
-#: .././usbcreator/install.py:177
+#: .././usbcreator/install.py:164
 #, python-format
 msgid ""
 "Insufficient free space to write the image:\n"
@@ -345,48 +353,48 @@
 "(%d MB) > %s (%d MB)"
 msgstr ""
 
-#: .././usbcreator/install.py:230
+#: .././usbcreator/install.py:217
 msgid "Installing the bootloader..."
 msgstr "Жүктегіш орнатылуда..."
 
-#: .././usbcreator/install.py:231
+#: .././usbcreator/install.py:218
 msgid "Failed to install the bootloader."
 msgstr "Жүктегішті орнату сәтсіз аяқталды."
 
-#: .././usbcreator/install.py:261
+#: .././usbcreator/install.py:248
 msgid "Modifying configuration..."
 msgstr "Баптаулар қалыпқа келтірілуде..."
 
 #. Failure here probably means the source was not really an Ubuntu
 #. image and did not have the files we wanted to move, see
 #. <https://bugs.launchpad.net/launchpad-code/+bug/513432>
-#: .././usbcreator/install.py:272
+#: .././usbcreator/install.py:259
 #, python-format
 msgid ""
 "Could not move syslinux files in \"%s\": %s. Maybe \"%s\" is not an Ubuntu "
 "image?"
 msgstr ""
 
-#: .././usbcreator/install.py:343
+#: .././usbcreator/install.py:330
 msgid "Creating a persistence file..."
 msgstr ""
 
-#: .././usbcreator/install.py:346
+#: .././usbcreator/install.py:333
 msgid "Creating an ext2 filesystem in the persistence file..."
 msgstr ""
 
-#: .././usbcreator/install.py:358
+#: .././usbcreator/install.py:345
 msgid "Finishing..."
 msgstr "Аяқтау..."
 
 #. TODO evand 2009-09-02: Disabled until we can find a cross-platform
 #. way of determining dd progress.
 #. self.initialize_progress_thread()
-#: .././usbcreator/install.py:381
+#: .././usbcreator/install.py:368
 msgid "Writing disk image..."
 msgstr "Дисктің образы жазылуда..."
 
-#: .././usbcreator/install.py:382
+#: .././usbcreator/install.py:369
 #, python-format
 msgid "Could not write the disk image (%s) to the device (%s)."
 msgstr ""
@@ -414,23 +422,23 @@
 #. Clear.
 #. Some of the code in this function was copied from Ubiquity's
 #. scripts/install.py
-#: .././usbcreator/install.py:448 .././usbcreator/install.py:561
+#: .././usbcreator/install.py:410 .././usbcreator/install.py:523
 msgid "Removing files..."
 msgstr "Файлдар жойылуда..."
 
-#: .././usbcreator/install.py:479 .././usbcreator/install.py:584
+#: .././usbcreator/install.py:441 .././usbcreator/install.py:546
 msgid "Copying files..."
 msgstr "Файлдар көшірілуде..."
 
-#: .././usbcreator/install.py:508
+#: .././usbcreator/install.py:470
 msgid "md5 checksums do not match."
 msgstr "md5 бақылау сомасы сәйкес келмей жатыр."
 
-#: .././usbcreator/install.py:537
+#: .././usbcreator/install.py:499
 msgid "Installing the EFI bootloader..."
 msgstr "EFI жүктегіші орнатылуда..."
 
-#: .././usbcreator/install.py:538
+#: .././usbcreator/install.py:500
 msgid "Failed to install the EFI bootloader."
 msgstr "EFI жүктегішін орнату сәтсіз аяқталды."
 
@@ -439,16 +447,16 @@
 #. user the option of selecting the re-inserted disk
 #. from a drop down list and continuing.
 #. TODO evand 2009-07-23: Fail more gracefully.
-#: .././usbcreator/install.py:656
+#: .././usbcreator/install.py:618
 #, python-format
 msgid "Could not read from %s"
 msgstr ""
 
-#: .././usbcreator/install.py:681
+#: .././usbcreator/install.py:643
 msgid "Checksums do not match.  Retry?"
 msgstr "Бақылау сома сәйкес келмей жатыр. Қайталау керек пе?"
 
-#: .././usbcreator/install.py:685
+#: .././usbcreator/install.py:647
 msgid "Checksums do not match."
 msgstr "Бақылау сома сәйкес келмей жатыр."
 
@@ -456,58 +464,57 @@
 msgid "Legal Notice"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:2
+#: .././gui/usbcreator-gtk.ui.h:1
 msgid "Installation Failed"
 msgstr "Орнатылым сәтсіз аяқталды"
 
-#: .././gui/usbcreator-gtk.ui.h:3
+#: .././gui/usbcreator-gtk.ui.h:2
 msgid ""
 "The installation failed.  Please see ~/.cache/usb-creator.log for more "
 "details.\n"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:5
+#: .././gui/usbcreator-gtk.ui.h:4
 msgid "Installation Complete"
 msgstr "Орнатылым аяқталды"
 
-#: .././gui/usbcreator-gtk.ui.h:6
+#: .././gui/usbcreator-gtk.ui.h:5
 msgid "Test Disk"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:7
+#: .././gui/usbcreator-gtk.ui.h:6
 msgid ""
 "Installation is complete.  You may now run Ubuntu on other computers by "
 "booting them with this drive inserted."
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:15
+#: .././gui/usbcreator-gtk.ui.h:14 usbcreator-kde.ui.py:27
 msgid "Disk to use:"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:18
+#: .././gui/usbcreator-gtk.ui.h:17 usbcreator-kde.ui.py:48
 msgid "Stored in reserved extra space"
 msgstr ""
 
-#: .././main.py:37
+#: .././main.py:38
 msgid "Please run this program as an administrator to continue."
 msgstr "Жалғастыру үшін, бұл бағдарламаны әкімшілік құқықтармен ашыңыз."
 
-#: .././main.py:38
+#: .././main.py:39
 msgid "Administrator privileges required"
 msgstr "Әкімшілік құқықтар қажет"
 
-#: .././main.py:55
+#: .././main.py:56
 #, python-format
 msgid ""
 "An unhandled exception occurred:\n"
 "%s"
 msgstr ""
 
-#: .././main.py:56
+#: .././main.py:57
 msgid "Error"
 msgstr "Қате"
 
-#: .././usbcreator/frontends/kde/frontend.py:204
-#: usbcreator/frontends/kde/frontend.py:204
+#: usbcreator/frontends/kde/frontend.py:178
 msgid "Cancel"
 msgstr "Бас тарту"
diff -Nru language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/whois.po language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/whois.po
--- language-pack-kk-base-14.04+20150219/data/kk/LC_MESSAGES/whois.po	2015-02-19 15:29:14.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/data/kk/LC_MESSAGES/whois.po	2015-08-14 07:55:46.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-02-19 11:42+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-08-04 06:47+0000\n"
+"X-Generator: Launchpad (build 17656)\n"
 
 #: ../whois.c:218
 #, c-format
@@ -195,17 +195,17 @@
 msgid "Illegal salt character '%c'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:316 ../mkpasswd.c:332
+#: ../mkpasswd.c:318 ../mkpasswd.c:334
 #, c-format
 msgid "Password: "
 msgstr "Құпия сөз: "
 
-#: ../mkpasswd.c:350
+#: ../mkpasswd.c:352
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr ""
 
-#: ../mkpasswd.c:439
+#: ../mkpasswd.c:441
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -213,7 +213,7 @@
 "\n"
 msgstr ""
 
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:444
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
@@ -233,7 +233,7 @@
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../mkpasswd.c:472
+#: ../mkpasswd.c:474
 #, c-format
 msgid "Available methods:\n"
 msgstr "Мүмкін әдістер:\n"
diff -Nru language-pack-kk-base-14.04+20150219/debian/changelog language-pack-kk-base-14.04+20150804/debian/changelog
--- language-pack-kk-base-14.04+20150219/debian/changelog	2015-02-19 15:29:11.000000000 +0000
+++ language-pack-kk-base-14.04+20150804/debian/changelog	2015-08-14 07:55:43.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-kk-base (1:14.04+20150219) trusty-proposed; urgency=low
+language-pack-kk-base (1:14.04+20150804) trusty-proposed; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Thu, 19 Feb 2015 15:29:11 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Fri, 14 Aug 2015 07:55:43 +0000