diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/apparmorapplet.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/apparmorapplet.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/apparmorapplet.po 2012-02-23 07:24:34.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/apparmorapplet.po 2012-03-23 07:46:31.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: 2012-02-21 23:36+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:36+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/debconf.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/debconf.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/debconf.po 2012-02-23 07:24:31.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/debconf.po 2012-03-23 07:46:28.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: debconf\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-10 22:59+0000\n" +"POT-Creation-Date: 2012-03-15 13:21+0000\n" "PO-Revision-Date: 2009-04-26 09:12+0000\n" "Last-Translator: Huxain \n" "Language-Team: Divehi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 17:36+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:24+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../Debconf/AutoSelect.pm:76 #, perl-format @@ -101,17 +101,17 @@ msgid "Help" msgstr "އެހީ" -#: ../Debconf/Element/Noninteractive/Error.pm:39 +#: ../Debconf/Element/Noninteractive/Error.pm:40 msgid "" -"Debconf was not configured to display this error message, so it mailed it to " -"you." +"Debconf is not confident this error message was displayed, so it mailed it " +"to you." msgstr "" -#: ../Debconf/Element/Noninteractive/Error.pm:63 +#: ../Debconf/Element/Noninteractive/Error.pm:67 msgid "Debconf" msgstr "" -#: ../Debconf/Element/Noninteractive/Error.pm:86 +#: ../Debconf/Element/Noninteractive/Error.pm:90 #, perl-format msgid "Debconf, running at %s" msgstr "" @@ -141,32 +141,32 @@ msgid "Configuring %s" msgstr "" -#: ../Debconf/FrontEnd/Dialog.pm:52 +#: ../Debconf/FrontEnd/Dialog.pm:53 msgid "TERM is not set, so the dialog frontend is not usable." msgstr "" -#: ../Debconf/FrontEnd/Dialog.pm:55 +#: ../Debconf/FrontEnd/Dialog.pm:56 msgid "Dialog frontend is incompatible with emacs shell buffers" msgstr "" -#: ../Debconf/FrontEnd/Dialog.pm:58 +#: ../Debconf/FrontEnd/Dialog.pm:59 msgid "" "Dialog frontend will not work on a dumb terminal, an emacs shell buffer, or " "without a controlling terminal." msgstr "" -#: ../Debconf/FrontEnd/Dialog.pm:104 +#: ../Debconf/FrontEnd/Dialog.pm:105 msgid "" "No usable dialog-like program is installed, so the dialog based frontend " "cannot be used." msgstr "" -#: ../Debconf/FrontEnd/Dialog.pm:111 +#: ../Debconf/FrontEnd/Dialog.pm:112 msgid "" "Dialog frontend requires a screen at least 13 lines tall and 31 columns wide." msgstr "" -#: ../Debconf/FrontEnd/Dialog.pm:295 +#: ../Debconf/FrontEnd/Dialog.pm:296 msgid "Package configuration" msgstr "" @@ -246,50 +246,50 @@ msgid "Template #%s in %s does not contain a 'Template:' line\n" msgstr "" -#: ../dpkg-preconfigure:125 +#: ../dpkg-preconfigure:126 #, perl-format msgid "must specify some debs to preconfigure" msgstr "" -#: ../dpkg-preconfigure:130 +#: ../dpkg-preconfigure:131 msgid "delaying package configuration, since apt-utils is not installed" msgstr "" -#: ../dpkg-preconfigure:137 +#: ../dpkg-preconfigure:138 #, perl-format msgid "unable to re-open stdin: %s" msgstr "" -#: ../dpkg-preconfigure:168 ../dpkg-preconfigure:180 +#: ../dpkg-preconfigure:169 ../dpkg-preconfigure:181 #, perl-format msgid "apt-extracttemplates failed: %s" msgstr "" -#: ../dpkg-preconfigure:172 ../dpkg-preconfigure:184 +#: ../dpkg-preconfigure:173 ../dpkg-preconfigure:185 #, perl-format msgid "Extracting templates from packages: %d%%" msgstr "" -#: ../dpkg-preconfigure:194 +#: ../dpkg-preconfigure:195 msgid "Preconfiguring packages ...\n" msgstr "" -#: ../dpkg-preconfigure:206 +#: ../dpkg-preconfigure:207 #, perl-format msgid "template parse error: %s" msgstr "" -#: ../dpkg-preconfigure:220 +#: ../dpkg-preconfigure:221 #, perl-format msgid "debconf: can't chmod: %s" msgstr "" -#: ../dpkg-preconfigure:231 +#: ../dpkg-preconfigure:232 #, perl-format msgid "%s failed to preconfigure, with exit status %s" msgstr "" -#: ../dpkg-reconfigure:107 +#: ../dpkg-reconfigure:105 msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -a, --all\t\t\tReconfigure all packages.\n" @@ -299,26 +299,26 @@ " --no-reload\t\tDo not reload templates. (Use with caution.)" msgstr "" -#: ../dpkg-reconfigure:121 +#: ../dpkg-reconfigure:119 #, perl-format msgid "%s must be run as root" msgstr "" -#: ../dpkg-reconfigure:154 +#: ../dpkg-reconfigure:152 msgid "please specify a package to reconfigure" msgstr "" -#: ../dpkg-reconfigure:175 +#: ../dpkg-reconfigure:177 #, perl-format msgid "%s is not installed" msgstr "" -#: ../dpkg-reconfigure:179 +#: ../dpkg-reconfigure:181 #, perl-format msgid "%s is broken or not fully installed" msgstr "" -#: ../dpkg-reconfigure:258 +#: ../dpkg-reconfigure:294 #, perl-format msgid "Cannot read status file: %s" msgstr "" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/desktop_kcm-gtk.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/desktop_kcm-gtk.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/desktop_kcm-gtk.po 2012-02-23 07:24:35.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/desktop_kcm-gtk.po 2012-03-23 07:46:32.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: 2012-02-22 01:16+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: kcmgtk.desktop:2 msgctxt "Name" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/example-content.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/example-content.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/example-content.po 2012-02-23 07:24:34.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/example-content.po 2012-03-23 07:46:30.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: 2012-02-21 22:32+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:02+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../data/examples.desktop.in.h:1 msgid "Examples" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/human-theme.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/human-theme.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/human-theme.po 2012-02-23 07:24:34.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/human-theme.po 2012-03-23 07:46:31.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: 2012-02-21 22:39+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../index.theme.in.h:1 msgid "Ubuntu default theme" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/ibus-pinyin.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/ibus-pinyin.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/ibus-pinyin.po 2012-02-23 07:24:35.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/ibus-pinyin.po 2012-03-23 07:46:32.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: 2012-02-22 00:52+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: engine/pydict.py:358 setup/pydict.py:358 msgid "MSPY" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/indent.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/indent.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/indent.po 2012-02-23 07:24:32.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/indent.po 2012-03-23 07:46:29.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: 2012-02-21 18:24+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:57+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/args.c:611 msgid "" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/jockey.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/jockey.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/jockey.po 2012-02-23 07:24:35.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/jockey.po 2012-03-23 07:46:32.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: jockey\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-12-08 12:01+0000\n" +"POT-Creation-Date: 2012-03-05 05:52+0000\n" "PO-Revision-Date: 2009-06-06 12:53+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Divehi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-22 00:12+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:04+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../text/jockey-text.py:72 msgid "Please enter 'y' or 'n' and press Enter" @@ -51,9 +51,29 @@ "ބޭނުންކުރުމަށް ބޭނުންވެދާނެއެވެ އަދި ހަމައެޔާއެކު 2D އެސެލަރޭސަން އާ " "ކާރޑުތަކަށްވެސް ފޯރުކޮށްދޭނެއެވެ" -#: ../data/handlers/broadcom_wl.py:20 -msgid "Broadcom STA wireless driver" -msgstr "Broadcom STA wireless ޑުރައިވަރު" +#: ../examples/handlers/nvidia.py:26 ../data/handlers/nvidia.py:28 +msgid "NVIDIA accelerated graphics driver" +msgstr "NVIDIA ގުރެފިކުސް ޑުރައިވަރ އަވަސްކޮށްދެއެވެ" + +#: ../examples/handlers/nvidia.py:27 +msgid "3D-accelerated proprietary graphics driver for NVIDIA cards." +msgstr "" +"NVIDIA ކާޑުތަކަށް ހުންނަ 3D-accelerated ޕުރޮޕުރިއެޓަރީ ގުރެފިކުސް " +"ޑުރައިވަރ ." + +#: ../examples/handlers/nvidia.py:29 +msgid "" +"This driver is required to fully utilise the 3D potential of NVIDIA graphics " +"cards, as well as provide 2D acceleration of newer cards.\n" +"\n" +"If you wish to enable desktop effects, this driver is required.\n" +"\n" +"If this driver is not enabled, you will not be able to enable desktop " +"effects and will not be able to run software that requires 3D acceleration, " +"such as some games." +msgstr "" +"3D-\n" +"NVIDIA" #: ../examples/handlers/madwifi.py:22 ../data/handlers/madwifi.py:22 msgid "Alternate Atheros \"madwifi\" driver" @@ -99,22 +119,6 @@ "graphics cards, as well as provide 2D acceleration of newer cards." msgstr "" -#: ../examples/handlers/sl_modem.py:15 ../data/handlers/sl_modem.py:15 -msgid "Software modem" -msgstr "ސޮފްޓުވެއަރގެ މޮޑެމް" - -#: ../examples/handlers/sl_modem.py:17 ../data/handlers/sl_modem.py:17 -msgid "" -"This driver enables the usage of many software modems, as commonly found in " -"laptops.\n" -"\n" -"If this driver is not enabled, you will not be able to use your modem." -msgstr "" -"މި ޑުރައިވަރ ބައިވަރު ސޮފްޓުވެއަރ މޮޑެމްސް ބޭނުންކުރުން އެނާބަލް ކުރާނީ " -"އާންމުކޮށް ލެޕްޓޮޕުން ފެންނަ ގޮތަށެވެ\n" -"މި ޑުރައިވަރ އެނޭބަލް ނުވެއްޖެނަމަ، ތިޔަފަރާތުގެ މޮޑެމް ބޭނުމެއް " -"ނުކުރެވޭނެއެވެ." - #: ../examples/handlers/vmware-client.py:17 #: ../data/handlers/vmware-client.py:17 msgid "VMWare Client Tools" @@ -158,10 +162,6 @@ msgid "Use a different target kernel version than the currently running one." msgstr "" -#: ../data/handlers/dvb_usb_firmware.py:21 -msgid "Firmware for DVB cards" -msgstr "" - #: ../kde/autostart/jockey-kde.desktop.in.h:1 #: ../gtk/autostart/jockey-gtk.desktop.in.h:1 msgid "Check for new hardware drivers" @@ -173,6 +173,22 @@ msgstr "" "ސިސްޓަމްއަށް އާ ހާރޑުވެއަރ ޑުރައިވަރތަށް ލިބޭގޮތްވުމުން އެނގޭގޮތް ހަދާށެވެ. ." +#: ../examples/handlers/sl_modem.py:15 ../data/handlers/sl_modem.py:15 +msgid "Software modem" +msgstr "ސޮފްޓުވެއަރގެ މޮޑެމް" + +#: ../examples/handlers/sl_modem.py:17 ../data/handlers/sl_modem.py:17 +msgid "" +"This driver enables the usage of many software modems, as commonly found in " +"laptops.\n" +"\n" +"If this driver is not enabled, you will not be able to use your modem." +msgstr "" +"މި ޑުރައިވަރ ބައިވަރު ސޮފްޓުވެއަރ މޮޑެމްސް ބޭނުންކުރުން އެނާބަލް ކުރާނީ " +"އާންމުކޮށް ލެޕްޓޮޕުން ފެންނަ ގޮތަށެވެ\n" +"މި ޑުރައިވަރ އެނޭބަލް ނުވެއްޖެނަމަ، ތިޔަފަރާތުގެ މޮޑެމް ބޭނުމެއް " +"ނުކުރެވޭނެއެވެ." + #: ../kde/jockey-kde.desktop.in.h:1 ../jockey/ui.py:206 ../jockey/ui.py:582 #: ../jockey/ui.py:590 ../jockey/ui.py:598 ../jockey/ui.py:802 #: ../gtk/jockey-gtk.desktop.in.h:1 @@ -184,11 +200,14 @@ msgstr "" "ތިންވަނަ-ޕާރޓީ އާއި އަދި ޕުރޮޕެރިއެޓަރީ ޑުރައިވަރތައް ކޮންފިގަރކުރާށެވެ" +#: ../data/handlers/dvb_usb_firmware.py:21 +msgid "Firmware for DVB cards" +msgstr "" + #: ../jockey/ui.py:121 msgid "" -"Cannot connect to D-BUS,\"+ \" please use the --" -"no-dbus option as root to\"+ \" use jockey " -"without it." +"Cannot connect to D-BUS, please use the --no-dbus option as root to use " +"jockey without it." msgstr "" #: ../jockey/ui.py:132 ../jockey/ui.py:145 @@ -566,10 +585,6 @@ msgid "NVIDIA accelerated graphics driver (post-release updates)" msgstr "" -#: ../data/handlers/nvidia.py:28 ../examples/handlers/nvidia.py:26 -msgid "NVIDIA accelerated graphics driver" -msgstr "NVIDIA ގުރެފިކުސް ޑުރައިވަރ އަވަސްކޮށްދެއެވެ" - #: ../data/handlers/nvidia.py:34 msgid "" "3D-accelerated proprietary graphics driver for NVIDIA cards. Required if you " @@ -623,22 +638,6 @@ msgid "To install or remove device drivers, you need to authenticate." msgstr "" -#: ../examples/handlers/nvidia.py:27 -msgid "3D-accelerated proprietary graphics driver for NVIDIA cards." -msgstr "" -"NVIDIA ކާޑުތަކަށް ހުންނަ 3D-accelerated ޕުރޮޕުރިއެޓަރީ ގުރެފިކުސް " -"ޑުރައިވަރ ." - -#: ../examples/handlers/nvidia.py:29 -msgid "" -"This driver is required to fully utilise the 3D potential of NVIDIA graphics " -"cards, as well as provide 2D acceleration of newer cards.\n" -"\n" -"If you wish to enable desktop effects, this driver is required.\n" -"\n" -"If this driver is not enabled, you will not be able to enable desktop " -"effects and will not be able to run software that requires 3D acceleration, " -"such as some games." -msgstr "" -"3D-\n" -"NVIDIA" +#: ../data/handlers/broadcom_wl.py:20 +msgid "Broadcom STA wireless driver" +msgstr "Broadcom STA wireless ޑުރައިވަރު" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/language-selector.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/language-selector.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/language-selector.po 2012-02-23 07:24:33.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/language-selector.po 2012-03-23 07:46:30.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: language-selector\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 06:50+0000\n" +"POT-Creation-Date: 2012-03-16 10:31+0000\n" "PO-Revision-Date: 2010-04-27 16:49+0000\n" "Last-Translator: Arne Goetje \n" "Language-Team: Divehi \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: 2012-02-21 21:54+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:42+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: dv\n" #. Hack for Chinese langpack split @@ -155,16 +155,18 @@ msgid "Details" msgstr "ތަފްޞީލްތައް" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:935 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:939 #, python-format -msgid "Failed to apply the '%s' format choice:" +msgid "" +"Failed to apply the '%s' format\n" +"choice. The examples may show up if you\n" +"close and re-open Language Support." msgstr "" #: ../LanguageSelector/qt/QtLanguageSelector.py:70 -#: ../LanguageSelector/qt/QtLanguageSelector.py:329 msgid "" "It is impossible to install or remove any software. Please use the package " -"manager \"Adept\" or run \"sudo apt-get install -f\" in a terminal to fix " +"manager \"Muon\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" @@ -243,6 +245,13 @@ msgid "Language Set" msgstr "" +#: ../LanguageSelector/qt/QtLanguageSelector.py:329 +msgid "" +"It is impossible to install or remove any software. Please use the package " +"manager \"Adept\" or run \"sudo apt-get install -f\" in a terminal to fix " +"this issue at first." +msgstr "" + #: ../LanguageSelector/qt/QtLanguageSelector.py:354 #, python-format msgid "" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/launchpad-integration.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/launchpad-integration.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/launchpad-integration.po 2012-02-23 07:24:34.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/launchpad-integration.po 2012-03-23 07:46:30.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: 2012-02-21 22:03+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: lib/launchpad-integration.c:71 msgid "The Launchpad helper application failed" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/Linux-PAM.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/Linux-PAM.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/Linux-PAM.po 2012-02-23 07:24:33.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/Linux-PAM.po 2012-03-23 07:46:30.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: 2012-02-21 18:43+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:09+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: libpam_misc/misc_conv.c:33 msgid "...Time is running out...\n" @@ -32,7 +32,7 @@ msgstr "" #: libpam/pam_get_authtok.c:39 modules/pam_exec/pam_exec.c:142 -#: modules/pam_unix/pam_unix_auth.c:157 modules/pam_userdb/pam_userdb.c:64 +#: modules/pam_unix/pam_unix_auth.c:157 modules/pam_userdb/pam_userdb.c:63 msgid "Password: " msgstr "" @@ -50,12 +50,12 @@ msgid "Sorry, passwords do not match." msgstr "" -#: libpam/pam_get_authtok.c:133 libpam/pam_get_authtok.c:209 +#: libpam/pam_get_authtok.c:132 libpam/pam_get_authtok.c:208 #, c-format msgid "Retype %s" msgstr "" -#: libpam/pam_get_authtok.c:153 libpam/pam_get_authtok.c:222 +#: libpam/pam_get_authtok.c:152 libpam/pam_get_authtok.c:221 msgid "Password change aborted." msgstr "" @@ -232,12 +232,12 @@ msgstr "" #: modules/pam_cracklib/pam_cracklib.c:555 -#: modules/pam_unix/pam_unix_passwd.c:476 +#: modules/pam_unix/pam_unix_passwd.c:475 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:555 -#: modules/pam_unix/pam_unix_passwd.c:476 +#: modules/pam_unix/pam_unix_passwd.c:475 msgid "Password unchanged" msgstr "" @@ -314,38 +314,38 @@ msgid "Too many logins for '%s'." msgstr "" -#: modules/pam_mail/pam_mail.c:297 +#: modules/pam_mail/pam_mail.c:318 msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 +#: modules/pam_mail/pam_mail.c:321 msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:303 +#: modules/pam_mail/pam_mail.c:324 msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:307 +#: modules/pam_mail/pam_mail.c:328 msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:314 +#: modules/pam_mail/pam_mail.c:335 #, c-format msgid "You have no mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:318 +#: modules/pam_mail/pam_mail.c:339 #, c-format msgid "You have new mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:322 +#: modules/pam_mail/pam_mail.c:343 #, c-format msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:327 +#: modules/pam_mail/pam_mail.c:348 #, c-format msgid "You have mail in folder %s." msgstr "" @@ -361,7 +361,7 @@ msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:218 -#: modules/pam_unix/pam_unix_passwd.c:497 +#: modules/pam_unix/pam_unix_passwd.c:496 msgid "Password has been already used. Choose another." msgstr "" @@ -395,17 +395,17 @@ msgid "No default type for role %s\n" msgstr "" -#: modules/pam_selinux/pam_selinux.c:667 +#: modules/pam_selinux/pam_selinux.c:677 #, c-format msgid "Unable to get valid context for %s" msgstr "" -#: modules/pam_selinux/pam_selinux.c:718 +#: modules/pam_selinux/pam_selinux.c:728 #, c-format msgid "Security Context %s Assigned" msgstr "" -#: modules/pam_selinux/pam_selinux.c:739 +#: modules/pam_selinux/pam_selinux.c:749 #, c-format msgid "Key Creation Context %s Assigned" msgstr "" @@ -502,7 +502,7 @@ " [-r] [--reset[=n]] [--quiet]\n" msgstr "" -#: modules/pam_timestamp/pam_timestamp.c:345 +#: modules/pam_timestamp/pam_timestamp.c:339 #, c-format msgid "Access granted (last access was %ld seconds ago)." msgstr "" @@ -536,27 +536,27 @@ msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:493 +#: modules/pam_unix/pam_unix_passwd.c:492 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:600 +#: modules/pam_unix/pam_unix_passwd.c:597 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:611 +#: modules/pam_unix/pam_unix_passwd.c:608 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:646 +#: modules/pam_unix/pam_unix_passwd.c:643 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:706 +#: modules/pam_unix/pam_unix_passwd.c:703 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:707 +#: modules/pam_unix/pam_unix_passwd.c:704 msgid "Retype new UNIX password: " msgstr "" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/newt.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/newt.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/newt.po 2012-02-23 07:24:33.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/newt.po 2012-03-23 07:46:30.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: 2012-02-21 18:42+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:09+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493 msgid "Ok" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/pidgin.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/pidgin.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/pidgin.po 2012-02-23 07:24:34.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/pidgin.po 2012-03-23 07:46:31.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: pidgin\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-01-05 16:39+0000\n" +"POT-Creation-Date: 2012-03-16 16:08+0000\n" "PO-Revision-Date: 2009-06-06 15:51+0000\n" "Last-Translator: Huxain \n" "Language-Team: Divehi \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: 2012-02-21 23:45+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:44+0000\n" +"X-Generator: Launchpad (build 14981)\n" #. Translators may want to transliterate the name. #. It is not to be translated. @@ -178,8 +178,8 @@ #: ../libpurple/protocols/mxit/login.c:690 #: ../libpurple/protocols/myspace/user.c:824 #: ../libpurple/protocols/myspace/user.c:885 -#: ../libpurple/protocols/oscar/oscar.c:5251 -#: ../libpurple/protocols/oscar/peer.c:1066 +#: ../libpurple/protocols/oscar/oscar.c:5237 +#: ../libpurple/protocols/oscar/peer.c:1075 #: ../libpurple/protocols/sametime/sametime.c:3472 #: ../libpurple/protocols/sametime/sametime.c:3558 #: ../libpurple/protocols/sametime/sametime.c:5457 @@ -209,12 +209,12 @@ #: ../pidgin/gtkaccount.c:1945 ../pidgin/gtkaccount.c:2480 #: ../pidgin/gtkblist.c:706 ../pidgin/gtkblist.c:3583 #: ../pidgin/gtkblist.c:7334 ../pidgin/gtkcertmgr.c:195 -#: ../pidgin/gtkdialogs.c:880 ../pidgin/gtkdialogs.c:1019 -#: ../pidgin/gtkdialogs.c:1111 ../pidgin/gtkdialogs.c:1131 -#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1177 -#: ../pidgin/gtkdialogs.c:1225 ../pidgin/gtkdialogs.c:1266 -#: ../pidgin/gtkdialogs.c:1322 ../pidgin/gtkdialogs.c:1361 -#: ../pidgin/gtkdialogs.c:1388 ../pidgin/gtkimhtmltoolbar.c:451 +#: ../pidgin/gtkdialogs.c:881 ../pidgin/gtkdialogs.c:1020 +#: ../pidgin/gtkdialogs.c:1112 ../pidgin/gtkdialogs.c:1132 +#: ../pidgin/gtkdialogs.c:1156 ../pidgin/gtkdialogs.c:1178 +#: ../pidgin/gtkdialogs.c:1226 ../pidgin/gtkdialogs.c:1267 +#: ../pidgin/gtkdialogs.c:1323 ../pidgin/gtkdialogs.c:1362 +#: ../pidgin/gtkdialogs.c:1389 ../pidgin/gtkimhtmltoolbar.c:451 #: ../pidgin/gtklog.c:324 ../pidgin/gtkplugin.c:308 ../pidgin/gtkpounce.c:1140 #: ../pidgin/gtkprivacy.c:497 ../pidgin/gtkprivacy.c:513 #: ../pidgin/gtkprivacy.c:538 ../pidgin/gtkprivacy.c:552 @@ -430,24 +430,24 @@ #: ../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:2432 -#: ../libpurple/protocols/msn/msn.c:2497 ../libpurple/protocols/msn/msn.c:2524 +#: ../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 -#: ../pidgin/plugins/disco/gtkdisco.c:552 +#: ../pidgin/plugins/disco/gtkdisco.c:554 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:131 #: ../pidgin/plugins/gevolution/assoc-buddy.c:122 msgid "Name" msgstr "ނަން" #: ../finch/gntblist.c:794 ../finch/gntblist.c:1735 -#: ../libpurple/protocols/gg/gg.c:1988 ../libpurple/protocols/msn/msn.c:2258 +#: ../libpurple/protocols/gg/gg.c:1988 ../libpurple/protocols/msn/msn.c:2237 #: ../libpurple/protocols/mxit/profile.c:173 #: ../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:1180 ../pidgin/gtkdialogs.c:1130 -#: ../pidgin/gtkdialogs.c:1154 ../pidgin/gtkdialogs.c:1176 +#: ../libpurple/protocols/zephyr/zephyr.c:1180 ../pidgin/gtkdialogs.c:1131 +#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1177 #: ../pidgin/gtkrequest.c:308 msgid "Alias" msgstr "" @@ -611,7 +611,7 @@ #: ../libpurple/protocols/jabber/jabber.c:2415 #: ../libpurple/protocols/jabber/jabber.c:2431 #: ../libpurple/protocols/jabber/jabber.c:2445 -#: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2435 +#: ../libpurple/protocols/msn/msn.c:2244 ../libpurple/protocols/msn/msn.c:2414 #: ../libpurple/protocols/silc/buddy.c:1550 #: ../libpurple/protocols/silc/ops.c:1019 #: ../libpurple/protocols/silc/ops.c:1202 @@ -637,7 +637,7 @@ #: ../libpurple/protocols/oscar/userinfo.c:508 #: ../libpurple/protocols/yahoo/libymsg.c:3874 #: ../libpurple/protocols/yahoo/yahoo_profile.c:709 ../pidgin/gtkblist.c:3832 -#: ../pidgin/gtkblist.c:4287 ../pidgin/gtkprefs.c:2692 +#: ../pidgin/gtkblist.c:4287 ../pidgin/gtkprefs.c:2709 msgid "Idle" msgstr "" @@ -693,7 +693,7 @@ #: ../libpurple/protocols/mxit/login.c:365 #: ../libpurple/protocols/myspace/user.c:823 #: ../libpurple/protocols/myspace/user.c:884 -#: ../libpurple/protocols/oscar/oscar.c:5250 +#: ../libpurple/protocols/oscar/oscar.c:5236 #: ../libpurple/protocols/silc/buddy.c:458 #: ../libpurple/protocols/silc/buddy.c:1198 #: ../libpurple/protocols/silc/chat.c:451 @@ -715,18 +715,18 @@ #: ../libpurple/protocols/yahoo/libymsg.c:4357 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:588 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkblist.c:3582 -#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:879 -#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1110 +#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:880 +#: ../pidgin/gtkdialogs.c:1019 ../pidgin/gtkdialogs.c:1111 #: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1621 #: ../pidgin/gtkutils.c:1641 msgid "OK" msgstr "އޯކޭ" -#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:874 +#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:875 msgid "New Instant Message" msgstr "އާ އިންސްޓެންޓް މެސެޖެއް" -#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:876 +#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:877 msgid "" "Please enter the username or alias of the person you would like to IM." msgstr "" @@ -747,7 +747,7 @@ msgid "Join" msgstr "ޖޮއިން" -#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1107 +#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1108 msgid "" "Please enter the username or alias of the person whose log you would like to " "view." @@ -816,7 +816,7 @@ #: ../libpurple/protocols/silc/util.c:560 #: ../libpurple/protocols/silc10/silc.c:704 #: ../libpurple/protocols/silc10/util.c:553 -#: ../pidgin/plugins/disco/gtkdisco.c:480 +#: ../pidgin/plugins/disco/gtkdisco.c:482 msgid "Chat" msgstr "ވާހަކަ ދައްކާ" @@ -1529,7 +1529,7 @@ #. 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:2813 +#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2830 msgid "Preferences" msgstr "" @@ -1715,12 +1715,12 @@ msgid "Based on keyboard use" msgstr "" -#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2697 +#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2714 msgid "From last sent message" msgstr "" #: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1349 ../pidgin/gtkprefs.c:1357 -#: ../pidgin/gtkprefs.c:2696 ../pidgin/gtkprefs.c:2732 +#: ../pidgin/gtkprefs.c:2713 ../pidgin/gtkprefs.c:2749 #: ../pidgin/plugins/win32/winprefs/winprefs.c:310 msgid "Never" msgstr "" @@ -1769,12 +1769,12 @@ msgid "Change status to" msgstr "" -#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2784 +#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2801 msgid "Conversations" msgstr "" #: ../finch/gntprefs.c:261 ../finch/plugins/gnthistory.c:155 -#: ../pidgin/gtkprefs.c:2208 ../pidgin/gtkprefs.c:2785 +#: ../pidgin/gtkprefs.c:2225 ../pidgin/gtkprefs.c:2802 msgid "Logging" msgstr "" @@ -1871,8 +1871,8 @@ #: ../finch/gntsound.c:739 ../finch/gntsound.c:825 ../pidgin/gtkpounce.c:178 #: ../pidgin/gtkpounce.c:189 ../pidgin/gtkpounce.c:318 #: ../pidgin/gtkpounce.c:695 ../pidgin/gtkpounce.c:957 -#: ../pidgin/gtkprefs.c:941 ../pidgin/gtkprefs.c:2334 -#: ../pidgin/gtkprefs.c:2432 ../pidgin/gtkprefs.c:2629 +#: ../pidgin/gtkprefs.c:941 ../pidgin/gtkprefs.c:2351 +#: ../pidgin/gtkprefs.c:2449 ../pidgin/gtkprefs.c:2646 msgid "(default)" msgstr "" @@ -1888,7 +1888,7 @@ msgid "Profiles" msgstr "" -#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2496 +#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2513 msgid "Automatic" msgstr "" @@ -1896,7 +1896,7 @@ msgid "Console Beep" msgstr "" -#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2500 +#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2517 msgid "Command" msgstr "" @@ -1920,7 +1920,7 @@ msgstr "" #. Sound options -#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2486 +#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2503 msgid "Sound Options" msgstr "" @@ -1929,18 +1929,18 @@ msgstr "" #: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1347 -#: ../pidgin/gtkprefs.c:1359 ../pidgin/gtkprefs.c:2531 +#: ../pidgin/gtkprefs.c:1359 ../pidgin/gtkprefs.c:2548 #: ../pidgin/plugins/timestamp_format.c:58 #: ../pidgin/plugins/timestamp_format.c:67 #: ../pidgin/plugins/win32/winprefs/winprefs.c:311 msgid "Always" msgstr "" -#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2529 +#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2546 msgid "Only when available" msgstr "" -#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2530 +#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2547 msgid "Only when not available" msgstr "" @@ -1949,12 +1949,12 @@ msgstr "" #. Sound events -#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2558 +#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2575 msgid "Sound Events" msgstr "" #: ../finch/gntsound.c:1043 ../pidgin/gtknotify.c:1609 -#: ../pidgin/gtkprefs.c:2612 +#: ../pidgin/gtkprefs.c:2629 msgid "Event" msgstr "" @@ -2030,18 +2030,18 @@ #: ../libpurple/protocols/novell/novell.c:2969 #: ../libpurple/protocols/novell/novell.c:2975 #: ../libpurple/protocols/novell/novell.c:2981 -#: ../libpurple/protocols/oscar/oscar.c:4794 -#: ../libpurple/protocols/oscar/oscar.c:4803 -#: ../libpurple/protocols/oscar/oscar.c:4811 -#: ../libpurple/protocols/oscar/oscar.c:4819 -#: ../libpurple/protocols/oscar/oscar.c:4827 -#: ../libpurple/protocols/oscar/oscar.c:4835 -#: ../libpurple/protocols/oscar/oscar.c:4844 -#: ../libpurple/protocols/oscar/oscar.c:4852 -#: ../libpurple/protocols/oscar/oscar.c:4859 +#: ../libpurple/protocols/oscar/oscar.c:4780 +#: ../libpurple/protocols/oscar/oscar.c:4789 +#: ../libpurple/protocols/oscar/oscar.c:4797 +#: ../libpurple/protocols/oscar/oscar.c:4805 +#: ../libpurple/protocols/oscar/oscar.c:4813 +#: ../libpurple/protocols/oscar/oscar.c:4821 +#: ../libpurple/protocols/oscar/oscar.c:4830 +#: ../libpurple/protocols/oscar/oscar.c:4838 +#: ../libpurple/protocols/oscar/oscar.c:4845 +#: ../libpurple/protocols/oscar/oscar.c:4857 +#: ../libpurple/protocols/oscar/oscar.c:4864 #: ../libpurple/protocols/oscar/oscar.c:4871 -#: ../libpurple/protocols/oscar/oscar.c:4878 -#: ../libpurple/protocols/oscar/oscar.c:4885 #: ../libpurple/protocols/sametime/sametime.c:3370 #: ../libpurple/protocols/sametime/sametime.c:3376 #: ../libpurple/protocols/sametime/sametime.c:3382 @@ -2107,7 +2107,7 @@ msgid "Certificates" msgstr "" -#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2789 +#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2806 msgid "Sounds" msgstr "" @@ -2286,7 +2286,7 @@ #: ../libpurple/protocols/jabber/jutil.c:659 #: ../libpurple/protocols/mxit/roster.c:53 #: ../libpurple/protocols/novell/novell.c:2856 -#: ../libpurple/protocols/oscar/oscar.c:4717 +#: ../libpurple/protocols/oscar/oscar.c:4703 #: ../libpurple/protocols/oscar/userinfo.c:279 #: ../libpurple/protocols/yahoo/libymsg.c:3876 ../libpurple/status.c:162 #: ../pidgin/gtkblist.c:3877 ../pidgin/gtkblist.c:4264 @@ -2429,10 +2429,10 @@ #: ../libpurple/account.c:2207 ../libpurple/protocols/gg/gg.c:1179 #: ../libpurple/protocols/jabber/buddy.c:778 #: ../libpurple/protocols/jabber/jutil.c:676 -#: ../libpurple/protocols/msn/oim.c:688 +#: ../libpurple/protocols/msn/oim.c:731 #: ../libpurple/protocols/mxit/profile.c:204 #: ../libpurple/protocols/novell/novell.c:2859 ../pidgin/gtkft.c:162 -#: ../pidgin/plugins/disco/gtkdisco.c:468 ../pidgin/plugins/vvconfig.c:145 +#: ../pidgin/plugins/disco/gtkdisco.c:470 ../pidgin/plugins/vvconfig.c:145 msgid "Unknown" msgstr "" @@ -3105,23 +3105,23 @@ "No codecs left. Your codec preferences in fs-codecs.conf are too strict." msgstr "" -#: ../libpurple/media/backend-fs2.c:887 +#: ../libpurple/media/backend-fs2.c:880 msgid "A non-recoverable Farsight2 error has occurred." msgstr "" -#: ../libpurple/media/backend-fs2.c:1115 +#: ../libpurple/media/backend-fs2.c:1108 msgid "Error with your microphone" msgstr "" -#: ../libpurple/media/backend-fs2.c:1118 +#: ../libpurple/media/backend-fs2.c:1111 msgid "Error with your webcam" msgstr "" -#: ../libpurple/media/backend-fs2.c:1125 +#: ../libpurple/media/backend-fs2.c:1118 msgid "Conference error" msgstr "" -#: ../libpurple/media/backend-fs2.c:1512 +#: ../libpurple/media/backend-fs2.c:1505 #, c-format msgid "Error creating session: %s" msgstr "" @@ -3210,23 +3210,23 @@ #: ../libpurple/protocols/mxit/actions.c:483 #: ../libpurple/protocols/oscar/authorization.c:99 #: ../libpurple/protocols/oscar/oscar.c:1224 -#: ../libpurple/protocols/oscar/oscar.c:4968 -#: ../libpurple/protocols/oscar/oscar.c:5025 -#: ../libpurple/protocols/oscar/oscar.c:5308 -#: ../libpurple/protocols/oscar/oscar.c:5365 ../libpurple/request.h:1498 +#: ../libpurple/protocols/oscar/oscar.c:4954 +#: ../libpurple/protocols/oscar/oscar.c:5011 +#: ../libpurple/protocols/oscar/oscar.c:5294 +#: ../libpurple/protocols/oscar/oscar.c:5351 ../libpurple/request.h:1498 #: ../libpurple/request.h:1508 ../libpurple/request.h:1521 msgid "_Cancel" msgstr "" -#: ../libpurple/plugins/autoaccept.c:208 ../libpurple/plugins/autoaccept.c:274 +#: ../libpurple/plugins/autoaccept.c:208 ../libpurple/plugins/autoaccept.c:278 msgid "Ask" msgstr "" -#: ../libpurple/plugins/autoaccept.c:209 ../libpurple/plugins/autoaccept.c:275 +#: ../libpurple/plugins/autoaccept.c:209 ../libpurple/plugins/autoaccept.c:279 msgid "Auto Accept" msgstr "" -#: ../libpurple/plugins/autoaccept.c:210 ../libpurple/plugins/autoaccept.c:276 +#: ../libpurple/plugins/autoaccept.c:210 ../libpurple/plugins/autoaccept.c:280 msgid "Auto Reject" msgstr "" @@ -3235,34 +3235,34 @@ msgstr "" #. XXX: Is there a better way than this? There really should be. -#: ../libpurple/plugins/autoaccept.c:266 +#: ../libpurple/plugins/autoaccept.c:270 msgid "" "Path to save the files in\n" "(Please provide the full path)" msgstr "" -#: ../libpurple/plugins/autoaccept.c:271 +#: ../libpurple/plugins/autoaccept.c:275 msgid "" "When a file-transfer request arrives from a user who is\n" "*not* on your buddy list:" msgstr "" -#: ../libpurple/plugins/autoaccept.c:280 +#: ../libpurple/plugins/autoaccept.c:284 msgid "" "Notify with a popup when an autoaccepted file transfer is complete\n" "(only when there's no conversation with the sender)" msgstr "" -#: ../libpurple/plugins/autoaccept.c:285 +#: ../libpurple/plugins/autoaccept.c:289 msgid "Create a new directory for each user" msgstr "" -#: ../libpurple/plugins/autoaccept.c:289 +#: ../libpurple/plugins/autoaccept.c:293 msgid "Escape the filenames" msgstr "" -#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2508 -#: ../libpurple/protocols/msn/msn.c:2538 +#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2487 +#: ../libpurple/protocols/msn/msn.c:2517 msgid "Notes" msgstr "" @@ -4218,7 +4218,7 @@ msgstr "" #. gender -#: ../libpurple/protocols/gg/gg.c:598 ../libpurple/protocols/msn/msn.c:2437 +#: ../libpurple/protocols/gg/gg.c:598 ../libpurple/protocols/msn/msn.c:2416 #: ../libpurple/protocols/mxit/actions.c:242 #: ../libpurple/protocols/mxit/login.c:349 #: ../libpurple/protocols/mxit/profile.c:184 @@ -4364,7 +4364,7 @@ #: ../libpurple/protocols/jabber/jutil.c:664 #: ../libpurple/protocols/mxit/roster.c:57 #: ../libpurple/protocols/oscar/oscar.c:159 -#: ../libpurple/protocols/oscar/oscar.c:4877 +#: ../libpurple/protocols/oscar/oscar.c:4863 #: ../libpurple/protocols/sametime/sametime.c:3381 msgid "Do Not Disturb" msgstr "" @@ -4383,7 +4383,7 @@ #: ../libpurple/protocols/silc10/buddy.c:1496 #: ../libpurple/protocols/yahoo/libymsg.c:4756 #: ../libpurple/protocols/yahoo/libymsg.c:4843 ../libpurple/status.c:166 -#: ../pidgin/gtkdocklet.c:554 ../pidgin/gtkprefs.c:2728 +#: ../pidgin/gtkdocklet.c:554 ../pidgin/gtkprefs.c:2745 #: ../pidgin/gtkstatusbox.c:1097 ../pidgin/plugins/themeedit-icon.c:64 msgid "Away" msgstr "" @@ -4564,26 +4564,26 @@ msgstr "" #: ../libpurple/protocols/gg/gg.c:2805 -#: ../libpurple/protocols/oscar/oscar.c:5773 +#: ../libpurple/protocols/oscar/oscar.c:5759 msgid "Don't use encryption" msgstr "" #: ../libpurple/protocols/gg/gg.c:2806 #: ../libpurple/protocols/jabber/libxmpp.c:277 -#: ../libpurple/protocols/oscar/oscar.c:5771 +#: ../libpurple/protocols/oscar/oscar.c:5757 msgid "Use encryption if available" msgstr "" #. TODO #: ../libpurple/protocols/gg/gg.c:2810 #: ../libpurple/protocols/jabber/libxmpp.c:276 -#: ../libpurple/protocols/oscar/oscar.c:5772 +#: ../libpurple/protocols/oscar/oscar.c:5758 msgid "Require encryption" msgstr "" #: ../libpurple/protocols/gg/gg.c:2813 #: ../libpurple/protocols/jabber/libxmpp.c:286 -#: ../libpurple/protocols/oscar/oscar.c:5797 +#: ../libpurple/protocols/oscar/oscar.c:5783 msgid "Connection security" msgstr "" @@ -4788,8 +4788,8 @@ #. set up account ID as user:server #: ../libpurple/protocols/irc/irc.c:1049 ../libpurple/protocols/irc/msgs.c:377 -#: ../libpurple/protocols/msn/msn.c:3046 -#: ../libpurple/protocols/oscar/oscar.c:5785 +#: ../libpurple/protocols/msn/msn.c:3025 +#: ../libpurple/protocols/oscar/oscar.c:5771 #: ../libpurple/protocols/sametime/sametime.c:5784 #: ../libpurple/protocols/silc/ops.c:1265 #: ../libpurple/protocols/silc/ops.c:1359 @@ -4800,8 +4800,8 @@ msgstr "" #. port to connect to -#: ../libpurple/protocols/irc/irc.c:1052 ../libpurple/protocols/msn/msn.c:3051 -#: ../libpurple/protocols/oscar/oscar.c:5788 +#: ../libpurple/protocols/irc/irc.c:1052 ../libpurple/protocols/msn/msn.c:3030 +#: ../libpurple/protocols/oscar/oscar.c:5774 #: ../libpurple/protocols/sametime/sametime.c:5793 #: ../libpurple/protocols/silc/silc.c:2197 #: ../libpurple/protocols/silc10/silc.c:1910 @@ -5539,7 +5539,7 @@ #: ../libpurple/protocols/jabber/buddy.c:365 #: ../libpurple/protocols/jabber/buddy.c:1163 -#: ../libpurple/protocols/msn/msn.c:2525 +#: ../libpurple/protocols/msn/msn.c:2504 #: ../libpurple/protocols/novell/novell.c:1497 #: ../libpurple/protocols/silc/ops.c:1027 #: ../libpurple/protocols/silc10/ops.c:1044 @@ -5555,7 +5555,7 @@ #. birthday (required) #: ../libpurple/protocols/jabber/buddy.c:367 #: ../libpurple/protocols/jabber/buddy.c:1053 -#: ../libpurple/protocols/msn/msn.c:2506 +#: ../libpurple/protocols/msn/msn.c:2485 #: ../libpurple/protocols/mxit/actions.c:236 #: ../libpurple/protocols/mxit/login.c:343 #: ../libpurple/protocols/mxit/profile.c:181 @@ -5566,7 +5566,7 @@ #: ../libpurple/protocols/jabber/buddy.c:368 #: ../libpurple/protocols/jabber/buddy.c:1167 #: ../libpurple/protocols/jabber/chat.c:911 ../pidgin/gtkblist.c:3889 -#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:569 +#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:571 msgid "Description" msgstr "" @@ -5997,7 +5997,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1466 #: ../libpurple/protocols/jabber/jabber.c:1477 #: ../pidgin/plugins/disco/gtkdisco.c:307 -#: ../pidgin/plugins/disco/gtkdisco.c:686 +#: ../pidgin/plugins/disco/gtkdisco.c:688 msgid "Register" msgstr "" @@ -6051,7 +6051,7 @@ #: ../libpurple/protocols/jabber/jabber.c:2701 #: ../libpurple/protocols/jabber/jabber.c:2744 #: ../libpurple/protocols/jabber/jabber.c:2782 -#: ../libpurple/protocols/oscar/oscar.c:4715 +#: ../libpurple/protocols/oscar/oscar.c:4701 #: ../libpurple/protocols/oscar/userinfo.c:272 msgid "Not Authorized" msgstr "" @@ -6132,12 +6132,12 @@ #: ../libpurple/protocols/jabber/jabber.c:2383 #: ../libpurple/protocols/mxit/roster.c:86 -#: ../libpurple/protocols/oscar/oscar.c:4896 +#: ../libpurple/protocols/oscar/oscar.c:4882 msgid "Mood Name" msgstr "" #: ../libpurple/protocols/jabber/jabber.c:2384 -#: ../libpurple/protocols/oscar/oscar.c:4897 +#: ../libpurple/protocols/oscar/oscar.c:4883 msgid "Mood Comment" msgstr "" @@ -6211,7 +6211,7 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:2570 -#: ../libpurple/protocols/oscar/oscar.c:5516 +#: ../libpurple/protocols/oscar/oscar.c:5502 #: ../libpurple/protocols/silc/silc.c:1333 #: ../libpurple/protocols/silc10/silc.c:1029 #: ../libpurple/protocols/yahoo/libymsg.c:4211 @@ -6221,7 +6221,7 @@ #. if (js->protocol_options & CHANGE_PASSWORD) { #: ../libpurple/protocols/jabber/jabber.c:2575 -#: ../libpurple/protocols/oscar/oscar.c:5527 +#: ../libpurple/protocols/oscar/oscar.c:5513 #: ../libpurple/protocols/silc/silc.c:1329 #: ../libpurple/protocols/silc10/silc.c:1025 msgid "Change Password..." @@ -7273,20 +7273,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:1046 -#: ../libpurple/protocols/msn/contact.c:1142 +#: ../libpurple/protocols/msn/contact.c:1067 +#: ../libpurple/protocols/msn/contact.c:1163 #: ../libpurple/protocols/msn/userlist.c:522 #, c-format msgid "Unable to add \"%s\"." msgstr "" -#: ../libpurple/protocols/msn/contact.c:1047 -#: ../libpurple/protocols/msn/contact.c:1143 +#: ../libpurple/protocols/msn/contact.c:1068 +#: ../libpurple/protocols/msn/contact.c:1164 msgid "Buddy Add error" msgstr "" -#: ../libpurple/protocols/msn/contact.c:1048 -#: ../libpurple/protocols/msn/contact.c:1144 +#: ../libpurple/protocols/msn/contact.c:1069 +#: ../libpurple/protocols/msn/contact.c:1165 msgid "The username specified does not exist." msgstr "" @@ -7825,31 +7825,31 @@ "SSL support is needed for MSN. Please install a supported SSL library." msgstr "" -#: ../libpurple/protocols/msn/msn.c:1803 +#: ../libpurple/protocols/msn/msn.c:1782 #, 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:1805 +#: ../libpurple/protocols/msn/msn.c:1784 #: ../libpurple/protocols/oscar/oscar.c:3709 #: ../libpurple/protocols/oscar/oscar.c:4180 #: ../libpurple/protocols/oscar/oscar.c:4195 msgid "Unable to Add" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2365 ../libpurple/protocols/msn/msn.c:2707 +#: ../libpurple/protocols/msn/msn.c:2344 ../libpurple/protocols/msn/msn.c:2686 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1199 msgid "Error retrieving profile" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2429 ../pidgin/plugins/convcolors.c:387 +#: ../libpurple/protocols/msn/msn.c:2408 ../pidgin/plugins/convcolors.c:387 msgid "General" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2436 +#: ../libpurple/protocols/msn/msn.c:2415 #: ../libpurple/protocols/mxit/profile.c:296 #: ../libpurple/protocols/myspace/user.c:127 #: ../libpurple/protocols/oscar/userinfo.c:454 @@ -7857,12 +7857,12 @@ msgid "Age" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2438 +#: ../libpurple/protocols/msn/msn.c:2417 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1095 msgid "Occupation" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2439 +#: ../libpurple/protocols/msn/msn.c:2418 #: ../libpurple/protocols/myspace/user.c:135 #: ../libpurple/protocols/novell/novell.c:1491 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1075 @@ -7871,194 +7871,194 @@ msgid "Location" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2444 ../libpurple/protocols/msn/msn.c:2636 -#: ../libpurple/protocols/msn/msn.c:2642 ../libpurple/protocols/msn/msn.c:2649 +#: ../libpurple/protocols/msn/msn.c:2423 ../libpurple/protocols/msn/msn.c:2615 +#: ../libpurple/protocols/msn/msn.c:2621 ../libpurple/protocols/msn/msn.c:2628 msgid "Hobbies and Interests" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2450 ../libpurple/protocols/msn/msn.c:2570 -#: ../libpurple/protocols/msn/msn.c:2576 ../libpurple/protocols/msn/msn.c:2583 -#: ../libpurple/protocols/msn/msn.c:2591 ../libpurple/protocols/msn/msn.c:2598 +#: ../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 msgid "A Little About Me" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2467 +#: ../libpurple/protocols/msn/msn.c:2446 msgid "Social" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2469 +#: ../libpurple/protocols/msn/msn.c:2448 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1085 msgid "Marital Status" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2470 +#: ../libpurple/protocols/msn/msn.c:2449 msgid "Interests" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2471 +#: ../libpurple/protocols/msn/msn.c:2450 msgid "Pets" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2472 +#: ../libpurple/protocols/msn/msn.c:2451 msgid "Hometown" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2473 +#: ../libpurple/protocols/msn/msn.c:2452 msgid "Places Lived" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2474 +#: ../libpurple/protocols/msn/msn.c:2453 msgid "Fashion" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2475 +#: ../libpurple/protocols/msn/msn.c:2454 msgid "Humor" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2476 +#: ../libpurple/protocols/msn/msn.c:2455 msgid "Music" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2477 ../libpurple/protocols/msn/msn.c:2658 -#: ../libpurple/protocols/msn/msn.c:2664 +#: ../libpurple/protocols/msn/msn.c:2456 ../libpurple/protocols/msn/msn.c:2637 +#: ../libpurple/protocols/msn/msn.c:2643 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1137 msgid "Favorite Quote" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2494 +#: ../libpurple/protocols/msn/msn.c:2473 msgid "Contact Info" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2495 +#: ../libpurple/protocols/msn/msn.c:2474 msgid "Personal" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2498 +#: ../libpurple/protocols/msn/msn.c:2477 msgid "Significant Other" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2499 +#: ../libpurple/protocols/msn/msn.c:2478 msgid "Home Phone" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2500 +#: ../libpurple/protocols/msn/msn.c:2479 msgid "Home Phone 2" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2501 +#: ../libpurple/protocols/msn/msn.c:2480 #: ../libpurple/protocols/oscar/userinfo.c:464 msgid "Home Address" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2502 +#: ../libpurple/protocols/msn/msn.c:2481 msgid "Personal Mobile" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2503 +#: ../libpurple/protocols/msn/msn.c:2482 msgid "Home Fax" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2504 +#: ../libpurple/protocols/msn/msn.c:2483 msgid "Personal Email" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2505 +#: ../libpurple/protocols/msn/msn.c:2484 msgid "Personal IM" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2507 +#: ../libpurple/protocols/msn/msn.c:2486 msgid "Anniversary" msgstr "" #. Business -#: ../libpurple/protocols/msn/msn.c:2523 +#: ../libpurple/protocols/msn/msn.c:2502 msgid "Work" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2526 +#: ../libpurple/protocols/msn/msn.c:2505 #: ../libpurple/protocols/oscar/userinfo.c:482 msgid "Company" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2527 +#: ../libpurple/protocols/msn/msn.c:2506 #: ../libpurple/protocols/novell/novell.c:1493 msgid "Department" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2528 +#: ../libpurple/protocols/msn/msn.c:2507 msgid "Profession" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2529 +#: ../libpurple/protocols/msn/msn.c:2508 msgid "Work Phone" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2530 +#: ../libpurple/protocols/msn/msn.c:2509 msgid "Work Phone 2" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2531 +#: ../libpurple/protocols/msn/msn.c:2510 #: ../libpurple/protocols/oscar/userinfo.c:472 msgid "Work Address" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2532 +#: ../libpurple/protocols/msn/msn.c:2511 msgid "Work Mobile" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2533 +#: ../libpurple/protocols/msn/msn.c:2512 msgid "Work Pager" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2534 +#: ../libpurple/protocols/msn/msn.c:2513 msgid "Work Fax" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2535 +#: ../libpurple/protocols/msn/msn.c:2514 msgid "Work Email" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2536 +#: ../libpurple/protocols/msn/msn.c:2515 msgid "Work IM" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2537 +#: ../libpurple/protocols/msn/msn.c:2516 msgid "Start Date" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2607 ../libpurple/protocols/msn/msn.c:2613 -#: ../libpurple/protocols/msn/msn.c:2620 ../libpurple/protocols/msn/msn.c:2627 +#: ../libpurple/protocols/msn/msn.c:2586 ../libpurple/protocols/msn/msn.c:2592 +#: ../libpurple/protocols/msn/msn.c:2599 ../libpurple/protocols/msn/msn.c:2606 msgid "Favorite Things" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2672 +#: ../libpurple/protocols/msn/msn.c:2651 msgid "Last Updated" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2683 +#: ../libpurple/protocols/msn/msn.c:2662 #: ../libpurple/protocols/silc/ops.c:1043 #: ../libpurple/protocols/silc10/ops.c:1060 msgid "Homepage" msgstr "" -#: ../libpurple/protocols/msn/msn.c:2709 +#: ../libpurple/protocols/msn/msn.c:2688 msgid "The user has not created a public profile." msgstr "" -#: ../libpurple/protocols/msn/msn.c:2710 +#: ../libpurple/protocols/msn/msn.c:2689 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:2714 +#: ../libpurple/protocols/msn/msn.c:2693 msgid "" "Could not find any information in the user's profile. The user most likely " "does not exist." msgstr "" -#: ../libpurple/protocols/msn/msn.c:2722 +#: ../libpurple/protocols/msn/msn.c:2701 #: ../libpurple/protocols/myspace/user.c:194 #: ../libpurple/protocols/myspace/user.c:197 #: ../libpurple/protocols/oscar/userinfo.c:544 @@ -8075,80 +8075,80 @@ #. *< name #. *< version #. *< summary -#: ../libpurple/protocols/msn/msn.c:3020 ../libpurple/protocols/msn/msn.c:3021 +#: ../libpurple/protocols/msn/msn.c:2999 ../libpurple/protocols/msn/msn.c:3000 msgid "Windows Live Messenger Protocol Plugin" msgstr "" -#: ../libpurple/protocols/msn/msn.c:3055 +#: ../libpurple/protocols/msn/msn.c:3034 msgid "Use HTTP Method" msgstr "" -#: ../libpurple/protocols/msn/msn.c:3060 +#: ../libpurple/protocols/msn/msn.c:3039 msgid "HTTP Method Server" msgstr "" -#: ../libpurple/protocols/msn/msn.c:3065 +#: ../libpurple/protocols/msn/msn.c:3044 msgid "Show custom smileys" msgstr "" -#: ../libpurple/protocols/msn/msn.c:3070 +#: ../libpurple/protocols/msn/msn.c:3049 msgid "Allow direct connections" msgstr "" -#: ../libpurple/protocols/msn/msn.c:3075 +#: ../libpurple/protocols/msn/msn.c:3054 msgid "Allow connecting from multiple locations" msgstr "" -#: ../libpurple/protocols/msn/msn.c:3083 +#: ../libpurple/protocols/msn/msn.c:3062 msgid "nudge: nudge a user to get their attention" msgstr "" -#: ../libpurple/protocols/msn/nexus.c:358 +#: ../libpurple/protocols/msn/nexus.c:357 msgid "Windows Live ID authentication:Unable to connect" msgstr "" -#: ../libpurple/protocols/msn/nexus.c:365 +#: ../libpurple/protocols/msn/nexus.c:364 msgid "Windows Live ID authentication:Invalid response" msgstr "" -#: ../libpurple/protocols/msn/notification.c:819 +#: ../libpurple/protocols/msn/notification.c:824 msgid "The following users are missing from your addressbook" msgstr "" -#: ../libpurple/protocols/msn/notification.c:827 -#: ../libpurple/protocols/msn/notification.c:874 +#: ../libpurple/protocols/msn/notification.c:832 +#: ../libpurple/protocols/msn/notification.c:879 #, c-format msgid "Unknown error (%d): %s" msgstr "" -#: ../libpurple/protocols/msn/notification.c:831 -#: ../libpurple/protocols/msn/notification.c:855 +#: ../libpurple/protocols/msn/notification.c:836 +#: ../libpurple/protocols/msn/notification.c:860 #: ../libpurple/protocols/sametime/sametime.c:4473 msgid "Unable to add user" msgstr "" #. Unknown error! -#: ../libpurple/protocols/msn/notification.c:854 -#: ../libpurple/protocols/msn/notification.c:900 +#: ../libpurple/protocols/msn/notification.c:859 +#: ../libpurple/protocols/msn/notification.c:905 #: ../libpurple/protocols/yahoo/libymsg.c:1997 #, c-format msgid "Unknown error (%d)" msgstr "" -#: ../libpurple/protocols/msn/notification.c:878 -#: ../libpurple/protocols/msn/notification.c:901 +#: ../libpurple/protocols/msn/notification.c:883 +#: ../libpurple/protocols/msn/notification.c:906 msgid "Unable to remove user" msgstr "" -#: ../libpurple/protocols/msn/notification.c:1200 +#: ../libpurple/protocols/msn/notification.c:1205 msgid "Mobile message was not sent because it was too long." msgstr "" -#: ../libpurple/protocols/msn/notification.c:1202 +#: ../libpurple/protocols/msn/notification.c:1207 msgid "Mobile message was not sent because an unknown error occurred." msgstr "" -#: ../libpurple/protocols/msn/notification.c:2204 +#: ../libpurple/protocols/msn/notification.c:2229 #, c-format msgid "" "The MSN server will shut down for maintenance in %d minute. You will " @@ -8185,6 +8185,27 @@ msgid "Message was not sent because an unknown error occurred." msgstr "" +#: ../libpurple/protocols/msn/oim.c:671 +#, c-format +msgid "" +"%s (There was an error receiving this message. Converting the encoding from " +"%s to UTF-8 failed.)" +msgstr "" + +#: ../libpurple/protocols/msn/oim.c:686 +#, c-format +msgid "" +"%s (There was an error receiving this message. The charset was %s, but it " +"was not valid UTF-8.)" +msgstr "" + +#: ../libpurple/protocols/msn/oim.c:690 +#, c-format +msgid "" +"%s (There was an error receiving this message. The charset was missing, but " +"it was not valid UTF-8.)" +msgstr "" + #: ../libpurple/protocols/msn/servconn.c:145 msgid "Writing error" msgstr "" @@ -8468,7 +8489,7 @@ msgstr "" #: ../libpurple/protocols/mxit/actions.c:482 -#: ../libpurple/protocols/oscar/oscar.c:5364 +#: ../libpurple/protocols/oscar/oscar.c:5350 msgid "_Search" msgstr "" @@ -9662,8 +9683,8 @@ #. #: ../libpurple/protocols/oscar/authorization.c:98 #: ../libpurple/protocols/oscar/oscar.c:1223 -#: ../libpurple/protocols/oscar/oscar.c:4967 -#: ../libpurple/protocols/oscar/oscar.c:5307 ../libpurple/request.h:1498 +#: ../libpurple/protocols/oscar/oscar.c:4953 +#: ../libpurple/protocols/oscar/oscar.c:5293 ../libpurple/request.h:1498 msgid "_OK" msgstr "" @@ -10009,17 +10030,17 @@ msgstr "" #: ../libpurple/protocols/oscar/oscar.c:157 -#: ../libpurple/protocols/oscar/oscar.c:4802 +#: ../libpurple/protocols/oscar/oscar.c:4788 msgid "Free For Chat" msgstr "" #: ../libpurple/protocols/oscar/oscar.c:161 -#: ../libpurple/protocols/oscar/oscar.c:4884 +#: ../libpurple/protocols/oscar/oscar.c:4870 msgid "Not Available" msgstr "" #: ../libpurple/protocols/oscar/oscar.c:163 -#: ../libpurple/protocols/oscar/oscar.c:4870 +#: ../libpurple/protocols/oscar/oscar.c:4856 msgid "Occupied" msgstr "" @@ -10034,22 +10055,22 @@ msgstr "" #: ../libpurple/protocols/oscar/oscar.c:171 -#: ../libpurple/protocols/oscar/oscar.c:4810 +#: ../libpurple/protocols/oscar/oscar.c:4796 msgid "Evil" msgstr "" #: ../libpurple/protocols/oscar/oscar.c:173 -#: ../libpurple/protocols/oscar/oscar.c:4818 +#: ../libpurple/protocols/oscar/oscar.c:4804 msgid "Depression" msgstr "" #: ../libpurple/protocols/oscar/oscar.c:175 -#: ../libpurple/protocols/oscar/oscar.c:4826 +#: ../libpurple/protocols/oscar/oscar.c:4812 msgid "At home" msgstr "" #: ../libpurple/protocols/oscar/oscar.c:177 -#: ../libpurple/protocols/oscar/oscar.c:4834 +#: ../libpurple/protocols/oscar/oscar.c:4820 msgid "At work" msgstr "" @@ -10230,7 +10251,7 @@ msgstr "" #: ../libpurple/protocols/oscar/oscar.c:2043 ../pidgin/gtkroomlist.c:325 -#: ../pidgin/plugins/disco/gtkdisco.c:692 +#: ../pidgin/plugins/disco/gtkdisco.c:694 msgid "_Add" msgstr "" @@ -10517,192 +10538,192 @@ msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats." msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:4796 +#: ../libpurple/protocols/oscar/oscar.c:4782 msgid "iTunes Music Store Link" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:4843 +#: ../libpurple/protocols/oscar/oscar.c:4829 msgid "Lunch" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:4964 +#: ../libpurple/protocols/oscar/oscar.c:4950 #, c-format msgid "Buddy Comment for %s" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:4965 +#: ../libpurple/protocols/oscar/oscar.c:4951 msgid "Buddy Comment:" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5014 +#: ../libpurple/protocols/oscar/oscar.c:5000 #, c-format msgid "You have selected to open a Direct IM connection with %s." msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5018 +#: ../libpurple/protocols/oscar/oscar.c:5004 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:5024 -#: ../libpurple/protocols/oscar/peer.c:1065 +#: ../libpurple/protocols/oscar/oscar.c:5010 +#: ../libpurple/protocols/oscar/peer.c:1074 msgid "C_onnect" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5062 +#: ../libpurple/protocols/oscar/oscar.c:5048 msgid "You closed the connection." msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5122 +#: ../libpurple/protocols/oscar/oscar.c:5108 msgid "Get AIM Info" msgstr "" #. We only do this if the user is in our buddy list -#: ../libpurple/protocols/oscar/oscar.c:5131 +#: ../libpurple/protocols/oscar/oscar.c:5117 msgid "Edit Buddy Comment" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5139 +#: ../libpurple/protocols/oscar/oscar.c:5125 msgid "Get X-Status Msg" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5157 +#: ../libpurple/protocols/oscar/oscar.c:5143 msgid "End Direct IM Session" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5163 +#: ../libpurple/protocols/oscar/oscar.c:5149 msgid "Direct IM" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5181 +#: ../libpurple/protocols/oscar/oscar.c:5167 msgid "Re-request Authorization" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5240 +#: ../libpurple/protocols/oscar/oscar.c:5226 msgid "Require authorization" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5243 +#: ../libpurple/protocols/oscar/oscar.c:5229 msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5248 +#: ../libpurple/protocols/oscar/oscar.c:5234 msgid "ICQ Privacy Options" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5305 +#: ../libpurple/protocols/oscar/oscar.c:5291 msgid "Change Address To:" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5338 +#: ../libpurple/protocols/oscar/oscar.c:5324 msgid "you are not waiting for authorization" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5341 +#: ../libpurple/protocols/oscar/oscar.c:5327 msgid "You are awaiting authorization from the following buddies" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5342 +#: ../libpurple/protocols/oscar/oscar.c:5328 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:5359 +#: ../libpurple/protocols/oscar/oscar.c:5345 msgid "Find Buddy by Email" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5360 +#: ../libpurple/protocols/oscar/oscar.c:5346 msgid "Search for a buddy by email address" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5361 +#: ../libpurple/protocols/oscar/oscar.c:5347 msgid "Type the email address of the buddy you are searching for." msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5522 +#: ../libpurple/protocols/oscar/oscar.c:5508 msgid "Set User Info (web)..." msgstr "" #. This only happens when connecting with the old-style BUCP login -#: ../libpurple/protocols/oscar/oscar.c:5534 +#: ../libpurple/protocols/oscar/oscar.c:5520 msgid "Change Password (web)" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5541 +#: ../libpurple/protocols/oscar/oscar.c:5527 msgid "Configure IM Forwarding (web)" msgstr "" #. ICQ actions -#: ../libpurple/protocols/oscar/oscar.c:5551 +#: ../libpurple/protocols/oscar/oscar.c:5537 msgid "Set Privacy Options..." msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5555 +#: ../libpurple/protocols/oscar/oscar.c:5541 msgid "Show Visible List" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5558 +#: ../libpurple/protocols/oscar/oscar.c:5544 msgid "Show Invisible List" msgstr "" #. AIM actions -#: ../libpurple/protocols/oscar/oscar.c:5564 +#: ../libpurple/protocols/oscar/oscar.c:5550 msgid "Confirm Account" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5568 +#: ../libpurple/protocols/oscar/oscar.c:5554 msgid "Display Currently Registered Email Address" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5572 +#: ../libpurple/protocols/oscar/oscar.c:5558 msgid "Change Currently Registered Email Address..." msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5579 +#: ../libpurple/protocols/oscar/oscar.c:5565 msgid "Show Buddies Awaiting Authorization" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5585 +#: ../libpurple/protocols/oscar/oscar.c:5571 msgid "Search for Buddy by Email Address..." msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5800 +#: ../libpurple/protocols/oscar/oscar.c:5786 msgid "Use clientLogin" msgstr "" -#: ../libpurple/protocols/oscar/oscar.c:5805 +#: ../libpurple/protocols/oscar/oscar.c:5791 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:5810 +#: ../libpurple/protocols/oscar/oscar.c:5796 msgid "Allow multiple simultaneous logins" msgstr "" -#: ../libpurple/protocols/oscar/peer.c:706 +#: ../libpurple/protocols/oscar/peer.c:724 #, c-format msgid "Asking %s to connect to us at %s:%hu for Direct IM." msgstr "" -#: ../libpurple/protocols/oscar/peer.c:800 +#: ../libpurple/protocols/oscar/peer.c:809 #, c-format msgid "Attempting to connect to %s:%hu." msgstr "" -#: ../libpurple/protocols/oscar/peer.c:874 +#: ../libpurple/protocols/oscar/peer.c:883 msgid "Attempting to connect via proxy server." msgstr "" -#: ../libpurple/protocols/oscar/peer.c:1053 +#: ../libpurple/protocols/oscar/peer.c:1062 #, c-format msgid "%s has just asked to directly connect to %s" msgstr "" -#: ../libpurple/protocols/oscar/peer.c:1057 +#: ../libpurple/protocols/oscar/peer.c:1066 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 " @@ -12484,7 +12505,7 @@ msgstr "" #: ../libpurple/protocols/silc/silc.c:981 -#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2394 +#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2411 #, c-format msgid "Normal" msgstr "" @@ -12859,7 +12880,7 @@ msgstr "" #: ../libpurple/protocols/silc/silc.c:2189 -#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2786 +#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2803 msgid "Network" msgstr "" @@ -13173,7 +13194,7 @@ msgid "Use proxy" msgstr "" -#: ../libpurple/protocols/simple/simple.c:2177 ../pidgin/gtkprefs.c:2787 +#: ../libpurple/protocols/simple/simple.c:2177 ../pidgin/gtkprefs.c:2804 msgid "Proxy" msgstr "" @@ -14141,27 +14162,27 @@ msgstr "" #. 10053 -#: ../libpurple/win32/libc_interface.c:320 +#: ../libpurple/win32/libc_interface.c:364 msgid "Connection interrupted by other software on your computer." msgstr "" #. 10054 -#: ../libpurple/win32/libc_interface.c:323 +#: ../libpurple/win32/libc_interface.c:367 msgid "Remote host closed connection." msgstr "" #. 10060 -#: ../libpurple/win32/libc_interface.c:326 +#: ../libpurple/win32/libc_interface.c:370 msgid "Connection timed out." msgstr "" #. 10061 -#: ../libpurple/win32/libc_interface.c:329 +#: ../libpurple/win32/libc_interface.c:373 msgid "Connection refused." msgstr "" #. 10048 -#: ../libpurple/win32/libc_interface.c:332 +#: ../libpurple/win32/libc_interface.c:376 msgid "Address already in use." msgstr "" @@ -14241,23 +14262,23 @@ msgid "No Proxy" msgstr "" -#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2096 +#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2113 msgid "SOCKS 4" msgstr "" -#: ../pidgin/gtkaccount.c:1012 ../pidgin/gtkprefs.c:2097 +#: ../pidgin/gtkaccount.c:1012 ../pidgin/gtkprefs.c:2114 msgid "SOCKS 5" msgstr "" -#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:2098 +#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:2115 msgid "Tor/Privacy (SOCKS5)" msgstr "" -#: ../pidgin/gtkaccount.c:1024 ../pidgin/gtkprefs.c:2099 +#: ../pidgin/gtkaccount.c:1024 ../pidgin/gtkprefs.c:2116 msgid "HTTP" msgstr "" -#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2100 +#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2117 msgid "Use Environmental Settings" msgstr "" @@ -14279,7 +14300,7 @@ msgid "Proxy _type:" msgstr "" -#: ../pidgin/gtkaccount.c:1117 ../pidgin/gtkprefs.c:2116 +#: ../pidgin/gtkaccount.c:1117 ../pidgin/gtkprefs.c:2133 msgid "_Host:" msgstr "" @@ -14287,7 +14308,7 @@ msgid "_Port:" msgstr "" -#: ../pidgin/gtkaccount.c:1138 ../pidgin/gtkprefs.c:2168 +#: ../pidgin/gtkaccount.c:1138 ../pidgin/gtkprefs.c:2185 msgid "Pa_ssword:" msgstr "" @@ -15564,7 +15585,7 @@ msgid "Separate IM and Chat windows" msgstr "" -#: ../pidgin/gtkconv.c:10068 ../pidgin/gtkprefs.c:2000 +#: ../pidgin/gtkconv.c:10068 ../pidgin/gtkprefs.c:2009 msgid "New window" msgstr "" @@ -16043,16 +16064,12 @@ msgid "Urdu" msgstr "" -#: ../pidgin/gtkdialogs.c:249 +#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:322 msgid "Vietnamese" msgstr "" -#: ../pidgin/gtkdialogs.c:249 -msgid "T.M.Thanh and the Gnome-Vi Team" -msgstr "" - -#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:322 -#: ../pidgin/gtkdialogs.c:323 +#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:323 +#: ../pidgin/gtkdialogs.c:324 msgid "Simplified Chinese" msgstr "" @@ -16062,7 +16079,7 @@ msgstr "" #: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255 -#: ../pidgin/gtkdialogs.c:324 +#: ../pidgin/gtkdialogs.c:325 msgid "Traditional Chinese" msgstr "" @@ -16075,7 +16092,11 @@ msgid "Lithuanian" msgstr "" -#: ../pidgin/gtkdialogs.c:495 +#: ../pidgin/gtkdialogs.c:322 +msgid "T.M.Thanh and the Gnome-Vi Team" +msgstr "" + +#: ../pidgin/gtkdialogs.c:496 #, c-format msgid "" "%s is a messaging client based on libpurple which is capable of connecting " @@ -16086,7 +16107,7 @@ " There is no warranty for %s.

" msgstr "" -#: ../pidgin/gtkdialogs.c:505 +#: ../pidgin/gtkdialogs.c:506 #, c-format msgid "" "Helpful Resources
\t
" msgstr "" -#: ../pidgin/gtkdialogs.c:512 +#: ../pidgin/gtkdialogs.c:513 #, c-format msgid "" "Help from other Pidgin users is available by " @@ -16108,114 +16129,114 @@ "responses may be less helpful.
" msgstr "" -#: ../pidgin/gtkdialogs.c:522 +#: ../pidgin/gtkdialogs.c:523 #, c-format msgid "About %s" msgstr "" -#: ../pidgin/gtkdialogs.c:544 +#: ../pidgin/gtkdialogs.c:545 msgid "Build Information" msgstr "" #. End of not to be translated section -#: ../pidgin/gtkdialogs.c:713 +#: ../pidgin/gtkdialogs.c:714 #, c-format msgid "%s Build Information" msgstr "" -#: ../pidgin/gtkdialogs.c:734 +#: ../pidgin/gtkdialogs.c:735 msgid "Current Developers" msgstr "" -#: ../pidgin/gtkdialogs.c:740 +#: ../pidgin/gtkdialogs.c:741 msgid "Crazy Patch Writers" msgstr "" -#: ../pidgin/gtkdialogs.c:746 +#: ../pidgin/gtkdialogs.c:747 msgid "Retired Developers" msgstr "" -#: ../pidgin/gtkdialogs.c:752 +#: ../pidgin/gtkdialogs.c:753 msgid "Retired Crazy Patch Writers" msgstr "" -#: ../pidgin/gtkdialogs.c:755 +#: ../pidgin/gtkdialogs.c:756 #, c-format msgid "%s Developer Information" msgstr "" -#: ../pidgin/gtkdialogs.c:776 +#: ../pidgin/gtkdialogs.c:777 msgid "Current Translators" msgstr "" -#: ../pidgin/gtkdialogs.c:782 +#: ../pidgin/gtkdialogs.c:783 msgid "Past Translators" msgstr "" -#: ../pidgin/gtkdialogs.c:785 +#: ../pidgin/gtkdialogs.c:786 #, c-format msgid "%s Translator Information" msgstr "" -#: ../pidgin/gtkdialogs.c:796 +#: ../pidgin/gtkdialogs.c:797 #, c-format msgid "%s Plugin Information" msgstr "" -#: ../pidgin/gtkdialogs.c:805 +#: ../pidgin/gtkdialogs.c:806 msgid "Plugin Information" msgstr "" -#: ../pidgin/gtkdialogs.c:861 ../pidgin/gtkdialogs.c:1000 -#: ../pidgin/gtkdialogs.c:1081 +#: ../pidgin/gtkdialogs.c:862 ../pidgin/gtkdialogs.c:1001 +#: ../pidgin/gtkdialogs.c:1082 msgid "_Name" msgstr "" -#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:1005 -#: ../pidgin/gtkdialogs.c:1086 +#: ../pidgin/gtkdialogs.c:867 ../pidgin/gtkdialogs.c:1006 +#: ../pidgin/gtkdialogs.c:1087 msgid "_Account" msgstr "_އެކައުންޓް" -#: ../pidgin/gtkdialogs.c:1013 +#: ../pidgin/gtkdialogs.c:1014 msgid "Get User Info" msgstr "" -#: ../pidgin/gtkdialogs.c:1015 +#: ../pidgin/gtkdialogs.c:1016 msgid "" "Please enter the username or alias of the person whose info you would like " "to view." msgstr "" -#: ../pidgin/gtkdialogs.c:1105 +#: ../pidgin/gtkdialogs.c:1106 msgid "View User Log" msgstr "" -#: ../pidgin/gtkdialogs.c:1127 +#: ../pidgin/gtkdialogs.c:1128 msgid "Alias Contact" msgstr "" -#: ../pidgin/gtkdialogs.c:1128 +#: ../pidgin/gtkdialogs.c:1129 msgid "Enter an alias for this contact." msgstr "" -#: ../pidgin/gtkdialogs.c:1150 +#: ../pidgin/gtkdialogs.c:1151 #, c-format msgid "Enter an alias for %s." msgstr "" -#: ../pidgin/gtkdialogs.c:1152 +#: ../pidgin/gtkdialogs.c:1153 msgid "Alias Buddy" msgstr "" -#: ../pidgin/gtkdialogs.c:1173 +#: ../pidgin/gtkdialogs.c:1174 msgid "Alias Chat" msgstr "" -#: ../pidgin/gtkdialogs.c:1174 +#: ../pidgin/gtkdialogs.c:1175 msgid "Enter an alias for this chat." msgstr "" -#: ../pidgin/gtkdialogs.c:1213 +#: ../pidgin/gtkdialogs.c:1214 #, c-format msgid "" "You are about to remove the contact containing %s and %d other buddy from " @@ -16226,70 +16247,70 @@ msgstr[0] "" msgstr[1] "" -#: ../pidgin/gtkdialogs.c:1221 +#: ../pidgin/gtkdialogs.c:1222 msgid "Remove Contact" msgstr "" -#: ../pidgin/gtkdialogs.c:1224 +#: ../pidgin/gtkdialogs.c:1225 msgid "_Remove Contact" msgstr "" -#: ../pidgin/gtkdialogs.c:1255 +#: ../pidgin/gtkdialogs.c:1256 #, 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:1262 +#: ../pidgin/gtkdialogs.c:1263 msgid "Merge Groups" msgstr "" -#: ../pidgin/gtkdialogs.c:1265 +#: ../pidgin/gtkdialogs.c:1266 msgid "_Merge Groups" msgstr "" -#: ../pidgin/gtkdialogs.c:1315 +#: ../pidgin/gtkdialogs.c:1316 #, 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:1318 +#: ../pidgin/gtkdialogs.c:1319 msgid "Remove Group" msgstr "" -#: ../pidgin/gtkdialogs.c:1321 +#: ../pidgin/gtkdialogs.c:1322 msgid "_Remove Group" msgstr "" -#: ../pidgin/gtkdialogs.c:1354 +#: ../pidgin/gtkdialogs.c:1355 #, c-format msgid "" "You are about to remove %s from your buddy list. Do you want to continue?" msgstr "" -#: ../pidgin/gtkdialogs.c:1357 +#: ../pidgin/gtkdialogs.c:1358 msgid "Remove Buddy" msgstr "" -#: ../pidgin/gtkdialogs.c:1360 +#: ../pidgin/gtkdialogs.c:1361 msgid "_Remove Buddy" msgstr "" -#: ../pidgin/gtkdialogs.c:1381 +#: ../pidgin/gtkdialogs.c:1382 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " "continue?" msgstr "" -#: ../pidgin/gtkdialogs.c:1384 +#: ../pidgin/gtkdialogs.c:1385 msgid "Remove Chat" msgstr "" -#: ../pidgin/gtkdialogs.c:1387 +#: ../pidgin/gtkdialogs.c:1388 msgid "_Remove Chat" msgstr "" @@ -17033,7 +17054,7 @@ msgstr "" #: ../pidgin/gtkpounce.c:564 ../pidgin/gtkroomlist.c:548 -#: ../pidgin/plugins/disco/gtkdisco.c:651 +#: ../pidgin/plugins/disco/gtkdisco.c:653 msgid "_Account:" msgstr "_އެކައުންޓް:" @@ -17109,7 +17130,7 @@ msgid "Br_owse..." msgstr "" -#: ../pidgin/gtkpounce.c:698 ../pidgin/gtkprefs.c:2637 +#: ../pidgin/gtkpounce.c:698 ../pidgin/gtkprefs.c:2654 msgid "Pre_view" msgstr "" @@ -17259,7 +17280,7 @@ msgid "_Hide new IM conversations:" msgstr "" -#: ../pidgin/gtkprefs.c:1358 ../pidgin/gtkprefs.c:2733 +#: ../pidgin/gtkprefs.c:1358 ../pidgin/gtkprefs.c:2750 msgid "When away" msgstr "" @@ -17524,226 +17545,226 @@ msgid "Browser preferences are configured in GNOME preferences" msgstr "" -#: ../pidgin/gtkprefs.c:1972 +#: ../pidgin/gtkprefs.c:1981 msgid "Browser configuration program was not found." msgstr "" -#: ../pidgin/gtkprefs.c:1975 +#: ../pidgin/gtkprefs.c:1984 msgid "Configure _Browser" msgstr "" -#: ../pidgin/gtkprefs.c:1988 +#: ../pidgin/gtkprefs.c:1997 msgid "_Browser:" msgstr "" -#: ../pidgin/gtkprefs.c:1996 +#: ../pidgin/gtkprefs.c:2005 msgid "_Open link in:" msgstr "" -#: ../pidgin/gtkprefs.c:1998 +#: ../pidgin/gtkprefs.c:2007 msgid "Browser default" msgstr "" -#: ../pidgin/gtkprefs.c:1999 +#: ../pidgin/gtkprefs.c:2008 msgid "Existing window" msgstr "" -#: ../pidgin/gtkprefs.c:2001 +#: ../pidgin/gtkprefs.c:2010 msgid "New tab" msgstr "" -#: ../pidgin/gtkprefs.c:2018 +#: ../pidgin/gtkprefs.c:2027 #, c-format msgid "" "_Manual:\n" "(%s for URL)" msgstr "" -#: ../pidgin/gtkprefs.c:2050 +#: ../pidgin/gtkprefs.c:2059 msgid "Proxy Server" msgstr "" -#: ../pidgin/gtkprefs.c:2057 +#: ../pidgin/gtkprefs.c:2066 msgid "Proxy preferences are configured in GNOME preferences" msgstr "" -#: ../pidgin/gtkprefs.c:2071 +#: ../pidgin/gtkprefs.c:2088 msgid "Proxy configuration program was not found." msgstr "" -#: ../pidgin/gtkprefs.c:2074 +#: ../pidgin/gtkprefs.c:2091 msgid "Configure _Proxy" msgstr "" #. This is a global option that affects SOCKS4 usage even with #. * account-specific proxy settings -#: ../pidgin/gtkprefs.c:2089 +#: ../pidgin/gtkprefs.c:2106 msgid "Use remote _DNS with SOCKS4 proxies" msgstr "" -#: ../pidgin/gtkprefs.c:2093 +#: ../pidgin/gtkprefs.c:2110 msgid "Proxy t_ype:" msgstr "" -#: ../pidgin/gtkprefs.c:2095 +#: ../pidgin/gtkprefs.c:2112 msgid "No proxy" msgstr "" -#: ../pidgin/gtkprefs.c:2134 +#: ../pidgin/gtkprefs.c:2151 msgid "P_ort:" msgstr "" -#: ../pidgin/gtkprefs.c:2150 +#: ../pidgin/gtkprefs.c:2167 msgid "User_name:" msgstr "" -#: ../pidgin/gtkprefs.c:2211 +#: ../pidgin/gtkprefs.c:2228 msgid "Log _format:" msgstr "" -#: ../pidgin/gtkprefs.c:2216 +#: ../pidgin/gtkprefs.c:2233 msgid "Log all _instant messages" msgstr "" -#: ../pidgin/gtkprefs.c:2218 +#: ../pidgin/gtkprefs.c:2235 msgid "Log all c_hats" msgstr "" -#: ../pidgin/gtkprefs.c:2220 +#: ../pidgin/gtkprefs.c:2237 msgid "Log all _status changes to system log" msgstr "" -#: ../pidgin/gtkprefs.c:2377 +#: ../pidgin/gtkprefs.c:2394 msgid "Sound Selection" msgstr "" -#: ../pidgin/gtkprefs.c:2388 +#: ../pidgin/gtkprefs.c:2405 #, c-format msgid "Quietest" msgstr "" -#: ../pidgin/gtkprefs.c:2390 +#: ../pidgin/gtkprefs.c:2407 #, c-format msgid "Quieter" msgstr "" -#: ../pidgin/gtkprefs.c:2392 +#: ../pidgin/gtkprefs.c:2409 #, c-format msgid "Quiet" msgstr "" -#: ../pidgin/gtkprefs.c:2396 +#: ../pidgin/gtkprefs.c:2413 #, c-format msgid "Loud" msgstr "" -#: ../pidgin/gtkprefs.c:2398 +#: ../pidgin/gtkprefs.c:2415 #, c-format msgid "Louder" msgstr "" -#: ../pidgin/gtkprefs.c:2400 +#: ../pidgin/gtkprefs.c:2417 #, c-format msgid "Loudest" msgstr "" -#: ../pidgin/gtkprefs.c:2492 +#: ../pidgin/gtkprefs.c:2509 msgid "_Method:" msgstr "" -#: ../pidgin/gtkprefs.c:2494 +#: ../pidgin/gtkprefs.c:2511 msgid "Console beep" msgstr "" -#: ../pidgin/gtkprefs.c:2501 +#: ../pidgin/gtkprefs.c:2518 msgid "No sounds" msgstr "" -#: ../pidgin/gtkprefs.c:2514 +#: ../pidgin/gtkprefs.c:2531 #, c-format msgid "" "Sound c_ommand:\n" "(%s for filename)" msgstr "" -#: ../pidgin/gtkprefs.c:2522 +#: ../pidgin/gtkprefs.c:2539 msgid "M_ute sounds" msgstr "" -#: ../pidgin/gtkprefs.c:2525 +#: ../pidgin/gtkprefs.c:2542 msgid "Sounds when conversation has _focus" msgstr "" -#: ../pidgin/gtkprefs.c:2527 +#: ../pidgin/gtkprefs.c:2544 msgid "_Enable sounds:" msgstr "" -#: ../pidgin/gtkprefs.c:2544 +#: ../pidgin/gtkprefs.c:2561 msgid "V_olume:" msgstr "" -#: ../pidgin/gtkprefs.c:2605 +#: ../pidgin/gtkprefs.c:2622 msgid "Play" msgstr "" -#: ../pidgin/gtkprefs.c:2633 +#: ../pidgin/gtkprefs.c:2650 msgid "_Browse..." msgstr "" -#: ../pidgin/gtkprefs.c:2641 +#: ../pidgin/gtkprefs.c:2658 msgid "_Reset" msgstr "" -#: ../pidgin/gtkprefs.c:2694 +#: ../pidgin/gtkprefs.c:2711 msgid "_Report idle time:" msgstr "" -#: ../pidgin/gtkprefs.c:2699 +#: ../pidgin/gtkprefs.c:2716 msgid "Based on keyboard or mouse use" msgstr "" -#: ../pidgin/gtkprefs.c:2706 +#: ../pidgin/gtkprefs.c:2723 msgid "_Minutes before becoming idle:" msgstr "" -#: ../pidgin/gtkprefs.c:2712 +#: ../pidgin/gtkprefs.c:2729 msgid "Change to this status when _idle:" msgstr "" -#: ../pidgin/gtkprefs.c:2730 +#: ../pidgin/gtkprefs.c:2747 msgid "_Auto-reply:" msgstr "" -#: ../pidgin/gtkprefs.c:2734 +#: ../pidgin/gtkprefs.c:2751 msgid "When both away and idle" msgstr "" #. Signon status stuff -#: ../pidgin/gtkprefs.c:2740 +#: ../pidgin/gtkprefs.c:2757 msgid "Status at Startup" msgstr "" -#: ../pidgin/gtkprefs.c:2742 +#: ../pidgin/gtkprefs.c:2759 msgid "Use status from last _exit at startup" msgstr "" -#: ../pidgin/gtkprefs.c:2751 +#: ../pidgin/gtkprefs.c:2768 msgid "Status to a_pply at startup:" msgstr "" -#: ../pidgin/gtkprefs.c:2775 +#: ../pidgin/gtkprefs.c:2792 msgid "Interface" msgstr "" -#: ../pidgin/gtkprefs.c:2781 +#: ../pidgin/gtkprefs.c:2798 msgid "Browser" msgstr "" -#: ../pidgin/gtkprefs.c:2790 +#: ../pidgin/gtkprefs.c:2807 msgid "Status / Idle" msgstr "" -#: ../pidgin/gtkprefs.c:2791 +#: ../pidgin/gtkprefs.c:2808 msgid "Themes" msgstr "" @@ -18366,38 +18387,38 @@ msgid "Add to Buddy List" msgstr "" -#: ../pidgin/plugins/disco/gtkdisco.c:472 +#: ../pidgin/plugins/disco/gtkdisco.c:474 msgid "Gateway" msgstr "" -#: ../pidgin/plugins/disco/gtkdisco.c:476 +#: ../pidgin/plugins/disco/gtkdisco.c:478 msgid "Directory" msgstr "" -#: ../pidgin/plugins/disco/gtkdisco.c:484 +#: ../pidgin/plugins/disco/gtkdisco.c:486 msgid "PubSub Collection" msgstr "" -#: ../pidgin/plugins/disco/gtkdisco.c:488 +#: ../pidgin/plugins/disco/gtkdisco.c:490 msgid "PubSub Leaf" msgstr "" -#: ../pidgin/plugins/disco/gtkdisco.c:492 +#: ../pidgin/plugins/disco/gtkdisco.c:494 msgid "Other" msgstr "" -#: ../pidgin/plugins/disco/gtkdisco.c:500 +#: ../pidgin/plugins/disco/gtkdisco.c:502 msgid "" "\n" "Description: " msgstr "" #. Create the window. -#: ../pidgin/plugins/disco/gtkdisco.c:635 +#: ../pidgin/plugins/disco/gtkdisco.c:637 msgid "Service Discovery" msgstr "" -#: ../pidgin/plugins/disco/gtkdisco.c:676 +#: ../pidgin/plugins/disco/gtkdisco.c:678 msgid "_Browse" msgstr "" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/system-service.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/system-service.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/system-service.po 2012-02-23 07:24:35.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/system-service.po 2012-03-23 07:46:32.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: 2012-02-22 00:49+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:26+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../backend/com.ubuntu.systemservice.policy.in.h:1 msgid "Get current global proxy" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/ubuntu-wallpapers.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/ubuntu-wallpapers.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/ubuntu-wallpapers.po 2012-02-23 07:24:34.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/ubuntu-wallpapers.po 2012-03-23 07:46:31.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: 2012-02-22 00:02+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:57+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../ubuntu-wallpapers.xml.in.h:1 msgid "Buck Off!" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/update-manager.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/update-manager.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/update-manager.po 2012-02-23 07:24:33.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/update-manager.po 2012-03-23 07:46:30.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-17 03:06+0000\n" +"POT-Creation-Date: 2012-03-20 20:39+0000\n" "PO-Revision-Date: 2010-05-25 10:37+0000\n" "Last-Translator: Huxain \n" "Language-Team: Divehi \n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-21 18:59+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:20+0000\n" +"X-Generator: Launchpad (build 14981)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:397 ../UpdateManager/Core/utils.py:397 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -27,13 +27,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:352 ../UpdateManager/Core/utils.py:352 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:208 ../DistUpgrade/distro.py:423 +#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:434 #, python-format msgid "Server for %s" msgstr "%s ގެ ސަރވަރ" @@ -41,20 +41,20 @@ #. 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 -#: ../DistUpgrade/distro.py:226 ../DistUpgrade/distro.py:232 -#: ../DistUpgrade/distro.py:248 +#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 +#: ../DistUpgrade/distro.py:246 msgid "Main server" msgstr "މައި ސަރވަރ" -#: ../DistUpgrade/distro.py:252 +#: ../DistUpgrade/distro.py:250 msgid "Custom servers" msgstr "އެހެނިހެން ސަރވަރތައް" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:131 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "އެއްވެސް ސޯރސް ލިސްޓް އެންޓްރީއެއް ނުފެނުނު" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:234 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -62,11 +62,11 @@ "އެއްވެސް ޕެކޭޖެއް ނުފެނުނު، މިއީ އުބުންޓުގެ ނިސްކެއް ނޫން ނުވަތަ މި ޑިސްކް " "އެލުލަވާލެވިފައިވަނީ ރަނގަޅަކަށް ނޫން" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:277 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "ސީޑީ އެއް ނުކުރެވި ފޭލްވެއްޖެ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:278 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -76,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:130 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:133 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -97,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:231 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:341 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:342 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:631 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -125,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:641 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:673 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:650 -#: ../UpdateManager/UpdateManager.py:772 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1025 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:700 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:701 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:721 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:725 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:734 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:851 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' އިންސްޓޯލެއް ނުކުރެވުނު" -#: ../DistUpgrade/DistUpgradeCache.py:882 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:861 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:862 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -192,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:86 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:189 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:190 +#: ../DistUpgrade/DistUpgradeController.py:211 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:236 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:237 +#: ../DistUpgrade/DistUpgradeController.py:245 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -219,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:251 +#: ../DistUpgrade/DistUpgradeController.py:259 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:252 +#: ../DistUpgrade/DistUpgradeController.py:260 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -234,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:267 +#: ../DistUpgrade/DistUpgradeController.py:274 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:268 +#: ../DistUpgrade/DistUpgradeController.py:275 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -246,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:282 +#: ../DistUpgrade/DistUpgradeController.py:283 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -255,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:339 -#: ../DistUpgrade/DistUpgradeController.py:384 +#: ../DistUpgrade/DistUpgradeController.py:355 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "Can not upgrade" msgstr "އަޕްގްރޭޑް ނުކުރެވުނު" -#: ../DistUpgrade/DistUpgradeController.py:340 +#: ../DistUpgrade/DistUpgradeController.py:356 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:349 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:350 +#: ../DistUpgrade/DistUpgradeController.py:366 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:356 +#: ../DistUpgrade/DistUpgradeController.py:372 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:372 +#: ../DistUpgrade/DistUpgradeController.py:373 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -287,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:401 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:411 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:412 +#: ../DistUpgrade/DistUpgradeController.py:428 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:439 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:441 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -316,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:422 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:423 +#: ../DistUpgrade/DistUpgradeController.py:453 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -332,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:647 +#: ../DistUpgrade/DistUpgradeController.py:673 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:674 +#: ../DistUpgrade/DistUpgradeController.py:700 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:675 +#: ../DistUpgrade/DistUpgradeController.py:701 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -354,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:695 +#: ../DistUpgrade/DistUpgradeController.py:721 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:696 +#: ../DistUpgrade/DistUpgradeController.py:722 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -367,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:731 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:757 +#: ../DistUpgrade/DistUpgradeController.py:758 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:738 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:739 +#: ../DistUpgrade/DistUpgradeController.py:766 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:806 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:782 +#: ../DistUpgrade/DistUpgradeController.py:809 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -407,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:830 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:831 +#: ../DistUpgrade/DistUpgradeController.py:858 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" #. print "on_button_install_clicked" -#: ../DistUpgrade/DistUpgradeController.py:840 -#: ../UpdateManager/UpdateManager.py:577 +#: ../DistUpgrade/DistUpgradeController.py:867 +#: ../UpdateManager/UpdateManager.py:750 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:867 +#: ../DistUpgrade/DistUpgradeController.py:868 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -434,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:869 -#: ../DistUpgrade/DistUpgradeController.py:1610 +#: ../DistUpgrade/DistUpgradeController.py:897 +#: ../DistUpgrade/DistUpgradeController.py:1664 msgid "Calculating the changes" msgstr "" -#. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeController.py:920 +#. ask the user +#: ../DistUpgrade/DistUpgradeController.py:929 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:985 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:995 +#: ../DistUpgrade/DistUpgradeController.py:996 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:991 -#: ../DistUpgrade/DistUpgradeController.py:1097 +#: ../DistUpgrade/DistUpgradeController.py:1002 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1002 +#: ../DistUpgrade/DistUpgradeController.py:1003 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -467,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1049 -#: ../DistUpgrade/DistUpgradeController.py:1085 -#: ../DistUpgrade/DistUpgradeController.py:1190 +#: ../DistUpgrade/DistUpgradeController.py:1087 +#: ../DistUpgrade/DistUpgradeController.py:1124 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1051 -#: ../DistUpgrade/DistUpgradeController.py:1087 -#: ../DistUpgrade/DistUpgradeController.py:1229 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1126 +#: ../DistUpgrade/DistUpgradeController.py:1268 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1052 -#: ../DistUpgrade/DistUpgradeController.py:1066 -#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1090 +#: ../DistUpgrade/DistUpgradeController.py:1105 +#: ../DistUpgrade/DistUpgradeController.py:1127 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1095 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1091 +#: ../DistUpgrade/DistUpgradeController.py:1100 #, python-format msgid "" "\n" @@ -504,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1128 +#: ../DistUpgrade/DistUpgradeController.py:1137 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1178 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1179 -#: ../DistUpgrade/DistUpgrade.ui.h:22 +#: ../DistUpgrade/DistUpgradeController.py:1218 +#: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_ބަހައްޓާ" -#: ../DistUpgrade/DistUpgradeController.py:1179 +#: ../DistUpgrade/DistUpgradeController.py:1218 msgid "_Remove" msgstr "އުނިކު_ރޭ" -#: ../DistUpgrade/DistUpgradeController.py:1191 +#: ../DistUpgrade/DistUpgradeController.py:1230 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -531,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1267 +#: ../DistUpgrade/DistUpgradeController.py:1306 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1268 +#: ../DistUpgrade/DistUpgradeController.py:1307 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1513 -#: ../DistUpgrade/DistUpgradeController.py:1580 +#: ../DistUpgrade/DistUpgradeController.py:1568 +#: ../DistUpgrade/DistUpgradeController.py:1633 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1518 +#: ../DistUpgrade/DistUpgradeController.py:1573 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1543 +#: ../DistUpgrade/DistUpgradeController.py:1574 msgid "" -"Preparing the system for the upgrade failed so a bug reporting process " -"isbeing started." +"Preparing the system for the upgrade failed so a bug reporting process is " +"being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1535 +#: ../DistUpgrade/DistUpgradeController.py:1588 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1558 +#: ../DistUpgrade/DistUpgradeController.py:1589 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -569,71 +569,71 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1566 +#: ../DistUpgrade/DistUpgradeController.py:1617 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1624 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1625 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1598 +#: ../DistUpgrade/DistUpgradeController.py:1653 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1623 +#: ../DistUpgrade/DistUpgradeController.py:1654 #, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore so a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1616 -#: ../DistUpgrade/DistUpgradeController.py:1664 +#: ../DistUpgrade/DistUpgradeController.py:1670 +#: ../DistUpgrade/DistUpgradeController.py:1723 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1622 -#: ../DistUpgrade/DistUpgradeController.py:1668 +#: ../DistUpgrade/DistUpgradeController.py:1676 +#: ../DistUpgrade/DistUpgradeController.py:1727 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1627 -#: ../DistUpgrade/DistUpgradeController.py:1670 -#: ../DistUpgrade/DistUpgradeController.py:1677 -#: ../DistUpgrade/DistUpgradeController.py:1688 +#: ../DistUpgrade/DistUpgradeController.py:1681 +#: ../DistUpgrade/DistUpgradeController.py:1729 +#: ../DistUpgrade/DistUpgradeController.py:1736 +#: ../DistUpgrade/DistUpgradeController.py:1747 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1651 -#: ../DistUpgrade/DistUpgradeController.py:1699 -#: ../DistUpgrade/DistUpgradeController.py:1706 +#: ../DistUpgrade/DistUpgradeController.py:1682 +#: ../DistUpgrade/DistUpgradeController.py:1730 +#: ../DistUpgrade/DistUpgradeController.py:1737 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1635 +#: ../DistUpgrade/DistUpgradeController.py:1689 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1640 +#: ../DistUpgrade/DistUpgradeController.py:1698 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1748 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:168 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:169 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -641,26 +641,28 @@ msgstr "" #: ../DistUpgrade/DistUpgradeQuirks.py:496 -msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." +msgid "" +"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" #: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" -"The support in Ubuntu 11.04 for your intel graphics hardware is limited and " -"you may encounter problems after the upgrade. Do you want to continue with " -"the upgrade?" +"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " +"and you may encounter problems after the upgrade. For more information see " +"https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to " +"continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:444 -#: ../DistUpgrade/DistUpgradeQuirks.py:472 -#: ../DistUpgrade/DistUpgradeQuirks.py:499 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:448 -#: ../DistUpgrade/DistUpgradeQuirks.py:476 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -669,7 +671,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:503 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -678,11 +680,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:607 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:608 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -690,11 +692,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:531 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -702,11 +704,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:551 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:552 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -716,15 +718,15 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:48 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:50 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:56 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -734,7 +736,7 @@ msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:62 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" @@ -742,39 +744,45 @@ msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:64 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#: ../DistUpgrade/DistUpgradeViewKDE.py:190 +#: ../DistUpgrade/DistUpgradeViewGtk.py:114 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:117 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 #: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewKDE.py:204 +#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:138 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:142 -#: ../DistUpgrade/DistUpgradeViewKDE.py:217 +#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:149 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:143 -#: ../DistUpgrade/DistUpgradeViewGtk.py:280 -#: ../DistUpgrade/DistUpgradeViewKDE.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:152 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:301 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:145 -#: ../DistUpgrade/DistUpgradeViewKDE.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:152 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -782,25 +790,29 @@ #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:177 -#: ../DistUpgrade/DistUpgradeViewKDE.py:254 +#: ../DistUpgrade/DistUpgradeViewGtk.py:183 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:186 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "ބަދަލުތައް ހުށައަޅަނީ" #. we do not report followup errors from earlier failures -#: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#: ../DistUpgrade/DistUpgradeViewKDE.py:267 +#: ../DistUpgrade/DistUpgradeViewGtk.py:208 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:211 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:207 -#: ../DistUpgrade/DistUpgradeViewKDE.py:269 +#: ../DistUpgrade/DistUpgradeViewGtk.py:213 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:216 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:208 -#: ../DistUpgrade/DistUpgradeViewKDE.py:270 +#: ../DistUpgrade/DistUpgradeViewGtk.py:214 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:217 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -808,28 +820,32 @@ msgstr "" #. self.expander.set_expanded(True) -#: ../DistUpgrade/DistUpgradeViewGtk.py:225 -#: ../DistUpgrade/DistUpgradeViewKDE.py:291 +#: ../DistUpgrade/DistUpgradeViewGtk.py:231 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:234 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:226 -#: ../DistUpgrade/DistUpgradeViewKDE.py:292 +#: ../DistUpgrade/DistUpgradeViewGtk.py:232 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:235 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:240 -#: ../DistUpgrade/DistUpgradeViewKDE.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:253 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:445 -#: ../DistUpgrade/DistUpgradeViewText.py:88 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:469 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" @@ -842,18 +858,21 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:487 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:488 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:611 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:621 msgid "To prevent data loss close all open applications and documents." msgstr "" @@ -894,47 +913,47 @@ msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:191 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 #: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:322 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:325 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:539 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "މައްސަލަ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:551 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:553 -#: ../DistUpgrade/DistUpgradeViewKDE.py:792 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:599 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:602 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:682 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "މަޢުލޫމާތު" -#: ../DistUpgrade/DistUpgradeViewKDE.py:732 -#: ../DistUpgrade/DistUpgradeViewKDE.py:775 -#: ../DistUpgrade/DistUpgradeViewKDE.py:778 ../DistUpgrade/DistUpgrade.ui.h:11 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "ތަފްޞީލްތައް" @@ -943,47 +962,43 @@ msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:627 -#: ../DistUpgrade/DistUpgradeViewKDE.py:758 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:632 -#: ../DistUpgrade/DistUpgradeViewKDE.py:760 -#: ../DistUpgrade/DistUpgradeViewText.py:169 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:635 -#: ../DistUpgrade/DistUpgradeViewKDE.py:762 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:637 -#: ../DistUpgrade/DistUpgradeViewKDE.py:764 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:788 -#: ../DistUpgrade/DistUpgradeViewText.py:217 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:788 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:791 ../DistUpgrade/DistUpgrade.ui.h:25 -#: ../data/glade/UpdateManager.ui.h:31 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:26 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -991,32 +1006,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:60 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:62 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:64 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1032,7 +1047,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:78 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1046,14 +1061,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:93 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:128 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1061,28 +1076,28 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:132 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:234 ../DistUpgrade/DistUpgrade.ui.h:16 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:235 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:236 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:237 ../DistUpgrade/DistUpgrade.ui.h:15 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:238 ../DistUpgrade/DistUpgrade.ui.h:10 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" @@ -1099,28 +1114,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:322 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:327 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:333 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:338 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1149,17 +1164,17 @@ msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:349 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:363 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -1176,10 +1191,10 @@ msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:132 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:133 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:132 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:133 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" @@ -1190,66 +1205,66 @@ "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:202 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:202 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:205 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:205 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:235 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:235 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:239 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:239 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:240 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:240 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:245 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:245 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:246 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:246 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:251 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:251 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:266 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:272 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:266 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:272 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" @@ -1260,8 +1275,8 @@ "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" @@ -1274,11 +1289,11 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:113 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:118 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" @@ -1286,33 +1301,33 @@ msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:150 -#: ../DistUpgrade/DistUpgradeViewText.py:183 -#: ../DistUpgrade/DistUpgradeViewText.py:190 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:150 -#: ../DistUpgrade/DistUpgradeViewText.py:183 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:154 -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "އ" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:200 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "ނ" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:160 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "ތ" @@ -1321,40 +1336,40 @@ msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:165 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:175 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:180 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:197 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:218 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:20 +#: ../DistUpgrade/DistUpgrade.ui.h:1 msgid "_Cancel Upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgrade.ui.h:2 msgid "_Resume Upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:2 +#: ../DistUpgrade/DistUpgrade.ui.h:3 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1362,38 +1377,38 @@ "strongly adviced to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:27 +#: ../DistUpgrade/DistUpgrade.ui.h:6 msgid "_Start Upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgrade.ui.h:9 msgid "_Replace" msgstr "_ބަދަލުކުރޭ (ރިޕްލޭސް)" -#: ../DistUpgrade/DistUpgrade.ui.h:12 +#: ../DistUpgrade/DistUpgrade.ui.h:10 msgid "Difference between the files" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:24 +#: ../DistUpgrade/DistUpgrade.ui.h:11 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgrade.ui.h:12 msgid "_Continue" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:8 +#: ../DistUpgrade/DistUpgrade.ui.h:13 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:5 +#: ../DistUpgrade/DistUpgrade.ui.h:15 msgid "" "Restart the system to complete the upgrade\n" "\n" "Please save your work before continuing." msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:13 +#: ../DistUpgrade/DistUpgrade.ui.h:18 msgid "Distribution Upgrade" msgstr "" @@ -1401,46 +1416,46 @@ msgid "Upgrading Ubuntu to version 12.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:1 +#: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " msgstr " " -#: ../DistUpgrade/DistUpgrade.ui.h:18 +#: ../DistUpgrade/DistUpgrade.ui.h:22 msgid "Setting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:17 +#: ../DistUpgrade/DistUpgrade.ui.h:24 msgid "Restarting the computer" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:19 +#: ../DistUpgrade/DistUpgrade.ui.h:27 msgid "Terminal" msgstr "ޓާރމިނަލް" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:42 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:44 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:85 +#: ../UpdateManager/DistUpgradeFetcher.py:108 #: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:86 +#: ../UpdateManager/DistUpgradeFetcher.py:109 #: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:96 +#: ../UpdateManager/DistUpgradeFetcher.py:119 #: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:97 +#: ../UpdateManager/DistUpgradeFetcher.py:120 #: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" @@ -1451,8 +1466,8 @@ msgstr "އަޕްގްރޭޑް" #: ../UpdateManager/DistUpgradeFetcherKDE.py:89 -#: ../data/glade/UpdateManager.ui.h:12 -#: ../data/glade/UpgradePromptDialog.ui.h:4 +#: ../data/gtkbuilder/UpdateManager.ui.h:20 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "ރިލީސް ނޯޓު" @@ -1472,20 +1487,20 @@ msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:70 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:72 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:116 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:121 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" @@ -1497,14 +1512,24 @@ #: ../UpdateManager/UpdateManager.py:105 msgid "" "You will not get any further security fixes or critical updates. Please " -"upgrade to a later version of Ubuntu Linux." +"upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:113 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:308 +#: ../UpdateManager/UpdateManager.py:226 +#: ../UpdateManagerText/UpdateManagerText.py:32 +msgid "Install" +msgstr "އިންސްޓޯލް" + +#: ../UpdateManager/UpdateManager.py:228 +msgid "Name" +msgstr "" + +#. upload_archive = version_match.group(2).strip() +#: ../UpdateManager/UpdateManager.py:388 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" @@ -1514,7 +1539,7 @@ "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:365 +#: ../UpdateManager/UpdateManager.py:453 msgid "Downloading list of changes..." msgstr "" @@ -1599,7 +1624,8 @@ msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:505 ../data/glade/UpdateManager.ui.h:23 +#: ../UpdateManager/UpdateManager.py:669 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1609,41 +1635,21 @@ msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:524 +#: ../UpdateManager/UpdateManager.py:696 msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:698 +#: ../UpdateManager/UpdateManager.py:697 msgid "" "These software updates have been issued since this version of Ubuntu was " -"released. If you don't want to install them now, choose \"Update Manager\" " -"from Applications later." +"released." msgstr "" #: ../UpdateManager/UpdateManager.py:700 -msgid "" -"These software updates have been issued since this version of Ubuntu was " -"released. If you don't want to install them now, choose \"Update Manager\" " -"from the Administration Menu later." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:528 -msgid "Software updates are available for this computer" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:705 -msgid "" -"If you don't want to install them now, choose \"Update Manager\" from " -"Applications later." +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:529 -msgid "" -"If you don't want to install them now, choose \"Update Manager\" from the " -"Administration menu later." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:578 +#: ../UpdateManager/UpdateManager.py:751 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1651,30 +1657,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../data/glade/UpdateManager.ui.h:24 +#: ../UpdateManager/UpdateManager.py:776 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:637 -#: ../UpdateManagerHildon/UpdateManagerHildon.py:114 +#: ../UpdateManager/UpdateManager.py:840 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:863 +#: ../UpdateManager/UpdateManager.py:855 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:880 +#: ../UpdateManager/UpdateManager.py:872 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:750 +#: ../UpdateManager/UpdateManager.py:996 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:751 +#: ../UpdateManager/UpdateManager.py:997 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1683,7 +1688,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:773 +#: ../UpdateManager/UpdateManager.py:1026 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1691,53 +1696,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:796 +#: ../UpdateManager/UpdateManager.py:1051 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:800 +#: ../UpdateManager/UpdateManager.py:1058 #, python-format msgid "(Size: %s)" msgstr "(Size: %s)" -#: ../UpdateManager/UpdateManager.py:802 +#: ../UpdateManager/UpdateManager.py:1060 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:806 +#: ../UpdateManager/UpdateManager.py:1064 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1103 ../do-release-upgrade:107 +#: ../UpdateManager/UpdateManager.py:1095 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:108 +#: ../UpdateManager/UpdateManager.py:1096 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#. print "on_button_dist_upgrade_clicked" -#: ../UpdateManager/UpdateManager.py:847 ../check-new-release-gtk:87 +#: ../UpdateManager/UpdateManager.py:1098 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:854 +#: ../UpdateManager/UpdateManager.py:1105 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:893 +#: ../UpdateManager/UpdateManager.py:1144 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:1145 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 " @@ -1752,14 +1756,10 @@ msgid "Install All Available Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:26 +#: ../UpdateManagerText/UpdateManagerText.py:31 msgid "Cancel" msgstr "ކެންސަލް" -#: ../UpdateManagerText/UpdateManagerText.py:27 -msgid "Install" -msgstr "އިންސްޓޯލް" - #: ../UpdateManagerText/UpdateManagerText.py:34 msgid "Changelog" msgstr "" @@ -1768,11 +1768,11 @@ msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:45 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:48 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1786,11 +1786,11 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:117 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:124 +#: ../UpdateManager/Core/MyCache.py:130 #, python-format msgid "Other updates (%s)" msgstr "" @@ -1808,13 +1808,13 @@ msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:297 +#: ../UpdateManager/Core/MyCache.py:305 ../UpdateManager/Core/MyCache.py:326 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:286 +#: ../UpdateManager/Core/MyCache.py:315 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1823,7 +1823,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:291 +#: ../UpdateManager/Core/MyCache.py:320 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1832,52 +1832,52 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:50 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:62 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:71 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" -#: ../data/glade/UpdateManager.ui.h:6 +#: ../data/gtkbuilder/UpdateManager.ui.h:1 msgid "Starting Update Manager" msgstr "" -#: ../data/glade/UpdateManager.ui.h:30 +#: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "" -#: ../data/glade/UpdateManager.ui.h:4 +#: ../data/gtkbuilder/UpdateManager.ui.h:4 msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:5 msgid "" "Run a partial upgrade, to install as many updates as possible. \n" "\n" @@ -1888,11 +1888,11 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.ui.h:8 +#: ../data/gtkbuilder/UpdateManager.ui.h:12 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.ui.h:1 +#: ../data/gtkbuilder/UpdateManager.ui.h:13 msgid "" "You must check for updates manually\n" "\n" @@ -1900,33 +1900,33 @@ "behavior in Software Sources on the Updates tab." msgstr "" -#: ../data/glade/UpdateManager.ui.h:28 +#: ../data/gtkbuilder/UpdateManager.ui.h:16 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.ui.h:9 +#: ../data/gtkbuilder/UpdateManager.ui.h:17 msgid "Co_ntinue" msgstr "" -#: ../data/glade/UpdateManager.ui.h:5 +#: ../data/gtkbuilder/UpdateManager.ui.h:18 msgid "Running on battery" msgstr "" -#: ../data/glade/UpdateManager.ui.h:27 +#: ../data/gtkbuilder/UpdateManager.ui.h:19 msgid "Your system is running on battery. Are you sure you want to continue?" msgstr "" -#: ../data/glade/UpdateManager.ui.h:32 +#: ../data/gtkbuilder/UpdateManager.ui.h:21 msgid "_Upgrade" msgstr "" -#: ../data/glade/UpdateManager.ui.h:22 -#: ../data/glade/UpgradePromptDialog.ui.h:5 +#: ../data/gtkbuilder/UpdateManager.ui.h:22 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:8 msgid "Show progress of individual files" msgstr "" -#: ../data/glade/UpdateManager.ui.h:26 ../data/update-manager.desktop.in.h:3 -#: ../data/update-manager-hildon.desktop.in.h:3 +#: ../data/gtkbuilder/UpdateManager.ui.h:23 +#: ../data/update-manager.desktop.in.h:1 msgid "Update Manager" msgstr "" @@ -1934,11 +1934,11 @@ msgid "Starting Update Manager" msgstr "" -#: ../data/glade/UpdateManager.ui.h:25 +#: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "updates" msgstr "" @@ -1956,19 +1956,19 @@ msgid "It’s safer to connect the computer to AC power before updating." msgstr "" -#: ../data/glade/UpdateManager.ui.h:29 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "_Install Updates" msgstr "_އަޕްޑޭޓްސް އިންސްޓޯލްކުރޭ" -#: ../data/glade/UpdateManager.ui.h:7 +#: ../data/gtkbuilder/UpdateManager.ui.h:32 msgid "Changes" msgstr "ބަދަލުތައް" -#: ../data/glade/UpdateManager.ui.h:10 +#: ../data/gtkbuilder/UpdateManager.ui.h:33 msgid "Description" msgstr "ތަފްސީލް" -#: ../data/glade/UpdateManager.ui.h:11 +#: ../data/gtkbuilder/UpdateManager.ui.h:34 msgid "Description of update" msgstr "" @@ -1976,68 +1976,66 @@ msgid "_Settings..." msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:1 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "" "A new version of Ubuntu is available. Would you like to upgrade?" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:3 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:3 msgid "Don't Upgrade" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:2 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:4 msgid "Ask Me Later" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:6 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:5 msgid "Yes, Upgrade Now" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:8 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:6 msgid "You have declined to upgrade to the new Ubuntu" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:7 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" "You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" #: ../data/update-manager.desktop.in.h:2 -#: ../data/update-manager-hildon.desktop.in.h:2 msgid "Software Updates" msgstr "" -#: ../data/update-manager.desktop.in.h:1 -#: ../data/update-manager-hildon.desktop.in.h:1 +#: ../data/update-manager.desktop.in.h:3 msgid "Show and install available updates" msgstr "" -#: ../update-manager:53 ../do-release-upgrade:33 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:56 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:59 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:62 ../do-release-upgrade:36 ../check-new-release-gtk:138 +#: ../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:66 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:73 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:76 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" @@ -2045,11 +2043,11 @@ msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:80 ../do-release-upgrade:52 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:100 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" @@ -2057,23 +2055,23 @@ msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:40 ../check-new-release-gtk:142 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:44 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:50 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:55 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2089,24 +2087,24 @@ "%(url)s\n" msgstr "" -#: ../do-release-upgrade:79 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:84 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:85 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:67 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:103 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" diff -Nru language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/usbcreator.po language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/usbcreator.po --- language-pack-dv-base-12.04+20120221/data/dv/LC_MESSAGES/usbcreator.po 2012-02-23 07:24:35.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/data/dv/LC_MESSAGES/usbcreator.po 2012-03-23 07:46:32.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: usb-creator\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-01-13 09:16+0000\n" +"POT-Creation-Date: 2012-03-13 18:22+0000\n" "PO-Revision-Date: 2010-08-07 08:46+0000\n" "Last-Translator: Evan Dandrea \n" "Language-Team: Divehi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-22 00:51+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:27+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: .././usbcreator/install.py:133 #, python-format @@ -129,60 +129,60 @@ msgid "Checksums do not match." msgstr "" -#: .././usbcreator/frontends/gtk/frontend.py:345 usbcreator-kde.ui.py:12 +#: .././usbcreator/frontends/gtk/frontend.py:347 usbcreator-kde.ui.py:12 msgid "CD-Drive/Image" msgstr "" -#: .././usbcreator/frontends/gtk/frontend.py:358 +#: .././usbcreator/frontends/gtk/frontend.py:360 #: .././usbcreator/frontends/winui/main_dialog.py:28 usbcreator-kde.ui.py:15 msgid "OS Version" msgstr "" #. #-#-#-#-# usbcreator.pot (PACKAGE VERSION) #-#-#-#-# #. encode to UTF-8 to work around GNOME #620579 -#: .././usbcreator/frontends/gtk/frontend.py:369 +#: .././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:442 +#: .././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/gtk/frontend.py:444 +#: .././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/gtk/frontend.py:476 -#: .././usbcreator/frontends/gtk/frontend.py:745 +#: .././usbcreator/frontends/gtk/frontend.py:478 +#: .././usbcreator/frontends/gtk/frontend.py:747 msgid "Erasing..." msgstr "" -#: .././usbcreator/frontends/gtk/frontend.py:481 +#: .././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:535 +#: .././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:551 +#: .././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:561 +#: .././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:571 +#: .././usbcreator/frontends/gtk/frontend.py:573 #: .././usbcreator/frontends/winui/main_dialog.py:39 usbcreator-kde.ui.py:39 msgid "Free Space" msgstr "ހުސް ޖާގަ" @@ -191,14 +191,14 @@ #. 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/gtk/frontend.py:583 +#: .././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/gtk/frontend.py:583 +#: .././usbcreator/frontends/gtk/frontend.py:585 #: .././usbcreator/frontends/winui/frontend.py:178 #: .././usbcreator/frontends/kde/frontend.py:406 #: usbcreator/frontends/kde/frontend.py:406 @@ -207,18 +207,18 @@ #. TODO evand 2009-07-31: Make these the default values in the #. GtkBuilder file. -#: .././usbcreator/frontends/gtk/frontend.py:604 +#: .././usbcreator/frontends/gtk/frontend.py:606 #: .././usbcreator/frontends/winui/install_window.py:28 msgid "Starting up..." msgstr "ހުޅުވެމުން ދަނީ ..." -#: .././usbcreator/frontends/gtk/frontend.py:633 +#: .././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:637 +#: .././usbcreator/frontends/gtk/frontend.py:639 #: .././usbcreator/frontends/winui/frontend.py:155 #, python-format msgid "%d%% complete" @@ -226,7 +226,7 @@ #. #-#-#-#-# usbcreator.pot (PACKAGE VERSION) #-#-#-#-# #. TODO evand 2009-07-28: Better error message. -#: .././usbcreator/frontends/gtk/frontend.py:683 +#: .././usbcreator/frontends/gtk/frontend.py:685 #: .././usbcreator/frontends/winui/frontend.py:85 #: .././usbcreator/frontends/kde/frontend.py:208 #: usbcreator/frontends/kde/frontend.py:208 @@ -235,7 +235,7 @@ #. #-#-#-#-# usbcreator.pot (PACKAGE VERSION) #-#-#-#-# #. TODO information about the device we're about to format. -#: .././usbcreator/frontends/gtk/frontend.py:740 +#: .././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?" Binary files /tmp/76KsYG9TNI/language-pack-dv-base-12.04+20120221/data/extra.tar and /tmp/7WAhLL9_6I/language-pack-dv-base-12.04+20120322/data/extra.tar differ diff -Nru language-pack-dv-base-12.04+20120221/debian/changelog language-pack-dv-base-12.04+20120322/debian/changelog --- language-pack-dv-base-12.04+20120221/debian/changelog 2012-02-23 07:24:31.000000000 +0000 +++ language-pack-dv-base-12.04+20120322/debian/changelog 2012-03-23 07:46:28.000000000 +0000 @@ -1,6 +1,6 @@ -language-pack-dv-base (1:12.04+20120221) precise; urgency=low +language-pack-dv-base (1:12.04+20120322) precise; urgency=low * Initial Release. - -- Ubuntu automatic language-pack builder Thu, 23 Feb 2012 07:24:30 +0000 + -- Ubuntu automatic language-pack builder Fri, 23 Mar 2012 07:46:28 +0000